diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-26 18:11:24 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-26 18:11:24 +0000 |
| commit | 858358dd41ba4aaf64954f6636a554bbdea839f7 (patch) | |
| tree | 51a2a6958408da8c3438bdfb91c4611da23d9417 /epan/dissectors/packet-catapult-dct2000.c | |
| parent | 54540f8a3a2f71bce97f1dbae5a22af0bc6e168a (diff) | |
Fix some proto_tree_add_item() encoding args;
Remove some unneeded #includes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39612 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 33907697e0..dc8e2bab5e 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -29,8 +29,6 @@ #include <glib.h> #include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <ctype.h> #include <epan/packet.h> @@ -2151,15 +2149,16 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (source_addr_length == 4) ? hf_catapult_dct2000_ipprim_src_addr_v4 : hf_catapult_dct2000_ipprim_src_addr_v6, - tvb, source_addr_offset, source_addr_length, FALSE); + tvb, source_addr_offset, source_addr_length, + (source_addr_length == 4) ? ENC_BIG_ENDIAN : ENC_NA); /* Add hidden item for "side-less" addr */ addr_ti = proto_tree_add_item(ipprim_tree, (source_addr_length == 4) ? hf_catapult_dct2000_ipprim_addr_v4 : hf_catapult_dct2000_ipprim_addr_v6, - tvb, source_addr_offset, - source_addr_length, FALSE); + tvb, source_addr_offset, source_addr_length, + (source_addr_length == 4) ? ENC_BIG_ENDIAN : ENC_NA); PROTO_ITEM_SET_HIDDEN(addr_ti); } if (source_port_offset != 0) { @@ -2171,12 +2170,12 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (type_of_port == PT_UDP) ? hf_catapult_dct2000_ipprim_udp_src_port : hf_catapult_dct2000_ipprim_tcp_src_port, - tvb, source_port_offset, 2, FALSE); + tvb, source_port_offset, 2, ENC_BIG_ENDIAN); port_ti = proto_tree_add_item(ipprim_tree, (type_of_port == PT_UDP) ? hf_catapult_dct2000_ipprim_udp_port : hf_catapult_dct2000_ipprim_tcp_port, - tvb, source_port_offset, 2, FALSE); + tvb, source_port_offset, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(port_ti); } if (dest_addr_offset != 0) { @@ -2194,14 +2193,16 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (dest_addr_length == 4) ? hf_catapult_dct2000_ipprim_dst_addr_v4 : hf_catapult_dct2000_ipprim_dst_addr_v6, - tvb, dest_addr_offset, dest_addr_length, FALSE); + tvb, dest_addr_offset, dest_addr_length, + (dest_addr_length == 4) ? ENC_BIG_ENDIAN : ENC_NA); /* Add hidden item for "side-less" addr */ addr_ti = proto_tree_add_item(ipprim_tree, (dest_addr_length == 4) ? hf_catapult_dct2000_ipprim_addr_v4 : hf_catapult_dct2000_ipprim_addr_v6, - tvb, dest_addr_offset, dest_addr_length, FALSE); + tvb, dest_addr_offset, dest_addr_length, + (dest_addr_length == 4) ? ENC_BIG_ENDIAN : ENC_NA); PROTO_ITEM_SET_HIDDEN(addr_ti); } if (dest_port_offset != 0) { @@ -2213,12 +2214,12 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (type_of_port == PT_UDP) ? hf_catapult_dct2000_ipprim_udp_dst_port : hf_catapult_dct2000_ipprim_tcp_dst_port, - tvb, dest_port_offset, 2, FALSE); + tvb, dest_port_offset, 2, ENC_BIG_ENDIAN); port_ti = proto_tree_add_item(ipprim_tree, (type_of_port == PT_UDP) ? hf_catapult_dct2000_ipprim_udp_port : hf_catapult_dct2000_ipprim_tcp_port, - tvb, dest_port_offset, 2, FALSE); + tvb, dest_port_offset, 2, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(port_ti); } if (conn_id_offset != 0) { @@ -2307,14 +2308,16 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (dest_addr_length == 4) ? hf_catapult_dct2000_sctpprim_dst_addr_v4 : hf_catapult_dct2000_sctpprim_dst_addr_v6, - tvb, dest_addr_offset, dest_addr_length, FALSE); + tvb, dest_addr_offset, dest_addr_length, + (dest_addr_length == 4) ? ENC_BIG_ENDIAN : ENC_NA); /* Add hidden item for "side-less" addr */ addr_ti = proto_tree_add_item(sctpprim_tree, (dest_addr_length == 4) ? hf_catapult_dct2000_sctpprim_addr_v4 : hf_catapult_dct2000_sctpprim_addr_v6, - tvb, dest_addr_offset, dest_addr_length, FALSE); + tvb, dest_addr_offset, dest_addr_length, + (dest_addr_length == 4) ? ENC_BIG_ENDIAN : ENC_NA); PROTO_ITEM_SET_HIDDEN(addr_ti); } |