diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-08-19 18:55:53 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-10-13 18:20:56 +0200 |
| commit | 5b48befaad3281c479673aed7c4b831e6e0da694 (patch) | |
| tree | e2c541ebe27d748de3bd672b46ace02a8c2ae27a /src/Makefile.am | |
| parent | 9bbf5e94c2ff676f685a7740713140026efbcb7c (diff) | |
| download | NetworkManager-5b48befaad3281c479673aed7c4b831e6e0da694.tar.gz | |
vpn-manager: support multiple VPN connections of the same typelr/multiple-vpn
A separate instance of the support plugin is spawned for each connection with
a different bus name. The bus name is passed via --bus-name <name> argument.
Plugins that support the feature indicate it with
support-multiple-connections=true key in the [VPN Connection] section.
The bus name is currently generated by adding a .<connection.uuid> to the VPN
service name. It's guarranteed unique, but if it proves to be too long or ugly
it can easily be replaced with something more meaningful (such as the same number
as is used for connection's DBus name).
NMVpnService has been removed and folded into NMVpnConnection. A
NMVpnConnection will spawn a service plugin instance whenever it is activated
and notices the bus name it needs is not provided.
The NMVpnManager no longer needs to keep track of the connections in use apart
for compatibility purposes with plugins that don't support the feature.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b845958a6e..2cae35de1c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -324,8 +324,6 @@ libNetworkManager_la_SOURCES = \ vpn-manager/nm-vpn-connection.h \ vpn-manager/nm-vpn-manager.c \ vpn-manager/nm-vpn-manager.h \ - vpn-manager/nm-vpn-service.c \ - vpn-manager/nm-vpn-service.h \ \ nm-activation-request.c \ nm-activation-request.h \ |