From 5d8363e83dfa18951f3ec9892f16dca0a49bf49a Mon Sep 17 00:00:00 2001 From: Tom Haynes Date: Tue, 1 Sep 2015 14:07:30 -0700 Subject: [PATCH] nfs: Fix order of octets in IPv4 address Before: skull:bugs loghyr$ ~/ipv4/wireshark/tshark -r 2-layoutstats-in-1-compound.pcap -Y nfs -V | grep -i ipv4 [IPv4 address 113.12.31.172, protocol=tcp, port=2049] After: skull:bugs loghyr$ ~/ipv4/wireshark/tshark -r 2-layoutstats-in-1-compound.pcap -Y nfs -V | grep -i ipv4 [IPv4 address 172.31.12.113, protocol=tcp, port=2049] Bug: 11496 Change-Id: Ia6097ae76411f6ff9de1f53191c8fc767856e2d1 Signed-off-by: Tom Haynes Reviewed-on: https://code.wireshark.org/review/10347 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- epan/dissectors/packet-nfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index f038d596a6..7ed351fcc8 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -7260,7 +7260,7 @@ dissect_nfs4_clientaddr(tvbuff_t *tvb, int offset, proto_tree *tree) &b1, &b2, &b3, &b4, &b5, &b6) == 6) { /* IPv4: h1.h2.h3.h4.p1.p2 */ port = (b5<<8) | b6; - ipv4 = (b1<<24) | (b2<<16) | (b3<<8) | b4; + ipv4 = g_htonl((b1<<24) | (b2<<16) | (b3<<8) | b4); SET_ADDRESS(&addr, AT_IPv4, 4, &ipv4); ti = proto_tree_add_ipv4_format(tree, hf_nfs4_universal_address_ipv4, tvb, addr_offset, offset-addr_offset, ipv4, "IPv4 address %s, protocol=%s, port=%u", address_to_str(wmem_packet_scope(), &addr), protocol, port);