diff options
author | Anders Broman <anders.broman@ericsson.com> | 2006-09-02 16:56:22 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2006-09-02 16:56:22 +0000 |
commit | db40553e30af20c14cac57016931fbce5171eb7a (patch) | |
tree | 10d4b11fae99846cd52a84a81e281885be311351 /plugins | |
parent | 0eba6491bd56b4025edd3d4b0f7094ccdece29c1 (diff) | |
download | wireshark-db40553e30af20c14cac57016931fbce5171eb7a.tar.gz |
Packages can have digits and '/' in their names...
svn path=/trunk/; revision=19124
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/megaco/packet-megaco.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/plugins/megaco/packet-megaco.c b/plugins/megaco/packet-megaco.c index e129c8267c..21c1ea1fb2 100644 --- a/plugins/megaco/packet-megaco.c +++ b/plugins/megaco/packet-megaco.c @@ -107,7 +107,7 @@ static int hf_megaco_Event_Buffer_Control = -1; static int hf_megaco_mode = -1; static int hf_megaco_reserve_group = -1; static int hf_megaco_h324_muxtbl_in = -1; -static int hf_megaco_h324_h223caprn = -1; +static int hf_megaco_h324_h223capr = -1; static int hf_megaco_reserve_value = -1; static int hf_megaco_streamid = -1; static int hf_megaco_requestid = -1; @@ -2568,16 +2568,20 @@ dissect_megaco_LocalControldescriptor(tvbuff_t *tvb, proto_tree *megaco_mediades */ /* Find token length */ for (tvb_offset=tvb_current_offset; tvb_offset < tvb_next_offset; tvb_offset++){ - if (!isalpha(tvb_get_guint8(tvb, tvb_offset ))){ - break; + guint8 octet; + octet = tvb_get_guint8(tvb, tvb_offset); + if (!isalnum(octet)){ + if (octet!='/'){ + break; + } } } token_name_len = tvb_offset - tvb_current_offset; /* Debug Code + */ proto_tree_add_text(megaco_LocalControl_tree, tvb, tvb_current_offset, token_name_len, "%s", tvb_format_text(tvb,tvb_current_offset,token_name_len)); - */ token_index = find_megaco_localParam_names(tvb, tvb_current_offset, token_name_len); /* Find start of parameter value */ tvb_offset = tvb_find_guint8(tvb, tvb_offset , tvb_next_offset, '='); @@ -2628,7 +2632,7 @@ dissect_megaco_LocalControldescriptor(tvbuff_t *tvb, proto_tree *megaco_mediades break; case H324_H223CAPR: /* h324/h223capr */ - proto_tree_add_string(megaco_LocalControl_tree, hf_megaco_h324_h223caprn, tvb, + proto_tree_add_string(megaco_LocalControl_tree, hf_megaco_h324_h223capr, tvb, tvb_current_offset, tokenlen, tvb_format_text(tvb, tvb_current_offset, tokenlen)); @@ -2756,9 +2760,9 @@ proto_register_megaco(void) { &hf_megaco_h324_muxtbl_in, { "h324/muxtbl_in", "megaco.h324_muxtbl_in", FT_STRING, BASE_DEC, NULL, 0x0, "h324/muxtbl_in", HFILL }}, - { &hf_megaco_h324_h223caprn, - { "h324/h223caprn", "megaco._h324_h223caprn", FT_STRING, BASE_DEC, NULL, 0x0, - "h324/h223caprn", HFILL }}, + { &hf_megaco_h324_h223capr, + { "h324/h223capr", "megaco._h324_h223capr", FT_STRING, BASE_DEC, NULL, 0x0, + "h324/h223capr", HFILL }}, { &hf_megaco_reserve_value, { "Reserve Value", "megaco.reservevalue", FT_STRING, BASE_DEC, NULL, 0x0, "Reserve Value on or off", HFILL }}, |