diff options
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | gtk/Makefile.common | 3 | ||||
-rw-r--r-- | gtk/sip_stat.c | 763 | ||||
-rw-r--r-- | packet-sip.c | 47 |
4 files changed, 804 insertions, 10 deletions
@@ -2030,6 +2030,7 @@ Sam Leffler <sam [AT] errno.com> { Martin Mathieson <martin [AT] arca-technologies.com> { SIP sipfrag support + SIP statistics tap } Christian Wagner <Christian.Wagner [AT] stud.uni-karlsruhe.de> { diff --git a/gtk/Makefile.common b/gtk/Makefile.common index da9a90113e..740a2a9d65 100644 --- a/gtk/Makefile.common +++ b/gtk/Makefile.common @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common,v 1.8 2004/02/23 19:19:38 ulfl Exp $ +# $Id: Makefile.common,v 1.9 2004/03/26 00:28:39 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -113,5 +113,6 @@ ETHEREAL_TAP_SRC = \ rtp_analysis.c \ rtp_stream_dlg.c \ tcp_graph.c \ + sip_stat.c \ smb_stat.c \ wsp_stat.c diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c new file mode 100644 index 0000000000..6b004d10e4 --- /dev/null +++ b/gtk/sip_stat.c @@ -0,0 +1,763 @@ +/* sip_stat.c + * sip_stat 2004 Martin Mathieson + * + * $Id: sip_stat.c,v 1.1 2004/03/26 00:28:39 guy Exp $ + * Copied from http_stat.c + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <string.h> + +#include <gtk/gtk.h> + +#include <epan/packet_info.h> +#include <epan/epan.h> + +#include "tap_menu.h" +#include "simple_dialog.h" +#include "ui_util.h" +#include "dlg_utils.h" +#include "tap.h" +#include "../register.h" +#include "../packet-sip.h" +#include "../globals.h" +#include "compat_macros.h" + +#define SUM_STR_MAX 1024 + +/* Used to keep track of the statistics for an entire program interface */ +typedef struct _sip_stats_t { + char *filter; + GtkWidget *win; + GHashTable *hash_responses; + GHashTable *hash_requests; + guint32 packets; /* number of sip packets, including continuations */ + GtkWidget *packets_label; + + GtkWidget *request_box; /* container for INVITE, ... */ + + GtkWidget *informational_table; /* Status code between 100 and 199 */ + GtkWidget *success_table; /* 200 and 299 */ + GtkWidget *redirection_table; /* 300 and 399 */ + GtkWidget *client_error_table; /* 400 and 499 */ + GtkWidget *server_errors_table; /* 500 and 599 */ + GtkWidget *global_failures_table; /* 600 and 699 */ +} sipstat_t; + +/* Used to keep track of the stats for a specific response code + * for example it can be { 3, 404, "Not Found" ,...} + * which means we captured 3 reply sip/1.1 404 Not Found */ +typedef struct _sip_response_code_t { + guint32 packets; /* 3 */ + guint response_code; /* 404 */ + gchar *name; /* "Not Found" */ + GtkWidget *widget; /* Label where we display it */ + GtkWidget *table; /* Table in which we put it, + e.g. client_error_table */ + sipstat_t *sp; /* Pointer back to main struct */ +} sip_response_code_t; + +/* Used to keep track of the stats for a specific request string */ +typedef struct _sip_request_method_t { + gchar *response; /* eg. : INVITE */ + guint32 packets; + GtkWidget *widget; + sipstat_t *sp; /* Pointer back to main struct */ +} sip_request_method_t; + +static GtkWidget *dlg=NULL; +static GtkWidget *filter_entry; + +/* TODO: extra codes to be added from SIP extensions? */ +static const value_string vals_status_code[] = { + { 100, "Trying"}, + { 180, "Ringing"}, + { 181, "Call Is Being Forwarded"}, + { 182, "Queued"}, + { 183, "Session Progress"}, + { 199, "Informational - Others" }, + + { 200, "OK"}, + { 202, "Accepted"}, + { 299, "Success - Others"}, /* used to keep track of other Success packets */ + + { 300, "Multiple Choices"}, + { 301, "Moved Permanently"}, + { 302, "Moved Temporarily"}, + { 305, "Use Proxy"}, + { 380, "Alternative Service"}, + { 399, "Redirection - Others"}, + + { 400, "Bad Request"}, + { 401, "Unauthorized"}, + { 402, "Payment Required"}, + { 403, "Forbidden"}, + { 404, "Not Found"}, + { 405, "Method Not Allowed"}, + { 406, "Not Acceptable"}, + { 407, "Proxy Authentication Required"}, + { 408, "Request Timeout"}, + { 410, "Gone"}, + { 413, "Request Entity Too Large"}, + { 414, "Request-URI Too Long"}, + { 415, "Unsupported Media Type"}, + { 416, "Unsupported URI Scheme"}, + { 420, "Bad Extension"}, + { 421, "Extension Required"}, + { 423, "Interval Too Brief"}, + { 480, "Temporarily Unavailable"}, + { 481, "Call/Transaction Does Not Exist"}, + { 482, "Loop Detected"}, + { 483, "Too Many Hops"}, + { 484, "Address Incomplete"}, + { 485, "Ambiguous"}, + { 486, "Busy Here"}, + { 487, "Request Terminated"}, + { 488, "Not Acceptable Here"}, + { 489, "Bad Event"}, + { 491, "Request Pending"}, + { 493, "Undecipherable"}, + { 499, "Client Error - Others"}, + + { 500, "Server Internal Error"}, + { 501, "Not Implemented"}, + { 502, "Bad Gateway"}, + { 503, "Service Unavailable"}, + { 504, "Server Time-out"}, + { 505, "Version Not Supported"}, + { 513, "Message Too Large"}, + { 599, "Server Error - Others"}, + + { 600, "Busy Everywhere"}, + { 603, "Decline"}, + { 604, "Does Not Exist Anywhere"}, + { 606, "Not Acceptable"}, + { 699, "Global Failure - Others"}, + + { 0, NULL} +}; + +/* Create tables for responses and requests */ +static void +sip_init_hash(sipstat_t *sp) +{ + int i; + + /* Create responses table */ + sp->hash_responses = g_hash_table_new(g_int_hash, g_int_equal); + + /* Add all response codes */ + for (i=0 ; vals_status_code[i].strptr ; i++) + { + gint *key = g_malloc (sizeof(gint)); + sip_response_code_t *sc = g_malloc (sizeof(sip_response_code_t)); + *key = vals_status_code[i].value; + sc->packets=0; + sc->response_code = *key; + sc->name=vals_status_code[i].strptr; + sc->widget=NULL; + sc->table=NULL; + sc->sp = sp; + g_hash_table_insert(sc->sp->hash_responses, key, sc); + } + + /* Create empty requests table */ + sp->hash_requests = g_hash_table_new(g_str_hash, g_str_equal); +} + +/* Draw the entry for an individual request message */ +static void +sip_draw_hash_requests(gchar *key _U_ , sip_request_method_t *data, gchar * unused _U_) +{ + gchar string_buff[SUM_STR_MAX]; + + if (data->packets==0) + { + return; + } + + /* Build string showing method and count */ + g_snprintf(string_buff, sizeof(string_buff), + " %-11s : %3d packets", data->response, data->packets); + if (data->widget==NULL) + { + /* Create new label */ + data->widget=gtk_label_new(string_buff); + gtk_misc_set_alignment(GTK_MISC(data->widget), 0.0, 0.5); + gtk_box_pack_start(GTK_BOX(data->sp->request_box), data->widget,FALSE,FALSE, 0); + gtk_widget_show(data->widget); + } + else + { + /* Update existing label */ + gtk_label_set(GTK_LABEL(data->widget), string_buff); + } +} + +/* Draw an individual response entry */ +static void +sip_draw_hash_responses(gint * key _U_ , sip_response_code_t *data, gchar * unused _U_) +{ + gchar string_buff[SUM_STR_MAX]; + + if (data==NULL) + { + g_warning("C'est quoi ce borderl key=%d\n", *key); + } + if (data->packets==0) + { + return; + } + + /* Create an entry in the relevant box of the window */ + if (data->widget==NULL) + { + guint16 x; + GtkWidget *tmp; + guint i = data->response_code; + + /* Out of valid range - ignore */ + if ((i<100)||(i>=700)) + { + return; + } + + /* Find the table matching the code */ + if (i<200) + { + data->table = data->sp->informational_table; + } + else if (i<300) + { + data->table = data->sp->success_table; + } + else if (i<400) + { + data->table = data->sp->redirection_table; + } + else if (i<500) + { + data->table = data->sp->client_error_table; + } + else if (i < 600) + { + data->table = data->sp->server_errors_table; + } + else + { + data->table = data->sp->global_failures_table; + } + + /* Get number of rows in table */ + x = GTK_TABLE(data->table)->nrows; + + /* Create a new label with this response, e.g. "SIP 180 Ringing" */ + g_snprintf(string_buff, sizeof(string_buff), + "SIP %3d %s ", data->response_code, data->name); + tmp = gtk_label_new(string_buff); + + /* Insert the label in the correct place in the table */ + gtk_table_attach_defaults(GTK_TABLE(data->table), tmp, 0, 1, x, x+1); + gtk_label_set_justify(GTK_LABEL(tmp), GTK_JUSTIFY_LEFT); + gtk_widget_show(tmp); + + /* Show number of packets */ + g_snprintf(string_buff, sizeof(string_buff), "%9d", data->packets); + data->widget=gtk_label_new(string_buff); + + /* Show this widget in the right place */ + gtk_table_attach_defaults(GTK_TABLE(data->table), data->widget, 1, 2,x,x+1); + gtk_label_set_justify(GTK_LABEL(data->widget), GTK_JUSTIFY_RIGHT); + gtk_widget_show(data->widget); + + gtk_table_resize(GTK_TABLE(data->table), x+1, 4); + + } else + { + /* Just update the existing label string */ + g_snprintf(string_buff, sizeof(string_buff), "%9d", data->packets); + gtk_label_set(GTK_LABEL(data->widget), string_buff); + } +} + + + +static void +sip_free_hash(gpointer key, gpointer value, gpointer user_data _U_) +{ + g_free(key); + g_free(value); +} + +static void +sip_reset_hash_responses(gchar *key _U_ , sip_response_code_t *data, gpointer ptr _U_) +{ + data->packets = 0; +} + +static void +sip_reset_hash_requests(gchar *key _U_ , sip_request_method_t *data, gpointer ptr _U_) +{ + data->packets = 0; +} + +static void +sipstat_reset(void *psp) +{ + sipstat_t *sp = psp; + if (!sp) + { + g_hash_table_foreach(sp->hash_responses, (GHFunc)sip_reset_hash_responses, NULL); + g_hash_table_foreach(sp->hash_responses, (GHFunc)sip_reset_hash_requests, NULL); + } +} + +/* Main entry point to SIP tap */ +static int +sipstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, void *pri) +{ + sip_info_value_t *value=pri; + sipstat_t *sp = (sipstat_t *)psp; + + /* Total number of packets, including continuation packets */ + sp->packets++; + + /* Looking at both requests and responses */ + if (value->response_code != 0) + { + /* Responses */ + guint *key = g_malloc(sizeof(guint)); + sip_response_code_t *sc; + + /* Look up response code in hash table */ + *key = value->response_code; + sc = g_hash_table_lookup(sp->hash_responses, key); + if (sc==NULL) + { + /* Non-standard status code ; we classify it as others + * in the relevant category + * (Informational,Success,Redirection,Client Error,Server Error,Global Failure) + */ + int i = value->response_code; + if ((i<100) || (i>=700)) + { + /* Forget about crazy values */ + return 0; + } + else if (i<200) + { + *key=199; /* Hopefully, this status code will never be used */ + } + else if (i<300) + { + *key=299; + } + else if (i<400) + { + *key=399; + } + else if (i<500) + { + *key=499; + } + else if (i<600) + { + *key=599; + } + else + { + *key = 699; + } + + /* Now look up this fallback code to get its text description */ + sc = g_hash_table_lookup(sp->hash_responses, key); + if (sc==NULL) + { + return 0; + } + } + sc->packets++; + } + else if (value->request_method) + { + /* Requests */ + sip_request_method_t *sc; + + /* Look up the request method in the table */ + sc = g_hash_table_lookup(sp->hash_requests, value->request_method); + if (sc == NULL) + { + /* First of this type. Create structure and initialise */ + sc=g_malloc(sizeof(sip_request_method_t)); + sc->response = g_strdup(value->request_method); + sc->packets = 1; + sc->widget = NULL; + sc->sp = sp; + /* Insert it into request table */ + g_hash_table_insert(sp->hash_requests, sc->response, sc); + } + else + { + /* Already existed, just update count for that method */ + sc->packets++; + } + /* g_free(value->request_method); */ + } + else + { + /* No request method set. Just ignore */ + return 0; + } + + return 1; +} + +/* Redraw the whole stats window */ +static void +sipstat_draw(void *psp) +{ + gchar string_buff[SUM_STR_MAX]; + sipstat_t *sp=psp; + + /* Set summary label */ + g_snprintf(string_buff, sizeof(string_buff), + "SIP stats (%d packets)", sp->packets); + gtk_label_set(GTK_LABEL(sp->packets_label), string_buff); + + /* Draw responses and requests from their tables */ + g_hash_table_foreach(sp->hash_responses, (GHFunc)sip_draw_hash_responses, NULL); + g_hash_table_foreach(sp->hash_requests, (GHFunc)sip_draw_hash_requests, NULL); +} + + +/* since the gtk2 implementation of tap is multithreaded we must protect + * remove_tap_listener() from modifying the list while draw_tap_listener() + * is running. the other protected block is in main.c + * + * there should not be any other critical regions in gtk2 + */ +void protect_thread_critical_region(void); +void unprotect_thread_critical_region(void); + +/* When window is destroyed, clean up */ +static void +win_destroy_cb(GtkWindow *win _U_, gpointer data) +{ + sipstat_t *sp=(sipstat_t *)data; + + protect_thread_critical_region(); + remove_tap_listener(sp); + unprotect_thread_critical_region(); + + g_hash_table_foreach(sp->hash_responses, (GHFunc)sip_free_hash, NULL); + g_hash_table_destroy(sp->hash_responses); + g_hash_table_foreach(sp->hash_requests, (GHFunc)sip_free_hash, NULL); + g_hash_table_destroy(sp->hash_requests); + g_free(sp->filter); + g_free(sp); +} + +/* Create a new instance of gtk_sipstat. */ +static void +gtk_sipstat_init(char *optarg) +{ + sipstat_t *sp; + char *filter = NULL; + GString *error_string; + char *title = NULL; + GtkWidget *main_vb, *separator, + *informational_fr, *success_fr, *redirection_fr, + *client_errors_fr, *server_errors_fr, *global_failures_fr, + *request_fr; + + + if (!strncmp (optarg, "sip,stat,", 9)) + { + /* Skip those characters from filter to display */ + filter=optarg + 9; + } + else + { + /* No filter */ + filter = NULL; + } + + /* Create sip stats window structure */ + sp = g_malloc(sizeof(sipstat_t)); + + /* Set title to include any filter given */ + if (filter) + { + sp->filter = strdup(filter); + title = g_strdup_printf("SIP statistics with filter: %s", filter); + } + else + { + sp->filter = NULL; + title = g_strdup("SIP statistics"); + } + + /* Create underlying window */ + sp->win = window_new(GTK_WINDOW_TOPLEVEL, title); + g_free(title); + + /* Set destroy callback for underlying window */ + SIGNAL_CONNECT(sp->win, "destroy", win_destroy_cb, sp); + + + /* Create container for all widgets */ + main_vb = gtk_vbox_new(FALSE, 10); + gtk_container_border_width(GTK_CONTAINER(main_vb), 10); + gtk_container_add(GTK_CONTAINER(sp->win), main_vb); + gtk_widget_show(main_vb); + + /* Initialise & show number of packets */ + sp->packets = 0; + sp->packets_label = gtk_label_new("SIP stats (0 SIP packets)"); + gtk_container_add(GTK_CONTAINER(main_vb), sp->packets_label); + gtk_widget_show(sp->packets_label); + + + /* Informational response frame */ + informational_fr = gtk_frame_new("Informational SIP 1xx"); + gtk_container_add(GTK_CONTAINER(main_vb), informational_fr); + gtk_widget_show(informational_fr); + + /* Information table (within that frame) */ + sp->informational_table = gtk_table_new(0, 2, FALSE); + gtk_container_add(GTK_CONTAINER(informational_fr), sp->informational_table); + gtk_widget_show(sp->informational_table); + + + /* Success table and frame */ + success_fr = gtk_frame_new ("Success SIP 2xx"); + gtk_container_add(GTK_CONTAINER(main_vb), success_fr); + gtk_widget_show(success_fr); + + sp->success_table = gtk_table_new(0, 2, FALSE); + gtk_container_add(GTK_CONTAINER(success_fr), sp->success_table); + gtk_widget_show(sp->success_table); + + + /* Redirection table and frame */ + redirection_fr = gtk_frame_new ("Redirection SIP 3xx"); + gtk_container_add(GTK_CONTAINER(main_vb), redirection_fr); + gtk_widget_show(redirection_fr); + + sp->redirection_table = gtk_table_new(0, 2, FALSE); + gtk_container_add(GTK_CONTAINER(redirection_fr), sp->redirection_table); + gtk_widget_show(sp->redirection_table); + + + /* Client Errors table and frame */ + client_errors_fr = gtk_frame_new("Client errors SIP 4xx"); + gtk_container_add(GTK_CONTAINER(main_vb), client_errors_fr); + gtk_widget_show(client_errors_fr); + + sp->client_error_table = gtk_table_new(0, 2, FALSE); + gtk_container_add(GTK_CONTAINER(client_errors_fr), sp->client_error_table); + gtk_widget_show(sp->client_error_table); + + + /* Server Errors table and frame */ + server_errors_fr = gtk_frame_new("Server errors SIP 5xx"); + gtk_container_add(GTK_CONTAINER(main_vb), server_errors_fr); + gtk_widget_show(server_errors_fr); + + sp->server_errors_table = gtk_table_new(0, 2, FALSE); + gtk_container_add(GTK_CONTAINER(server_errors_fr), sp->server_errors_table); + gtk_widget_show(sp->server_errors_table); + + + /* Global Failures table and frame */ + global_failures_fr = gtk_frame_new("Global failures SIP 6xx"); + gtk_container_add(GTK_CONTAINER(main_vb), global_failures_fr); + gtk_widget_show(global_failures_fr); + + sp->global_failures_table = gtk_table_new(0, 2, FALSE); + gtk_container_add(GTK_CONTAINER(global_failures_fr), sp->global_failures_table); + gtk_widget_show(sp->global_failures_table); + + + /* Separator between requests and responses */ + separator = gtk_hseparator_new(); + gtk_container_add(GTK_CONTAINER(main_vb), separator); + + + /* Request table and frame */ + request_fr = gtk_frame_new("List of request methods"); + gtk_container_add(GTK_CONTAINER(main_vb), request_fr); + gtk_container_border_width(GTK_CONTAINER(request_fr), 0); + gtk_widget_show(request_fr); + + sp->request_box = gtk_vbox_new(FALSE, 10); + gtk_container_add(GTK_CONTAINER(request_fr), sp->request_box); + gtk_widget_show(sp->request_box); + + + /* Register this tap listener now */ + error_string = register_tap_listener("sip", + sp, + filter, + sipstat_reset, + sipstat_packet, + sipstat_draw); + if (error_string) + { + /* Error. We failed to attach to the tap. Clean up */ + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, error_string->str); + g_free(sp->filter); + g_free(sp); + g_string_free(error_string, TRUE); + return; + } + + /* If there was an existing dialog, destroy it */ + if (dlg) + { + gtk_widget_destroy(dlg); + } + + /* Display up-to-date contents */ + gtk_widget_show_all(sp->win); + sip_init_hash(sp); + retap_packets(&cfile); +} + + +/* Callback function for start button (filter dialog) */ +static void +sipstat_start_button_clicked(GtkWidget *item _U_, gpointer data _U_) +{ + GString *str; + char *filter; + + /* Will append "sip,stat," onto the front of every filter */ + str = g_string_new("sip,stat,"); + filter = (char *)gtk_entry_get_text(GTK_ENTRY(filter_entry)); + str = g_string_append(str, filter); + gtk_sipstat_init(str->str); + g_string_free(str, TRUE); +} + +/* Callback function for (filter) dialog being destroyed */ +static void +dlg_destroy_cb(void) +{ + dlg = NULL; +} + +/* Callback function for cancel button (filter dialog) */ +static void +dlg_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w) +{ + gtk_widget_destroy(GTK_WIDGET(parent_w)); +} + +/* Show the SIP stats dialog */ +static void +gtk_sipstat_cb(GtkWidget *w _U_, gpointer d _U_) +{ + GtkWidget *dlg_box; + GtkWidget *filter_box, *filter_label; + GtkWidget *bbox, *start_button, *cancel_button; + + /* If the window is already open, bring it to front */ + if (dlg) + { + gdk_window_raise(dlg->window); + return; + } + + /* Otherwise, create a new SIP stats dialog */ + dlg = dlg_window_new("Ethereal: Compute SIP statistics"); + + /* Set callback for destroy */ + SIGNAL_CONNECT(dlg, "destroy", dlg_destroy_cb, NULL); + + /* Create and show the empty filter dialog */ + dlg_box = gtk_vbox_new(FALSE, 10); + gtk_container_border_width(GTK_CONTAINER(dlg_box), 10); + gtk_container_add(GTK_CONTAINER(dlg), dlg_box); + gtk_widget_show(dlg_box); + + /* Filter box */ + filter_box = gtk_hbox_new(FALSE, 3); + + /* Filter label */ + filter_label = gtk_label_new("Filter:"); + gtk_box_pack_start(GTK_BOX(filter_box), filter_label, FALSE, FALSE, 0); + gtk_widget_show(filter_label); + + /* Filter entry */ + filter_entry = gtk_entry_new(); + WIDGET_SET_SIZE(filter_entry, 300, -1); + gtk_box_pack_start(GTK_BOX(filter_box), filter_entry, TRUE, TRUE, 0); + gtk_widget_show(filter_entry); + + gtk_box_pack_start(GTK_BOX(dlg_box), filter_box, TRUE, TRUE, 0); + gtk_widget_show(filter_box); + + /* 'Create stat' button */ + bbox = dlg_button_row_new(ETHEREAL_STOCK_CREATE_STAT, GTK_STOCK_CANCEL, NULL); + gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0); + gtk_widget_show(bbox); + + start_button = OBJECT_GET_DATA(bbox, ETHEREAL_STOCK_CREATE_STAT); + gtk_widget_grab_default(start_button); + SIGNAL_CONNECT_OBJECT(start_button, "clicked", + sipstat_start_button_clicked, NULL); + + /* Set callback for cancel button */ + cancel_button = OBJECT_GET_DATA(bbox, GTK_STOCK_CANCEL); + SIGNAL_CONNECT(cancel_button, "clicked", dlg_cancel_cb, dlg); + + /* Catch the "activate" signal on the filter text entry, so that + if the user types Return there, we act as if the "Create Stat" + button had been selected, as happens if Return is typed if + some widget that *doesn't* handle the Return key has the input + focus. */ + dlg_set_activate(filter_entry, start_button); + + /* Catch the "key_press_event" signal in the window, so that we can + catch the ESC key being pressed and act as if the "Cancel" button + had been selected. */ + dlg_set_cancel(dlg, cancel_button); + + /* Give the initial focus to the "Filter" entry box. */ + gtk_widget_grab_focus(filter_entry); + + /* Show everything now. */ + gtk_widget_show_all(dlg); +} + +/* Register this tap listener and add menu item. */ +void +register_tap_listener_gtksipstat(void) +{ + register_ethereal_tap("sip,stat,", gtk_sipstat_init); + + register_tap_menu_item("SIP", REGISTER_TAP_GROUP_NONE, + gtk_sipstat_cb, NULL, NULL, NULL); +} diff --git a/packet-sip.c b/packet-sip.c index 6401bf9b93..572e5c6da6 100644 --- a/packet-sip.c +++ b/packet-sip.c @@ -18,7 +18,7 @@ * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi> * Copyright 2001, Jean-Francois Mule <jfm@cablelabs.com> * - * $Id: packet-sip.c,v 1.60 2004/02/18 20:55:57 guy Exp $ + * $Id: packet-sip.c,v 1.61 2004/03/26 00:28:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -55,9 +55,14 @@ #include <glib.h> #include <epan/packet.h> +#include "packet-sip.h" +#include "tap.h" + #define TCP_PORT_SIP 5060 #define UDP_PORT_SIP 5060 +static gint sip_tap = -1; + /* Initialize the protocol and registered fields */ static gint proto_sip = -1; static gint proto_raw_sip = -1; @@ -369,12 +374,24 @@ static dissector_table_t media_type_dissector_table; #define SIP2_HDR "SIP/2.0" #define SIP2_HDR_LEN (strlen (SIP2_HDR)) +/* Store the info needed by the SIP tap for one packet */ +static sip_info_value_t *stat_info; + /* Code to actually dissect the packets */ static int dissect_sip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + /* Initialise stat info for passing to tap */ + stat_info = g_malloc(sizeof(sip_info_value_t)); + stat_info->response_code = 0; + stat_info->request_method = NULL; + if (!dissect_sip_common(tvb, pinfo, tree, FALSE)) return 0; + + /* Report this packet to the tap */ + tap_queue_packet(sip_tap, pinfo, stat_info); + return tvb_length(tvb); } @@ -815,6 +832,12 @@ dfilter_sip_request_line(tvbuff_t *tvb, proto_tree *tree, guint meth_len) */ string = tvb_get_string(tvb, 0, meth_len); proto_tree_add_string(tree, hf_Method, tvb, 0, meth_len, string); + + /* Copy request method for telling tap */ + stat_info->request_method = g_malloc(meth_len+1); + strncpy(stat_info->request_method, string, meth_len+1); + + /* String no longer needed */ g_free(string); } @@ -834,6 +857,9 @@ dfilter_sip_status_line(tvbuff_t *tvb, proto_tree *tree) string[3] = '\0'; proto_tree_add_string(tree, hf_Status_Code, tvb, SIP2_HDR_LEN + 1, 3, string); + + /* Add response code for sending to tap */ + stat_info->response_code = atoi(string); } /* From section 4.1 of RFC 2543: @@ -1484,21 +1510,24 @@ void proto_register_sip(void) "Disable it to allow SIP traffic with a different version " "to be dissected as SIP.", &strict_sip_version); + + /* Register for tapping */ + sip_tap = register_tap("sip"); } void proto_reg_handoff_sip(void) { - dissector_handle_t sip_handle, sip_tcp_handle; + dissector_handle_t sip_handle, sip_tcp_handle; - sip_handle = new_create_dissector_handle(dissect_sip, proto_sip); - dissector_add("udp.port", UDP_PORT_SIP, sip_handle); + sip_handle = new_create_dissector_handle(dissect_sip, proto_sip); + dissector_add("udp.port", UDP_PORT_SIP, sip_handle); dissector_add_string("media_type", "message/sip", sip_handle); - sip_tcp_handle = create_dissector_handle(dissect_sip_tcp, proto_sip); - dissector_add("tcp.port", TCP_PORT_SIP, sip_tcp_handle); + sip_tcp_handle = create_dissector_handle(dissect_sip_tcp, proto_sip); + dissector_add("tcp.port", TCP_PORT_SIP, sip_tcp_handle); - heur_dissector_add("udp", dissect_sip_heur, proto_sip); - heur_dissector_add("tcp", dissect_sip_heur, proto_sip); - heur_dissector_add("sctp", dissect_sip_heur, proto_sip); + heur_dissector_add("udp", dissect_sip_heur, proto_sip); + heur_dissector_add("tcp", dissect_sip_heur, proto_sip); + heur_dissector_add("sctp", dissect_sip_heur, proto_sip); } |