for VoIP Call Analysis:

- make VoIP Call Analysis work if, called from command line
- should also work now while capturing with packet list
  updated in "real time" (to be tested)
- give each tap listener a unique identifier, so ethereal
  won't mix them up
- various cleanups
- compile by default

Todo:
- add support for "tap display filter"
- reimplement function to add rtp streams to the call flow.

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b0d2017a62a272457f6b5ec3dbf8dd2524dea36c..37595b4bd27d917c872e3e340a702bdf4af85aa7 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -53,6 +53,7 @@ noinst_HEADERS = \
        follow_dlg.h    \
        font_utils.h    \
        goto_dlg.h      \
+       graph_analysis.h \
        gsm_map_stat.h  \
        gtkglobals.h    \
        gtk_stat_util.h \
@@ -93,6 +94,8 @@ noinst_HEADERS = \
        text_page.h     \
        toolbar.h       \
        ui_util.h       \
+       voip_calls.h    \
+       voip_calls_dlg.h \
        webbrowser.h
 
 if USE_GTK2

diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 123ba2c3cc244bfda1265f4be3ebbb0a2c787c3e..4d3f4d4990fcca5690da9cc9e7c9032b8f685b51 100644 (file)
--- a/gtk/Makefile.common
+++ b/gtk/Makefile.common
@@ -51,6 +51,7 @@ ETHEREAL_GTK_SRC = \
        follow_dlg.c    \
        font_utils.c    \
        goto_dlg.c      \
+       graph_analysis.c \
        gtk_stat_util.c \
        gui_prefs.c     \
        h323_analysis.c \
@@ -84,6 +85,7 @@ ETHEREAL_GTK_SRC = \
        text_page.c     \
        toolbar.c       \
        ui_util.c \
+       voip_calls.c \
        webbrowser.c
 
 
@@ -131,4 +133,5 @@ ETHEREAL_TAP_SRC = \
        sip_stat.c      \
        smb_stat.c      \
        tcp_graph.c     \
+       voip_calls_dlg.c \
        wsp_stat.c

diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c
index b1cb4d40af0bf60f08b8098506ba72007a4f4bd0..27b18e57aaba9729d05f3cbd7be51ea83c259c14 100644 (file)
--- a/gtk/voip_calls.c
+++ b/gtk/voip_calls.c
@@ -90,7 +90,7 @@ char *voip_protocol_name[3]={
 /****************************************************************************/
 /* the one and only global voip_calls_tapinfo_t structure */
 static voip_calls_tapinfo_t the_tapinfo_struct =
-       {0, NULL, 0, NULL, 0, 0, 0, 0, NULL};
+       {0, NULL, 0, NULL, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0};
 
 /* static voip_calls_tapinfo_t the_tapinfo_struct;
 */
@@ -174,6 +174,16 @@ void graph_analysis_data_init(){
 
 /****************************************************************************/
 /* Add the RTP streams into the graph data */
+/** 
+ * TODO: 
+ * - reimplement this function
+ * This function does not work with VoIP taps
+ * which keep the window up to date.
+ * Either make rtp_stream() work without redissection or
+ * add an additional tap listener for rtp to this file.
+ * The second solution is cleaner and probably easier to implement, 
+ * leaving the current rtp analysis feature untouched.
+ */
 void add_rtp_streams_graph()
 {
        rtp_stream_info_t *strinfo;
@@ -272,7 +282,7 @@ int add_to_graph(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, gchar *f
 /****************************************************************************/
 /* Append str to frame_label and comment in a graph item */
 /* return 0 if the frame_num is not in the graph list */
-int append_to_frame_graph(voip_calls_tapinfo_t *tapinfo _U_, guint32 frame_num, gchar *new_frame_label, gchar *new_comment)
+int append_to_frame_graph(voip_calls_tapinfo_t *tapinfo _U_, guint32 frame_num, const gchar *new_frame_label, const gchar *new_comment)
 {
        graph_analysis_item_t *gai;
        GList* list;
@@ -312,9 +322,10 @@ int append_to_frame_graph(voip_calls_tapinfo_t *tapinfo _U_, guint32 frame_num,
 
 /****************************************************************************/
 /* whenever a SIP packet is seen by the tap listener */
-int SIPcalls_packet(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void *SIPinfo)
+static int 
+SIPcalls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *SIPinfo)
 {
-
+       voip_calls_tapinfo_t *tapinfo = &the_tapinfo_struct;
        /* we just take note of the ISUP data here; when we receive the MTP3 part everything will
           be compared with existing calls */
 
@@ -326,7 +337,7 @@ int SIPcalls_packet(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, epan_
        gchar *frame_label = NULL;
        gchar *comment = NULL;
 
-       sip_info_value_t *pi = SIPinfo;
+       const sip_info_value_t *pi = SIPinfo;
 
        /* do not consider packets without call_id */
        if (pi->tap_call_id ==NULL){
@@ -462,8 +473,11 @@ sip_calls_init_tap(void)
        if(have_SIP_tap_listener==FALSE)
        {
                /* don't register tap listener, if we have it already */
-               error_string = register_tap_listener("sip", &the_tapinfo_struct, NULL,
-                       NULL, (void*)SIPcalls_packet, NULL);
+               error_string = register_tap_listener("sip", &(the_tapinfo_struct.sip_dummy), NULL,
+                       voip_calls_dlg_reset, 
+                       SIPcalls_packet, 
+                       voip_calls_dlg_draw
+                       );
                if (error_string != NULL) {
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
                                      error_string->str);
@@ -485,7 +499,7 @@ void
 remove_tap_listener_sip_calls(void)
 {
        protect_thread_critical_region();
-       remove_tap_listener(&the_tapinfo_struct);
+       remove_tap_listener(&(the_tapinfo_struct.sip_dummy));
        unprotect_thread_critical_region();
 
        have_SIP_tap_listener=FALSE;
@@ -501,10 +515,11 @@ static guint8             isup_message_type;
 
 /****************************************************************************/
 /* whenever a isup_ packet is seen by the tap listener */
-int isup_calls_packet(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void *isup_info _U_)
+static int 
+isup_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *isup_info _U_)
 {
-
-       isup_tap_rec_t *pi = isup_info;
+       voip_calls_tapinfo_t *tapinfo = &the_tapinfo_struct;
+       const isup_tap_rec_t *pi = isup_info;
 
        if (pi->calling_number!=NULL){
                strcpy(isup_calling_number, pi->calling_number);
@@ -530,9 +545,12 @@ isup_calls_init_tap(void)
 
        if(have_isup_tap_listener==FALSE)
        {
-               error_string = register_tap_listener("isup", &the_tapinfo_struct,
+               error_string = register_tap_listener("isup", &(the_tapinfo_struct.isup_dummy),
                        NULL,
-                       NULL, (void*)isup_calls_packet, NULL);
+                       voip_calls_dlg_reset, 
+                       isup_calls_packet, 
+                       voip_calls_dlg_draw
+                       );
        
                if (error_string != NULL) {
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -550,7 +568,7 @@ void
 remove_tap_listener_isup_calls(void)
 {
        protect_thread_critical_region();
-       remove_tap_listener(&the_tapinfo_struct);
+       remove_tap_listener(&(the_tapinfo_struct.isup_dummy));
        unprotect_thread_critical_region();
 
        have_isup_tap_listener=FALSE;
@@ -564,9 +582,10 @@ remove_tap_listener_isup_calls(void)
 
 /****************************************************************************/
 /* whenever a mtp3_ packet is seen by the tap listener */
-int mtp3_calls_packet(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void *mtp3_info _U_)
+static int 
+mtp3_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *mtp3_info _U_)
 {
-
+       voip_calls_tapinfo_t *tapinfo = &the_tapinfo_struct;
        voip_calls_info_t *tmp_listinfo;
        voip_calls_info_t *strinfo = NULL;
        isup_calls_info_t *tmp_isupinfo;
@@ -575,7 +594,7 @@ int mtp3_calls_packet(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, epa
        gboolean right_pair = TRUE;
        GList* list;
 
-       mtp3_tap_rec_t *pi = mtp3_info;
+       const mtp3_tap_rec_t *pi = mtp3_info;
 
        /* check wether we already have a call with these parameters in the list */
        list = g_list_first(tapinfo->strinfo_list);
@@ -697,9 +716,12 @@ mtp3_calls_init_tap(void)
 
        if(have_mtp3_tap_listener==FALSE)
        {
-               error_string = register_tap_listener("mtp3", &the_tapinfo_struct,
+               error_string = register_tap_listener("mtp3", &(the_tapinfo_struct.mtp3_dummy),
                        NULL,
-                       NULL, (void*)mtp3_calls_packet, NULL);
+                       voip_calls_dlg_reset, 
+                       mtp3_calls_packet, 
+                       voip_calls_dlg_draw
+                       );
 
                if (error_string != NULL) {
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -717,7 +739,7 @@ void
 remove_tap_listener_mtp3_calls(void)
 {
        protect_thread_critical_region();
-       remove_tap_listener(&the_tapinfo_struct);
+       remove_tap_listener(&(the_tapinfo_struct.mtp3_dummy));
        unprotect_thread_critical_region();
 
        have_mtp3_tap_listener=FALSE;
@@ -736,10 +758,11 @@ static guint32 q931_frame_num;
 
 /****************************************************************************/
 /* whenever a q931_ packet is seen by the tap listener */
-int q931_calls_packet(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void *q931_info _U_)
+static int 
+q931_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *q931_info _U_)
 {
-
-       q931_packet_info *pi = q931_info;
+       voip_calls_tapinfo_t *tapinfo = &the_tapinfo_struct;
+       const q931_packet_info *pi = q931_info;
 
        /* free previously allocated q931_calling/ed_number */
        g_free(q931_calling_number);
@@ -772,9 +795,12 @@ q931_calls_init_tap(void)
 
        if(have_q931_tap_listener==FALSE)
        {
-               error_string = register_tap_listener("q931", &the_tapinfo_struct,
+               error_string = register_tap_listener("q931", &(the_tapinfo_struct.q931_dummy),
                        NULL,
-                       NULL, (void*)q931_calls_packet, NULL);
+                       voip_calls_dlg_reset,
+                       q931_calls_packet,
+                       voip_calls_dlg_draw
+                       );
                        
                if (error_string != NULL) {
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -792,7 +818,7 @@ void
 remove_tap_listener_q931_calls(void)
 {
        protect_thread_critical_region();
-       remove_tap_listener(&the_tapinfo_struct);
+       remove_tap_listener(&(the_tapinfo_struct.q931_dummy));
        unprotect_thread_critical_region();
 
        have_q931_tap_listener=FALSE;
@@ -819,9 +845,10 @@ void add_h245_Address(h323_calls_info_t *h323info, guint32 h245_address, guint16
 
 /****************************************************************************/
 /* whenever a H225 packet is seen by the tap listener */
-int H225calls_packet(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void *H225info)
+static int 
+H225calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *H225info)
 {
-
+       voip_calls_tapinfo_t *tapinfo = &the_tapinfo_struct;
        voip_calls_info_t *tmp_listinfo;
        voip_calls_info_t *strinfo = NULL;
        h323_calls_info_t *tmp_h323info;
@@ -830,11 +857,7 @@ int H225calls_packet(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, epan
        GList* list;
        guint32 tmp_src, tmp_dst;
 
-       h225_packet_info *pi = H225info;
-
-       /* we ignore packets that are not displayed */
-       if (pinfo->fd->flags.passed_dfilter == 0)
-               return 0;
+       const h225_packet_info *pi = H225info;
 
        /* if not guid and RAS return because did not belong to a call */
        if ((memcmp(pi->guid, guid_allzero, GUID_LEN) == 0) && (pi->msg_type == H225_RAS))
@@ -1030,8 +1053,11 @@ h225_calls_init_tap(void)
        if(have_H225_tap_listener==FALSE)
        {
                /* don't register tap listener, if we have it already */
-               error_string = register_tap_listener("h225", &the_tapinfo_struct, NULL,
-                       NULL, (void*)H225calls_packet, NULL);
+               error_string = register_tap_listener("h225", &(the_tapinfo_struct.h225_dummy), NULL,
+                       voip_calls_dlg_reset, 
+                       H225calls_packet, 
+                       voip_calls_dlg_draw
+                       );
                        
                if (error_string != NULL) {
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -1054,7 +1080,7 @@ void
 remove_tap_listener_h225_calls(void)
 {
        protect_thread_critical_region();
-       remove_tap_listener(&the_tapinfo_struct);
+       remove_tap_listener(&(the_tapinfo_struct.h225_dummy));
        unprotect_thread_critical_region();
 
        have_H225_tap_listener=FALSE;
@@ -1063,9 +1089,10 @@ remove_tap_listener_h225_calls(void)
 
 /****************************************************************************/
 /* whenever a H245dg packet is seen by the tap listener (when H245 tunneling is ON) */
-int H245dgcalls_packet(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void *H245info)
+static int 
+H245dgcalls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *H245info)
 {
-
+       voip_calls_tapinfo_t *tapinfo = &the_tapinfo_struct;
        voip_calls_info_t *tmp_listinfo;
        voip_calls_info_t *strinfo = NULL;
        h323_calls_info_t *tmp_h323info;
@@ -1076,11 +1103,7 @@ int H245dgcalls_packet(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, ep
        guint32 tmp_src, tmp_dst;
        h245_address_t *h245_add = NULL;
 
-       h245_packet_info *pi = H245info;
-
-       /* we ignore packets that are not displayed */
-       if (pinfo->fd->flags.passed_dfilter == 0)
-               return 0;
+       const h245_packet_info *pi = H245info;
 
        /* if H245 tunneling is on, append to graph */
        if (append_to_frame_graph(tapinfo, pinfo->fd->num, pi->frame_label, pi->comment)) return 1;
@@ -1143,8 +1166,11 @@ h245dg_calls_init_tap(void)
        if(have_H245dg_tap_listener==FALSE)
        {
                /* don't register tap listener, if we have it already */
-               error_string = register_tap_listener("h245dg", &the_tapinfo_struct, NULL,
-                       NULL, (void*)H245dgcalls_packet, NULL);
+               error_string = register_tap_listener("h245dg", &(the_tapinfo_struct.h245dg_dummy), NULL,
+                       voip_calls_dlg_reset,
+                       H245dgcalls_packet, 
+                       voip_calls_dlg_draw
+                       );
                
                if (error_string != NULL) {
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -1166,7 +1192,7 @@ void
 remove_tap_listener_h245dg_calls(void)
 {
        protect_thread_critical_region();
-       remove_tap_listener(&the_tapinfo_struct);
+       remove_tap_listener(&(the_tapinfo_struct.h245dg_dummy));
        unprotect_thread_critical_region();
 
        have_H245dg_tap_listener=FALSE;
@@ -1177,17 +1203,16 @@ remove_tap_listener_h245dg_calls(void)
 /****************************TAP for SDP PROTOCOL ***************************/
 /****************************************************************************/
 /* whenever a SDP packet is seen by the tap listener */
-int SDPcalls_packet(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void *SDPinfo)
+static int 
+SDPcalls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *SDPinfo)
 {
-       sdp_packet_info *pi = SDPinfo;
-
-       /* we ignore packets that are not displayed */
-       if (pinfo->fd->flags.passed_dfilter == 0)
-               return 0;
-
+       voip_calls_tapinfo_t *tapinfo = &the_tapinfo_struct;
+       const sdp_packet_info *pi = SDPinfo;
+       char summary_str[50];
+       
        /* Append to graph the SDP summary if the packet exists */
-       g_snprintf(pi->summary_str, 50, "SDP (%s)", pi->summary_str);
-       append_to_frame_graph(tapinfo, pinfo->fd->num, pi->summary_str, NULL);
+       g_snprintf(summary_str, 50, "SDP (%s)", pi->summary_str);
+       append_to_frame_graph(tapinfo, pinfo->fd->num, summary_str, NULL);
 
        return 1;  /* refresh output */
 }
@@ -1206,8 +1231,11 @@ sdp_calls_init_tap(void)
        if(have_sdp_tap_listener==FALSE)
        {
                /* don't register tap listener, if we have it already */
-               error_string = register_tap_listener("sdp", &the_tapinfo_struct, NULL,
-                       NULL, (void*)SDPcalls_packet, NULL);
+               error_string = register_tap_listener("sdp", &(the_tapinfo_struct.sdp_dummy), NULL,
+                       voip_calls_dlg_reset, 
+                       SDPcalls_packet, 
+                       voip_calls_dlg_draw
+                       );
                        
                if (error_string != NULL) {
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -1229,7 +1257,7 @@ void
 remove_tap_listener_sdp_calls(void)
 {
        protect_thread_critical_region();
-       remove_tap_listener(&the_tapinfo_struct);
+       remove_tap_listener(&(the_tapinfo_struct.sdp_dummy));
        unprotect_thread_critical_region();
 
        have_sdp_tap_listener=FALSE;
@@ -1243,17 +1271,13 @@ remove_tap_listener_sdp_calls(void)
 /* ***************************TAP for OTHER PROTOCOL **********************************/
 /****************************************************************************/
 
-/****************************************************************************/
-/* redraw the output */
-/*void prot_calls_draw(voip_calls_tapinfo_t *tapinfo _U_)
-{
-       return;
-}
-*/
 /****************************************************************************/
 /* whenever a prot_ packet is seen by the tap listener */
-/*int prot_calls_packet(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void *prot_info _U_)
+/*
+static int 
+prot_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prot_info _U_)
 {
+       voip_calls_tapinfo_t *tapinfo = &the_tapinfo_struct;
        if (strinfo!=NULL){
                strinfo->stop_sec=pinfo->fd->rel_secs;
                strinfo->stop_usec=pinfo->fd->rel_usecs;
@@ -1276,9 +1300,12 @@ prot_calls_init_tap(void)
 
        if(have_prot__tap_listener==FALSE)
        {
-               error_string = register_tap_listener("prot_", &the_tapinfo_struct,
+               error_string = register_tap_listener("prot_", &(the_tapinfo_struct.prot__dummy),
                        NULL,
-                       NULL, (void*)prot_calls_packet, NULL);
+                       voip_calls_dlg_reset,
+                       prot__calls_packet, 
+                       voip_calls_dlg_draw
+                       );
 
                if (error_string != NULL) {
                        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
@@ -1296,17 +1323,10 @@ void
 remove_tap_listener_prot__calls(void)
 {
        protect_thread_critical_region();
-       remove_tap_listener(&the_tapinfo_struct);
+       remove_tap_listener(&(the_tapinfo_struct.prot__dummy));
        unprotect_thread_critical_region();
 
        have_prot__tap_listener=FALSE;
 }
 */
 
-/****************************************************************************/
-
-/*void prot_calls_reset(voip_calls_tapinfo_t *tapinfo _U_)
-{
-       return;
-}
-*/

diff --git a/gtk/voip_calls.h b/gtk/voip_calls.h
index 0cd976513b37577856eda3945dfb5341cc1a80ec..e9f21f55fa6eda8b29b57a60520784096b5262ed 100644 (file)
--- a/gtk/voip_calls.h
+++ b/gtk/voip_calls.h
@@ -136,6 +136,17 @@ typedef struct _voip_calls_tapinfo {
        int completed_calls;
        int rejected_calls;
        graph_analysis_info_t* graph_analysis;
+       /* 
+        * Now add dummy variables, one for each tap listener.
+        * Their address will be used to distinguish between them.
+        */
+       int sip_dummy;
+       int sdp_dummy;
+       int h225_dummy;
+       int h245dg_dummy;
+       int mtp3_dummy;
+       int isup_dummy;
+       int q931_dummy;
 } voip_calls_tapinfo_t;
 
 

diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index 964eabb5eeecfd1a8308ca5ff97da38d3b87bcef..4f3b96051d06bfe38c7f5b3c5fe1b8016ae4a2cb 100644 (file)
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -183,6 +183,9 @@ static void
 voip_calls_on_destroy                      (GtkObject       *object _U_,
                                         gpointer         user_data _U_)
 {
+       /* remove_tap_listeners */
+       voip_calls_remove_tap_listener();
+
        /* Clean up memory used by calls tap */
        voip_calls_reset((voip_calls_tapinfo_t*) voip_calls_get_info());
 
@@ -279,11 +282,6 @@ voip_calls_on_filter                    (GtkButton       *button _U_,
 
        
        g_free(filter_string);
-
-/*
-       main_filter_packets(&cfile, filter_string, FALSE);
-       voip_calls_dlg_update(voip_calls_get_info()->strinfo_list);
-*/
 }
 
 
@@ -608,10 +606,9 @@ void voip_calls_dlg_update(GList *list)
 
        if (voip_calls_dlg != NULL) {
 
-               voip_calls_remove_tap_listener();
-
                /* Add the RTP streams info for the graph */
-               add_rtp_streams_graph();
+               /* deactivated for now */
+/*             add_rtp_streams_graph(); */
 
                gtk_clist_clear(GTK_CLIST(clist));
                calls_nb = 0;
@@ -647,23 +644,17 @@ void voip_calls_dlg_update(GList *list)
 
 
 /****************************************************************************/
-/* update the contents of the dialog box clist */
-/* list: pointer to list of voip_calls_info_t* */
-void voip_calls_dlg_show(GList *list)
+/* draw function for tap listeners to keep the window up to date */
+void voip_calls_dlg_draw(void *ptr _U_)
 {
-       if (voip_calls_dlg != NULL) {
-               /* There's already a dialog box; reactivate it. */
-               reactivate_window(voip_calls_dlg);
-               /* Another list since last call? */
-               if (list != last_list) {
-                       voip_calls_dlg_update(list);
-               }
-       }
-       else {
-               /* Create and show the dialog box */
-               voip_calls_dlg_create();
-               voip_calls_dlg_update(list);
-       }
+       voip_calls_dlg_update(voip_calls_get_info()->strinfo_list);
+}
+
+/* reset function for tap listeners to clear window, if necessary */
+void voip_calls_dlg_reset(void *ptr _U_)
+{
+       /* Clean up memory used by calls tap */
+       voip_calls_reset((voip_calls_tapinfo_t*) voip_calls_get_info());
 }
 
 /* init function for tap */
@@ -684,16 +675,22 @@ voip_calls_init_tap(char *dummy _U_)
        q931_calls_init_tap();
        sdp_calls_init_tap();
        
+       /* init the Graph Analysys */
+       graph_analysis_data = graph_analysis_init();
+       graph_analysis_data->graph_info = voip_calls_get_info()->graph_analysis;
 
+       /* create dialog box if necessary */
+       if (voip_calls_dlg == NULL) {
+               voip_calls_dlg_create();
+       } else {
+               /* There's already a dialog box; reactivate it. */
+               reactivate_window(voip_calls_dlg);
+       }
+       
        /* Scan for VoIP calls calls (redissect all packets) */
        retap_packets(&cfile);
-
-       /* Show the dialog box with the list of calls */
-       voip_calls_dlg_show(voip_calls_get_info()->strinfo_list);
        
-
        /* Tap listener will be removed and cleaned up in voip_calls_on_destroy */
-       
 }
 
 
@@ -702,10 +699,6 @@ voip_calls_init_tap(char *dummy _U_)
 void voip_calls_launch(GtkWidget *w _U_, gpointer data _U_)
 {
        voip_calls_init_tap("");
-       
-       /* init the Graph Analysys */
-       graph_analysis_data = graph_analysis_init();
-       graph_analysis_data->graph_info = voip_calls_get_info()->graph_analysis;
 }
 
 /****************************************************************************/

diff --git a/gtk/voip_calls_dlg.h b/gtk/voip_calls_dlg.h
index 0c540615164f83b834b8d5e86b660b021f90ef02..74bd793f899586d5f439d5643176117877f4a0ef 100644 (file)
--- a/gtk/voip_calls_dlg.h
+++ b/gtk/voip_calls_dlg.h
@@ -38,13 +38,6 @@
 
 #include <gtk/gtk.h>
 
-/**
- * Create or reactivate the voip calls dialog box.
- *
- * @param list pointer to list of rtp_stream_info_t*
- */
-void voip_calls_dlg_show(GList *list);
-
 /**
  * Update the contents of the dialog box clist with that of list.
  *
@@ -52,4 +45,8 @@ void voip_calls_dlg_show(GList *list);
  */
 void voip_calls_dlg_update(GList *list);
 
+/* functions for tap_listeners in voip_calls.c */
+void voip_calls_dlg_draw(void *ptr);
+void voip_calls_dlg_reset(void *ptr);
+
 #endif /* VOIP_CALLS_DLG_H_INCLUDED*/