diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-10-29 17:49:34 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-10-30 00:50:06 +0000 |
| commit | 734c5b35a5491794dc9cb31ed07a8d0d5576d4f5 (patch) | |
| tree | 15067601163a7a4fe89ebc9f3f28e7574e3d14e9 | |
| parent | 3630a447d9e73f3e04cfe37dd578d22a452fbbe6 (diff) | |
Get rid of ipv4_get_net_order_addr() and ipv4_get_host_order_addr().
Just directly use the addr field, converting from host to network byte
order if necessary.
Change-Id: Ie1cd9ea5527b7824014dc315225ad2a6adb61c38
Reviewed-on: https://code.wireshark.org/review/24176
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/ftypes/ftype-ipv4.c | 2 | ||||
| -rw-r--r-- | epan/ipv4.h | 12 | ||||
| -rw-r--r-- | epan/proto.c | 4 | ||||
| -rw-r--r-- | ui/gtk/packet_win.c | 3 |
4 files changed, 5 insertions, 16 deletions
diff --git a/epan/ftypes/ftype-ipv4.c b/epan/ftypes/ftype-ipv4.c index c07392ecc6..6d45e2eb97 100644 --- a/epan/ftypes/ftype-ipv4.c +++ b/epan/ftypes/ftype-ipv4.c @@ -212,7 +212,7 @@ static void slice(fvalue_t *fv, GByteArray *bytes, guint offset, guint length) { guint8* data; - guint32 addr = ipv4_get_net_order_addr(&(fv->value.ipv4)); + guint32 addr = g_htonl(fv->value.ipv4.addr); data = ((guint8*)&addr)+offset; g_byte_array_append(bytes, data, length); } diff --git a/epan/ipv4.h b/epan/ipv4.h index 9ee4e7f524..979f5f52d6 100644 --- a/epan/ipv4.h +++ b/epan/ipv4.h @@ -35,16 +35,4 @@ typedef struct { guint32 nmask; /* stored in host order */ } ipv4_addr_and_mask; -static inline guint32 -ipv4_get_net_order_addr(ipv4_addr_and_mask *ipv4) -{ - return g_htonl(ipv4->addr); -} - -static inline guint32 -ipv4_get_host_order_addr(ipv4_addr_and_mask *ipv4) -{ - return ipv4->addr; -} - #endif diff --git a/epan/proto.c b/epan/proto.c index ca28e6ed53..68e81afa64 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -5945,7 +5945,7 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, case FT_IPv4: ipv4 = (ipv4_addr_and_mask *)fvalue_get(&finfo->value); - n_addr = ipv4_get_net_order_addr(ipv4); + n_addr = g_ntohl(ipv4->addr); set_address (&addr, AT_IPv4, 4, &n_addr); address_to_str_buf(&addr, result+offset_r, size-offset_r); offset_r = (int)strlen(result); @@ -8366,7 +8366,7 @@ proto_item_fill_label(field_info *fi, gchar *label_str) case FT_IPv4: ipv4 = (ipv4_addr_and_mask *)fvalue_get(&fi->value); - n_addr = ipv4_get_net_order_addr(ipv4); + n_addr = g_htonl(ipv4->addr); addr.type = AT_IPv4; addr.len = 4; diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index a078e3b9f8..529e04f5e4 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -615,7 +615,8 @@ new_finfo_window(GtkWidget *w, struct FieldinfoWinData *DataPtr) g_signal_connect(fvalue_edit, "toggled", G_CALLBACK(finfo_boolean_changed), DataPtr); } else if (finfo_type == FT_IPv4) { - guint32 net_addr = ipv4_get_net_order_addr((ipv4_addr_and_mask *)fvalue_get(&finfo->value)); + ipv4_addr_and_mask *ipv4 = (ipv4_addr_and_mask *)fvalue_get(&finfo->value); + guint32 net_addr = g_htonl(ipv4->addr); #if GTK_CHECK_VERSION(3,0,0) GtkAdjustment *adj; #else |