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

2006-01-03 Robert Love <rml@novell.com>

Browse Source 
* src/backends/NetworkManagerSuSE.c: update to newer API (no more
	  nm_device_get_hw_address); use inet_aton in lieu of inet_addr as the
	  latter cannot differentiate between error and the address -1; misc.
	  clean up.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1250 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2006-01-03 17:29:08 +00:00
committed by Robert Love
parent d639dbeac0
commit c71d14c97f
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2006-01-03 Robert Love <rml@novell.com>
* src/backends/NetworkManagerSuSE.c: update to newer API (no more
nm_device_get_hw_address); use inet_aton in lieu of inet_addr as the
latter cannot differentiate between error and the address -1; misc.
clean up.
2006-1-3 Dan Williams <dcbw@redhat.com> 2006-1-3 Dan Williams <dcbw@redhat.com>
* src/NetworkManager.c * src/NetworkManager.c

29
src/backends/NetworkManagerSuSE.c
View File

@@ -435,12 +435,11 @@ void *nm_system_device_get_system_config (NMDevice *dev)
shvarFile *file; shvarFile *file;
char *buf = NULL; char *buf = NULL;
SuSESystemConfigData *sys_data = NULL; SuSESystemConfigData *sys_data = NULL;
struct ether_addr addr; struct ether_addr hw_addr;
FILE *f = NULL; FILE *f = NULL;
char buffer[512]; char buffer[512];
gboolean error = FALSE; gboolean error = FALSE;
unsigned int i; int i, len;
int len;
struct in_addr temp_addr; struct in_addr temp_addr;
char *ip_str; char *ip_str;
@@ -449,12 +448,15 @@ void *nm_system_device_get_system_config (NMDevice *dev)
sys_data = g_malloc0 (sizeof (SuSESystemConfigData)); sys_data = g_malloc0 (sizeof (SuSESystemConfigData));
sys_data->use_dhcp = TRUE; sys_data->use_dhcp = TRUE;
memset (&addr, 0, sizeof(addr)); if (nm_device_is_802_3_ethernet (dev))
nm_device_get_hw_address (dev, &addr); nm_device_802_3_ethernet_get_address (NM_DEVICE_802_3_ETHERNET (dev), &hw_addr);
else if (nm_device_is_802_11_wireless (dev))
nm_device_802_11_wireless_get_address (NM_DEVICE_802_11_WIRELESS (dev), &hw_addr);
sprintf (mac, "%02x:%02x:%02x:%02x:%02x:%02x", sprintf (mac, "%02x:%02x:%02x:%02x:%02x:%02x",
addr.ether_addr_octet[0], addr.ether_addr_octet[1], hw_addr.ether_addr_octet[0], hw_addr.ether_addr_octet[1],
addr.ether_addr_octet[2], addr.ether_addr_octet[3], hw_addr.ether_addr_octet[2], hw_addr.ether_addr_octet[3],
addr.ether_addr_octet[4], addr.ether_addr_octet[5]); hw_addr.ether_addr_octet[4], hw_addr.ether_addr_octet[5]);
cfg_file_path = g_strdup_printf (SYSCONFDIR"/sysconfig/network/ifcfg-eth-id-%s", mac); cfg_file_path = g_strdup_printf (SYSCONFDIR"/sysconfig/network/ifcfg-eth-id-%s", mac);
if (!cfg_file_path) if (!cfg_file_path)
return sys_data; return sys_data;
@@ -502,11 +504,12 @@ found:
buf = svGetValue (file, "IPADDR"); buf = svGetValue (file, "IPADDR");
if (buf) if (buf)
{ {
in_addr_t ip; struct in_addr ip;
int ret;
ip = inet_addr (buf); ret = inet_aton (buf, &ip);
if (ip != -1) if (ret)
nm_ip4_config_set_address (sys_data->config, ip); nm_ip4_config_set_address (sys_data->config, ip.s_addr);
else else
error = TRUE; error = TRUE;
free (buf); free (buf);
@@ -839,7 +842,7 @@ void nm_system_activate_nis (NMIP4Config *config)
gchar *nis_domain = NULL; gchar *nis_domain = NULL;
int num_nis_servers = 0; int num_nis_servers = 0;
struct in_addr temp_addr; struct in_addr temp_addr;
int i, ret; int i;
FILE *ypconf = NULL; FILE *ypconf = NULL;
g_return_if_fail (config != NULL); g_return_if_fail (config != NULL);