diff options
author | Bill Meier <wmeier@newsguy.com> | 2012-06-11 19:07:53 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2012-06-11 19:07:53 +0000 |
commit | 5e3066f006bc005d1b23b664881b7012bf59b38a (patch) | |
tree | 80618b65b97588d5e5673e4686a3b71b5c850822 | |
parent | 70cc6362fe8aa2fa21c4103c372309feef65b74b (diff) |
Use dscp_vals_ext everyplace (instead of dscp_vals);
(dscp_vals is now a static array in packet-ip.c)
svn path=/trunk/; revision=43211
-rw-r--r-- | epan/dissectors/packet-ip.h | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-megaco.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-mpls-pm.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-nhrp.h | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ip.h b/epan/dissectors/packet-ip.h index 7009c20abe..87a8beef9f 100644 --- a/epan/dissectors/packet-ip.h +++ b/epan/dissectors/packet-ip.h @@ -43,8 +43,7 @@ typedef struct _ws_ip void capture_ip(const guchar *, int, int, packet_counts *); guint16 ip_checksum(const guint8 *ptr, int len); -/* Export the DSCP value-string table for other protocols */ -WS_VAR_IMPORT const value_string dscp_vals[]; +/* Export the DSCP extended value-string table for other protocols */ WS_VAR_IMPORT value_string_ext dscp_vals_ext; proto_item *add_ip_version_to_tree(proto_tree *tree, tvbuff_t *tvb, int offset); diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index 0c11b47292..8a7d985b50 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -3222,7 +3222,8 @@ dissect_megaco_LocalControldescriptor(tvbuff_t *tvb, proto_tree *megaco_mediades tokenlen)); tvb_get_nstringz0(tvb,tvb_current_offset,3,code_str); - proto_item_append_text(item,"[ %s ]", val_to_str(strtoul(code_str,NULL,16), dscp_vals,"Unknown (%u)")); + proto_item_append_text(item,"[ %s ]", + val_to_str_ext(strtoul(code_str,NULL,16), &dscp_vals_ext,"Unknown (%u)")); tvb_current_offset = megaco_tvb_skip_wsp(tvb, tvb_offset +1); break; diff --git a/epan/dissectors/packet-mpls-pm.c b/epan/dissectors/packet-mpls-pm.c index ce231cea7a..c5435b1883 100644 --- a/epan/dissectors/packet-mpls-pm.c +++ b/epan/dissectors/packet-mpls-pm.c @@ -982,8 +982,8 @@ proto_register_mpls_pm(void) { "Differentiated Services Codepoint", "mpls.pm.ds", - FT_UINT8, BASE_DEC, - VALS(dscp_vals), 0x3F, + FT_UINT8, BASE_DEC | BASE_EXT_STRING, + &dscp_vals_ext, 0x3F, NULL, HFILL } }, diff --git a/epan/dissectors/packet-nhrp.h b/epan/dissectors/packet-nhrp.h index 1b3b4f8268..36aa2896cf 100644 --- a/epan/dissectors/packet-nhrp.h +++ b/epan/dissectors/packet-nhrp.h @@ -28,7 +28,4 @@ void capture_nhrp(const guchar *, int, int, packet_counts *); -/* Export the DSCP value-string table for other protocols */ -/*extern const value_string dscp_vals[];*/ - #endif |