Do case insensitive search for lua scripts to load.

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

diff --git a/gtk/conversations_sctp.c b/gtk/conversations_sctp.c
index aa3458924a91304e1788861ed4693fa6440e0316..90a1795e932781f9f6023ccfd8bdbd654e261099 100644 (file)
--- a/gtk/conversations_sctp.c
+++ b/gtk/conversations_sctp.c
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -29,31 +29,34 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#include <string.h>
 
 #include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
-#include "../stat.h"
-#include "stat_menu.h"
+
+#include <epan/packet.h>
+#include <epan/stat_cmd_args.h>
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-sctp.h>
 
+#include "../stat_menu.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
 
 static int
 sctp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
        const struct _sctp_info *sctphdr=vip;
 
-       add_conversation_table_data((conversations_table *)pct, 
-               &sctphdr->ip_src, 
-               &sctphdr->ip_dst, 
-               sctphdr->sport, 
-               sctphdr->dport, 
-               1, 
-               pinfo->fd->pkt_len, 
-               SAT_NONE, 
+       add_conversation_table_data((conversations_table *)pct,
+               &sctphdr->ip_src,
+               &sctphdr->ip_dst,
+               sctphdr->sport,
+               sctphdr->dport,
+               1,
+               pinfo->fd->pkt_len,
+               &pinfo->fd->rel_ts,
+                SAT_NONE,
                PT_SCTP);
 
 
@@ -63,7 +66,7 @@ sctp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_,
 
 
 static void
-sctp_conversation_init(const char *optarg)
+sctp_conversation_init(const char *optarg, void* userdata _U_)
 {
        const char *filter=NULL;
 
@@ -77,21 +80,29 @@ sctp_conversation_init(const char *optarg)
 
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+sctp_conversation_cb(GtkAction *action _U_, gpointer user_data _U_)
+{
+       sctp_conversation_init("conv,sctp",NULL);
+}
+#else
 static void
 sctp_conversation_cb(GtkWidget *w _U_, gpointer d _U_)
 {
-       sctp_conversation_init("conv,sctp");
+       sctp_conversation_init("conv,sctp",NULL);
 }
-
+#endif
 
 void
 register_tap_listener_sctp_conversation(void)
 {
-       register_stat_cmd_arg("conv,sctp", sctp_conversation_init);
+       register_stat_cmd_arg("conv,sctp", sctp_conversation_init,NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else  
        register_stat_menu_item("SCTP", REGISTER_STAT_GROUP_CONVERSATION_LIST,
            sctp_conversation_cb, NULL, NULL, NULL);
-
+#endif
     register_conversation_table(FALSE, "SCTP", "sctp", NULL /*filter*/, sctp_conversation_packet);
 }