Fix the wireless settings button for AirPCap devices in the
[obnox/wireshark/wip.git] / gtk / conversations_tcpip.c
index 1cbd3d4adc55549c633eb3b1ff0dbea5dfd198b3..38a27095a84f116574426b35ee71e1a62d37a23b 100644 (file)
@@ -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
 #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 <epan/packet.h>
 #include <epan/stat_cmd_args.h>
-#include "../stat_menu.h"
-#include "gtk_stat_menu.h"
 #include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
 #include <epan/dissectors/packet-tcp.h>
 
+#include "../stat_menu.h"
+
+#include "gtk/gui_stat_menu.h"
+#include "gtk/conversations_table.h"
 
 static int
 tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
        const struct tcpheader *tcphdr=vip;
 
-       add_conversation_table_data((conversations_table *)pct, &tcphdr->ip_src, &tcphdr->ip_dst, tcphdr->th_sport, tcphdr->th_dport, 1, pinfo->fd->pkt_len, SAT_NONE, PT_TCP);
+       add_conversation_table_data((conversations_table *)pct, &tcphdr->ip_src, &tcphdr->ip_dst, tcphdr->th_sport, tcphdr->th_dport, 1, pinfo->fd->pkt_len, &pinfo->fd->rel_ts, SAT_NONE, PT_TCP);
 
        return 1;
 }
@@ -55,7 +56,7 @@ tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_
 
 
 static void
-tcpip_conversation_init(const char *optarg)
+tcpip_conversation_init(const char *optarg, void* userdata _U_)
 {
        const char *filter=NULL;
 
@@ -69,21 +70,30 @@ tcpip_conversation_init(const char *optarg)
 
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+tcpip_conversation_cb(GtkAction *action _U_, gpointer user_data _U_)
+{
+       tcpip_conversation_init("conv,tcp",NULL);
+}
+#else
 static void
 tcpip_conversation_cb(GtkWidget *w _U_, gpointer d _U_)
 {
-       tcpip_conversation_init("conv,tcp");
+       tcpip_conversation_init("conv,tcp",NULL);
 }
-
+#endif
 
 void
 register_tap_listener_tcpip_conversation(void)
 {
-       register_stat_cmd_arg("conv,tcp", tcpip_conversation_init);
+       register_stat_cmd_arg("conv,tcp", tcpip_conversation_init,NULL);
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else  
        register_stat_menu_item("TCP (IPv4 & IPv6)", REGISTER_STAT_GROUP_CONVERSATION_LIST,
            tcpip_conversation_cb, NULL, NULL, NULL);
+#endif
 
        register_conversation_table(FALSE, "TCP", "tcp", NULL /*filter*/, tcpip_conversation_packet);
 }