diff options
| author | Jiri Novak <j.novak@netsystem.cz> | 2016-12-16 11:49:56 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-12-18 11:55:03 +0000 |
| commit | 92c725cafb37067291022d3e9d05b9cbf4624b6e (patch) | |
| tree | ef1158b4a340e4b201b73507ea46efd179973a46 /ui | |
| parent | b4ea3c50f5f966896d47e7b47426682d7db3e077 (diff) | |
SIP/SDP, RTP: Dissectors shows information about ED-137 related states of radio in info column/VoIP call flow
Based on EUROCAE ED-137B specification:
ED-137B, Part 1: RADIO, INTEROPERABILITY STANDARDS FOR VOIP ATM COMPONENTS
https://boutique.eurocae.net/eshop/catalog/index.php
Bug: 13252
Change-Id: Ifab1aaf47e3405fcd46309167237f11ce2d7e2ff
Reviewed-on: https://code.wireshark.org/review/19302
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/rtp_stream.h | 1 | ||||
| -rw-r--r-- | ui/voip_calls.c | 21 |
2 files changed, 20 insertions, 2 deletions
diff --git a/ui/rtp_stream.h b/ui/rtp_stream.h index f4b46dd63f..602dce5c41 100644 --- a/ui/rtp_stream.h +++ b/ui/rtp_stream.h @@ -76,6 +76,7 @@ typedef struct _rtp_stream_info { tap_rtp_stat_t rtp_stats; /**< here goes the RTP statistics info */ gboolean problem; /**< if the streams had wrong sequence numbers or wrong timestamps */ + gchar *ed137_info; } rtp_stream_info_t; /** tapping modes */ diff --git a/ui/voip_calls.c b/ui/voip_calls.c index 609ead9fba..d376afcb9b 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -305,6 +305,7 @@ voip_calls_reset_all_taps(voip_calls_tapinfo_t *tapinfo) { strinfo = (rtp_stream_info_t *)list->data; wmem_free(NULL, strinfo->payload_type_name); + wmem_free(NULL, strinfo->ed137_info); list = g_list_next(list); } g_list_free(tapinfo->rtp_stream_list); @@ -620,6 +621,14 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c this is to show multiple payload changes in the Graph for example for DTMF RFC2833 */ if ( tmp_listinfo->payload_type != rtp_info->info_payload_type ) { tmp_listinfo->end_stream = TRUE; + } else if ( ( ( tmp_listinfo->ed137_info == NULL ) && (rtp_info->info_ed137_info != NULL) ) || + ( ( tmp_listinfo->ed137_info != NULL ) && (rtp_info->info_ed137_info == NULL) ) || + ( ( tmp_listinfo->ed137_info != NULL ) && (rtp_info->info_ed137_info != NULL) && + ( 0!=strcmp(tmp_listinfo->ed137_info, rtp_info->info_ed137_info) ) + ) + ) { + /* if ed137_info has changed, create new stream */ + tmp_listinfo->end_stream = TRUE; } else { strinfo = (rtp_stream_info_t*)(list->data); break; @@ -660,6 +669,11 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c strinfo->setup_frame_number = rtp_info->info_setup_frame_num; strinfo->call_num = -1; strinfo->rtp_event = -1; + if (rtp_info->info_ed137_info != NULL) { + strinfo->ed137_info = wmem_strdup(NULL, rtp_info->info_ed137_info); + } else { + strinfo->ed137_info = NULL; + } tapinfo->rtp_stream_list = g_list_prepend(tapinfo->rtp_stream_list, strinfo); } @@ -726,11 +740,14 @@ rtp_draw(void *tap_offset_ptr) new_gai->port_src = rtp_listinfo->src_port; new_gai->port_dst = rtp_listinfo->dest_port; duration = (guint32)(nstime_to_msec(&rtp_listinfo->stop_rel_time) - nstime_to_msec(&rtp_listinfo->start_rel_time)); - new_gai->frame_label = g_strdup_printf("%s (%s) %s", + new_gai->frame_label = g_strdup_printf("%s (%s) %s%s%s", (rtp_listinfo->is_srtp)?"SRTP":"RTP", rtp_listinfo->payload_type_name, (rtp_listinfo->rtp_event == -1)? - "":val_to_str_ext_const(rtp_listinfo->rtp_event, &rtp_event_type_values_ext, "Unknown RTP Event")); + "":val_to_str_ext_const(rtp_listinfo->rtp_event, &rtp_event_type_values_ext, "Unknown RTP Event"), + (rtp_listinfo->ed137_info!=NULL?" ":""), + (rtp_listinfo->ed137_info!=NULL?rtp_listinfo->ed137_info:"") + ); new_gai->comment = g_strdup_printf(comment_fmt, (rtp_listinfo->is_srtp)?"SRTP":"RTP", rtp_listinfo->packet_count, duration/1000,(duration%1000), rtp_listinfo->ssrc); |