diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-01-10 15:12:13 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-01-10 15:12:13 +0000 |
| commit | 65ce72e3a395898416fcf72ed36f0e39faa32846 (patch) | |
| tree | 8ce1da9f0c2285b3ca0c4405e2b296abdf9d4f52 /epan/dissectors/packet-ua.c | |
| parent | 8b66d8fae74b9e2de694e5f1ee616d90a7a504c6 (diff) | |
From mtwire via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6722
Small corrections in the Alcatel UA dissector
The most important change is to add a condition in dissector for TLV with ID equal to 104 as in the case of the 120. No condition causing 'malformed packet'.
svn path=/trunk/; revision=40424
Diffstat (limited to 'epan/dissectors/packet-ua.c')
| -rw-r--r-- | epan/dissectors/packet-ua.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c index 5a4d650845..e88cd8212d 100644 --- a/epan/dissectors/packet-ua.c +++ b/epan/dissectors/packet-ua.c @@ -434,8 +434,8 @@ static void DissectNOE_callserver(tvbuff_t *pTvb, proto_tree *pNoeItem) gboolean bIsArrIndex; nTlvProperty = tvb_get_guint8(pTvb, iOffs); - /* for property of more than 100 and equal 120 before the field is still arrindex propsize */ - if((nTlvProperty < 100) || (nTlvProperty == 120)) + /* for property of more than 100 and equal 104 or 120 before the field is still arrindex propsize */ + if((nTlvProperty < 100) || (nTlvProperty == 104) || (nTlvProperty == 120)) { nTlvLen = tvb_get_guint8(pTvb, iOffs+1); nTlvLen += 2; @@ -556,37 +556,37 @@ static void DissectNOE_ip_startrtp_properties(tvbuff_t *pTvb, proto_tree *pNoeIt case 0x00: /*LocalUDPPort*/ { proto_item_append_text(pProp, ": %u", tvb_get_ntohs(pTvb, 2)); - proto_tree_add_item(pSubTreeProp, hf_noe_local_port, pTvb, 2, -1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(pSubTreeProp, hf_noe_local_port, pTvb, 2, 2, ENC_BIG_ENDIAN); break; } case 0x01: /*RemoteIP*/ { proto_item_append_text(pProp, ": %s", tvb_ip_to_str(pTvb, 2)); - proto_tree_add_item(pSubTreeProp, hf_noe_remote_ip, pTvb, 2, -1, ENC_NA); + proto_tree_add_item(pSubTreeProp, hf_noe_remote_ip, pTvb, 2, 4, ENC_NA); break; } case 0x02: /*RemoteUDPPort*/ { proto_item_append_text(pProp, ": %u", tvb_get_ntohs(pTvb, 2)); - proto_tree_add_item(pSubTreeProp, hf_noe_remote_port, pTvb, 2, -1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(pSubTreeProp, hf_noe_remote_port, pTvb, 2, 2, ENC_BIG_ENDIAN); break; } case 0x03: /*TypeOfService*/ { proto_item_append_text(pProp, ": %u", tvb_get_guint8(pTvb, 2)); - proto_tree_add_item(pSubTreeProp, hf_noe_typeofservice, pTvb, 2, -1, ENC_NA); + proto_tree_add_item(pSubTreeProp, hf_noe_typeofservice, pTvb, 2, 1, ENC_NA); break; } case 0x04: /*Payload*/ { proto_item_append_text(pProp, ": %s", val_to_str_const(tvb_get_guint8(pTvb, 2), szStartRtpPayload, "Unknown")); - proto_tree_add_item(pSubTreeProp, hf_noe_compressor, pTvb, 2, -1, ENC_NA); + proto_tree_add_item(pSubTreeProp, hf_noe_compressor, pTvb, 2, 1, ENC_NA); break; } case 0x05: /*PayloadConcatenation*/ { proto_item_append_text(pProp, ": %u ms", tvb_get_guint8(pTvb, 2)); - proto_tree_add_item(pSubTreeProp, hf_noe_payloadconcat, pTvb, 2, -1, ENC_NA); + proto_tree_add_item(pSubTreeProp, hf_noe_payloadconcat, pTvb, 2, 1, ENC_NA); break; } } |