Have tap listeners specify whether the "packet" routine requires

[obnox/wireshark/wip.git] / gtk / voip_calls_dlg.c

diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index 169b0b0215dc513b04a0c46d99da1599db1433c2..75ed4c5fdcf199ba834d36005d27bfd49e058a29 100644 (file)
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -187,7 +187,7 @@ static void add_to_clist(voip_calls_info_t* strinfo)
                plurality(calls_nb, "Call", "Calls"),
                calls_ns,
                plurality(calls_ns, "Call", "Calls"));
-       gtk_label_set(GTK_LABEL(top_label), label_text);
+        gtk_label_set_text(GTK_LABEL(top_label), label_text);
 
        /* Update the status label with the number of total messages */
         g_snprintf(label_text, 256,
@@ -196,7 +196,7 @@ static void add_to_clist(voip_calls_info_t* strinfo)
                        voip_calls_get_info()->start_packets, 
                        voip_calls_get_info()->completed_calls,
                        voip_calls_get_info()->rejected_calls);
-        gtk_label_set(GTK_LABEL(status_label), label_text);
+         gtk_label_set_text(GTK_LABEL(status_label), label_text);
 }
 
 
@@ -220,11 +220,11 @@ static void voip_calls_remove_tap_listener(void)
                remove_tap_listener_voip_calls();
        }
        remove_tap_listener_rtp_event();
-       if (find_tap_id("mgcp")) {
-               remove_tap_listener_mgcp_calls();
-       }
+       remove_tap_listener_mgcp_calls();
        remove_tap_listener_actrace_calls();
        remove_tap_listener_t38();
+       remove_tap_listener_skinny_calls();
+       remove_tap_listener_iax2_calls();
 }
 
 /****************************************************************************/
@@ -276,8 +276,8 @@ voip_calls_on_filter                    (GtkButton       *button _U_,
        const gchar *filter_prepend;
        gboolean isFirst = TRUE;
        GList* list;
-       guint filter_length = 0;
-       guint max_filter_length = 2048;
+       size_t filter_length = 0;
+       size_t max_filter_length = 2048;
        sip_calls_info_t *tmp_sipinfo;
        isup_calls_info_t *tmp_isupinfo;
        h323_calls_info_t *tmp_h323info;
@@ -377,6 +377,8 @@ voip_calls_on_filter                    (GtkButton       *button _U_,
                        case TEL_BSSMAP:
                        case TEL_RANAP:
                        case VOIP_UNISTIM:
+                       case VOIP_SKINNY:
+                       case VOIP_IAX2:
                        case VOIP_COMMON:
                                /* XXX - not supported */
                                break;
@@ -487,7 +489,7 @@ voip_calls_on_select_row(GtkCList *clist,
             plurality(calls_nb, "Call", "Calls"),
                        calls_ns,
                        plurality(calls_ns, "Call", "Calls"));
-       gtk_label_set(GTK_LABEL(top_label), label_text);
+        gtk_label_set_text(GTK_LABEL(top_label), label_text);
 
 
        if      (calls_ns > 0) {
@@ -545,7 +547,7 @@ voip_calls_on_unselect_row(GtkCList *clist,
             plurality(calls_nb, "Call", "Calls"),
                        calls_ns,
                        plurality(calls_ns, "Call", "Calls"));
-       gtk_label_set(GTK_LABEL(top_label), label_text);
+        gtk_label_set_text(GTK_LABEL(top_label), label_text);
 
        if      (calls_ns > 0) {
                gtk_widget_set_sensitive(bt_filter, TRUE);
@@ -760,7 +762,7 @@ static void voip_calls_dlg_create (void)
        hbuttonbox = gtk_hbutton_box_new ();
        gtk_box_pack_start (GTK_BOX (main_vb), hbuttonbox, FALSE, FALSE, 0);
        gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD);
-       gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 30);
+       gtk_box_set_spacing (GTK_BOX (hbuttonbox), 30);
 
        /*bt_unselect = gtk_button_new_with_label ("Unselect");
        gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_unselect);
@@ -837,7 +839,7 @@ void voip_calls_dlg_update(GList *list)
                        voip_calls_get_info()->start_packets, 
                        voip_calls_get_info()->completed_calls,
                        voip_calls_get_info()->rejected_calls);
-               gtk_label_set(GTK_LABEL(status_label), label_text);
+                gtk_label_set_text(GTK_LABEL(status_label), label_text);
 
                gtk_clist_freeze(GTK_CLIST(clist));
                gtk_clist_clear(GTK_CLIST(clist));
@@ -855,7 +857,7 @@ void voip_calls_dlg_update(GList *list)
                        plurality(calls_nb, "Call", "Calls"),
                        calls_ns,
                        plurality(calls_ns, "Call", "Calls"));
-               gtk_label_set(GTK_LABEL(top_label), label_text);
+                gtk_label_set_text(GTK_LABEL(top_label), label_text);
        }
 
        last_list = list;
@@ -923,12 +925,11 @@ voip_calls_init_tap(const char *dummy _U_, void* userdata _U_)
        }
        rtp_init_tap();
        rtp_event_init_tap();
-       /* We don't register this tap, if we don't have the mgcp plugin loaded.*/
-       if (find_tap_id("mgcp")) {
-               mgcp_calls_init_tap();
-       }
+       mgcp_calls_init_tap();
        actrace_calls_init_tap();
        t38_init_tap();
+       skinny_calls_init_tap();
+       iax2_calls_init_tap();
 
        /* create dialog box if necessary */
        if (voip_calls_dlg == NULL) {
@@ -949,8 +950,8 @@ voip_calls_init_tap(const char *dummy _U_, void* userdata _U_)
        gtk_clist_append(GTK_CLIST(clist), data);
        
        /* Scan for VoIP calls calls (redissect all packets) */
-       cf_retap_packets(&cfile, FALSE);
-
+       cf_retap_packets(&cfile);
+       gdk_window_raise(voip_calls_dlg->window);
        /* Tap listener will be removed and cleaned up in voip_calls_on_destroy */
 }