diff options
| author | martinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-08-18 10:33:54 +0000 |
|---|---|---|
| committer | martinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-08-18 10:33:54 +0000 |
| commit | 03b41ca38e0b228c40fcc02b80848b8af17e6f08 (patch) | |
| tree | 3068e7d9473d6b0c00933b00f4297cde401f39e2 /epan/dissectors/packet-catapult-dct2000.c | |
| parent | cf10c35d69016de40fc74590fbcf8caf14bf18b0 (diff) | |
Show IPv6 addresses in ipprim summary line.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33839 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index ffc93bfd9a..9648241ecc 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -1995,6 +1995,16 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ipprim_tree; proto_item *ipprim_ti; + struct e_in6_addr sourcev6, destv6; + + /* Fetch IPv6 addresses */ + if (source_addr_length != 4) { + tvb_get_ipv6(tvb, source_addr_offset, &sourcev6); + } + if (dest_addr_length != 4) { + tvb_get_ipv6(tvb, dest_addr_offset, &destv6); + } + /* Will use this dissector then. */ protocol_handle = heur_protocol_handle; @@ -2010,7 +2020,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (source_addr_offset) ? ((source_addr_length == 4) ? get_hostname(tvb_get_ipv4(tvb, source_addr_offset)) : - "<ipv6-address>" + get_hostname6(&sourcev6) ) : "0.0.0.0", (source_port_offset) ? @@ -2019,7 +2029,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (dest_addr_offset) ? ((source_addr_length == 4) ? get_hostname(tvb_get_ipv4(tvb, dest_addr_offset)) : - "<ipv6-address>" + get_hostname6(&destv6) ) : "0.0.0.0", (dest_port_offset) ? |