diff options
author | Bill Meier <wmeier@newsguy.com> | 2011-10-10 00:39:31 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2011-10-10 00:39:31 +0000 |
commit | 67ee5049d4eaba0c87fe943e5fe8b203cacd378d (patch) | |
tree | 279279f3db0b5f366362166344c1cc92c0d44b38 /epan/dissectors/packet-dvmrp.c | |
parent | e0820c62d4a87ce424122a54e274b45bd8d64d6d (diff) |
Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
the encoding parameter for proto_tree_add_item() calls which directly reference
an item in hf[] which has a type of:
FT_BOOLEAN
FT_IPv4
FT_EUI64
FT_GUID
FT_UINT_STRING
Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260)
svn path=/trunk/; revision=39328
Diffstat (limited to 'epan/dissectors/packet-dvmrp.c')
-rw-r--r-- | epan/dissectors/packet-dvmrp.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index a01c7532e9..eeac4c43c3 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -385,7 +385,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 4; while (tvb_reported_length_remaining(tvb, offset)>=4) { proto_tree_add_item(parent_tree, hf_neighbor, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; @@ -395,11 +395,11 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int case DVMRP_V3_PRUNE: /* source address */ proto_tree_add_item(parent_tree, hf_saddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* group address */ proto_tree_add_item(parent_tree, hf_maddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* prune lifetime */ proto_tree_add_item(parent_tree, hf_life, @@ -408,39 +408,39 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int /* source netmask */ if (tvb_reported_length_remaining(tvb, offset)>=4) { proto_tree_add_item(parent_tree, hf_netmask, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; case DVMRP_V3_GRAFT: /* source address */ proto_tree_add_item(parent_tree, hf_saddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* group address */ proto_tree_add_item(parent_tree, hf_maddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* source netmask */ if (tvb_reported_length_remaining(tvb, offset)>=4) { proto_tree_add_item(parent_tree, hf_netmask, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; case DVMRP_V3_GRAFT_ACK: /* source address */ proto_tree_add_item(parent_tree, hf_saddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* group address */ proto_tree_add_item(parent_tree, hf_maddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* source netmask */ if (tvb_reported_length_remaining(tvb, offset)>=4) { proto_tree_add_item(parent_tree, hf_netmask, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } break; @@ -457,7 +457,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int /* local address */ proto_tree_add_item(parent_tree, hf_local, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; /* Metric */ proto_tree_add_item(parent_tree, hf_metric, @@ -477,17 +477,17 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int tree = proto_item_add_subtree(item, ett_flags); proto_tree_add_item(tree, hf_flag_tunnel, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_flag_srcroute, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_flag_down, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_flag_disabled, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_flag_querier, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_flag_leaf, tvb, - offset, 1, FALSE); + offset, 1, ENC_BIG_ENDIAN); } offset += 1; /* Neighbor count */ @@ -499,7 +499,7 @@ dissect_dvmrp_v3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int while ((tvb_reported_length_remaining(tvb, offset)>=4) && (neighbor_count>0)) { proto_tree_add_item(parent_tree, hf_neighbor, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; neighbor_count--; } @@ -580,7 +580,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 1; if (count) { /* must be 0 or 1 */ proto_tree_add_item(tree, hf_netmask, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); if (item) { proto_item_set_text(item, "%s: %d.%d.%d.%d", val_to_str(cmd, command, "Unknown Command:0x%02x"), @@ -634,7 +634,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 1; while (count--) { proto_tree_add_item(tree, hf_daddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if (item) { @@ -649,7 +649,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 1; while (count--) { proto_tree_add_item(tree, hf_maddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; proto_tree_add_item(tree, hf_hold, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -667,7 +667,7 @@ dissect_dvmrp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset += 1; while (count--) { proto_tree_add_item(tree, hf_maddr, - tvb, offset, 4, FALSE); + tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } if (item) { |