diff options
| -rw-r--r-- | epan/dissectors/packet-sdp.c | 1350 |
1 files changed, 672 insertions, 678 deletions
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index a03957c69b..8919403c1d 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -169,29 +169,30 @@ static int ett_sdp_fmtp = -1; #define SDP_MAX_RTP_PAYLOAD_TYPES 20 typedef struct { - gint32 pt[SDP_MAX_RTP_PAYLOAD_TYPES]; - gint8 pt_count; - GHashTable *rtp_dyn_payload; + gint32 pt[SDP_MAX_RTP_PAYLOAD_TYPES]; + gint8 pt_count; + GHashTable *rtp_dyn_payload; } transport_media_pt_t; typedef struct { - char *connection_address; - char *connection_type; - char *media_port[SDP_MAX_RTP_CHANNELS]; - char *media_proto[SDP_MAX_RTP_CHANNELS]; - transport_media_pt_t media[SDP_MAX_RTP_CHANNELS]; - gint8 media_count; + char *connection_address; + char *connection_type; + char *encoding_name; + char *media_port[SDP_MAX_RTP_CHANNELS]; + char *media_proto[SDP_MAX_RTP_CHANNELS]; + transport_media_pt_t media[SDP_MAX_RTP_CHANNELS]; + gint8 media_count; } transport_info_t; /* static functions */ static void call_sdp_subdissector(tvbuff_t *tvb, int hf, proto_tree* ti, - transport_info_t *transport_info); + transport_info_t *transport_info); /* Subdissector functions */ static void dissect_sdp_owner(tvbuff_t *tvb, proto_item* ti); static void dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti, - transport_info_t *transport_info); + transport_info_t *transport_info); static void dissect_sdp_bandwidth(tvbuff_t *tvb, proto_item *ti); static void dissect_sdp_time(tvbuff_t *tvb, proto_item* ti); static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti); @@ -199,288 +200,282 @@ static void dissect_sdp_timezone(tvbuff_t *tvb, proto_item* ti); static void dissect_sdp_encryption_key(tvbuff_t *tvb, proto_item * ti); static void dissect_sdp_session_attribute(tvbuff_t *tvb, proto_item *ti); static void dissect_sdp_media(tvbuff_t *tvb, proto_item *ti, - transport_info_t *transport_info); + transport_info_t *transport_info); static void dissect_sdp_media_attribute(tvbuff_t *tvb, proto_item *ti, transport_info_t *transport_info); static void dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - proto_tree *sdp_tree; - proto_item *ti, *sub_ti; - gint offset = 0; - gint next_offset; - int linelen; - gboolean in_media_description; - guchar type; - guchar delim; - int datalen; - int tokenoffset; - int hf = -1; - char *string; - - address src_addr; - - transport_info_t transport_info; - - guint32 port=0; - gboolean is_rtp=FALSE; - gboolean is_t38=FALSE; - gboolean set_rtp=FALSE; - gboolean is_ipv4_addr=FALSE; - gboolean is_ipv6_addr=FALSE; - guint32 ipaddr[4]; - gint n,i; - sdp_packet_info *sdp_pi; - - /* Initialise packet info for passing to tap */ - sdp_pi = ep_alloc(sizeof(sdp_packet_info)); - sdp_pi->summary_str[0] = '\0'; - - /* Initialise RTP channel info */ - transport_info.connection_address=NULL; - transport_info.connection_type=NULL; - for (n=0; n < SDP_MAX_RTP_CHANNELS; n++) - { - transport_info.media_port[n]=NULL; - transport_info.media_proto[n]=NULL; - transport_info.media[n].pt_count = 0; - transport_info.media[n].rtp_dyn_payload = g_hash_table_new( g_int_hash, g_int_equal); - } - transport_info.media_count = 0; - - /* - * As RFC 2327 says, "SDP is purely a format for session - * description - it does not incorporate a transport protocol, - * and is intended to use different transport protocols as - * appropriate including the Session Announcement Protocol, - * Session Initiation Protocol, Real-Time Streaming Protocol, - * electronic mail using the MIME extensions, and the - * Hypertext Transport Protocol." - * - * We therefore don't set the protocol or info columns; - * instead, we append to them, so that we don't erase - * what the protocol inside which the SDP stuff resides - * put there. - */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_append_str(pinfo->cinfo, COL_PROTOCOL, "/SDP"); - - if (check_col(pinfo->cinfo, COL_INFO)) { - /* XXX: Needs description. */ - col_append_str(pinfo->cinfo, COL_INFO, ", with session description"); - } - - ti = proto_tree_add_item(tree, proto_sdp, tvb, offset, -1, FALSE); - sdp_tree = proto_item_add_subtree(ti, ett_sdp); - - /* - * Show the SDP message a line at a time. - */ - in_media_description = FALSE; - while (tvb_reported_length_remaining(tvb, offset) > 0) { - /* - * Find the end of the line. - */ - linelen = tvb_find_line_end_unquoted(tvb, offset, -1, - &next_offset); - - /* - * Line must contain at least e.g. "v=". - */ - if (linelen < 2) - break; - - type = tvb_get_guint8(tvb,offset); - delim = tvb_get_guint8(tvb,offset + 1); - if (delim != '=') { - proto_tree_add_item(sdp_tree,hf_invalid,tvb, offset, - linelen, FALSE); - offset = next_offset; - continue; - } - - /* - * Attributes. - */ - switch (type) { - case 'v': - hf = hf_protocol_version; - break; - case 'o': - hf = hf_owner; - break; - case 's': - hf = hf_session_name; - break; - case 'i': - if (in_media_description) { - hf = hf_media_title; - } - else{ - hf = hf_session_info; - } - break; - case 'u': - hf = hf_uri; - break; - case 'e': - hf = hf_email; - break; - case 'p': - hf = hf_phone; - break; - case 'c': - hf = hf_connection_info; - break; - case 'b': - hf = hf_bandwidth; - break; - case 't': - hf = hf_time; - break; - case 'r': - hf = hf_repeat_time; - break; - case 'm': - hf = hf_media; - in_media_description = TRUE; - break; - case 'k': - hf = hf_encryption_key; - break; - case 'a': - if (in_media_description) { - hf = hf_media_attribute; - } - else{ - hf = hf_session_attribute; - } - break; - case 'z': - hf = hf_timezone; - break; - default: - hf = hf_unknown; - break; - } - tokenoffset = 2; - if (hf == hf_unknown) - tokenoffset = 0; - string = tvb_get_ephemeral_string(tvb, offset + tokenoffset, - linelen - tokenoffset); - sub_ti = proto_tree_add_string_format(sdp_tree,hf,tvb, offset, - linelen, string, - "%s: %s", - proto_registrar_get_name(hf), - format_text(string, - linelen - tokenoffset)); - call_sdp_subdissector(tvb_new_subset(tvb,offset+tokenoffset, - linelen-tokenoffset, - linelen-tokenoffset), - hf,sub_ti,&transport_info), - offset = next_offset; - } - - - /* Now look, if we have strings collected. - * Try to convert ipv4 addresses and ports into binary format, - * so we can use them to detect rtp and rtcp streams. - * Don't forget to free the strings! - */ - - for (n = 0; n < transport_info.media_count; n++) - { - if(transport_info.media_port[n]!=NULL) { - port = atol(transport_info.media_port[n]); - } - if(transport_info.media_proto[n]!=NULL) { - /* Check if media protocol is RTP */ - is_rtp = (strcmp(transport_info.media_proto[n],"RTP/AVP")==0); - /* Check if media protocol is T38 */ - is_t38 = ( (strcmp(transport_info.media_proto[n],"UDPTL")==0) || (strcmp(transport_info.media_proto[n],"udptl")==0) ); - - } - if(transport_info.connection_address!=NULL) { - if(transport_info.connection_type!=NULL) { - if (strcmp(transport_info.connection_type,"IP4")==0) { - if(inet_pton(AF_INET,transport_info.connection_address, &ipaddr)==1 ) { - /* connection_address could be converted to a valid ipv4 address*/ - is_ipv4_addr=TRUE; - src_addr.type=AT_IPv4; - src_addr.len=4; - } - } - else if (strcmp(transport_info.connection_type,"IP6")==0){ - if (inet_pton(AF_INET6, transport_info.connection_address, &ipaddr)==1){ - /* connection_address could be converted to a valid ipv6 address*/ - is_ipv6_addr=TRUE; - src_addr.type=AT_IPv6; - src_addr.len=16; - } - } - } - } - set_rtp = FALSE; - /* Add rtp and rtcp conversation, if available (overrides t38 if conversation already set) */ - if((!pinfo->fd->flags.visited) && port!=0 && is_rtp && (is_ipv4_addr || is_ipv6_addr)){ - src_addr.data=(char *)&ipaddr; - if(rtp_handle){ - rtp_add_address(pinfo, &src_addr, port, 0, - "SDP", pinfo->fd->num, transport_info.media[n].rtp_dyn_payload); - set_rtp = TRUE; - } - if(rtcp_handle){ - port++; - rtcp_add_address(pinfo, &src_addr, port, 0, - "SDP", pinfo->fd->num); - } - } - - /* Add t38 conversation, if available and only if no rtp */ - if((!pinfo->fd->flags.visited) && port!=0 && !set_rtp && is_t38 && is_ipv4_addr){ - src_addr.data=(char *)&ipaddr; - if(t38_handle){ - t38_add_address(pinfo, &src_addr, port, 0, "SDP", pinfo->fd->num); - } - } - - /* Create the RTP summary str for the Voip Call analysis */ - for (i = 0; i < transport_info.media[n].pt_count; i++) - { - /* if the payload type is dynamic (96 to 127), check the hash table to add the desc in the SDP summary */ - if ( (transport_info.media[n].pt[i] >=96) && (transport_info.media[n].pt[i] <=127) ) { - gchar *str_dyn_pt = g_hash_table_lookup(transport_info.media[n].rtp_dyn_payload, &transport_info.media[n].pt[i]); - if (str_dyn_pt) - g_snprintf(sdp_pi->summary_str, 50, "%s %s", sdp_pi->summary_str, str_dyn_pt); - else - g_snprintf(sdp_pi->summary_str, 50, "%s %d", sdp_pi->summary_str, transport_info.media[n].pt[i]); - } else - g_snprintf(sdp_pi->summary_str, 50, "%s %s", sdp_pi->summary_str, val_to_str(transport_info.media[n].pt[i], rtp_payload_type_short_vals, "%u")); - } - - /* Free the hash table if we did't assigned it to a conv use it */ - if (set_rtp == FALSE) - rtp_free_hash_dyn_payload(transport_info.media[n].rtp_dyn_payload); - - /* Create the T38 summary str for the Voip Call analysis */ - if (is_t38) g_snprintf(sdp_pi->summary_str, 50, "%s t38", sdp_pi->summary_str); - } - - /* Free the remainded hash tables not used */ - for (n = transport_info.media_count; n < SDP_MAX_RTP_CHANNELS; n++) - { - rtp_free_hash_dyn_payload(transport_info.media[n].rtp_dyn_payload); - } - - - datalen = tvb_length_remaining(tvb, offset); - if (datalen > 0) { - proto_tree_add_text(sdp_tree, tvb, offset, datalen, - "Data (%d bytes)", datalen); - } - - /* Report this packet to the tap */ - tap_queue_packet(sdp_tap, pinfo, sdp_pi); + proto_tree *sdp_tree; + proto_item *ti, *sub_ti; + gint offset = 0; + gint next_offset; + int linelen; + gboolean in_media_description; + guchar type; + guchar delim; + int datalen; + int tokenoffset; + int hf = -1; + char *string; + + address src_addr; + + transport_info_t transport_info; + + guint32 port=0; + gboolean is_rtp=FALSE; + gboolean is_t38=FALSE; + gboolean set_rtp=FALSE; + gboolean is_ipv4_addr=FALSE; + gboolean is_ipv6_addr=FALSE; + guint32 ipaddr[4]; + gint n,i; + sdp_packet_info *sdp_pi; + + /* Initialise packet info for passing to tap */ + sdp_pi = ep_alloc(sizeof(sdp_packet_info)); + sdp_pi->summary_str[0] = '\0'; + + /* Initialise RTP channel info */ + transport_info.connection_address=NULL; + transport_info.connection_type=NULL; + transport_info.encoding_name=NULL; + for (n=0; n < SDP_MAX_RTP_CHANNELS; n++) + { + transport_info.media_port[n]=NULL; + transport_info.media_proto[n]=NULL; + transport_info.media[n].pt_count = 0; + transport_info.media[n].rtp_dyn_payload = g_hash_table_new( g_int_hash, g_int_equal); + } + transport_info.media_count = 0; + + /* + * As RFC 2327 says, "SDP is purely a format for session + * description - it does not incorporate a transport protocol, + * and is intended to use different transport protocols as + * appropriate including the Session Announcement Protocol, + * Session Initiation Protocol, Real-Time Streaming Protocol, + * electronic mail using the MIME extensions, and the + * Hypertext Transport Protocol." + * + * We therefore don't set the protocol or info columns; + * instead, we append to them, so that we don't erase + * what the protocol inside which the SDP stuff resides + * put there. + */ + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_append_str(pinfo->cinfo, COL_PROTOCOL, "/SDP"); + + if (check_col(pinfo->cinfo, COL_INFO)) { + /* XXX: Needs description. */ + col_append_str(pinfo->cinfo, COL_INFO, ", with session description"); + } + + ti = proto_tree_add_item(tree, proto_sdp, tvb, offset, -1, FALSE); + sdp_tree = proto_item_add_subtree(ti, ett_sdp); + + /* + * Show the SDP message a line at a time. + */ + in_media_description = FALSE; + while (tvb_reported_length_remaining(tvb, offset) > 0) { + /* + * Find the end of the line. + */ + linelen = tvb_find_line_end_unquoted(tvb, offset, -1, &next_offset); + + /* + * Line must contain at least e.g. "v=". + */ + if (linelen < 2) + break; + + type = tvb_get_guint8(tvb,offset); + delim = tvb_get_guint8(tvb,offset + 1); + if (delim != '=') { + proto_tree_add_item(sdp_tree, hf_invalid, tvb, offset, linelen, FALSE); + offset = next_offset; + continue; + } + + /* + * Attributes. + */ + switch (type) { + case 'v': + hf = hf_protocol_version; + break; + case 'o': + hf = hf_owner; + break; + case 's': + hf = hf_session_name; + break; + case 'i': + if (in_media_description) { + hf = hf_media_title; + } + else{ + hf = hf_session_info; + } + break; + case 'u': + hf = hf_uri; + break; + case 'e': + hf = hf_email; + break; + case 'p': + hf = hf_phone; + break; + case 'c': + hf = hf_connection_info; + break; + case 'b': + hf = hf_bandwidth; + break; + case 't': + hf = hf_time; + break; + case 'r': + hf = hf_repeat_time; + break; + case 'm': + hf = hf_media; + in_media_description = TRUE; + break; + case 'k': + hf = hf_encryption_key; + break; + case 'a': + if (in_media_description) { + hf = hf_media_attribute; + } + else{ + hf = hf_session_attribute; + } + break; + case 'z': + hf = hf_timezone; + break; + default: + hf = hf_unknown; + break; + } + tokenoffset = 2; + if (hf == hf_unknown) + tokenoffset = 0; + string = tvb_get_ephemeral_string(tvb, offset + tokenoffset, + linelen - tokenoffset); + sub_ti = proto_tree_add_string(sdp_tree, hf, tvb, offset, linelen, + string); + call_sdp_subdissector(tvb_new_subset(tvb,offset+tokenoffset, + linelen-tokenoffset, + linelen-tokenoffset), + hf,sub_ti,&transport_info), + offset = next_offset; + } + + + /* Now look, if we have strings collected. + * Try to convert ipv4 addresses and ports into binary format, + * so we can use them to detect rtp and rtcp streams. + * Don't forget to free the strings! + */ + + for (n = 0; n < transport_info.media_count; n++) + { + if(transport_info.media_port[n]!=NULL) { + port = atol(transport_info.media_port[n]); + } + if(transport_info.media_proto[n]!=NULL) { + /* Check if media protocol is RTP */ + is_rtp = (strcmp(transport_info.media_proto[n],"RTP/AVP")==0); + /* Check if media protocol is T38 */ + is_t38 = ( (strcmp(transport_info.media_proto[n],"UDPTL")==0) || (strcmp(transport_info.media_proto[n],"udptl")==0) ); + + } + if(transport_info.connection_address!=NULL) { + if(transport_info.connection_type!=NULL) { + if (strcmp(transport_info.connection_type,"IP4")==0) { + if(inet_pton(AF_INET,transport_info.connection_address, &ipaddr)==1 ) { + /* connection_address could be converted to a valid ipv4 address*/ + is_ipv4_addr=TRUE; + src_addr.type=AT_IPv4; + src_addr.len=4; + } + } + else if (strcmp(transport_info.connection_type,"IP6")==0){ + if (inet_pton(AF_INET6, transport_info.connection_address, &ipaddr)==1){ + /* connection_address could be converted to a valid ipv6 address*/ + is_ipv6_addr=TRUE; + src_addr.type=AT_IPv6; + src_addr.len=16; + } + } + } + } + set_rtp = FALSE; + /* Add rtp and rtcp conversation, if available (overrides t38 if conversation already set) */ + if((!pinfo->fd->flags.visited) && port!=0 && is_rtp && (is_ipv4_addr || is_ipv6_addr)){ + src_addr.data=(char *)&ipaddr; + if(rtp_handle){ + rtp_add_address(pinfo, &src_addr, port, 0, "SDP", pinfo->fd->num, + transport_info.media[n].rtp_dyn_payload); + set_rtp = TRUE; + } + if(rtcp_handle){ + port++; + rtcp_add_address(pinfo, &src_addr, port, 0, "SDP", pinfo->fd->num); + } + } + + /* Add t38 conversation, if available and only if no rtp */ + if((!pinfo->fd->flags.visited) && port!=0 && !set_rtp && is_t38 && is_ipv4_addr){ + src_addr.data=(char *)&ipaddr; + if(t38_handle){ + t38_add_address(pinfo, &src_addr, port, 0, "SDP", pinfo->fd->num); + } + } + + /* Create the RTP summary str for the Voip Call analysis */ + for (i = 0; i < transport_info.media[n].pt_count; i++) + { + /* if the payload type is dynamic (96 to 127), check the hash table to add the desc in the SDP summary */ + if ( (transport_info.media[n].pt[i] >=96) && (transport_info.media[n].pt[i] <=127) ) { + gchar *str_dyn_pt = g_hash_table_lookup(transport_info.media[n].rtp_dyn_payload, &transport_info.media[n].pt[i]); + if (str_dyn_pt) + g_snprintf(sdp_pi->summary_str, 50, "%s %s", sdp_pi->summary_str, str_dyn_pt); + else + g_snprintf(sdp_pi->summary_str, 50, "%s %d", sdp_pi->summary_str, transport_info.media[n].pt[i]); + } else + g_snprintf(sdp_pi->summary_str, 50, "%s %s", sdp_pi->summary_str, val_to_str(transport_info.media[n].pt[i], rtp_payload_type_short_vals, "%u")); + } + + /* Free the hash table if we did't assigned it to a conv use it */ + if (set_rtp == FALSE) + rtp_free_hash_dyn_payload(transport_info.media[n].rtp_dyn_payload); + + /* Create the T38 summary str for the Voip Call analysis */ + if (is_t38) g_snprintf(sdp_pi->summary_str, 50, "%s t38", sdp_pi->summary_str); + } + + /* Free the remainded hash tables not used */ + for (n = transport_info.media_count; n < SDP_MAX_RTP_CHANNELS; n++) + { + rtp_free_hash_dyn_payload(transport_info.media[n].rtp_dyn_payload); + } + + + datalen = tvb_length_remaining(tvb, offset); + if (datalen > 0) { + proto_tree_add_text(sdp_tree, tvb, offset, datalen, "Data (%d bytes)", + datalen); + } + + /* Report this packet to the tap */ + tap_queue_packet(sdp_tap, pinfo, sdp_pi); } static void @@ -525,8 +520,8 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){ return; tokenlen = next_offset - offset; - proto_tree_add_item(sdp_owner_tree,hf_owner_username,tvb, offset,tokenlen, - FALSE); + proto_tree_add_item(sdp_owner_tree, hf_owner_username, tvb, offset, tokenlen, + FALSE); offset = next_offset + 1; /* Find the session id */ @@ -535,8 +530,8 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){ return; tokenlen = next_offset - offset; - proto_tree_add_item(sdp_owner_tree,hf_owner_sessionid, tvb, - offset,tokenlen,FALSE); + proto_tree_add_item(sdp_owner_tree, hf_owner_sessionid, tvb, offset, + tokenlen, FALSE); offset = next_offset + 1; /* Find the version */ @@ -545,8 +540,8 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){ return; tokenlen = next_offset - offset; - proto_tree_add_item(sdp_owner_tree,hf_owner_version, tvb, - offset,tokenlen,FALSE); + proto_tree_add_item(sdp_owner_tree, hf_owner_version, tvb, offset, tokenlen, + FALSE); offset = next_offset + 1; /* Find the network type */ @@ -555,8 +550,8 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){ return; tokenlen = next_offset - offset; - proto_tree_add_item(sdp_owner_tree,hf_owner_network_type, tvb, - offset,tokenlen,FALSE); + proto_tree_add_item(sdp_owner_tree, hf_owner_network_type, tvb, offset, + tokenlen, FALSE); offset = next_offset + 1; /* Find the address type */ @@ -565,8 +560,8 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){ return; tokenlen = next_offset - offset; - proto_tree_add_item(sdp_owner_tree,hf_owner_address_type, tvb, - offset,tokenlen,FALSE); + proto_tree_add_item(sdp_owner_tree, hf_owner_address_type, tvb, offset, + tokenlen, FALSE); offset = next_offset + 1; /* Find the address */ @@ -579,7 +574,7 @@ dissect_sdp_owner(tvbuff_t *tvb, proto_item *ti){ */ static void dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti, - transport_info_t *transport_info){ + transport_info_t *transport_info){ proto_tree *sdp_connection_info_tree; gint offset,next_offset,tokenlen; @@ -588,7 +583,7 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti, tokenlen = 0; sdp_connection_info_tree = proto_item_add_subtree(ti, - ett_sdp_connection_info); + ett_sdp_connection_info); /* Find the network type */ next_offset = tvb_find_guint8(tvb,offset,-1,' '); @@ -597,8 +592,8 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti, tokenlen = next_offset - offset; proto_tree_add_item(sdp_connection_info_tree, - hf_connection_info_network_type,tvb, - offset,tokenlen,FALSE); + hf_connection_info_network_type, tvb, offset, tokenlen, + FALSE); offset = next_offset + 1; /* Find the address type */ @@ -611,15 +606,15 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti, proto_tree_add_item(sdp_connection_info_tree, - hf_connection_info_address_type,tvb, - offset,tokenlen,FALSE); + hf_connection_info_address_type, tvb, offset, tokenlen, + FALSE); offset = next_offset + 1; /* Find the connection address */ /* XXX - what if there's a <number of addresses> value? */ next_offset = tvb_find_guint8(tvb,offset,-1,'/'); if( next_offset == -1){ - tokenlen = -1; /* end of tvbuff */ + tokenlen = -1; /* end of tvbuff */ /* Save connection address */ transport_info->connection_address = tvb_get_ephemeral_string(tvb, offset, tvb_length_remaining(tvb, offset)); @@ -630,23 +625,22 @@ dissect_sdp_connection_info(tvbuff_t *tvb, proto_item* ti, } proto_tree_add_item(sdp_connection_info_tree, - hf_connection_info_connection_address, tvb, - offset,tokenlen,FALSE); + hf_connection_info_connection_address, tvb, offset, + tokenlen, FALSE); if(next_offset != -1){ offset = next_offset + 1; next_offset = tvb_find_guint8(tvb,offset,-1,'/'); if( next_offset == -1){ - tokenlen = -1; /* end of tvbuff */ + tokenlen = -1; /* end of tvbuff */ } else { tokenlen = next_offset - offset; } proto_tree_add_item(sdp_connection_info_tree, - hf_connection_info_ttl,tvb,offset,tokenlen,FALSE); + hf_connection_info_ttl, tvb, offset, tokenlen, FALSE); if(next_offset != -1){ offset = next_offset + 1; proto_tree_add_item(sdp_connection_info_tree, - hf_connection_info_num_addr, tvb, - offset, -1, FALSE); + hf_connection_info_num_addr, tvb, offset, -1, FALSE); } } } @@ -670,14 +664,13 @@ dissect_sdp_bandwidth(tvbuff_t *tvb, proto_item *ti){ tokenlen = next_offset - offset; - proto_tree_add_item(sdp_bandwidth_tree, hf_bandwidth_modifier, - tvb, offset, tokenlen, FALSE); + proto_tree_add_item(sdp_bandwidth_tree, hf_bandwidth_modifier, tvb, offset, + tokenlen, FALSE); offset = next_offset + 1; - proto_tree_add_item(sdp_bandwidth_tree, hf_bandwidth_value, - tvb, offset, -1, FALSE); - + proto_tree_add_item(sdp_bandwidth_tree, hf_bandwidth_value, tvb, offset, -1, + FALSE); } static void dissect_sdp_time(tvbuff_t *tvb, proto_item* ti){ @@ -696,13 +689,12 @@ static void dissect_sdp_time(tvbuff_t *tvb, proto_item* ti){ return; tokenlen = next_offset - offset; - proto_tree_add_item(sdp_time_tree, hf_time_start, tvb, - offset, tokenlen, FALSE); + proto_tree_add_item(sdp_time_tree, hf_time_start, tvb, offset, tokenlen, + FALSE); /* get stop time */ offset = next_offset + 1; - proto_tree_add_item(sdp_time_tree, hf_time_stop, tvb, - offset, -1, FALSE); + proto_tree_add_item(sdp_time_tree, hf_time_stop, tvb, offset, -1, FALSE); } static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti){ @@ -722,7 +714,7 @@ static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti){ tokenlen = next_offset - offset; proto_tree_add_item(sdp_repeat_time_tree, hf_repeat_time_interval, tvb, - offset, tokenlen, FALSE); + offset, tokenlen, FALSE); /* get duration */ offset = next_offset + 1; @@ -732,7 +724,7 @@ static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti){ tokenlen = next_offset - offset; proto_tree_add_item(sdp_repeat_time_tree,hf_repeat_time_duration, tvb, - offset, tokenlen, FALSE); + offset, tokenlen, FALSE); /* get offsets */ do{ @@ -741,10 +733,10 @@ static void dissect_sdp_repeat_time(tvbuff_t *tvb, proto_item* ti){ if(next_offset != -1){ tokenlen = next_offset - offset; } else { - tokenlen = -1; /* end of tvbuff */ + tokenlen = -1; /* end of tvbuff */ } proto_tree_add_item(sdp_repeat_time_tree, hf_repeat_time_offset, - tvb, offset, tokenlen, FALSE); + tvb, offset, tokenlen, FALSE); } while( next_offset != -1 ); } @@ -764,17 +756,17 @@ dissect_sdp_timezone(tvbuff_t *tvb, proto_item* ti){ break; tokenlen = next_offset - offset; - proto_tree_add_item(sdp_timezone_tree,hf_timezone_time,tvb, - offset, tokenlen, FALSE); + proto_tree_add_item(sdp_timezone_tree, hf_timezone_time, tvb, offset, + tokenlen, FALSE); offset = next_offset + 1; next_offset = tvb_find_guint8(tvb,offset,-1,' '); if(next_offset != -1){ tokenlen = next_offset - offset; } else { - tokenlen = -1; /* end of tvbuff */ + tokenlen = -1; /* end of tvbuff */ } - proto_tree_add_item(sdp_timezone_tree,hf_timezone_offset,tvb, - offset, tokenlen, FALSE); + proto_tree_add_item(sdp_timezone_tree, hf_timezone_offset, tvb, offset, + tokenlen, FALSE); offset = next_offset + 1; } while (next_offset != -1); @@ -799,12 +791,11 @@ static void dissect_sdp_encryption_key(tvbuff_t *tvb, proto_item * ti){ tokenlen = next_offset - offset; proto_tree_add_item(sdp_encryption_key_tree,hf_encryption_key_type, - tvb, offset, tokenlen, FALSE); + tvb, offset, tokenlen, FALSE); offset = next_offset + 1; proto_tree_add_item(sdp_encryption_key_tree,hf_encryption_key_data, - tvb, offset, -1, FALSE); - + tvb, offset, -1, FALSE); } @@ -819,7 +810,7 @@ static void dissect_sdp_session_attribute(tvbuff_t *tvb, proto_item * ti){ tokenlen = 0; sdp_session_attribute_tree = proto_item_add_subtree(ti, - ett_sdp_session_attribute); + ett_sdp_session_attribute); next_offset = tvb_find_guint8(tvb,offset,-1,':'); @@ -828,53 +819,49 @@ static void dissect_sdp_session_attribute(tvbuff_t *tvb, proto_item * ti){ tokenlen = next_offset - offset; - proto_tree_add_item(sdp_session_attribute_tree, - hf_session_attribute_field, - tvb, offset, tokenlen, FALSE); + proto_tree_add_item(sdp_session_attribute_tree, hf_session_attribute_field, + tvb, offset, tokenlen, FALSE); field_name = tvb_get_ephemeral_string(tvb, offset, tokenlen); offset = next_offset + 1; if (strcmp(field_name, "ipbcp") == 0) { - - offset = tvb_pbrk_guint8(tvb,offset,-1,"0123456789"); - - if (offset == -1) - return; - - next_offset = tvb_find_guint8(tvb,offset,-1,' '); - - if (next_offset == -1) - return; - - tokenlen = next_offset - offset; - - proto_tree_add_item(sdp_session_attribute_tree,hf_ipbcp_version,tvb,offset,tokenlen,FALSE); - - offset = tvb_pbrk_guint8(tvb,offset,-1,"ABCDEFGHIJKLMNOPQRSTUVWXYZ"); - - if (offset == -1) - return; - - tokenlen = tvb_find_line_end(tvb,offset,-1, &next_offset, FALSE); - - if (tokenlen == -1) - return; - - proto_tree_add_item(sdp_session_attribute_tree,hf_ipbcp_type,tvb,offset,tokenlen,FALSE); - - } else { - proto_tree_add_item(sdp_session_attribute_tree, - hf_session_attribute_value, - tvb, offset, -1, FALSE); + offset = tvb_pbrk_guint8(tvb,offset,-1,"0123456789"); + if (offset == -1) + return; + + next_offset = tvb_find_guint8(tvb,offset,-1,' '); + + if (next_offset == -1) + return; + + tokenlen = next_offset - offset; + + proto_tree_add_item(sdp_session_attribute_tree,hf_ipbcp_version,tvb,offset,tokenlen,FALSE); + + offset = tvb_pbrk_guint8(tvb,offset,-1,"ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + + if (offset == -1) + return; + + tokenlen = tvb_find_line_end(tvb,offset,-1, &next_offset, FALSE); + + if (tokenlen == -1) + return; + + proto_tree_add_item(sdp_session_attribute_tree,hf_ipbcp_type,tvb,offset,tokenlen,FALSE); + + } else { + proto_tree_add_item(sdp_session_attribute_tree, hf_session_attribute_value, + tvb, offset, -1, FALSE); } } static void dissect_sdp_media(tvbuff_t *tvb, proto_item *ti, - transport_info_t *transport_info){ + transport_info_t *transport_info){ proto_tree *sdp_media_tree; gint offset, next_offset, tokenlen, index; guint8 *media_format; @@ -892,8 +879,8 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti, tokenlen = next_offset - offset; - proto_tree_add_item(sdp_media_tree, hf_media_media, tvb, - offset, tokenlen, FALSE); + proto_tree_add_item(sdp_media_tree, hf_media_media, tvb, offset, tokenlen, + FALSE); offset = next_offset + 1; @@ -908,15 +895,15 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti, /* Save port info */ transport_info->media_port[transport_info->media_count] = tvb_get_ephemeral_string(tvb, offset, tokenlen); - proto_tree_add_item(sdp_media_tree, hf_media_port, tvb, - offset, tokenlen, FALSE); + proto_tree_add_item(sdp_media_tree, hf_media_port, tvb, offset, tokenlen, + FALSE); offset = next_offset + 1; next_offset = tvb_find_guint8(tvb,offset, -1, ' '); if(next_offset == -1) return; tokenlen = next_offset - offset; - proto_tree_add_item(sdp_media_tree, hf_media_portcount, tvb, - offset, tokenlen, FALSE); + proto_tree_add_item(sdp_media_tree, hf_media_portcount, tvb, offset, + tokenlen, FALSE); offset = next_offset + 1; } else { next_offset = tvb_find_guint8(tvb,offset, -1, ' '); @@ -928,8 +915,8 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti, transport_info->media_port[transport_info->media_count] = tvb_get_ephemeral_string(tvb, offset, tokenlen); /* XXX Remember Port */ - proto_tree_add_item(sdp_media_tree, hf_media_port, tvb, - offset, tokenlen, FALSE); + proto_tree_add_item(sdp_media_tree, hf_media_port, tvb, offset, tokenlen, + FALSE); offset = next_offset + 1; } @@ -943,17 +930,17 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti, transport_info->media_proto[transport_info->media_count] = tvb_get_ephemeral_string(tvb, offset, tokenlen); /* XXX Remember Protocol */ - proto_tree_add_item(sdp_media_tree, hf_media_proto, tvb, - offset, tokenlen, FALSE); + proto_tree_add_item(sdp_media_tree, hf_media_proto, tvb, offset, tokenlen, + FALSE); do{ offset = next_offset + 1; next_offset = tvb_find_guint8(tvb,offset,-1,' '); if(next_offset == -1){ - tokenlen = tvb_length_remaining(tvb, offset); /* End of tvbuff */ + tokenlen = tvb_length_remaining(tvb, offset); /* End of tvbuff */ if (tokenlen == 0) - break; /* Nothing more left */ + break; /* Nothing more left */ } else { tokenlen = next_offset - offset; } @@ -962,14 +949,14 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti, "RTP/AVP") == 0) { media_format = tvb_get_ephemeral_string(tvb, offset, tokenlen); proto_tree_add_string(sdp_media_tree, hf_media_format, tvb, offset, - tokenlen, val_to_str(atol(media_format), rtp_payload_type_vals, "%u")); - index = transport_info->media[transport_info->media_count].pt_count; - transport_info->media[transport_info->media_count].pt[index] = atol(media_format); - if (index < (SDP_MAX_RTP_PAYLOAD_TYPES-1)) - transport_info->media[transport_info->media_count].pt_count++; + tokenlen, val_to_str(atol(media_format), rtp_payload_type_vals, "%u")); + index = transport_info->media[transport_info->media_count].pt_count; + transport_info->media[transport_info->media_count].pt[index] = atol(media_format); + if (index < (SDP_MAX_RTP_PAYLOAD_TYPES-1)) + transport_info->media[transport_info->media_count].pt_count++; } else { - proto_tree_add_item(sdp_media_tree, hf_media_format, tvb, - offset, tokenlen, FALSE); + proto_tree_add_item(sdp_media_tree, hf_media_format, tvb, offset, + tokenlen, FALSE); } } while (next_offset != -1); @@ -987,94 +974,95 @@ dissect_sdp_media(tvbuff_t *tvb, proto_item *ti, */ } + /* -14496-2, Annex G, Tabell G-1. +14496-2, Annex G, Table G-1. Table G-1 FLC table for profile_and_level_indication Profile/Level Code */ static const value_string mpeg4es_level_indication_vals[] = { - { 0, "Reserved" }, - { 1, "Simple Profile/Level 1" }, - { 2, "Simple Profile/Level 2" }, - { 3, "Reserved" }, - { 4, "Reserved" }, - { 5, "Reserved" }, - { 6, "Reserved" }, - { 7, "Reserved" }, - { 8, "Simple Profile/Level 0" }, - { 9, "Simple Profile/Level 0b" }, - /* Reserved 00001001 - 00010000 */ - { 0x11, "Simple Scalable Profile/Level 1" }, - { 0x12, "Simple Scalable Profile/Level 2" }, - /* Reserved 00010011 - 00100000 */ - { 0x21, "Core Profile/Level 1" }, - { 0x22, "Core Profile/Level 2" }, - /* Reserved 00100011 - 00110001 */ - { 0x32, "Main Profile/Level 2" }, - { 0x33, "Main Profile/Level 3" }, - { 0x34, "Main Profile/Level 4" }, - /* Reserved 00110101 - 01000001 */ - { 0x42, "N-bit Profile/Level 2" }, - /* Reserved 01000011 - 01010000 */ - { 0x51, "Scalable Texture Profile/Level 1" }, - /* Reserved 01010010 - 01100000 */ - { 0x61, "Simple Face Animation Profile/Level 1" }, - { 0x62, "Simple Face Animation Profile/Level 2" }, - { 0x63, "Simple FBA Profile/Level 1" }, - { 0x64, "Simple FBA Profile/Level 2" }, - /* Reserved 01100101 - 01110000 */ - { 0x71, "Basic Animated Texture Profile/Level 1" }, - { 0x72, "Basic Animated Texture Profile/Level 2" }, - /* Reserved 01110011 - 10000000 */ - { 0x81, "Hybrid Profile/Level 1" }, - { 0x82, "Hybrid Profile/Level 2" }, - /* Reserved 10000011 - 10010000 */ - { 0x91, "Advanced Real Time Simple Profile/Level 1" }, - { 0x92, "Advanced Real Time Simple Profile/Level 2" }, - { 0x93, "Advanced Real Time Simple Profile/Level 3" }, - { 0x94, "Advanced Real Time Simple Profile/Level 4" }, - /* Reserved 10010101 - 10100000 */ - { 0xa1, "Core Scalable Profile/Level 1" }, - { 0xa2, "Core Scalable Profile/Level 2" }, - { 0xa3, "Core Scalable Profile/Level 3" }, - /* Reserved 10100100 - 10110000 */ - { 0xb1, "Advanced Coding Efficiency Profile/Level 1" }, - { 0xb2, "Advanced Coding Efficiency Profile/Level 2" }, - { 0xb3, "Advanced Coding Efficiency Profile/Level 3" }, - { 0xb4, "Advanced Coding Efficiency Profile/Level 4" }, - /* Reserved 10110101 - 11000000 */ - { 0xc1, "Advanced Core Profile/Level 1" }, - { 0xc2, "Advanced Core Profile/Level 2" }, - /* Reserved 11000011 - 11010000 */ - { 0xd1, "Advanced Scalable Texture/Level 1" }, - { 0xd2, "Advanced Scalable Texture/Level 2" }, - { 0xd3, "Advanced Scalable Texture/Level 3" }, - /* Reserved 11010100 - 11100000 */ - { 0xe1, "Simple Studio Profile/Level 1" }, - { 0xe2, "Simple Studio Profile/Level 2" }, - { 0xe3, "Simple Studio Profile/Level 3" }, - { 0xe4, "Simple Studio Profile/Level 4" }, - { 0xe5, "Core Studio Profile/Level 1" }, - { 0xe6, "Core Studio Profile/Level 2" }, - { 0xe7, "Core Studio Profile/Level 3" }, - { 0xe8, "Core Studio Profile/Level 4" }, - /* Reserved 11101001 - 11101111 */ - { 0xf0, "Advanced Simple Profile/Level 0" }, - { 0xf1, "Advanced Simple Profile/Level 1" }, - { 0xf2, "Advanced Simple Profile/Level 2" }, - { 0xf3, "Advanced Simple Profile/Level 3" }, - { 0xf4, "Advanced Simple Profile/Level 4" }, - { 0xf5, "Advanced Simple Profile/Level 5" }, - /* Reserved 11110110 - 11110111 */ - { 0xf8, "Fine Granularity Scalable Profile/Level 0" }, - { 0xf9, "Fine Granularity Scalable Profile/Level 1" }, - { 0xfa, "Fine Granularity Scalable Profile/Level 2" }, - { 0xfb, "Fine Granularity Scalable Profile/Level 3" }, - { 0xfc, "Fine Granularity Scalable Profile/Level 4" }, - { 0xfd, "Fine Granularity Scalable Profile/Level 5" }, - { 0xfe, "Reserved" }, - { 0xff, "Reserved for Escape" }, - { 0, NULL }, + { 0, "Reserved" }, + { 1, "Simple Profile/Level 1" }, + { 2, "Simple Profile/Level 2" }, + { 3, "Reserved" }, + { 4, "Reserved" }, + { 5, "Reserved" }, + { 6, "Reserved" }, + { 7, "Reserved" }, + { 8, "Simple Profile/Level 0" }, + { 9, "Simple Profile/Level 0b" }, + /* Reserved 00001001 - 00010000 */ + { 0x11, "Simple Scalable Profile/Level 1" }, + { 0x12, "Simple Scalable Profile/Level 2" }, + /* Reserved 00010011 - 00100000 */ + { 0x21, "Core Profile/Level 1" }, + { 0x22, "Core Profile/Level 2" }, + /* Reserved 00100011 - 00110001 */ + { 0x32, "Main Profile/Level 2" }, + { 0x33, "Main Profile/Level 3" }, + { 0x34, "Main Profile/Level 4" }, + /* Reserved 00110101 - 01000001 */ + { 0x42, "N-bit Profile/Level 2" }, + /* Reserved 01000011 - 01010000 */ + { 0x51, "Scalable Texture Profile/Level 1" }, + /* Reserved 01010010 - 01100000 */ + { 0x61, "Simple Face Animation Profile/Level 1" }, + { 0x62, "Simple Face Animation Profile/Level 2" }, + { 0x63, "Simple FBA Profile/Level 1" }, + { 0x64, "Simple FBA Profile/Level 2" }, + /* Reserved 01100101 - 01110000 */ + { 0x71, "Basic Animated Texture Profile/Level 1" }, + { 0x72, "Basic Animated Texture Profile/Level 2" }, + /* Reserved 01110011 - 10000000 */ + { 0x81, "Hybrid Profile/Level 1" }, + { 0x82, "Hybrid Profile/Level 2" }, + /* Reserved 10000011 - 10010000 */ + { 0x91, "Advanced Real Time Simple Profile/Level 1" }, + { 0x92, "Advanced Real Time Simple Profile/Level 2" }, + { 0x93, "Advanced Real Time Simple Profile/Level 3" }, + { 0x94, "Advanced Real Time Simple Profile/Level 4" }, + /* Reserved 10010101 - 10100000 */ + { 0xa1, "Core Scalable Profile/Level 1" }, + { 0xa2, "Core Scalable Profile/Level 2" }, + { 0xa3, "Core Scalable Profile/Level 3" }, + /* Reserved 10100100 - 10110000 */ + { 0xb1, "Advanced Coding Efficiency Profile/Level 1" }, + { 0xb2, "Advanced Coding Efficiency Profile/Level 2" }, + { 0xb3, "Advanced Coding Efficiency Profile/Level 3" }, + { 0xb4, "Advanced Coding Efficiency Profile/Level 4" }, + /* Reserved 10110101 - 11000000 */ + { 0xc1, "Advanced Core Profile/Level 1" }, + { 0xc2, "Advanced Core Profile/Level 2" }, + /* Reserved 11000011 - 11010000 */ + { 0xd1, "Advanced Scalable Texture/Level 1" }, + { 0xd2, "Advanced Scalable Texture/Level 2" }, + { 0xd3, "Advanced Scalable Texture/Level 3" }, + /* Reserved 11010100 - 11100000 */ + { 0xe1, "Simple Studio Profile/Level 1" }, + { 0xe2, "Simple Studio Profile/Level 2" }, + { 0xe3, "Simple Studio Profile/Level 3" }, + { 0xe4, "Simple Studio Profile/Level 4" }, + { 0xe5, "Core Studio Profile/Level 1" }, + { 0xe6, "Core Studio Profile/Level 2" }, + { 0xe7, "Core Studio Profile/Level 3" }, + { 0xe8, "Core Studio Profile/Level 4" }, + /* Reserved 11101001 - 11101111 */ + { 0xf0, "Advanced Simple Profile/Level 0" }, + { 0xf1, "Advanced Simple Profile/Level 1" }, + { 0xf2, "Advanced Simple Profile/Level 2" }, + { 0xf3, "Advanced Simple Profile/Level 3" }, + { 0xf4, "Advanced Simple Profile/Level 4" }, + { 0xf5, "Advanced Simple Profile/Level 5" }, + /* Reserved 11110110 - 11110111 */ + { 0xf8, "Fine Granularity Scalable Profile/Level 0" }, + { 0xf9, "Fine Granularity Scalable Profile/Level 1" }, + { 0xfa, "Fine Granularity Scalable Profile/Level 2" }, + { 0xfb, "Fine Granularity Scalable Profile/Level 3" }, + { 0xfc, "Fine Granularity Scalable Profile/Level 4" }, + { 0xfd, "Fine Granularity Scalable Profile/Level 5" }, + { 0xfe, "Reserved" }, + { 0xff, "Reserved for Escape" }, + { 0, NULL }, }; static void @@ -1093,33 +1081,30 @@ decode_sdp_fmtp(proto_tree *tree, tvbuff_t *tvb,gint offset, gint tokenlen, guin field_name = tvb_get_ephemeral_string(tvb, offset, tokenlen); offset = next_offset; - if (strcmp(mime_type, "MP4V-ES") == 0) { - - if (strcmp(field_name, "profile-level-id") == 0) { - offset++; - tokenlen = end_offset - offset; - format_specific_parameter = tvb_get_ephemeral_string(tvb, offset, tokenlen); - item = proto_tree_add_uint(tree, hf_sdp_fmtp_profile_level_id, tvb, offset, tokenlen, atol(format_specific_parameter)); - PROTO_ITEM_SET_GENERATED(item); - } + if (mime_type != NULL && strcmp(mime_type, "MP4V-ES") == 0) { + if (strcmp(field_name, "profile-level-id") == 0) { + offset++; + tokenlen = end_offset - offset; + format_specific_parameter = tvb_get_ephemeral_string(tvb, offset, tokenlen); + item = proto_tree_add_uint(tree, hf_sdp_fmtp_profile_level_id, tvb, offset, tokenlen, atol(format_specific_parameter)); + PROTO_ITEM_SET_GENERATED(item); + } } } - guint8 *encoding_name2; static void dissect_sdp_media_attribute(tvbuff_t *tvb, proto_item * ti, transport_info_t *transport_info){ proto_tree *sdp_media_attribute_tree; gint offset, next_offset, tokenlen, n; guint8 *field_name; guint8 *payload_type; - guint8 *encoding_name; - gint *key; + gint *key; offset = 0; next_offset = 0; tokenlen = 0; sdp_media_attribute_tree = proto_item_add_subtree(ti, - ett_sdp_media_attribute); + ett_sdp_media_attribute); next_offset = tvb_find_guint8(tvb,offset,-1,':'); @@ -1129,8 +1114,8 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, proto_item * ti, transpor tokenlen = next_offset - offset; proto_tree_add_item(sdp_media_attribute_tree, - hf_media_attribute_field, - tvb, offset, tokenlen, FALSE); + hf_media_attribute_field, + tvb, offset, tokenlen, FALSE); field_name = tvb_get_ephemeral_string(tvb, offset, tokenlen); @@ -1139,15 +1124,15 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, proto_item * ti, transpor /* decode the rtpmap to see if it is DynamicPayload to dissect them automatic */ if (strcmp(field_name, "rtpmap") == 0) { - next_offset = tvb_find_guint8(tvb,offset,-1,' '); + next_offset = tvb_find_guint8(tvb,offset,-1,' '); if(next_offset == -1) - return; + return; tokenlen = next_offset - offset; - proto_tree_add_item(sdp_media_attribute_tree, hf_media_format, tvb, - offset, tokenlen, FALSE); + proto_tree_add_item(sdp_media_attribute_tree, hf_media_format, tvb, + offset, tokenlen, FALSE); payload_type = tvb_get_ephemeral_string(tvb, offset, tokenlen); @@ -1161,102 +1146,113 @@ static void dissect_sdp_media_attribute(tvbuff_t *tvb, proto_item * ti, transpor tokenlen = next_offset - offset; - proto_tree_add_item(sdp_media_attribute_tree, hf_media_encoding_name, tvb, - offset, tokenlen, FALSE); - encoding_name = tvb_get_string(tvb, offset, tokenlen); - encoding_name2 = encoding_name; - proto_tree_add_text(sdp_media_attribute_tree, tvb, offset, tokenlen, - "MIMEtype: %s", encoding_name); - - key=g_malloc( sizeof(gint) ); - *key=atol(payload_type); - - /* As per RFC2327 it is possible to have multiple Media Descriptions ("m=") For example: - - a=rtpmap:101 G726-32/8000 - m=audio 49170 RTP/AVP 0 97 - a=rtpmap:97 telephone-event/8000 - m=audio 49172 RTP/AVP 97 101 - a=rtpmap:97 G726-24/8000 - - The Media attributes ("a="s) after the "m=" only apply for that "m=". - If there is an "a=" before the first "m=", that attribute apply for all the session (all the "m="s). - */ - - /* so, if this "a=" appear before any "m=", we add it to all the dynamic hash tables */ - if (transport_info->media_count == 0) { - for (n=0; n < SDP_MAX_RTP_CHANNELS; n++) { - if (n==0) - g_hash_table_insert(transport_info->media[n].rtp_dyn_payload, key, encoding_name); - else { /* we create a new key and encoding_name to assign to the other hash tables */ - gint *key2; - key2=g_malloc( sizeof(gint) ); - *key2=atol(payload_type); - g_hash_table_insert(transport_info->media[n].rtp_dyn_payload, key2, encoding_name); - } - } - return; - - /* if the "a=" is after an "m=", only apply to this "m=" */ - } else - /* in case there is an overflow in SDP_MAX_RTP_CHANNELS, we keep always the last "m=" */ - if (transport_info->media_count == SDP_MAX_RTP_CHANNELS-1) - g_hash_table_insert(transport_info->media[ transport_info->media_count ].rtp_dyn_payload, key, encoding_name); - else - g_hash_table_insert(transport_info->media[ transport_info->media_count-1 ].rtp_dyn_payload, key, encoding_name); - - return; + proto_tree_add_item(sdp_media_attribute_tree, hf_media_encoding_name, tvb, + offset, tokenlen, FALSE); + transport_info->encoding_name = tvb_get_ephemeral_string(tvb, offset, + tokenlen); + proto_tree_add_text(sdp_media_attribute_tree, tvb, offset, tokenlen, + "MIME type: %s", transport_info->encoding_name); + + key=g_malloc( sizeof(gint) ); + *key=atol(payload_type); + + /* As per RFC2327 it is possible to have multiple Media Descriptions ("m="). + For example: + + a=rtpmap:101 G726-32/8000 + m=audio 49170 RTP/AVP 0 97 + a=rtpmap:97 telephone-event/8000 + m=audio 49172 RTP/AVP 97 101 + a=rtpmap:97 G726-24/8000 + + The Media attributes ("a="s) after the "m=" only apply for that "m=". + If there is an "a=" before the first "m=", that attribute applies for + all the session (all the "m="s). + */ + + /* so, if this "a=" appear before any "m=", we add it to all the dynamic + hash tables */ + if (transport_info->media_count == 0) { + for (n=0; n < SDP_MAX_RTP_CHANNELS; n++) { + if (n==0) + g_hash_table_insert(transport_info->media[n].rtp_dyn_payload, + key, transport_info->encoding_name); + else { /* we create a new key and encoding_name to assign to the other hash tables */ + gint *key2; + key2=g_malloc( sizeof(gint) ); + *key2=atol(payload_type); + g_hash_table_insert(transport_info->media[n].rtp_dyn_payload, + key2, transport_info->encoding_name); + } + } + return; + + /* if the "a=" is after an "m=", only apply to this "m=" */ + } else + /* in case there is an overflow in SDP_MAX_RTP_CHANNELS, we keep always the last "m=" */ + if (transport_info->media_count == SDP_MAX_RTP_CHANNELS-1) + g_hash_table_insert(transport_info->media[ transport_info->media_count ].rtp_dyn_payload, + key, transport_info->encoding_name); + else + g_hash_table_insert(transport_info->media[ transport_info->media_count-1 ].rtp_dyn_payload, + key, transport_info->encoding_name); + + return; } if (strcmp(field_name, "fmtp") == 0) { - proto_item *fmtp_item, *media_format_item; - proto_tree *fmtp_tree; + proto_item *fmtp_item, *media_format_item; + proto_tree *fmtp_tree; - next_offset = tvb_find_guint8(tvb,offset,-1,' '); + next_offset = tvb_find_guint8(tvb,offset,-1,' '); if(next_offset == -1) - return; + return; tokenlen = next_offset - offset; - media_format_item = proto_tree_add_item(sdp_media_attribute_tree, hf_media_format, tvb, - offset, tokenlen, FALSE); - - proto_item_append_text(media_format_item, - " [%s]", encoding_name2); + media_format_item = proto_tree_add_item(sdp_media_attribute_tree, + hf_media_format, tvb, offset, + tokenlen, FALSE); + + if (transport_info->encoding_name) + proto_item_append_text(media_format_item, " [%s]", + transport_info->encoding_name); payload_type = tvb_get_ephemeral_string(tvb, offset, tokenlen); offset = next_offset + 1; - next_offset = tvb_find_guint8(tvb,offset,-1,';'); + next_offset = tvb_find_guint8(tvb,offset,-1,';'); if(next_offset != -1){ - tokenlen = next_offset - offset; - fmtp_item = proto_tree_add_item(sdp_media_attribute_tree, hf_media_format_specific_parameter, tvb, - offset, tokenlen, FALSE); + tokenlen = next_offset - offset; + fmtp_item = proto_tree_add_item(sdp_media_attribute_tree, + hf_media_format_specific_parameter, tvb, + offset, tokenlen, FALSE); - fmtp_tree = proto_item_add_subtree(fmtp_item, ett_sdp_fmtp); + fmtp_tree = proto_item_add_subtree(fmtp_item, ett_sdp_fmtp); - decode_sdp_fmtp(fmtp_tree, tvb, offset, tokenlen, encoding_name2); + decode_sdp_fmtp(fmtp_tree, tvb, offset, tokenlen, + transport_info->encoding_name); - offset = next_offset + 1; + offset = next_offset + 1; } - tokenlen = tvb_find_line_end(tvb,offset,-1, &next_offset, FALSE); + tokenlen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE); - fmtp_item = proto_tree_add_item(sdp_media_attribute_tree, hf_media_format_specific_parameter, tvb, - offset, tokenlen, FALSE); + fmtp_item = proto_tree_add_item(sdp_media_attribute_tree, + hf_media_format_specific_parameter, tvb, + offset, tokenlen, FALSE); - fmtp_tree = proto_item_add_subtree(fmtp_item, ett_sdp_fmtp); + fmtp_tree = proto_item_add_subtree(fmtp_item, ett_sdp_fmtp); - decode_sdp_fmtp(fmtp_tree, tvb, offset, tokenlen, encoding_name2); - return; + decode_sdp_fmtp(fmtp_tree, tvb, offset, tokenlen, + transport_info->encoding_name); + return; } - proto_tree_add_item(sdp_media_attribute_tree, - hf_media_attribute_value, - tvb, offset, -1, FALSE); - + proto_tree_add_item(sdp_media_attribute_tree, hf_media_attribute_value, + tvb, offset, -1, FALSE); } void @@ -1265,224 +1261,224 @@ proto_register_sdp(void) static hf_register_info hf[] = { { &hf_protocol_version, { "Session Description Protocol Version (v)", - "sdp.version", FT_STRING, BASE_NONE,NULL,0x0, - "Session Description Protocol Version", HFILL }}, + "sdp.version", FT_STRING, BASE_NONE,NULL,0x0, + "Session Description Protocol Version", HFILL }}, { &hf_owner, { "Owner/Creator, Session Id (o)", - "sdp.owner", FT_STRING, BASE_NONE, NULL, 0x0, - "Owner/Creator, Session Id", HFILL}}, + "sdp.owner", FT_STRING, BASE_NONE, NULL, 0x0, + "Owner/Creator, Session Id", HFILL}}, { &hf_session_name, { "Session Name (s)", - "sdp.session_name", FT_STRING, BASE_NONE,NULL, 0x0, - "Session Name", HFILL }}, + "sdp.session_name", FT_STRING, BASE_NONE,NULL, 0x0, + "Session Name", HFILL }}, { &hf_session_info, { "Session Information (i)", - "sdp.session_info", FT_STRING, BASE_NONE, NULL, 0x0, - "Session Information", HFILL }}, + "sdp.session_info", FT_STRING, BASE_NONE, NULL, 0x0, + "Session Information", HFILL }}, { &hf_uri, { "URI of Description (u)", - "sdp.uri", FT_STRING, BASE_NONE,NULL, 0x0, - "URI of Description", HFILL }}, + "sdp.uri", FT_STRING, BASE_NONE,NULL, 0x0, + "URI of Description", HFILL }}, { &hf_email, { "E-mail Address (e)", - "sdp.email", FT_STRING, BASE_NONE, NULL, 0x0, - "E-mail Address", HFILL }}, + "sdp.email", FT_STRING, BASE_NONE, NULL, 0x0, + "E-mail Address", HFILL }}, { &hf_phone, { "Phone Number (p)", - "sdp.phone", FT_STRING, BASE_NONE, NULL, 0x0, - "Phone Number", HFILL }}, + "sdp.phone", FT_STRING, BASE_NONE, NULL, 0x0, + "Phone Number", HFILL }}, { &hf_connection_info, { "Connection Information (c)", - "sdp.connection_info", FT_STRING, BASE_NONE, NULL, 0x0, - "Connection Information", HFILL }}, + "sdp.connection_info", FT_STRING, BASE_NONE, NULL, 0x0, + "Connection Information", HFILL }}, { &hf_bandwidth, { "Bandwidth Information (b)", - "sdp.bandwidth", FT_STRING, BASE_NONE, NULL, 0x0, - "Bandwidth Information", HFILL }}, + "sdp.bandwidth", FT_STRING, BASE_NONE, NULL, 0x0, + "Bandwidth Information", HFILL }}, { &hf_timezone, { "Time Zone Adjustments (z)", - "sdp.timezone", FT_STRING, BASE_NONE, NULL, 0x0, - "Time Zone Adjustments", HFILL }}, + "sdp.timezone", FT_STRING, BASE_NONE, NULL, 0x0, + "Time Zone Adjustments", HFILL }}, { &hf_encryption_key, { "Encryption Key (k)", - "sdp.encryption_key", FT_STRING, BASE_NONE, NULL, 0x0, - "Encryption Key", HFILL }}, + "sdp.encryption_key", FT_STRING, BASE_NONE, NULL, 0x0, + "Encryption Key", HFILL }}, { &hf_session_attribute, { "Session Attribute (a)", - "sdp.session_attr", FT_STRING, BASE_NONE, NULL, 0x0, - "Session Attribute", HFILL }}, + "sdp.session_attr", FT_STRING, BASE_NONE, NULL, 0x0, + "Session Attribute", HFILL }}, { &hf_media_attribute, { "Media Attribute (a)", - "sdp.media_attr", FT_STRING, BASE_NONE, NULL, 0x0, - "Media Attribute", HFILL }}, + "sdp.media_attr", FT_STRING, BASE_NONE, NULL, 0x0, + "Media Attribute", HFILL }}, { &hf_time, { "Time Description, active time (t)", - "sdp.time", FT_STRING, BASE_NONE, NULL, 0x0, - "Time Description, active time", HFILL }}, + "sdp.time", FT_STRING, BASE_NONE, NULL, 0x0, + "Time Description, active time", HFILL }}, { &hf_repeat_time, { "Repeat Time (r)", - "sdp.repeat_time", FT_STRING, BASE_NONE, NULL, 0x0, - "Repeat Time", HFILL }}, + "sdp.repeat_time", FT_STRING, BASE_NONE, NULL, 0x0, + "Repeat Time", HFILL }}, { &hf_media, { "Media Description, name and address (m)", - "sdp.media", FT_STRING, BASE_NONE, NULL, 0x0, - "Media Description, name and address", HFILL }}, + "sdp.media", FT_STRING, BASE_NONE, NULL, 0x0, + "Media Description, name and address", HFILL }}, { &hf_media_title, { "Media Title (i)", - "sdp.media_title",FT_STRING, BASE_NONE, NULL, 0x0, - "Media Title", HFILL }}, + "sdp.media_title",FT_STRING, BASE_NONE, NULL, 0x0, + "Media Title", HFILL }}, { &hf_unknown, { "Unknown", - "sdp.unknown",FT_STRING, BASE_NONE, NULL, 0x0, - "Unknown", HFILL }}, + "sdp.unknown",FT_STRING, BASE_NONE, NULL, 0x0, + "Unknown", HFILL }}, { &hf_invalid, { "Invalid line", - "sdp.invalid",FT_STRING, BASE_NONE, NULL, 0x0, - "Invalid line", HFILL }}, + "sdp.invalid",FT_STRING, BASE_NONE, NULL, 0x0, + "Invalid line", HFILL }}, { &hf_owner_username, { "Owner Username", - "sdp.owner.username",FT_STRING, BASE_NONE, NULL, 0x0, - "Owner Username", HFILL }}, + "sdp.owner.username",FT_STRING, BASE_NONE, NULL, 0x0, + "Owner Username", HFILL }}, { &hf_owner_sessionid, { "Session ID", - "sdp.owner.sessionid",FT_STRING, BASE_NONE, NULL, 0x0, - "Session ID", HFILL }}, + "sdp.owner.sessionid",FT_STRING, BASE_NONE, NULL, 0x0, + "Session ID", HFILL }}, { &hf_owner_version, { "Session Version", - "sdp.owner.version",FT_STRING, BASE_NONE, NULL, 0x0, - "Session Version", HFILL }}, + "sdp.owner.version",FT_STRING, BASE_NONE, NULL, 0x0, + "Session Version", HFILL }}, { &hf_owner_network_type, { "Owner Network Type", - "sdp.owner.network_type",FT_STRING, BASE_NONE, NULL, 0x0, - "Owner Network Type", HFILL }}, + "sdp.owner.network_type",FT_STRING, BASE_NONE, NULL, 0x0, + "Owner Network Type", HFILL }}, { &hf_owner_address_type, { "Owner Address Type", - "sdp.owner.address_type",FT_STRING, BASE_NONE, NULL, 0x0, - "Owner Address Type", HFILL }}, + "sdp.owner.address_type",FT_STRING, BASE_NONE, NULL, 0x0, + "Owner Address Type", HFILL }}, { &hf_owner_address, { "Owner Address", - "sdp.owner.address",FT_STRING, BASE_NONE, NULL, 0x0, - "Owner Address", HFILL }}, + "sdp.owner.address",FT_STRING, BASE_NONE, NULL, 0x0, + "Owner Address", HFILL }}, { &hf_connection_info_network_type, { "Connection Network Type", - "sdp.connection_info.network_type",FT_STRING, BASE_NONE, NULL, 0x0, - "Connection Network Type", HFILL }}, + "sdp.connection_info.network_type",FT_STRING, BASE_NONE, NULL, 0x0, + "Connection Network Type", HFILL }}, { &hf_connection_info_address_type, { "Connection Address Type", - "sdp.connection_info.address_type",FT_STRING, BASE_NONE, NULL, 0x0, - "Connection Address Type", HFILL }}, + "sdp.connection_info.address_type",FT_STRING, BASE_NONE, NULL, 0x0, + "Connection Address Type", HFILL }}, { &hf_connection_info_connection_address, { "Connection Address", - "sdp.connection_info.address",FT_STRING, BASE_NONE, NULL, 0x0, - "Connection Address", HFILL }}, + "sdp.connection_info.address",FT_STRING, BASE_NONE, NULL, 0x0, + "Connection Address", HFILL }}, { &hf_connection_info_ttl, { "Connection TTL", - "sdp.connection_info.ttl",FT_STRING, BASE_NONE, NULL, 0x0, - "Connection TTL", HFILL }}, + "sdp.connection_info.ttl",FT_STRING, BASE_NONE, NULL, 0x0, + "Connection TTL", HFILL }}, { &hf_connection_info_num_addr, { "Connection Number of Addresses", - "sdp.connection_info.num_addr",FT_STRING, BASE_NONE, NULL, 0x0, - "Connection Number of Addresses", HFILL }}, + "sdp.connection_info.num_addr",FT_STRING, BASE_NONE, NULL, 0x0, + "Connection Number of Addresses", HFILL }}, { &hf_bandwidth_modifier, { "Bandwidth Modifier", - "sdp.bandwidth.modifier",FT_STRING, BASE_NONE, NULL, 0x0, - "Bandwidth Modifier", HFILL }}, + "sdp.bandwidth.modifier",FT_STRING, BASE_NONE, NULL, 0x0, + "Bandwidth Modifier", HFILL }}, { &hf_bandwidth_value, { "Bandwidth Value", - "sdp.bandwidth.value",FT_STRING, BASE_NONE, NULL, 0x0, - "Bandwidth Value (in kbits/s)", HFILL }}, + "sdp.bandwidth.value",FT_STRING, BASE_NONE, NULL, 0x0, + "Bandwidth Value (in kbits/s)", HFILL }}, { &hf_time_start, { "Session Start Time", - "sdp.time.start",FT_STRING, BASE_NONE, NULL, 0x0, - "Session Start Time", HFILL }}, + "sdp.time.start",FT_STRING, BASE_NONE, NULL, 0x0, + "Session Start Time", HFILL }}, { &hf_time_stop, { "Session Stop Time", - "sdp.time.stop",FT_STRING, BASE_NONE, NULL, 0x0, - "Session Stop Time", HFILL }}, + "sdp.time.stop",FT_STRING, BASE_NONE, NULL, 0x0, + "Session Stop Time", HFILL }}, { &hf_repeat_time_interval, { "Repeat Interval", - "sdp.repeat_time.interval",FT_STRING, BASE_NONE, NULL, 0x0, - "Repeat Interval", HFILL }}, + "sdp.repeat_time.interval",FT_STRING, BASE_NONE, NULL, 0x0, + "Repeat Interval", HFILL }}, { &hf_repeat_time_duration, { "Repeat Duration", - "sdp.repeat_time.duration",FT_STRING, BASE_NONE, NULL, 0x0, - "Repeat Duration", HFILL }}, + "sdp.repeat_time.duration",FT_STRING, BASE_NONE, NULL, 0x0, + "Repeat Duration", HFILL }}, { &hf_repeat_time_offset, { "Repeat Offset", - "sdp.repeat_time.offset",FT_STRING, BASE_NONE, NULL, 0x0, - "Repeat Offset", HFILL }}, + "sdp.repeat_time.offset",FT_STRING, BASE_NONE, NULL, 0x0, + "Repeat Offset", HFILL }}, { &hf_timezone_time, { "Timezone Time", - "sdp.timezone.time",FT_STRING, BASE_NONE, NULL, 0x0, - "Timezone Time", HFILL }}, + "sdp.timezone.time",FT_STRING, BASE_NONE, NULL, 0x0, + "Timezone Time", HFILL }}, { &hf_timezone_offset, { "Timezone Offset", - "sdp.timezone.offset",FT_STRING, BASE_NONE, NULL, 0x0, - "Timezone Offset", HFILL }}, + "sdp.timezone.offset",FT_STRING, BASE_NONE, NULL, 0x0, + "Timezone Offset", HFILL }}, { &hf_encryption_key_type, { "Key Type", - "sdp.encryption_key.type",FT_STRING, BASE_NONE, NULL, 0x0, - "Type", HFILL }}, + "sdp.encryption_key.type",FT_STRING, BASE_NONE, NULL, 0x0, + "Type", HFILL }}, { &hf_encryption_key_data, { "Key Data", - "sdp.encryption_key.data",FT_STRING, BASE_NONE, NULL, 0x0, - "Data", HFILL }}, + "sdp.encryption_key.data",FT_STRING, BASE_NONE, NULL, 0x0, + "Data", HFILL }}, { &hf_session_attribute_field, { "Session Attribute Fieldname", - "sdp.session_attr.field",FT_STRING, BASE_NONE, NULL, 0x0, - "Session Attribute Fieldname", HFILL }}, + "sdp.session_attr.field",FT_STRING, BASE_NONE, NULL, 0x0, + "Session Attribute Fieldname", HFILL }}, { &hf_session_attribute_value, { "Session Attribute Value", - "sdp.session_attr.value",FT_STRING, BASE_NONE, NULL, 0x0, - "Session Attribute Value", HFILL }}, + "sdp.session_attr.value",FT_STRING, BASE_NONE, NULL, 0x0, + "Session Attribute Value", HFILL }}, { &hf_media_media, { "Media Type", - "sdp.media.media",FT_STRING, BASE_NONE, NULL, 0x0, - "Media Type", HFILL }}, + "sdp.media.media",FT_STRING, BASE_NONE, NULL, 0x0, + "Media Type", HFILL }}, { &hf_media_port, { "Media Port", - "sdp.media.port",FT_STRING, BASE_NONE, NULL, 0x0, - "Media Port", HFILL }}, + "sdp.media.port",FT_STRING, BASE_NONE, NULL, 0x0, + "Media Port", HFILL }}, { &hf_media_portcount, { "Media Port Count", - "sdp.media.portcount",FT_STRING, BASE_NONE, NULL, 0x0, - "Media Port Count", HFILL }}, + "sdp.media.portcount",FT_STRING, BASE_NONE, NULL, 0x0, + "Media Port Count", HFILL }}, { &hf_media_proto, { "Media Proto", - "sdp.media.proto",FT_STRING, BASE_NONE, NULL, 0x0, - "Media Protocol", HFILL }}, + "sdp.media.proto",FT_STRING, BASE_NONE, NULL, 0x0, + "Media Protocol", HFILL }}, { &hf_media_format, { "Media Format", - "sdp.media.format",FT_STRING, BASE_NONE, NULL, 0x0, - "Media Format", HFILL }}, + "sdp.media.format",FT_STRING, BASE_NONE, NULL, 0x0, + "Media Format", HFILL }}, { &hf_media_attribute_field, { "Media Attribute Fieldname", - "sdp.media_attribute.field",FT_STRING, BASE_NONE, NULL, 0x0, - "Media Attribute Fieldname", HFILL }}, + "sdp.media_attribute.field",FT_STRING, BASE_NONE, NULL, 0x0, + "Media Attribute Fieldname", HFILL }}, { &hf_media_attribute_value, { "Media Attribute Value", - "sdp.media_attribute.value",FT_STRING, BASE_NONE, NULL, 0x0, - "Media Attribute Value", HFILL }}, - { &hf_media_encoding_name, + "sdp.media_attribute.value",FT_STRING, BASE_NONE, NULL, 0x0, + "Media Attribute Value", HFILL }}, + { &hf_media_encoding_name, { "MIME Type", - "sdp.mime.type",FT_STRING, BASE_NONE, NULL, 0x0, - "SDP MIME Type", HFILL }}, - { &hf_media_format_specific_parameter, + "sdp.mime.type",FT_STRING, BASE_NONE, NULL, 0x0, + "SDP MIME Type", HFILL }}, + { &hf_media_format_specific_parameter, { "Media format specific parameters", - "sdp.fmtp.parameter",FT_STRING, BASE_NONE, NULL, 0x0, - "Format specific parameter(fmtp)", HFILL }}, + "sdp.fmtp.parameter",FT_STRING, BASE_NONE, NULL, 0x0, + "Format specific parameter(fmtp)", HFILL }}, { &hf_ipbcp_version, { "IPBCP Protocol Version", - "ipbcp.version",FT_STRING, BASE_NONE, NULL, 0x0, - "IPBCP Protocol Version", HFILL }}, + "ipbcp.version",FT_STRING, BASE_NONE, NULL, 0x0, + "IPBCP Protocol Version", HFILL }}, { &hf_ipbcp_type, { "IPBCP Command Type", - "ipbcp.command",FT_STRING, BASE_NONE, NULL, 0x0, - "IPBCP Command Type", HFILL }}, - {&hf_sdp_fmtp_profile_level_id, + "ipbcp.command",FT_STRING, BASE_NONE, NULL, 0x0, + "IPBCP Command Type", HFILL }}, + {&hf_sdp_fmtp_profile_level_id, { "Level Code", - "sdp.fmtp.profile_level_id",FT_UINT32, BASE_DEC,VALS(mpeg4es_level_indication_vals), 0x0, - "Level Code", HFILL }}, + "sdp.fmtp.profile_level_id",FT_UINT32, BASE_DEC,VALS(mpeg4es_level_indication_vals), 0x0, + "Level Code", HFILL }}, }; static gint *ett[] = { &ett_sdp, @@ -1496,19 +1492,17 @@ proto_register_sdp(void) &ett_sdp_session_attribute, &ett_sdp_media, &ett_sdp_media_attribute, - &ett_sdp_fmtp, + &ett_sdp_fmtp, }; proto_sdp = proto_register_protocol("Session Description Protocol", - "SDP", "sdp"); + "SDP", "sdp"); proto_register_field_array(proto_sdp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); /* * Register the dissector by name, so other dissectors can - * grab it by name rather than just referring to it directly - * (you can't refer to it directly from a plugin dissector - * on Windows without stuffing it into the Big Transfer Vector). + * grab it by name rather than just referring to it directly. */ register_dissector("sdp", dissect_sdp, proto_sdp); |