fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 04:08:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2008-07-07 Dan Williams <dcbw@redhat.com>

Browse source 
* src/nm-vpnc-service-vpnc-helper.c
	  properties/nm-vpnc.c
		- Use IPv4 address prefixes rather than netmasks (requires svn3812)



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3814 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-07-07 18:59:29 +00:00
parent cc59b77ff1
commit 036ac60842
3 changed files with 44 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vpn-daemons/vpnc/ChangeLog
View file

@ -1,3 +1,9 @@
2008-07-07 Dan Williams <dcbw@redhat.com>
* src/nm-vpnc-service-vpnc-helper.c
properties/nm-vpnc.c
- Use IPv4 address prefixes rather than netmasks (requires svn3812)
2008-07-03 Dan Williams <dcbw@redhat.com>
* nm-vpnc-service.name.in

6
vpn-daemons/vpnc/properties/nm-vpnc.c
View file

@ -566,7 +566,7 @@ get_routes (const char *routelist)
errno = 0;
prefix = strtol (p + 1, NULL, 10);
if (errno || prefix < 0 || prefix > 32) {
if (errno || prefix <= 0 || prefix > 32) {
g_warning ("Ignoring invalid route '%s'", route);
goto next;
}
@ -578,7 +578,7 @@ get_routes (const char *routelist)
addr = g_new0 (NMSettingIP4Address, 1);
addr->address = tmp.s_addr;
addr->netmask = ntohl (0xFFFFFFFF << (32 - prefix));
addr->prefix = (guint32) prefix;
addr->gateway = 0;
routes = g_slist_append (routes, addr);
@ -805,7 +805,7 @@ export (NMVpnPluginUiInterface *iface,
num_addr.s_addr = addr->address;
if (inet_ntop (AF_INET, &num_addr, &str_addr[0], INET_ADDRSTRLEN + 1))
g_string_append_printf (routes, "%s/%d", str_addr, addr->netmask);
g_string_append_printf (routes, "%s/%d", str_addr, addr->prefix);
}
}

44
vpn-daemons/vpnc/src/nm-vpnc-service-vpnc-helper.c
View file

@ -27,6 +27,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <errno.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus-glib.h>
@ -210,8 +211,8 @@ get_routes (void)
GArray *array;
char buf[BUFLEN];
struct in_addr network;
struct in_addr netmask;
guint32 gateway = 0; /* no gateway */
guint32 prefix;
snprintf (buf, BUFLEN, "CISCO_SPLIT_INC_%d_ADDR", i);
tmp = getenv (buf);
@ -220,16 +221,33 @@ get_routes (void)
continue;
}
snprintf (buf, BUFLEN, "CISCO_SPLIT_INC_%d_MASK", i);
snprintf (buf, BUFLEN, "CISCO_SPLIT_INC_%d_MASKLEN", i);
tmp = getenv (buf);
if (!tmp || inet_pton (AF_INET, tmp, &netmask) <= 0) {
nm_warning ("Ignoring invalid static route netmask '%s'", tmp ? tmp : "NULL");
continue;
if (tmp) {
long int tmp_prefix;
errno = 0;
tmp_prefix = strtol (tmp, NULL, 10);
if (errno || tmp_prefix <= 0 || tmp_prefix > 32) {
nm_warning ("Ignoring invalid static route prefix '%s'", tmp ? tmp : "NULL");
continue;
}
prefix = (guint32) tmp_prefix;
} else {
struct in_addr netmask;
snprintf (buf, BUFLEN, "CISCO_SPLIT_INC_%d_MASK", i);
tmp = getenv (buf);
if (!tmp || inet_pton (AF_INET, tmp, &netmask) <= 0) {
nm_warning ("Ignoring invalid static route netmask '%s'", tmp ? tmp : "NULL");
continue;
}
prefix = nm_utils_ip4_netmask_to_prefix (netmask.s_addr);
}
array = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 3);
g_array_append_val (array, network.s_addr);
g_array_append_val (array, netmask.s_addr);
g_array_append_val (array, prefix);
g_array_append_val (array, gateway);
g_ptr_array_add (routes, array);
}
@ -265,6 +283,7 @@ main (int argc, char *argv[])
GHashTable *config;
GValue *val;
GError *err = NULL;
struct in_addr temp_addr;
g_type_init ();
@ -312,9 +331,16 @@ main (int argc, char *argv[])
helper_failed (connection, "IP4 PTP Address");
/* Netmask */
val = addr_to_gvalue (getenv ("INTERNAL_IP4_NETMASK"));
if (val)
g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_NETMASK, val);
tmp = getenv ("INTERNAL_IP4_NETMASK");
if (tmp && inet_pton (AF_INET, tmp, &temp_addr) > 0) {
GValue *val;
val = g_slice_new0 (GValue);
g_value_init (val, G_TYPE_UINT);
g_value_set_uint (val, nm_utils_ip4_netmask_to_prefix (temp_addr.s_addr));
g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, val);
}
/* DNS */
val = addr_list_to_gvalue (getenv ("INTERNAL_IP4_DNS"));