diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-10-29 18:39:41 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-10-30 01:40:13 +0000 |
| commit | dd1c18dd031038cbee7e219e322cbea1eafc87ca (patch) | |
| tree | cd9e471c265d8d2ceab059f6677626e67e920d96 /ui | |
| parent | 734c5b35a5491794dc9cb31ed07a8d0d5576d4f5 (diff) | |
Make FT_IPv4 a bit more like FT_IPv6.
FT_IPv6 doesn't expose the prefix, which is used only for values in
filter expressions, not values in protocol fields; do the same for
FT_IPv4, hiding the netmask, and using fvalue_get_integer() to get the
value, having it return a network-byte-order value for the address.
(This also makes it opaque whether the address and netmask are stored in
host or network byte order.)
Change-Id: I4285a87f6ccef2c0ccec040490ddcd15d787326e
Reviewed-on: https://code.wireshark.org/review/24177
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/packet_win.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index 529e04f5e4..50cae431ae 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -615,14 +615,13 @@ 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) { - ipv4_addr_and_mask *ipv4 = (ipv4_addr_and_mask *)fvalue_get(&finfo->value); - guint32 net_addr = g_htonl(ipv4->addr); + guint32 ipv4 = fvalue_get_uinteger(&finfo->value); #if GTK_CHECK_VERSION(3,0,0) GtkAdjustment *adj; #else GtkObject *adj; #endif - adj = gtk_adjustment_new((double) (GUINT32_FROM_BE(net_addr)), 0.0, 4294967295.0 /* (2^32)-1 */, 1.0, 256.0, 0); + adj = gtk_adjustment_new((double) (GUINT32_FROM_BE(ipv4)), 0.0, 4294967295.0 /* (2^32)-1 */, 1.0, 256.0, 0); /* XXX, create four gtk_spin_button_new which takes 0..255 */ fvalue_edit = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1.0, 0); |