diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2007-05-15 15:26:13 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2007-05-15 15:26:13 +0000 |
| commit | 198f8f8185f8af202699660cdba6a32752617b66 (patch) | |
| tree | ba502c660101f7f1d508881e9abb49aa9f4a2edb /epan/dissectors | |
| parent | dc9745267b180494c690a2d945573f530aff7aa7 (diff) | |
Fix problem from previous commit (confused myself with FT_UINT_STRING needing length of 1 when adding to tree...), and show display-name in info column.
svn path=/trunk/; revision=21790
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-rtcp.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 727f732f56..e74bfe1704 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -895,11 +895,12 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree /* SIP URI */ item_len = tvb_get_guint8( tvb, offset ); - proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_sip_uri, tvb, offset, 1, FALSE ); + /* Item len of 1 because its an FT_UINT_STRING... */ + proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_sip_uri, + tvb, offset, 1, FALSE ); offset++; - if (check_col(pinfo->cinfo, COL_INFO)) - { + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, " CNAME=\"%s\"", tvb_get_ephemeral_string(tvb, offset, item_len)); } @@ -927,10 +928,18 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree /* Display name */ item_len = tvb_get_guint8( tvb, offset ); - offset++; if (item_len != 0) { - proto_tree_add_item( PoC1_tree, hf_rtcp_app_poc1_disp_name, tvb, offset, 1, FALSE ); + /* Item len of 1 because its an FT_UINT_STRING... */ + proto_tree_add_item(PoC1_tree, hf_rtcp_app_poc1_disp_name, + tvb, offset, 1, FALSE); } + offset++; + + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_fstr(pinfo->cinfo, COL_INFO, " DISPLAY-NAME=\"%s\"", + tvb_get_ephemeral_string(tvb, offset, item_len)); + } + offset += item_len; packet_len = packet_len - item_len - 1; |