diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-10-21 11:46:49 -0700 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-10-22 11:46:12 +0000 |
commit | d9e530bc177553c07bae7594e9b4f8e6235fc0e0 (patch) | |
tree | 481239fdd3662cae66a4c5110b853563be7ca1cd /ui/gtk/wlan_stat_dlg.c | |
parent | 86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd (diff) | |
download | wireshark-d9e530bc177553c07bae7594e9b4f8e6235fc0e0.tar.gz |
Use address functions instead of ADDRESS macros in ui.
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the ui directory.
Change-Id: I10e95e66c8da5b880133452ebc484c53046e87ba
Reviewed-on: https://code.wireshark.org/review/11199
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk/wlan_stat_dlg.c')
-rw-r--r-- | ui/gtk/wlan_stat_dlg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index 743406304c..a1693db63e 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -240,7 +240,7 @@ alloc_wlan_ep (const struct _wlan_hdr *si, const packet_info *pinfo _U_) ep = (wlan_ep_t *)g_malloc (sizeof(wlan_ep_t)); - COPY_ADDRESS (&ep->bssid, &si->bssid); + copy_address (&ep->bssid, &si->bssid); ep->stats.channel = si->stats.channel; memcpy (ep->stats.ssid, si->stats.ssid, MAX_SSID_LEN); ep->stats.ssid_len = si->stats.ssid_len; @@ -267,7 +267,7 @@ alloc_wlan_details_ep (const address *addr) if (!(d_ep = (wlan_details_ep_t *)g_malloc (sizeof(wlan_details_ep_t)))) return NULL; - COPY_ADDRESS (&d_ep->addr, addr); + copy_address (&d_ep->addr, addr); d_ep->probe_req = 0; d_ep->probe_rsp = 0; d_ep->auth = 0; @@ -292,7 +292,7 @@ get_details_ep (wlan_ep_t *te, const address *addr) d_te = te->details; } else { for (tmp = te->details; tmp; tmp = tmp->next) { - if (!CMP_ADDRESS (&tmp->addr, addr)) { + if (!cmp_address (&tmp->addr, addr)) { d_te = tmp; break; } @@ -369,7 +369,7 @@ is_broadcast(const address *addr) /* doesn't work if MAC resolution is disable */ return cmp_addr; - return ADDRESSES_EQUAL(&broadcast, addr); + return addresses_equal(&broadcast, addr); } #endif @@ -408,7 +408,7 @@ wlanstat_packet (void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, const v || ((si->stats.ssid_len != 0) && (ssid_equal(&tmp->stats, &si->stats))) ))) || - ((si->type != MGT_PROBE_REQ) && !CMP_ADDRESS(&tmp->bssid, &si->bssid))) { + ((si->type != MGT_PROBE_REQ) && !cmp_address(&tmp->bssid, &si->bssid))) { te = tmp; break; } |