diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-09-10 08:26:22 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-09-10 08:26:22 +0000 |
| commit | 77f4036dd60328dff5bd5ad659ef0e7e90b6c21e (patch) | |
| tree | 61d5a7a6b5eb860f34a3ee54b40d8cf4d1461cf1 /epan | |
| parent | 5e4bff84d36f55c3a7ce2d30a2f9d3f4e2f2d4b1 (diff) | |
Add dissection of Vendor id to CISCO AVP dissection.
svn path=/trunk/; revision=44827
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-l2tp.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 54f9b9378c..e3791bd0ca 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -897,8 +897,11 @@ static int dissect_l2tp_cisco_avps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ offset += 2; avp_len -= 2; - proto_tree_add_uint(l2tp_avp_tree, hf_l2tp_cisco_avp_type, - tvb, offset, 2, avp_type); + proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_vendor_id, tvb, offset, 2, ENC_BIG_ENDIAN); + offset += 2; + avp_len -= 2; + + proto_tree_add_uint(l2tp_avp_tree, hf_l2tp_cisco_avp_type, tvb, offset, 2, avp_type); offset += 2; avp_len -= 2; @@ -1559,10 +1562,14 @@ static void process_control_avps(tvbuff_t *tvb, case LOCAL_SESSION_ID: proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_local_session_id, tvb, idx, 4, ENC_BIG_ENDIAN); + col_append_fstr(pinfo->cinfo,COL_INFO, ", LSID: %2u", + tvb_get_ntohl(tvb, idx)); break; case REMOTE_SESSION_ID: proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_remote_session_id, tvb, idx, 4, ENC_BIG_ENDIAN); + col_append_fstr(pinfo->cinfo,COL_INFO, ", RSID: %2u", + tvb_get_ntohl(tvb, idx)); break; case ASSIGNED_COOKIE: proto_tree_add_text(l2tp_avp_tree, tvb, idx, avp_len, |