denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm: Remove dummy TUN device

Browse Source 
Recent NM releases don't insist on getting a device back from VPN
plugins.
This commit is contained in:
Tobias Brunner
2016-10-04 09:57:14 +02:00
parent 5b93de43c6
commit a28c6269a4
1 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon-nm/nm/nm_service.c
-36
View File
@@ -23,7 +23,6 @@
#include <utils/identification.h> #include <utils/identification.h>
#include <config/peer_cfg.h> #include <config/peer_cfg.h>
#include <credentials/certificates/x509.h> #include <credentials/certificates/x509.h>
#include <networking/tun_device.h>
#include <stdio.h> #include <stdio.h>
@@ -43,8 +42,6 @@ typedef struct {
nm_creds_t *creds; nm_creds_t *creds;
/* attribute handler for DNS/NBNS server information */ /* attribute handler for DNS/NBNS server information */
nm_handler_t *handler; nm_handler_t *handler;
/* dummy TUN device */
tun_device_t *tun;
/* name of the connection */ /* name of the connection */
char *name; char *name;
} NMStrongswanPluginPrivate; } NMStrongswanPluginPrivate;
@@ -101,14 +98,6 @@ static void signal_ipv4_config(NMVPNPlugin *plugin,
g_value_set_uint (val, *(uint32_t*)other->get_address(other).ptr); g_value_set_uint (val, *(uint32_t*)other->get_address(other).ptr);
g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, val); g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, val);
/* NM requires a tundev, but netkey does not use one. Passing the physical
* interface does not work, as NM fiddles around with it. So we pass a dummy
* TUN device along for NM to play with... */
val = g_slice_new0 (GValue);
g_value_init (val, G_TYPE_STRING);
g_value_set_string (val, priv->tun->get_name(priv->tun));
g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val);
/* NM installs this IP address on the interface above, so we use the VIP if /* NM installs this IP address on the interface above, so we use the VIP if
* we got one. * we got one.
*/ */
@@ -343,12 +332,6 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection,
priv->name); priv->name);
DBG4(DBG_CFG, "%s", DBG4(DBG_CFG, "%s",
nm_setting_to_string(NM_SETTING(vpn))); nm_setting_to_string(NM_SETTING(vpn)));
if (!priv->tun)
{
g_set_error(err, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,
"Failed to create dummy TUN device.");
return FALSE;
}
address = nm_setting_vpn_get_data_item(vpn, "address"); address = nm_setting_vpn_get_data_item(vpn, "address");
if (!address || !*address) if (!address || !*address)
{ {
@@ -739,27 +722,9 @@ static void nm_strongswan_plugin_init(NMStrongswanPlugin *plugin)
memset(&priv->listener, 0, sizeof(listener_t)); memset(&priv->listener, 0, sizeof(listener_t));
priv->listener.child_updown = child_updown; priv->listener.child_updown = child_updown;
priv->listener.ike_rekey = ike_rekey; priv->listener.ike_rekey = ike_rekey;
priv->tun = tun_device_create(NULL);
priv->name = NULL; priv->name = NULL;
} }
/**
* Destructor
*/
static void nm_strongswan_plugin_dispose(GObject *obj)
{
NMStrongswanPlugin *plugin;
NMStrongswanPluginPrivate *priv;
plugin = NM_STRONGSWAN_PLUGIN(obj);
priv = NM_STRONGSWAN_PLUGIN_GET_PRIVATE(plugin);
if (priv->tun)
{
priv->tun->destroy(priv->tun);
priv->tun = NULL;
}
}
/** /**
* Class constructor * Class constructor
*/ */
@@ -773,7 +738,6 @@ static void nm_strongswan_plugin_class_init(
parent_class->connect = connect_; parent_class->connect = connect_;
parent_class->need_secrets = need_secrets; parent_class->need_secrets = need_secrets;
parent_class->disconnect = disconnect; parent_class->disconnect = disconnect;
G_OBJECT_CLASS(strongswan_class)->dispose = nm_strongswan_plugin_dispose;
} }
/** /**