we can merge more than two files with mergecap

[obnox/wireshark/wip.git] / tap-sipstat.c

diff --git a/tap-sipstat.c b/tap-sipstat.c
index 3856f400c5921a34eeb5c05561a6fc93ca57ca0b..3bacac0911b8787fb8cd9e00b60c06601e5b5f72 100644 (file)
--- a/tap-sipstat.c
+++ b/tap-sipstat.c
@@ -1,7 +1,7 @@
 /* tap_sipstat.c
  * sip message counter for ethereal
  *
- * $Id: tap-sipstat.c,v 1.2 2004/05/01 21:34:24 guy Exp $
+ * $Id$
  * Copied from gtk/sip_stat.c and tap-httpstat.c
  *
  * Ethereal - Network traffic analyzer
@@ -35,10 +35,10 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
 #include "epan/value_string.h"
 #include "register.h"
-#include "packet-sip.h"
+#include <epan/dissectors/packet-sip.h>
 
 /* used to keep track of the statictics for an entire program interface */
 typedef struct _sip_stats_t {
@@ -217,9 +217,9 @@ sipstat_reset(void *psp  )
 
 /* Main entry point to SIP tap */
 static int
-sipstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, void *pri)
+sipstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri)
 {
-    sip_info_value_t *value=pri;
+    const sip_info_value_t *value=pri;
     sipstat_t *sp = (sipstat_t *)psp;
     
     /* Total number of packets, including continuation packets */