colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2005-06-21 Robert Love <rml@novell.com>

Browse Source 
* src/backends/NetworkManagerSuSE.c: cleanup.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@734 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2005-06-21 20:41:52 +00:00
committed by Robert Love
parent 1e781d23d1
commit 1946bc567f
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,6 +1,7 @@
2005-06-21 Robert Love <rml@novell.com> 2005-06-21 Robert Love <rml@novell.com>
* initscript/SUSE/networkmanager: update * initscript/SUSE/networkmanager: update.
* src/backends/NetworkManagerSuSE.c: cleanup.
2005-06-21 Robert Love <rml@novell.com> 2005-06-21 Robert Love <rml@novell.com>

17
src/backends/NetworkManagerSuSE.c
View File

@@ -1,7 +1,9 @@
/* NetworkManager -- Network link manager /*
* NetworkManager -- Network link manager
* *
* Dan Williams <dcbw@redhat.com> * Dan Williams <dcbw@redhat.com>
* Kay Sievers <kay.sievers@suse.de> * Kay Sievers <kay.sievers@suse.de>
* Robert Love <rml@novell.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -26,6 +28,7 @@
#include <signal.h> #include <signal.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include "NetworkManagerSystem.h" #include "NetworkManagerSystem.h"
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#include "NetworkManagerDevice.h" #include "NetworkManagerDevice.h"
@@ -317,7 +320,6 @@ void nm_system_restart_mdns_responder (void)
void nm_system_device_add_ip6_link_address (NMDevice *dev) void nm_system_device_add_ip6_link_address (NMDevice *dev)
{ {
char *buf; char *buf;
char *addr;
struct ether_addr hw_addr; struct ether_addr hw_addr;
unsigned char eui[8]; unsigned char eui[8];
@@ -438,7 +440,8 @@ void *nm_system_device_get_system_config (NMDevice *dev)
FILE *f = NULL; FILE *f = NULL;
char buffer[512]; char buffer[512];
gboolean error = FALSE; gboolean error = FALSE;
int i, len; unsigned int i;
int len;
struct in_addr temp_addr; struct in_addr temp_addr;
char *ip_str; char *ip_str;
@@ -519,12 +522,12 @@ found:
} }
else else
{ {
guint32 addr = nm_ip4_config_get_address (sys_data->config); guint32 ip4addr = nm_ip4_config_get_address (sys_data->config);
/* Make a default netmask if we have an IP address */ /* Make a default netmask if we have an IP address */
if (((ntohl (addr) & 0xFF000000) >> 24) <= 127) if (((ntohl (ip4addr) & 0xFF000000) >> 24) <= 127)
nm_ip4_config_set_netmask (sys_data->config, htonl (0xFF000000)); nm_ip4_config_set_netmask (sys_data->config, htonl (0xFF000000));
else if (((ntohl (addr) & 0xFF000000) >> 24) <= 191) else if (((ntohl (ip4addr) & 0xFF000000) >> 24) <= 191)
nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFF0000)); nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFF0000));
else else
nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFFFF00)); nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFFFF00));
@@ -602,7 +605,7 @@ out:
len = nm_ip4_config_get_num_nameservers (sys_data->config); len = nm_ip4_config_get_num_nameservers (sys_data->config);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
guint ns_addr = nm_ip4_config_get_nameserver (sys_data->config, i); guint ns_addr = nm_ip4_config_get_nameserver (sys_data->config, i);
temp_addr.s_addr = ns_addr; temp_addr.s_addr = ns_addr;
ip_str = g_strdup (inet_ntoa (temp_addr)); ip_str = g_strdup (inet_ntoa (temp_addr));