From 51a9e36e10664ebe3f2fff0266c38771c5a761b5 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Wed, 1 Jul 2009 16:51:01 +0200 Subject: [PATCH] Remove vips references. Rename to eidps. --- configure.in | 2 +- src/Makefile.am | 10 +++++----- src/alert-debuglog.c | 4 ++-- src/alert-fastlog.c | 4 ++-- src/alert-unified-alert.c | 4 ++-- src/alert-unified-log.c | 4 ++-- src/config.c | 4 ++-- src/decode-ipv4.c | 2 +- src/decode-udp.h | 1 + src/detect-engine-address-ipv4.c | 2 ++ src/detect-engine-address-ipv6.c | 2 ++ src/detect-engine-iponly.c | 4 ++-- src/detect-engine.c | 2 +- src/detect-parse.c | 2 +- src/detect.c | 4 ++-- src/{vips.c => eidps.c} | 30 +++++++++++++++--------------- src/{vips.h => eidps.h} | 6 +++--- src/flow.c | 2 +- src/log-httplog.c | 4 ++-- src/packet-queue.c | 2 +- src/respond-reject-libnet11.c | 2 +- src/respond-reject.c | 2 +- src/source-nfq.c | 2 +- src/source-pcap-file.c | 2 +- src/source-pcap.c | 2 +- src/stream-tcp-reassemble.c | 2 +- src/stream-tcp-reassemble.h | 3 ++- src/stream-tcp.c | 3 ++- src/tm-modules.c | 2 +- src/tm-queuehandlers.c | 2 +- src/tm-queues.c | 2 +- src/tm-threads.c | 2 +- src/tmqh-nfq.c | 2 +- src/tmqh-packetpool.c | 2 +- src/tmqh-simple.c | 2 +- src/util-binsearch.c | 5 +++-- src/util-mpm-b2g.c | 2 +- src/util-mpm-b3g.c | 2 +- src/util-pool.h | 2 ++ src/util-time.c | 2 +- src/util-var-name.c | 2 +- src/util-var.c | 2 +- 42 files changed, 77 insertions(+), 67 deletions(-) rename src/{vips.c => eidps.c} (97%) rename src/{vips.h => eidps.h} (94%) diff --git a/configure.in b/configure.in index 5c4780a3ff..a4e1a5ff41 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_INIT(configure.in) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(vips, 0.1) +AM_INIT_AUTOMAKE(eidps, 0.1) AC_LANG_C AC_PROG_CC diff --git a/src/Makefile.am b/src/Makefile.am index 08b8ff9917..d6a5564425 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ -bin_PROGRAMS = vips -vips_SOURCES = vips.c vips.h \ +bin_PROGRAMS = eidps +eidps_SOURCES = eidps.c eidps.h \ config.c config.h \ packet-queue.c packet-queue.h \ threads.c threads.h \ @@ -96,7 +96,7 @@ respond-reject-libnet11.h respond-reject-libnet11.c INCLUDES= $(all_includes) # the library search path. -vips_LDFLAGS = $(all_libraries) -#vips_LDADD = -lnetfilter_queue -lpthread -lpcre -#vips_CFLAGS = -Wall -fno-strict-aliasing +eidps_LDFLAGS = $(all_libraries) +#eidps_LDADD = -lnetfilter_queue -lpthread -lpcre +#eidps_CFLAGS = -Wall -fno-strict-aliasing diff --git a/src/alert-debuglog.c b/src/alert-debuglog.c index 9be0bfc292..1bd59535a6 100644 --- a/src/alert-debuglog.c +++ b/src/alert-debuglog.c @@ -19,7 +19,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "debug.h" #include "detect.h" #include "flow.h" @@ -205,7 +205,7 @@ int AlertDebuglogThreadInit(ThreadVars *t, void *initdata, void **data) memset(aft, 0, sizeof(AlertDebuglogThread)); /* XXX */ - aft->fp = fopen("/var/log/eips/alert-debug.log", "w"); + aft->fp = fopen("/var/log/eidps/alert-debug.log", "w"); if (aft->fp == NULL) { return -1; } diff --git a/src/alert-fastlog.c b/src/alert-fastlog.c index a523f40703..7a0c5b41d0 100644 --- a/src/alert-fastlog.c +++ b/src/alert-fastlog.c @@ -23,7 +23,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "debug.h" #include "detect.h" #include "flow.h" @@ -156,7 +156,7 @@ int AlertFastlogThreadInit(ThreadVars *t, void *initdata, void **data) memset(aft, 0, sizeof(AlertFastlogThread)); /* XXX */ - aft->fp = fopen("/var/log/eips/fast.log", "w"); + aft->fp = fopen("/var/log/eidps/fast.log", "w"); if (aft->fp == NULL) { return -1; } diff --git a/src/alert-unified-alert.c b/src/alert-unified-alert.c index 93497579de..bd78931cbb 100644 --- a/src/alert-unified-alert.c +++ b/src/alert-unified-alert.c @@ -23,7 +23,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "debug.h" #include "detect.h" #include "flow.h" @@ -98,7 +98,7 @@ int AlertUnifiedAlertCreateFile(ThreadVars *t, AlertUnifiedAlertThread *aun) { gettimeofday(&ts, NULL); /* create the filename to use */ - snprintf(filename, sizeof(filename), "%s/%s.%u", "/var/log/eips", "unified.alert", (u_int32_t)ts.tv_sec); + snprintf(filename, sizeof(filename), "%s/%s.%u", "/var/log/eidps", "unified.alert", (u_int32_t)ts.tv_sec); /* XXX filename & location */ aun->fp = fopen(filename, "wb"); diff --git a/src/alert-unified-log.c b/src/alert-unified-log.c index d32ae30773..932d7804ff 100644 --- a/src/alert-unified-log.c +++ b/src/alert-unified-log.c @@ -23,7 +23,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "debug.h" #include "detect.h" #include "flow.h" @@ -100,7 +100,7 @@ int AlertUnifiedLogCreateFile(ThreadVars *t, AlertUnifiedLogThread *aun) { gettimeofday(&ts, NULL); /* create the filename to use */ - snprintf(filename, sizeof(filename), "%s/%s.%u", "/var/log/eips", "unified.log", (u_int32_t)ts.tv_sec); + snprintf(filename, sizeof(filename), "%s/%s.%u", "/var/log/eidps", "unified.log", (u_int32_t)ts.tv_sec); /* XXX filename & location */ aun->fp = fopen(filename, "wb"); diff --git a/src/config.c b/src/config.c index 072c97ab61..6914c66ed4 100644 --- a/src/config.c +++ b/src/config.c @@ -15,7 +15,7 @@ #include -#include "vips.h" +#include "eidps.h" static pcre *config_pcre = NULL; static pcre_extra *config_pcre_extra = NULL; @@ -34,7 +34,7 @@ int LoadConfig ( void ) { #define MAX_SUBSTRINGS 30 int ov[MAX_SUBSTRINGS]; - FILE *fp = fopen("vips.conf", "r"); + FILE *fp = fopen("eidps.conf", "r"); if (fp == NULL) printf("ERROR: fopen failed %s\n", strerror(errno)); diff --git a/src/decode-ipv4.c b/src/decode-ipv4.c index 52f513c9a0..35d60ab825 100644 --- a/src/decode-ipv4.c +++ b/src/decode-ipv4.c @@ -1,6 +1,6 @@ /* Copyright (c) 2008 Victor Julien */ -#include "vips.h" +#include "eidps.h" #include "packet-queue.h" #include "decode.h" #include "decode-ipv4.h" diff --git a/src/decode-udp.h b/src/decode-udp.h index 06e0a26ef6..371a05c95b 100644 --- a/src/decode-udp.h +++ b/src/decode-udp.h @@ -5,6 +5,7 @@ #define UDP_HEADER_LEN 8 +/* XXX RAW* needs to be really 'raw', so no ntohs there */ #define UDP_GET_RAW_LEN(udph) ntohs((udph)->uh_len) #define UDP_GET_RAW_SRC_PORT(udph) ntohs((udph)->uh_sport) #define UDP_GET_RAW_DST_PORT(udph) ntohs((udph)->uh_dport) diff --git a/src/detect-engine-address-ipv4.c b/src/detect-engine-address-ipv4.c index 10686cb047..2d10eb16a3 100644 --- a/src/detect-engine-address-ipv4.c +++ b/src/detect-engine-address-ipv4.c @@ -1,6 +1,8 @@ /* Address part of the detection engine. * * Copyright (c) 2008 Victor Julien + * + * XXX we need to unit test the hell out of this code */ #include "decode.h" diff --git a/src/detect-engine-address-ipv6.c b/src/detect-engine-address-ipv6.c index 75e5c9e683..89a6a43600 100644 --- a/src/detect-engine-address-ipv6.c +++ b/src/detect-engine-address-ipv6.c @@ -1,6 +1,8 @@ /* Address part of the detection engine. * * Copyright (c) 2008 Victor Julien + * + * XXX unit test the join code */ #include "decode.h" diff --git a/src/detect-engine-iponly.c b/src/detect-engine-iponly.c index 88b355492b..f8de0f39eb 100644 --- a/src/detect-engine-iponly.c +++ b/src/detect-engine-iponly.c @@ -1,6 +1,6 @@ /* ip only part of the detection engine */ -/* TODO: needs a lot of work +/* TODO: needs a lot of work, for example IPv6 support * * The dificulty with ip only matching is that we need to support (very large) * netblocks as well. So we can't just add every single ip to a hash as that @@ -9,7 +9,7 @@ * we split it into /16's. */ -#include "vips.h" +#include "eidps.h" #include "debug.h" #include "detect.h" #include "flow.h" diff --git a/src/detect-engine.c b/src/detect-engine.c index a461110000..114ae68b3d 100644 --- a/src/detect-engine.c +++ b/src/detect-engine.c @@ -1,6 +1,6 @@ /* Copyright (C) 2008 by Victor Julien */ -#include "vips.h" +#include "eidps.h" #include "debug.h" #include "detect.h" #include "flow.h" diff --git a/src/detect-parse.c b/src/detect-parse.c index 11ed3429d1..62af782c2f 100644 --- a/src/detect-parse.c +++ b/src/detect-parse.c @@ -2,7 +2,7 @@ #include -#include "vips.h" +#include "eidps.h" #include "debug.h" #include "detect.h" diff --git a/src/detect.c b/src/detect.c index 029aa5c293..694e76a8b4 100644 --- a/src/detect.c +++ b/src/detect.c @@ -2,7 +2,7 @@ #include -#include "vips.h" +#include "eidps.h" #include "debug.h" #include "detect.h" #include "flow.h" @@ -278,7 +278,7 @@ void SigLoadSignatures (void) //FILE *fp = fopen("/home/victor/rules/iponly.rules", "r"); //FILE *fp = fopen("/home/victor/rules/iponly-small.rules", "r"); //FILE *fp = fopen("/home/victor/rules/all.rules", "r"); - //FILE *fp = fopen("/home/victor/rules/vips-http.sigs", "r"); + //FILE *fp = fopen("/home/victor/rules/eidps.http.sigs", "r"); //FILE *fp = fopen("/home/victor/rules/emerging-dshield.rules", "r"); FILE *fp = fopen("/home/victor/rules/emerging-all.rules", "r"); //FILE *fp = fopen("/home/victor/rules/emerging-web.rules", "r"); diff --git a/src/vips.c b/src/eidps.c similarity index 97% rename from src/vips.c rename to src/eidps.c index 6e0282fda8..4e13a0d342 100644 --- a/src/vips.c +++ b/src/eidps.c @@ -14,7 +14,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "decode.h" #include "detect.h" #include "packet-queue.h" @@ -73,17 +73,17 @@ static int sigint_count = 0; static int sighup_count = 0; static int sigterm_count = 0; -#define VIPS_SIGINT 0x01 -#define VIPS_SIGHUP 0x02 -#define VIPS_SIGTERM 0x04 -#define VIPS_STOP 0x08 -#define VIPS_KILL 0x10 +#define EIDPS_SIGINT 0x01 +#define EIDPS_SIGHUP 0x02 +#define EIDPS_SIGTERM 0x04 +#define EIDPS_STOP 0x08 +#define EIDPS_KILL 0x10 static u_int8_t sigflags = 0; -static void handle_sigint(/*@unused@*/ int sig) { sigint_count = 1; sigflags |= VIPS_SIGINT; } -static void handle_sigterm(/*@unused@*/ int sig) { sigterm_count = 1; sigflags |= VIPS_SIGTERM; } -static void handle_sighup(/*@unused@*/ int sig) { sighup_count = 1; sigflags |= VIPS_SIGHUP; } +static void handle_sigint(/*@unused@*/ int sig) { sigint_count = 1; sigflags |= EIDPS_SIGINT; } +static void handle_sigterm(/*@unused@*/ int sig) { sigterm_count = 1; sigflags |= EIDPS_SIGTERM; } +static void handle_sighup(/*@unused@*/ int sig) { sighup_count = 1; sigflags |= EIDPS_SIGHUP; } static void setup_signal_handler(int sig, void (*handler)()) @@ -191,11 +191,11 @@ Packet *TunnelPktSetup(ThreadVars *t, Packet *parent, u_int8_t *pkt, u_int16_t l function. Purpose: pcap file mode needs to be able to tell the engine the file eof is reached. */ void EngineStop(void) { - sigflags |= VIPS_STOP; + sigflags |= EIDPS_STOP; } void EngineKill(void) { - sigflags |= VIPS_KILL; + sigflags |= EIDPS_KILL; } int RunModeIdsPcap(char *iface) { @@ -867,7 +867,7 @@ int main(int argc, char **argv) if (sigflags) { printf("signal received\n"); - if (sigflags & VIPS_SIGINT || sigflags & VIPS_STOP) { + if (sigflags & EIDPS_SIGINT || sigflags & EIDPS_STOP) { printf ("SIGINT or EngineStop received\n"); /* Stop the engine so it quits after processing the pcap file @@ -875,7 +875,7 @@ int main(int argc, char **argv) * threads. */ char done = 0; do { - if (sigflags & VIPS_SIGTERM || sigflags & VIPS_KILL) + if (sigflags & EIDPS_SIGTERM || sigflags & EIDPS_KILL) break; mutex_lock(&mutex_pending); @@ -890,8 +890,8 @@ int main(int argc, char **argv) printf("main: all packets processed by threads, stopping engine\n"); } - if (sigflags & VIPS_SIGHUP) printf ("SIGHUP\n"); - if (sigflags & VIPS_SIGTERM) printf ("SIGTERM\n"); + if (sigflags & EIDPS_SIGHUP) printf ("SIGHUP\n"); + if (sigflags & EIDPS_SIGTERM) printf ("SIGTERM\n"); struct timeval end_time; memset(&end_time, 0, sizeof(end_time)); diff --git a/src/vips.h b/src/eidps.h similarity index 94% rename from src/vips.h rename to src/eidps.h index ea62ecdd7f..4e49d36e6c 100644 --- a/src/vips.h +++ b/src/eidps.h @@ -6,8 +6,8 @@ * */ -#ifndef __VIPS_H__ -#define __VIPS_H__ +#ifndef __EIDPS_H__ +#define __EIDPS_H__ #include "packet-queue.h" @@ -48,5 +48,5 @@ u_int8_t g_u8_lowercasetable[256]; //#define u8_tolower(c) ((c) >= 'A' && (c) <= 'Z') ? ((c) + ('a' - 'A')) : (c) -#endif /* __VIPS_H__ */ +#endif /* __EIDPS_H__ */ diff --git a/src/flow.c b/src/flow.c index 61134cbfe6..486c8e27c2 100644 --- a/src/flow.c +++ b/src/flow.c @@ -1,6 +1,6 @@ /* Copyright (c) 2008 Victor Julien */ -#include "vips.h" +#include "eidps.h" #include "debug.h" #include "decode.h" #include "threads.h" diff --git a/src/log-httplog.c b/src/log-httplog.c index 9d6e1ca213..1f978d6387 100644 --- a/src/log-httplog.c +++ b/src/log-httplog.c @@ -15,7 +15,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "debug.h" #include "detect.h" #include "pkt-var.h" @@ -181,7 +181,7 @@ int LogHttplogThreadInit(ThreadVars *t, void *initdata, void **data) memset(aft, 0, sizeof(LogHttplogThread)); /* XXX */ - aft->fp = fopen("/var/log/eips/http.log", "w"); + aft->fp = fopen("/var/log/eidps/http.log", "w"); if (aft->fp == NULL) { return -1; } diff --git a/src/packet-queue.c b/src/packet-queue.c index 492eb5e728..9e30e3eb59 100644 --- a/src/packet-queue.c +++ b/src/packet-queue.c @@ -1,6 +1,6 @@ /* Copyright (c) 2008 Victor Julien */ -#include "vips.h" +#include "eidps.h" #include "decode.h" #include "packet-queue.h" #include "threads.h" diff --git a/src/respond-reject-libnet11.c b/src/respond-reject-libnet11.c index 66173da7e2..3dfa1daae7 100644 --- a/src/respond-reject-libnet11.c +++ b/src/respond-reject-libnet11.c @@ -18,7 +18,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "decode.h" #include "decode-ipv4.h" #include "decode-tcp.h" diff --git a/src/respond-reject.c b/src/respond-reject.c index 54ff190cc1..f126d12b3e 100644 --- a/src/respond-reject.c +++ b/src/respond-reject.c @@ -15,7 +15,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "decode.h" #include "packet-queue.h" #include "threads.h" diff --git a/src/source-nfq.c b/src/source-nfq.c index a3db1c9a01..def85e944b 100644 --- a/src/source-nfq.c +++ b/src/source-nfq.c @@ -10,7 +10,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "decode.h" #include "packet-queue.h" #include "threads.h" diff --git a/src/source-pcap-file.c b/src/source-pcap-file.c index 3597b9c1bb..03b498522d 100644 --- a/src/source-pcap-file.c +++ b/src/source-pcap-file.c @@ -10,7 +10,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "decode.h" #include "packet-queue.h" #include "threads.h" diff --git a/src/source-pcap.c b/src/source-pcap.c index 19d98dca8a..e7fb067de6 100644 --- a/src/source-pcap.c +++ b/src/source-pcap.c @@ -10,7 +10,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "decode.h" #include "packet-queue.h" #include "threads.h" diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c index 144b5448c6..555444c0d6 100644 --- a/src/stream-tcp-reassemble.c +++ b/src/stream-tcp-reassemble.c @@ -16,7 +16,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "debug.h" #include "detect.h" #include "flow.h" diff --git a/src/stream-tcp-reassemble.h b/src/stream-tcp-reassemble.h index 50d0feb492..bc1987d7aa 100644 --- a/src/stream-tcp-reassemble.h +++ b/src/stream-tcp-reassemble.h @@ -3,7 +3,8 @@ #ifndef __STREAM_TCP_REASSEMBLE_H__ #define __STREAM_TCP_REASSEMBLE_H__ -/* XXX */ +int StreamTcpReassembleHandleSegment (TcpSession *ssn, TcpStream *stream, Packet *p); +int StreamTcpReassembleInit(void); #endif /* __STREAM_TCP_REASSEMBLE_H__ */ diff --git a/src/stream-tcp.c b/src/stream-tcp.c index b1d2cac9f8..60ff9e2074 100644 --- a/src/stream-tcp.c +++ b/src/stream-tcp.c @@ -11,7 +11,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "debug.h" #include "detect.h" #include "flow.h" @@ -24,6 +24,7 @@ #include "util-unittest.h" #include "stream-tcp-private.h" +#include "stream-tcp-reassemble.h" int StreamTcp (ThreadVars *, Packet *, void *, PacketQueue *); int StreamTcpThreadInit(ThreadVars *, void *, void **); diff --git a/src/tm-modules.c b/src/tm-modules.c index f437712dba..369091dedd 100644 --- a/src/tm-modules.c +++ b/src/tm-modules.c @@ -1,6 +1,6 @@ /* Copyright (c) 2008 Victor Julien */ -#include "vips.h" +#include "eidps.h" #include "tm-modules.h" TmModule tmm_modules[TMM_SIZE]; diff --git a/src/tm-queuehandlers.c b/src/tm-queuehandlers.c index 6ca23c7b7e..09362ead71 100644 --- a/src/tm-queuehandlers.c +++ b/src/tm-queuehandlers.c @@ -1,6 +1,6 @@ /* Copyright (c) 2008 Victor Julien */ -#include "vips.h" +#include "eidps.h" #include "packet-queue.h" #include "decode.h" #include "threads.h" diff --git a/src/tm-queues.c b/src/tm-queues.c index 8cb68256d3..eb96616e99 100644 --- a/src/tm-queues.c +++ b/src/tm-queues.c @@ -1,4 +1,4 @@ -#include "vips.h" +#include "eidps.h" #include "threads.h" #include "tm-queues.h" diff --git a/src/tm-threads.c b/src/tm-threads.c index e395a6f376..cc91ffb285 100644 --- a/src/tm-threads.c +++ b/src/tm-threads.c @@ -6,7 +6,7 @@ #include #include /* for sched_setaffinity(2) */ -#include "vips.h" +#include "eidps.h" #include "threadvars.h" #include "tm-queues.h" #include "tm-queuehandlers.h" diff --git a/src/tmqh-nfq.c b/src/tmqh-nfq.c index aaac01ea62..c35e78f4cc 100644 --- a/src/tmqh-nfq.c +++ b/src/tmqh-nfq.c @@ -1,6 +1,6 @@ /* Copyright (c) 2008 Victor Julien */ -#include "vips.h" +#include "eidps.h" #include "packet-queue.h" #include "decode.h" #include "threads.h" diff --git a/src/tmqh-packetpool.c b/src/tmqh-packetpool.c index 37d74e3595..08b0933f94 100644 --- a/src/tmqh-packetpool.c +++ b/src/tmqh-packetpool.c @@ -1,6 +1,6 @@ /* Packetpool queue handlers */ -#include "vips.h" +#include "eidps.h" #include "packet-queue.h" #include "decode.h" #include "threads.h" diff --git a/src/tmqh-simple.c b/src/tmqh-simple.c index ce315c334b..6daa91dd77 100644 --- a/src/tmqh-simple.c +++ b/src/tmqh-simple.c @@ -1,5 +1,5 @@ -#include "vips.h" +#include "eidps.h" #include "packet-queue.h" #include "decode.h" #include "threads.h" diff --git a/src/util-binsearch.c b/src/util-binsearch.c index 409236f930..704969213b 100644 --- a/src/util-binsearch.c +++ b/src/util-binsearch.c @@ -2,6 +2,8 @@ #include #include +/* XXX replace this by a better algo */ + u_int8_t nocasetable[256]; #define _nc(c) nocasetable[(c)] @@ -25,8 +27,7 @@ void BinSearchInit (void) #endif /* DEBUG */ } -/* Caseless binary search. More expensive that the one that - * respects case. +/* Binary search. * * Returns: * - ptr to start of the match diff --git a/src/util-mpm-b2g.c b/src/util-mpm-b2g.c index 57a7578eaa..79119d4471 100644 --- a/src/util-mpm-b2g.c +++ b/src/util-mpm-b2g.c @@ -20,7 +20,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "detect.h" #include "util-bloomfilter.h" #include "util-mpm-b2g.h" diff --git a/src/util-mpm-b3g.c b/src/util-mpm-b3g.c index 1da3890033..acc180cb55 100644 --- a/src/util-mpm-b3g.c +++ b/src/util-mpm-b3g.c @@ -18,7 +18,7 @@ #include #include -#include "vips.h" +#include "eidps.h" #include "util-bloomfilter.h" #include "util-mpm-b3g.h" diff --git a/src/util-pool.h b/src/util-pool.h index 460a7a3230..748b40081b 100644 --- a/src/util-pool.h +++ b/src/util-pool.h @@ -26,7 +26,9 @@ typedef struct _Pool { Pool* PoolInit(u_int32_t, u_int32_t, void *(*Alloc)(void *), void *, void (*Free)(void *)); void PoolFree(Pool *); void PoolPrint(Pool *); + void *PoolGet(Pool *); +void PoolReturn(Pool *, void *); void PoolRegisterTests(void); diff --git a/src/util-time.c b/src/util-time.c index 61792ec030..2cb5057193 100644 --- a/src/util-time.c +++ b/src/util-time.c @@ -1,6 +1,6 @@ /* Time keeping for offline (non-live) packet handling (pcap files) */ -#include "vips.h" +#include "eidps.h" #include "detect.h" #include "threads.h" diff --git a/src/util-var-name.c b/src/util-var-name.c index 6157f92f48..07570632d0 100644 --- a/src/util-var-name.c +++ b/src/util-var-name.c @@ -1,4 +1,4 @@ -#include "vips.h" +#include "eidps.h" #include "detect.h" #include "util-hashlist.h" diff --git a/src/util-var.c b/src/util-var.c index ab799447d4..01f75ba612 100644 --- a/src/util-var.c +++ b/src/util-var.c @@ -1,4 +1,4 @@ -#include "vips.h" +#include "eidps.h" #include "detect.h" #include "util-var.h"