system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-23 19:24:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-03-13 Dan Williams <dcbw@redhat.com>

Browse source 
* src/NetworkManagerUtils.c
	  src/NetworkManagerUtils.h
		- (nm_ether_ntop): replacement for iw_ether_ntop()

	* src/NetworkManagerAP.c
	  src/nm-device-802-11-wireless.c
	  src/nm-device-802-3-ethernet.c
		- s/iw_ether_ntop/nm_ether_ntop/g



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3451 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-03-13 20:52:23 +00:00
parent 48f7c484c5
commit fab1135d97
6 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2008-03-13 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerUtils.c
src/NetworkManagerUtils.h
- (nm_ether_ntop): replacement for iw_ether_ntop()
* src/NetworkManagerAP.c
src/nm-device-802-11-wireless.c
src/nm-device-802-3-ethernet.c
- s/iw_ether_ntop/nm_ether_ntop/g
2008-03-13 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerPolicy.c

5
src/NetworkManagerAP.c
View file

@ -162,7 +162,6 @@ get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
NMAccessPointPrivate *priv = NM_AP_GET_PRIVATE (object);
char hw_addr_buf[20];
GArray * ssid;
int len;
int i;
@ -189,9 +188,7 @@ get_property (GObject *object, guint prop_id,
g_value_set_uint (value, priv->freq);
break;
case PROP_HW_ADDRESS:
memset (hw_addr_buf, 0, 20);
iw_ether_ntop (&priv->address, hw_addr_buf);
g_value_set_string (value, &hw_addr_buf[0]);
g_value_take_string (value, nm_ether_ntop (&priv->address));
break;
case PROP_MODE:
g_value_set_int (value, priv->mode);

11
src/NetworkManagerUtils.c
View file

@ -351,3 +351,14 @@ nm_utils_hexstr2bin (const char *hex,
}
/* End from hostap */
char *
nm_ether_ntop (const struct ether_addr *mac)
{
/* we like leading zeros */
return g_strdup_printf ("%02X:%02X:%02X:%02X:%02X:%02X",
mac->ether_addr_octet[0], mac->ether_addr_octet[1],
mac->ether_addr_octet[2], mac->ether_addr_octet[3],
mac->ether_addr_octet[4], mac->ether_addr_octet[5]);
}

2
src/NetworkManagerUtils.h
View file

@ -50,5 +50,7 @@ int nm_utils_ip4_netmask_to_prefix (guint32 ip4_netmask);
char * nm_utils_hexstr2bin (const char *hex, size_t len);
char *nm_ether_ntop (const struct ether_addr *mac);
#endif

20
src/nm-device-802-11-wireless.c
View file

@ -610,28 +610,27 @@ periodic_update (NMDevice80211Wireless *self)
const GByteArray *new_ssid = NULL;
const struct ether_addr *old_bssid = NULL;
const GByteArray *old_ssid = NULL;
gchar new_addr[20];
gchar old_addr[20];
char *old_addr = NULL, *new_addr = NULL;
memset (new_addr, '\0', sizeof (new_addr));
if (new_ap) {
new_bssid = nm_ap_get_address (new_ap);
iw_ether_ntop (new_bssid, new_addr);
new_addr = nm_ether_ntop (new_bssid);
new_ssid = nm_ap_get_ssid (new_ap);
}
memset (old_addr, '\0', sizeof (old_addr));
if (priv->current_ap) {
old_bssid = nm_ap_get_address (priv->current_ap);
iw_ether_ntop (old_bssid, old_addr);
old_addr = nm_ether_ntop (old_bssid);
old_ssid = nm_ap_get_ssid (priv->current_ap);
}
nm_debug ("Roamed from BSSID %s (%s) to %s (%s)",
old_bssid ? old_addr : "(none)",
old_addr ? old_addr : "(none)",
old_ssid ? nm_utils_escape_ssid (old_ssid->data, old_ssid->len) : "(none)",
new_bssid ? new_addr : "(none)",
new_addr ? new_addr : "(none)",
new_ssid ? nm_utils_escape_ssid (new_ssid->data, new_ssid->len) : "(none)");
g_free (old_addr);
g_free (new_addr);
set_current_ap (self, new_ap);
}
@ -2942,14 +2941,11 @@ get_property (GObject *object, guint prop_id,
NMDevice80211Wireless *device = NM_DEVICE_802_11_WIRELESS (object);
NMDevice80211WirelessPrivate *priv = NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (device);
struct ether_addr hw_addr;
char hw_addr_buf[20];
switch (prop_id) {
case PROP_HW_ADDRESS:
memset (hw_addr_buf, 0, 20);
nm_device_802_11_wireless_get_address (device, &hw_addr);
iw_ether_ntop (&hw_addr, hw_addr_buf);
g_value_set_string (value, &hw_addr_buf[0]);
g_value_take_string (value, nm_ether_ntop (&hw_addr));
break;
case PROP_MODE:
g_value_set_int (value, nm_device_802_11_wireless_get_mode (device));

5
src/nm-device-802-3-ethernet.c
View file

@ -714,14 +714,11 @@ get_property (GObject *object, guint prop_id,
{
NMDevice8023Ethernet *device = NM_DEVICE_802_3_ETHERNET (object);
struct ether_addr hw_addr;
char hw_addr_buf[20];
switch (prop_id) {
case PROP_HW_ADDRESS:
memset (hw_addr_buf, 0, 20);
nm_device_802_3_ethernet_get_address (device, &hw_addr);
iw_ether_ntop (&hw_addr, hw_addr_buf);
g_value_set_string (value, &hw_addr_buf[0]);
g_value_take_string (value, nm_ether_ntop (&hw_addr));
break;
case PROP_SPEED:
g_value_set_uint (value, nm_device_802_3_ethernet_get_speed (device));