From Lars Ruoff:

find attached several trivial diffs for viewing RTP SSRC values in Hex
rather than Dec at various places in the UI.
Also includes change from BASE_DEC to BASE_HEX_DEC for corresponding RTP
and RTCP dissector header fields.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22017 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 18e44cffacc67015fddbb6f71d97ae5f59c0b3e2..da19a895de0a7195b3a0d8d1047828fd481b1083 100644 (file)
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -1302,7 +1302,7 @@ dissect_rtcp_sdes( tvbuff_t *tvb, int offset, proto_tree *tree,
 
                ssrc = tvb_get_ntohl( tvb, offset );
                sdes_item = proto_tree_add_text(tree, tvb, offset, -1,
-                   "Chunk %u, SSRC/CSRC %u", chunk, ssrc);
+                   "Chunk %u, SSRC/CSRC 0x%X", chunk, ssrc);
                sdes_tree = proto_item_add_subtree( sdes_item, ett_sdes );
 
                /* SSRC_n source identifier, 32 bits */
@@ -2575,7 +2575,7 @@ proto_register_rtcp(void)
                                "Sender SSRC",
                                "rtcp.senderssrc",
                                FT_UINT32,
-                               BASE_DEC,
+                               BASE_HEX_DEC,
                                NULL,
                                0x0,
                                "", HFILL
@@ -2659,7 +2659,7 @@ proto_register_rtcp(void)
                                "Identifier",
                                "rtcp.ssrc.identifier",
                                FT_UINT32,
-                               BASE_DEC,
+                               BASE_HEX_DEC,
                                NULL,
                                0x0,
                                "", HFILL
@@ -2767,7 +2767,7 @@ proto_register_rtcp(void)
                                "SSRC / CSRC identifier",
                                "rtcp.sdes.ssrc_csrc",
                                FT_UINT32,
-                               BASE_DEC,
+                               BASE_HEX_DEC,
                                NULL,
                                0x0,
                                "", HFILL

diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index 359fd6c8eba845d8b9ccb7194abca86ada718cb6..7a422aa718d92949124992a8296f85421a9a16f3 100644 (file)
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -976,7 +976,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
 
        if ( check_col( pinfo->cinfo, COL_INFO) ) {
                col_add_fstr( pinfo->cinfo, COL_INFO,
-                   "PT=%s, SSRC=%u, Seq=%u, Time=%u%s",
+                   "PT=%s, SSRC=0x%X, Seq=%u, Time=%u%s",
                        payload_type_str ? payload_type_str : val_to_str( payload_type, rtp_payload_type_vals,"Unknown (%u)" ),
                    sync_src,
                    seq_num,
@@ -1046,7 +1046,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
                        if ( tree ) proto_tree_add_uint_format( rtp_csrc_tree,
                            hf_rtp_csrc_item, tvb, offset, 4,
                            csrc_item,
-                           "CSRC item %d: %u",
+                           "CSRC item %d: 0x%X",
                            i, csrc_item );
                        offset += 4;
                }
@@ -1474,7 +1474,7 @@ proto_register_rtp(void)
                                "Synchronization Source identifier",
                                "rtp.ssrc",
                                FT_UINT32,
-                               BASE_DEC,
+                               BASE_HEX_DEC,
                                NULL,
                                0x0,
                                "", HFILL
@@ -1510,7 +1510,7 @@ proto_register_rtp(void)
                                "CSRC item",
                                "rtp.csrc.item",
                                FT_UINT32,
-                               BASE_DEC,
+                               BASE_HEX_DEC,
                                NULL,
                                0x0,
                                "", HFILL

diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index b94e5e4010df323cdeeb10cd291b208b4231c8f1..a430b468822e14343c561d959c5328f8e30144ca 100644 (file)
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -1117,14 +1117,14 @@ static void on_graph_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_)
        user_data->series_rev.color.blue = 0xffff;
        user_data->series_rev.yvalue = -0.5;
 
-       g_snprintf(title1, 80, "Forward: %s:%u to %s:%u (SSRC=%u)",
+       g_snprintf(title1, 80, "Forward: %s:%u to %s:%u (SSRC=0x%X)",
                get_addr_name(&(user_data->ip_src_fwd)),
                user_data->port_src_fwd,
                get_addr_name(&(user_data->ip_dst_fwd)),
                user_data->port_dst_fwd,
                user_data->ssrc_fwd);
 
-       g_snprintf(title2, 80, "Reverse: %s:%u to %s:%u (SSRC=%u)",
+       g_snprintf(title2, 80, "Reverse: %s:%u to %s:%u (SSRC=0x%X)",
                get_addr_name(&(user_data->ip_src_rev)),
                user_data->port_src_rev,
                get_addr_name(&(user_data->ip_dst_rev)),
@@ -1183,7 +1183,7 @@ static void dialog_graph_reset(user_data_t* user_data)
        for(i=0;i<MAX_GRAPHS;i++){
                /* it is forward */
                if (i<2){
-                               g_snprintf(user_data->dlg.dialog_graph.graph[i].title, 100, "%s: %s:%u to %s:%u (SSRC=%u)",
+                               g_snprintf(user_data->dlg.dialog_graph.graph[i].title, 100, "%s: %s:%u to %s:%u (SSRC=0x%X)",
                        graph_descr[i],
                        get_addr_name(&(user_data->ip_src_fwd)),
                        user_data->port_src_fwd,
@@ -1192,7 +1192,7 @@ static void dialog_graph_reset(user_data_t* user_data)
                        user_data->ssrc_fwd);
                /* it is reverse */
                } else {
-                       g_snprintf(user_data->dlg.dialog_graph.graph[i].title, 100, "%s: %s:%u to %s:%u (SSRC=%u)",
+                       g_snprintf(user_data->dlg.dialog_graph.graph[i].title, 100, "%s: %s:%u to %s:%u (SSRC=0x%X)",
                        graph_descr[i],
                        get_addr_name(&(user_data->ip_src_rev)),
                        user_data->port_src_rev,
@@ -3428,7 +3428,7 @@ static void create_rtp_dialog(user_data_t* user_data)
        strcpy(str_ip_dst, get_addr_name(&(user_data->ip_dst_fwd)));
 
        g_snprintf(label_forward, 149,
-               "Analysing stream from  %s port %u  to  %s port %u   SSRC = %u",
+               "Analysing stream from  %s port %u  to  %s port %u   SSRC = 0x%X",
                str_ip_src, user_data->port_src_fwd, str_ip_dst, user_data->port_dst_fwd, user_data->ssrc_fwd);
 
 
@@ -3436,7 +3436,7 @@ static void create_rtp_dialog(user_data_t* user_data)
        strcpy(str_ip_dst, get_addr_name(&(user_data->ip_dst_rev)));
 
        g_snprintf(label_reverse, 149,
-               "Analysing stream from  %s port %u  to  %s port %u   SSRC = %u",
+               "Analysing stream from  %s port %u  to  %s port %u   SSRC = 0x%X",
                str_ip_src, user_data->port_src_rev, str_ip_dst, user_data->port_dst_rev, user_data->ssrc_rev);
 
        /* Start a notebook for flipping between sets of changes */

diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index 94898a2ba8abd3dd3d3bc63daf299522d2c7a9cb..911424feaed8f99178422626899c76338f9744dd 100644 (file)
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -102,7 +102,7 @@ static void add_to_clist(rtp_stream_info_t* strinfo)
        data[1] = g_strdup_printf("%u", strinfo->src_port);
        data[2] = g_strdup(get_addr_name(&(strinfo->dest_addr)));
        data[3] = g_strdup_printf("%u", strinfo->dest_port);
-       data[4] = g_strdup_printf("%u", strinfo->ssrc);
+       data[4] = g_strdup_printf("0x%X", strinfo->ssrc);
        if(strinfo->pt>95){
                if(strinfo->info_payload_type_str != NULL){
                        data[5] = g_strdup(strinfo->info_payload_type_str);
@@ -381,7 +381,7 @@ rtpstream_on_filter                    (GtkButton       *button _U_,
                        strcpy(ip_version,"");
                }
                filter_string_fwd = g_strdup_printf(
-                       "(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==%u)",
+                       "(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==0x%X)",
                        ip_version,
                        address_to_str(&(selected_stream_fwd->src_addr)),
                        selected_stream_fwd->src_port,
@@ -401,7 +401,7 @@ rtpstream_on_filter                    (GtkButton       *button _U_,
                        strcpy(ip_version,"");
                }
                filter_string_rev = g_strdup_printf(
-                       "(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==%u)",
+                       "(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==0x%X)",
                        ip_version,
                        address_to_str(&(selected_stream_rev->src_addr)),
                        selected_stream_rev->src_port,
@@ -537,7 +537,7 @@ rtpstream_on_select_row(GtkCList *clist,
        /* update the labels */
        if (event==NULL || event->state & GDK_SHIFT_MASK) {
                selected_stream_rev = gtk_clist_get_row_data(GTK_CLIST(clist), row);
-               g_snprintf(label_text, 80, "Reverse: %s:%u -> %s:%u, SSRC=%u",
+               g_snprintf(label_text, 80, "Reverse: %s:%u -> %s:%u, SSRC=0x%X",
                        get_addr_name(&(selected_stream_rev->src_addr)),
                        selected_stream_rev->src_port,
                        get_addr_name(&(selected_stream_rev->dest_addr)),
@@ -548,7 +548,7 @@ rtpstream_on_select_row(GtkCList *clist,
        }
        else {
                selected_stream_fwd = gtk_clist_get_row_data(GTK_CLIST(clist), row);
-               g_snprintf(label_text, 80, "Forward: %s:%u -> %s:%u, SSRC=%u",
+               g_snprintf(label_text, 80, "Forward: %s:%u -> %s:%u, SSRC=0x%X",
                        get_addr_name(&(selected_stream_fwd->src_addr)),
                        selected_stream_fwd->src_port,
                        get_addr_name(&(selected_stream_fwd->dest_addr)),
@@ -695,7 +695,7 @@ static void rtpstream_dlg_create (void)
     gtk_clist_set_column_width (GTK_CLIST (clist), 4, 64);
     gtk_clist_set_column_width (GTK_CLIST (clist), 5, 96);
     gtk_clist_set_column_width (GTK_CLIST (clist), 6, 50);
-    gtk_clist_set_column_width (GTK_CLIST (clist), 7, 50);
+    gtk_clist_set_column_width (GTK_CLIST (clist), 7, 64);
     gtk_clist_set_column_width (GTK_CLIST (clist), 8, 80);
     gtk_clist_set_column_width (GTK_CLIST (clist), 9, 80);
     gtk_clist_set_column_width (GTK_CLIST (clist), 10, 80);

diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c
index bee6c0f8b6f17605a74e9db67eb4eeef8a54bc60..7e2b7f233696411a090d65c1453d5609748757cd 100644 (file)
--- a/gtk/voip_calls.c
+++ b/gtk/voip_calls.c
@@ -595,7 +595,7 @@ static void RTP_packet_draw(void *prs _U_)
                                        if (rtp_listinfo->first_frame_num == gai->frame_num){
                                                duration = (rtp_listinfo->stop_rel_sec*1000000 + rtp_listinfo->stop_rel_usec) - (rtp_listinfo->start_rel_sec*1000000 + rtp_listinfo->start_rel_usec);
                                                g_free(gai->comment);
-                                               gai->comment = g_strdup_printf("RTP Num packets:%u  Duration:%u.%03us ssrc:%u", rtp_listinfo->npackets, duration/1000000,(duration%1000000)/1000, rtp_listinfo->ssrc);
+                                               gai->comment = g_strdup_printf("RTP Num packets:%u  Duration:%u.%03us SSRC:0x%X", rtp_listinfo->npackets, duration/1000000,(duration%1000000)/1000, rtp_listinfo->ssrc);
                                                break;
                                        }
 
@@ -615,7 +615,7 @@ static void RTP_packet_draw(void *prs _U_)
                                                duration = (rtp_listinfo->stop_rel_sec*1000000 + rtp_listinfo->stop_rel_usec) - (rtp_listinfo->start_rel_sec*1000000 + rtp_listinfo->start_rel_usec);
                                                new_gai->frame_label = g_strdup_printf("RTP (%s) %s", rtp_listinfo->pt_str, (rtp_listinfo->rtp_event == -1)?"":val_to_str(rtp_listinfo->rtp_event, rtp_event_type_values, "Unknown RTP Event")); 
                                                g_free(rtp_listinfo->pt_str);
-                                               new_gai->comment = g_strdup_printf("RTP Num packets:%u  Duration:%u.%03us ssrc:%u", rtp_listinfo->npackets, duration/1000000,(duration%1000000)/1000, rtp_listinfo->ssrc);
+                                               new_gai->comment = g_strdup_printf("RTP Num packets:%u  Duration:%u.%03us SSRC:0x%X", rtp_listinfo->npackets, duration/1000000,(duration%1000000)/1000, rtp_listinfo->ssrc);
                                                new_gai->conv_num = conv_num;
                                                new_gai->display=FALSE;
                                                new_gai->line_style = 2;  /* the arrow line will be 2 pixels width */