osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

SDP: add ability to display port as a string 

Bug: 10898
Change-Id: Ib1b5698c85cd568b8874b44690cafe391eea28f3
Reviewed-on: https://code.wireshark.org/review/6849
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Pascal Quantin 2015-01-29 23:06:37 +01:00 committed by Alexis La Goutte
parent 78755c775c
commit a614212aa8
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
epan/dissectors/packet-sdp.c
View File

@ -139,6 +139,7 @@ static int hf_session_attribute_value = -1;
/* hf_media subfields */
static int hf_media_media = -1;
static int hf_media_port = -1;
static int hf_media_port_string = -1;
static int hf_media_portcount = -1;
static int hf_media_proto = -1;
static int hf_media_format = -1;
@ -868,6 +869,7 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti,
gint offset, next_offset, tokenlen, idx;
guint8 *media_format;
gboolean optional = FALSE;
proto_item *it;
offset = 0;
@ -905,8 +907,13 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti,
media_info->media_port[media_info->media_count],
media_info->media_count));
proto_tree_add_uint(sdp_media_tree, hf_media_port, tvb, offset, tokenlen,
atoi((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_UTF_8|ENC_NA)));
it = proto_tree_add_string(sdp_media_tree, hf_media_port_string, tvb, offset, tokenlen,
media_info->media_port[media_info->media_count]);
if (g_ascii_isdigit(media_info->media_port[media_info->media_count][0])) {
PROTO_ITEM_SET_HIDDEN(it);
proto_tree_add_uint(sdp_media_tree, hf_media_port, tvb, offset, tokenlen,
atoi(media_info->media_port[media_info->media_count]));
}
offset = next_offset + 1;
tokenlen = find_next_token_in_line(tvb, sdp_media_tree, &offset, &next_offset);
@ -929,8 +936,13 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti,
media_info->media_port[media_info->media_count],
media_info->media_count));
/* XXX Remember Port */
proto_tree_add_uint(sdp_media_tree, hf_media_port, tvb, offset, tokenlen,
atoi((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, tokenlen, ENC_UTF_8|ENC_NA)));
it = proto_tree_add_string(sdp_media_tree, hf_media_port_string, tvb, offset, tokenlen,
media_info->media_port[media_info->media_count]);
if (g_ascii_isdigit(media_info->media_port[media_info->media_count][0])) {
PROTO_ITEM_SET_HIDDEN(it);
proto_tree_add_uint(sdp_media_tree, hf_media_port, tvb, offset, tokenlen,
atoi(media_info->media_port[media_info->media_count]));
}
offset = next_offset + 1;
}
@ -2850,6 +2862,11 @@ proto_register_sdp(void)
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
{ &hf_media_port_string,
{ "Media Port", "sdp.media.port_string",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_media_portcount,
{ "Media Port Count", "sdp.media.portcount",
FT_STRING, BASE_NONE, NULL, 0x0,