From 1d1f080733753e29ae9c7cb3a2c2da4620fc913b Mon Sep 17 00:00:00 2001 From: William Metcalf Date: Fri, 24 Jul 2009 16:12:16 -0500 Subject: [PATCH] Remove Libpcap GlobalVars from source-pcap.c --- src/source-pcap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/source-pcap.c b/src/source-pcap.c index 0af550af26..df8c2225b6 100644 --- a/src/source-pcap.c +++ b/src/source-pcap.c @@ -24,9 +24,6 @@ #include "tm-modules.h" #include "source-pcap.h" -typedef struct PcapGlobalVars_ { - void (*Decoder)(ThreadVars *, Packet *, u_int8_t *, u_int16_t, PacketQueue *); -} PcapGlobalVars; typedef struct PcapThreadVars_ { @@ -44,7 +41,6 @@ typedef struct PcapThreadVars_ ThreadVars *tv; } PcapThreadVars; -static PcapGlobalVars pcap_g = { NULL, }; int ReceivePcap(ThreadVars *, Packet *, void *, PacketQueue *); int ReceivePcapThreadInit(ThreadVars *, void *, void **); @@ -85,6 +81,7 @@ void PcapCallback(char *user, struct pcap_pkthdr *h, u_char *pkt) { Packet *p = tv->tmqh_in(tv); p->ts.tv_sec = h->ts.tv_sec; p->ts.tv_usec = h->ts.tv_usec; + ptv->pkts++; ptv->bytes += h->caplen;