From 6f68d85cd4c2047921794548d17bad83dba41979 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 9 Nov 2005 01:56:03 +0000 Subject: [PATCH] 2005-11-08 Dan Williams Patch from Bill Moss * src/NetworkManagerAPList.c src/NetworkManagerDevice.c src/NetworkManagerDbus.c - Replace occurances of ether_ntoa_r() with iw_ether_ntop() so we get more readable ether/mac addresses git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1101 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 9 +++++++++ src/NetworkManagerAPList.c | 2 +- src/NetworkManagerDbus.c | 2 +- src/NetworkManagerDevice.c | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbb8a2536..00206b7fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-11-08 Dan Williams + + Patch from Bill Moss + * src/NetworkManagerAPList.c + src/NetworkManagerDevice.c + src/NetworkManagerDBus.c + - Replace occurances of ether_ntoa_r() with iw_ether_ntop() so + we get more readable ether/mac addresses + 2005-11-02 Christopher Aillon * gnome/applet/main.c: Don't set the restart command. This fixes diff --git a/src/NetworkManagerAPList.c b/src/NetworkManagerAPList.c index 73fc7197a..b0ff30ea3 100644 --- a/src/NetworkManagerAPList.c +++ b/src/NetworkManagerAPList.c @@ -397,7 +397,7 @@ NMAccessPoint *nm_ap_list_get_ap_by_address (NMAccessPointList *list, const stru GSList *elt; memset (&char_addr[0], 0, 20); - ether_ntoa_r (addr, &char_addr[0]); + iw_ether_ntop (addr, &char_addr[0]); for (elt = user_addrs; elt; elt = g_slist_next (elt)) { if (elt->data && !strcmp (elt->data, &char_addr[0])) diff --git a/src/NetworkManagerDbus.c b/src/NetworkManagerDbus.c index 52047cb6e..ac1369e06 100644 --- a/src/NetworkManagerDbus.c +++ b/src/NetworkManagerDbus.c @@ -676,7 +676,7 @@ gboolean nm_dbus_add_network_address (DBusConnection *connection, NMNetworkType } char_addr = g_new0 (gchar, 20); - ether_ntoa_r (addr, char_addr); + iw_ether_ntop (addr, char_addr); dbus_message_append_args (message, DBUS_TYPE_STRING, &network, DBUS_TYPE_INT32, &type_as_int32, DBUS_TYPE_STRING, &char_addr, diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c index a28cccdf4..aa44df363 100644 --- a/src/NetworkManagerDevice.c +++ b/src/NetworkManagerDevice.c @@ -3739,7 +3739,7 @@ NMAccessPoint * nm_device_get_best_ap (NMDevice *dev) user_addrs = nm_ap_get_user_addresses (tmp_ap); memset (&char_addr[0], 0, 20); - ether_ntoa_r (ap_addr, &char_addr[0]); + iw_ether_ntop (ap_addr, &char_addr[0]); for (elt = user_addrs; elt; elt = g_slist_next (elt)) {