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

2008-08-06 Dan Williams <dcbw@redhat.com>

Browse source 
* src/nm-openvpn-service-openvpn-helper.c
		- (get_routes): handle route metrics



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3899 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-08-06 22:24:32 +00:00
parent 2c31b5499b
commit 92cc4a0bee
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vpn-daemons/openvpn/ChangeLog
View file

@ -1,3 +1,8 @@
2008-08-06 Dan Williams <dcbw@redhat.com>
* src/nm-openvpn-service-openvpn-helper.c
- (get_routes): handle route metrics
2008-07-28 Dan Williams <dcbw@redhat.com> 2008-07-28 Dan Williams <dcbw@redhat.com>
* properties/auth-helpers.c * properties/auth-helpers.c

24
vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
View file

@ -31,6 +31,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include <regex.h> #include <regex.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -197,7 +198,7 @@ get_routes (void)
struct in_addr network; struct in_addr network;
struct in_addr netmask; struct in_addr netmask;
struct in_addr gateway = { 0, }; struct in_addr gateway = { 0, };
guint32 prefix; guint32 prefix, metric = 0;
snprintf (buf, BUFLEN, "route_network_%d", i); snprintf (buf, BUFLEN, "route_network_%d", i);
tmp = getenv (buf); tmp = getenv (buf);
@ -218,16 +219,33 @@ get_routes (void)
snprintf (buf, BUFLEN, "route_gateway_%d", i); snprintf (buf, BUFLEN, "route_gateway_%d", i);
tmp = getenv (buf); tmp = getenv (buf);
if (!tmp || inet_pton (AF_INET, tmp, &gateway) <= 0) { /* gateway can be missing */
if (tmp && (inet_pton (AF_INET, tmp, &gateway) <= 0)) {
nm_warning ("Ignoring invalid static route gateway '%s'", tmp ? tmp : "NULL"); nm_warning ("Ignoring invalid static route gateway '%s'", tmp ? tmp : "NULL");
continue; continue;
} }
array = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 3); snprintf (buf, BUFLEN, "route_metric_%d", i);
tmp = getenv (buf);
/* metric can be missing */
if (tmp && strlen (tmp)) {
long int tmp_metric;
errno = 0;
tmp_metric = strtol (tmp, NULL, 10);
if (errno || tmp_metric < 0 || tmp_metric > G_MAXUINT32) {
nm_warning ("Ignoring invalid static route metric '%s'", tmp);
continue;
}
metric = (guint32) tmp_metric;
}
array = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 4);
g_array_append_val (array, network.s_addr); g_array_append_val (array, network.s_addr);
prefix = nm_utils_ip4_netmask_to_prefix (netmask.s_addr); prefix = nm_utils_ip4_netmask_to_prefix (netmask.s_addr);
g_array_append_val (array, prefix); g_array_append_val (array, prefix);
g_array_append_val (array, gateway.s_addr); g_array_append_val (array, gateway.s_addr);
g_array_append_val (array, metric);
g_ptr_array_add (routes, array); g_ptr_array_add (routes, array);
} }