diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-12-13 06:58:45 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-12-13 06:58:45 +0000 |
| commit | 31bf1214846b93ba45e79e1d90d55aa18217826e (patch) | |
| tree | 228e8488fd2d5766bd8f73ac39050148802f65c6 /plugins | |
| parent | 84553a1b5ea5a542a4f335270f1ec98452217e19 (diff) | |
Fix for parameter Media dissection with more than one parameter.
svn path=/trunk/; revision=20130
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/megaco/packet-megaco.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/plugins/megaco/packet-megaco.c b/plugins/megaco/packet-megaco.c index 008edde5e4..0e7c7e5321 100644 --- a/plugins/megaco/packet-megaco.c +++ b/plugins/megaco/packet-megaco.c @@ -1979,6 +1979,7 @@ dissect_megaco_auditdescriptor(tvbuff_t *tvb, proto_tree *megaco_tree, packet_in #define MEGACO_MGC_ID_TOKEN 4 #define MEGACO_PROFILE_TOKEN 5 #define MEGACO_VERSION_TOKEN 6 +#define MEGACO_METHOD_TOKEN 7 static const megaco_tokens_t megaco_serviceChangeParm_names[] = { { "Unknown-token", NULL }, /* 0 Pad so that the real headers start at index 1 */ @@ -1989,6 +1990,7 @@ static const megaco_tokens_t megaco_serviceChangeParm_names[] = { { "MgcIdToTry", "MG" }, /* 4 MgcIdToken */ { "Profile", "PF" }, /* 5 ProfileToken */ { "Version", "V" }, /* 6 VersionToken */ + { "Method", "MT" }, /* 7 MethodToken */ }; /* Returns index of megaco_tokens_t */ @@ -2049,7 +2051,6 @@ dissect_megaco_servicechangedescriptor(tvbuff_t *tvb, proto_tree *megaco_tree, gint reason; guint8 ServiceChangeReason_str[4]; - tvb_LBRKT = tvb_find_guint8(tvb, tvb_previous_offset, tvb_RBRKT, '{'); /* if (tvb_LBRKT == -1) @@ -2074,7 +2075,7 @@ dissect_megaco_servicechangedescriptor(tvbuff_t *tvb, proto_tree *megaco_tree, token_index = find_megaco_megaco_serviceChangeParm_names(tvb, tvb_previous_offset, tokenlen); tvb_offset = tvb_find_guint8(tvb, tvb_offset, tvb_RBRKT, ','); - if (tvb_offset == -1){ + if ((tvb_offset == -1)||(tvb_offset >=tvb_RBRKT)){ more_params = FALSE; tvb_offset = tvb_skip_wsp_return(tvb, tvb_RBRKT-1); } @@ -2107,6 +2108,7 @@ dissect_megaco_servicechangedescriptor(tvbuff_t *tvb, proto_tree *megaco_tree, case MEGACO_MGC_ID_TOKEN: case MEGACO_PROFILE_TOKEN: case MEGACO_VERSION_TOKEN: + case MEGACO_METHOD_TOKEN: /* No special dissection: fall trough */ default: /* Unknown or: @@ -2117,9 +2119,9 @@ dissect_megaco_servicechangedescriptor(tvbuff_t *tvb, proto_tree *megaco_tree, "%s", tvb_format_text(tvb, tvb_previous_offset, tokenlen)); break; } - if (more_params == TRUE ){ - tvb_previous_offset = tvb_offset +1; - } + + tvb_previous_offset = tvb_offset +1; + }/*End while */ /* extension = extensionParameter parmValue |