Rename to Suricata.

configure.in

@@ -3,7 +3,7 @@
 AC_INIT(configure.in)
 
     AM_CONFIG_HEADER(config.h)
-    AM_INIT_AUTOMAKE(eidps, 0.1)
+    AM_INIT_AUTOMAKE(suricata, 0.1)
 
     AC_LANG_C
     AC_PROG_CC_C99

src/Makefile.am

@@ -1,5 +1,5 @@
-bin_PROGRAMS = eidps
-eidps_SOURCES = eidps.c eidps.h \
+bin_PROGRAMS = suricata
+suricata_SOURCES = suricata.c suricata.h \
 runmodes.c runmodes.h \
 packet-queue.c packet-queue.h \
 threads.c threads.h \
@@ -86,6 +86,7 @@ detect-ttl.c detect-ttl.h \
 detect-itype.c detect-itype.h \
 detect-icode.c detect-icode.h \
 detect-http-cookie.c detect-http-cookie.h \
+detect-tls-version.c detect-tls-version.h \
 util-print.c util-print.h \
 util-mpm.c util-mpm.h \
 util-binsearch.c util-binsearch.h \
@@ -110,6 +111,7 @@ util-enum.c util-enum.h \
 util-radix-tree.c util-radix-tree.h \
 util-host-os-info.c util-host-os-info.h \
 util-rule-vars.c util-rule-vars.h \
+util-fix_checksum.c util-fix_checksum.h \
 tm-modules.c tm-modules.h \
 tm-queues.c tm-queues.h \
 tm-queuehandlers.c tm-queuehandlers.h \
@@ -120,35 +122,33 @@ tmqh-packetpool.c tmqh-packetpool.h \
 tmqh-flow.c tmqh-flow.h \
 alert-fastlog.c alert-fastlog.h \
 alert-debuglog.c alert-debuglog.h \
-log-httplog.c log-httplog.h \
 alert-unified-log.c alert-unified-log.h \
 alert-unified-alert.c alert-unified-alert.h \
 alert-unified2-alert.c alert-unified2-alert.h \
+log-httplog.c log-httplog.h \
 stream.c stream.h \
 stream-tcp.c stream-tcp.h stream-tcp-private.h \
 stream-tcp-reassemble.c stream-tcp-reassemble.h \
 respond-reject.c respond-reject.h \
 respond-reject-libnet11.h respond-reject-libnet11.c \
+conf.c conf.h \
+conf-yaml-loader.c conf-yaml-loader.h \
 counters.c counter.h \
 app-layer.c app-layer.h \
 app-layer-detect-proto.c app-layer-detect-proto.h \
 app-layer-parser.c app-layer-parser.h \
+app-layer-protos.h \
+app-layer-htp.c app-layer-htp.h \
 app-layer-tls.c app-layer-tls.h \
 app-layer-smb.c app-layer-smb.h \
 app-layer-dcerpc.c app-layer-dcerpc.h \
-detect-tls-version.c detect-tls-version.h \
-app-layer-protos.h \
-conf.c conf.h \
-conf-yaml-loader.c conf-yaml-loader.h \
-util-fix_checksum.c util-fix_checksum.h \
-defrag.c defrag.h \
-app-layer-htp.c app-layer-htp.h
+defrag.c defrag.h
 
 # set the include path found by configure
 INCLUDES= $(all_includes)
 
 # the library search path.
-eidps_LDFLAGS = $(all_libraries) 
-#eidps_LDADD = -lnetfilter_queue -lpthread -lpcre 
-#eidps_CFLAGS = -Wall -fno-strict-aliasing 
+suricata_LDFLAGS = $(all_libraries) 
+#suricata_LDADD = -lnetfilter_queue -lpthread -lpcre 
+#suricata_CFLAGS = -Wall -fno-strict-aliasing 
 

src/alert-debuglog.c

@@ -8,7 +8,7 @@
  *   - maybe by accessing it just and hoping threading doesn't hurt
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"

src/alert-fastlog.c

@@ -12,7 +12,7 @@
  * - Print [drop] as well if appropriate
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"

src/alert-unified-alert.c

@@ -12,7 +12,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"

src/alert-unified-log.c

@@ -12,7 +12,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"

src/alert-unified2-alert.c

@@ -4,7 +4,7 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"

src/app-layer-dcerpc.c

@@ -4,7 +4,7 @@
  *
  * \author Kirby Kuehl <kkuehl@gmail.com>
  */
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "debug.h"
 #include "decode.h"

src/app-layer-detect-proto.c

@@ -11,7 +11,7 @@
  *  \todo Fall back to port based classification if other detection fails.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "threads.h"

src/app-layer-detect.c

@@ -1,4 +1,4 @@
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "app-layer-detect.h"
 
 /** \brief alloc a app layer detection ctx

src/app-layer-detect.h

@@ -1,4 +1,4 @@
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 #include "app-layer-protos.h"

src/app-layer-htp.c

@@ -8,7 +8,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "threads.h"

src/app-layer-http.c

@@ -1,6 +1,6 @@
 /* Copyright (c) 2009 Victor Julien */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "threads.h"

src/app-layer-parser.c

@@ -1,6 +1,6 @@
 /* Copyright (c) 2009 Victor Julien */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "util-unittest.h"
 #include "decode.h"

src/app-layer-smb.c

@@ -4,7 +4,7 @@
  *
  * \author Kirby Kuehl <kkuehl@gmail.com>
  */
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "debug.h"
 #include "decode.h"

src/app-layer-smb2.c

@@ -4,7 +4,7 @@
  *
  * \author Kirby Kuehl <kkuehl@gmail.com>
  */
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "debug.h"
 #include "decode.h"

src/app-layer-tls.c

@@ -1,6 +1,6 @@
 /* Copyright (c) 2009 Victor Julien */
 /** \todo support for the newly find TLS handshake GAP vulnerbility */
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "threads.h"

src/app-layer.c

@@ -1,4 +1,4 @@
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "app-layer.h"
 #include "stream-tcp-private.h"
 #include "util-debug.h"

src/conf-yaml-loader.c

@@ -9,7 +9,7 @@
  */
 
 #include <yaml.h>
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "conf.h"
 #include "util-debug.h"
 #include "util-unittest.h"

src/conf.c

@@ -14,7 +14,7 @@
  * \todo Consider using HashListTable to allow easy dumping of all data.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "conf.h"
 #include "util-hash.h"
 #include "util-unittest.h"

src/conf.h

@@ -26,7 +26,7 @@ typedef struct ConfNode_ {
 /**
  * The default log directory.
  */
-#define DEFAULT_LOG_DIR "/var/log/eidps"
+#define DEFAULT_LOG_DIR "/var/log/suricata"
 
 void ConfInit(void);
 int ConfGet(char *name, char **vptr);

src/counters.c

@@ -2,8 +2,8 @@
  *  \author Anoop Saldanha <poonaatsoc@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "counters.h"
 #include "threadvars.h"
 #include "tm-modules.h"

src/decode-ethernet.c

@@ -1,6 +1,6 @@
 /* Copyright (c) 2009 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "decode-ethernet.h"
 #include "decode-events.h"

src/decode-gre.c

@@ -3,8 +3,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "decode-events.h"
 #include "decode-gre.h"

src/decode-icmpv4.c

@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "decode-events.h"

src/decode-icmpv6.c

@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode-icmpv6.h"
 #include "decode.h"
 #include "decode-tcp.h"

src/decode-icmpv6.h

@@ -1,10 +1,11 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
+#ifndef __DECODE_ICMPV6_H__
+#define __DECODE_ICMPV6_H__
+
 #include "decode-tcp.h"
 #include "decode-udp.h"
 #include "decode-ipv6.h"
-#ifndef __DECODE_ICMPV6_H__
-#define __DECODE_ICMPV6_H__
 
 #define ICMPV6_HEADER_LEN       8
 #define ICMPV6_HEADER_PKT_OFFSET 8

src/decode-ipv4.c

@@ -4,7 +4,7 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "packet-queue.h"
 #include "decode.h"
 #include "decode-ipv4.h"

src/decode-ipv6.c

@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "decode-ipv6.h"
 #include "decode-icmpv6.h"

src/decode-ppp.c

@@ -1,7 +1,7 @@
 /** Copyright (c) 2009 Open Information Security Foundation
  *  \author Breno Silva Pinto <breno.silva@gmail.com> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "decode-ppp.h"
 #include "decode-events.h"

src/decode-pppoe.c

@@ -5,7 +5,7 @@
  * \brief PPPOE Decoder
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "packet-queue.h"
 

src/decode-sll.c

@@ -1,6 +1,6 @@
 /* Copyright (c) 2009 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "decode-sll.h"
 #include "decode-events.h"

src/decode-tcp.c

@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "decode-tcp.h"
 #include "decode-events.h"

src/decode-udp.c

@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "decode-udp.h"
 #include "decode-events.h"

src/decode.c

@@ -2,7 +2,7 @@
 
 /* Decode the raw packet */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "util-debug.h"
 

src/defrag.c

@@ -20,7 +20,7 @@
 
 #include "queue.h"
 
-#include "eidps.h"
+#include "suricata.h"
 #include "threads.h"
 #include "conf.h"
 #include "decode-ipv6.h"

src/detect-ack.c

@@ -7,7 +7,7 @@
  * Implements the "ack" keyword.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-bytejump.c

@@ -3,7 +3,7 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-bytetest.c

@@ -3,7 +3,7 @@
  * \author Brian Rectanus <brectanu@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-classtype.c

@@ -1,6 +1,6 @@
 /* CLASSTYPE part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-content.c

@@ -34,7 +34,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "detect-content.h"

src/detect-csum.c

@@ -5,7 +5,7 @@
  * Checksum keyword for the the detection engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-decode-event.c

@@ -3,8 +3,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-depth.c

@@ -1,6 +1,6 @@
 /* DEPTH part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-distance.c

@@ -1,6 +1,6 @@
 /* DISTANCE part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-dsize.c

@@ -5,7 +5,7 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-engine-address-ipv4.c

@@ -5,7 +5,7 @@
  * XXX we need to unit test the hell out of this code
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "detect.h"

src/detect-engine-address-ipv6.c

@@ -5,7 +5,7 @@
  * XXX unit test the join code
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "detect.h"

src/detect-engine-address.c

@@ -8,7 +8,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-engine-iponly.c

@@ -9,7 +9,7 @@
  * we split it into /16's.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"

src/detect-engine-mpm.c

@@ -1,6 +1,6 @@
 /* Multi pattern matcher */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "detect.h"

src/detect-engine-port.c

@@ -8,7 +8,7 @@
  * - more unittesting
  * */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-engine-proto.c

@@ -4,7 +4,7 @@
  *
  * TODO move this out of the detection plugin structure */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "detect.h"

src/detect-engine-siggroup.c

@@ -2,7 +2,7 @@
  *  \author Victor Julien <victor@inliniac.net>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-engine-sigorder.c

@@ -7,7 +7,7 @@
 #include <string.h>
 #include <pcre.h>
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 #include "detect-flowbits.h"
 #include "detect-engine-sigorder.h"

src/detect-engine.c

@@ -1,6 +1,6 @@
 /* Copyright (C) 2008 by Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"

src/detect-fast-pattern.c

@@ -2,7 +2,7 @@
  *  \author Anoop Saldanha <poonaatsoc@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 #include "flow.h"
 #include "detect-content.h"

src/detect-flags.c

@@ -4,8 +4,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-flow.c

@@ -5,7 +5,7 @@
  * FLOW part of the detection engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-flowbits.c

@@ -5,7 +5,7 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "threads.h"

src/detect-flowint.c

@@ -5,7 +5,7 @@
  * Keyword: flowint
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "threads.h"

src/detect-flowvar.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2008 by Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "detect-content.h"

src/detect-fragbits.c

@@ -4,8 +4,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-gid.c

@@ -4,8 +4,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-http-cookie.c

@@ -4,7 +4,7 @@
  *
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "threads.h"
 #include "debug.h"
 #include "decode.h"
@@ -439,4 +439,4 @@ void DetectHttpCookieRegisterTests (void)
     UtRegisterTest("DetectHttpCookieSigTest01", DetectHttpCookieSigTest01, 1);
 #endif /* UNITTESTS */
 
-}
+}

src/detect-icode.c

@@ -7,7 +7,7 @@
  * "icode" keyword support
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-id.c

@@ -7,7 +7,7 @@
  * "id" keyword, IPv4 Identifier keyword, part of the detection engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-ipopts.c

@@ -4,8 +4,8 @@
  *  \author Breno Silva <breno.silva@gmail.com>
  */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-ipproto.c

@@ -7,7 +7,7 @@
 
 #include <netdb.h>
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-isdataat.c

@@ -5,7 +5,7 @@
  * ISDATAAT part of the detection engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-itype.c

@@ -7,7 +7,7 @@
  * "itype" keyword support
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-metadata.c

@@ -1,6 +1,6 @@
 /* METADATA part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectMetadataSetup (DetectEngineCtx *, Signature *s, SigMatch *m, char *str);

src/detect-msg.c

@@ -1,6 +1,6 @@
 /* MSG part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 #include "util-debug.h"
 #include "util-unittest.h"

src/detect-noalert.c

@@ -1,6 +1,6 @@
 /* NOALERT part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectNoalertSetup (DetectEngineCtx *, Signature *, SigMatch *, char *);

src/detect-nocase.c

@@ -1,6 +1,6 @@
 /* NOCASE part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-offset.c

@@ -1,6 +1,6 @@
 /* OFFSET part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "detect.h"

src/detect-parse.c

@@ -1,6 +1,6 @@
 /* signature parser */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 
 #include "detect.h"

src/detect-pcre.c

@@ -1,6 +1,6 @@
 /* PCRE part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-pktvar.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2008 by Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "threads.h"

src/detect-priority.c

@@ -1,6 +1,6 @@
 /* PRIORITY part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectPrioritySetup (DetectEngineCtx *, Signature *s, SigMatch *m, char *sidstr);

src/detect-rawbytes.c

@@ -1,6 +1,6 @@
 /* RAWBYTES part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 
 #include "decode.h"
 #include "detect.h"

src/detect-recursive.c

@@ -5,7 +5,7 @@
  *
  * Note: non Snort compatible. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect-reference.c

@@ -1,6 +1,6 @@
 /* REFERENCE part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectReferenceSetup (DetectEngineCtx *, Signature *s, SigMatch *m, char *str);

src/detect-rev.c

@@ -1,6 +1,6 @@
 /* REV part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectRevSetup (DetectEngineCtx *, Signature *s, SigMatch *m, char *str);

src/detect-rpc.c

@@ -6,7 +6,7 @@
  * RPC keyword support
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 

src/detect-sameip.c

@@ -7,7 +7,7 @@
  * Implements the "sameip" keyword.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-seq.c

@@ -7,7 +7,7 @@
  * Implements the "seq" keyword.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-sid.c

@@ -1,6 +1,6 @@
 /* SID part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectSidSetup (DetectEngineCtx *, Signature *s, SigMatch *m, char *sidstr);

src/detect-stream_size.c

@@ -5,7 +5,7 @@
  * Stream size for the engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "stream-tcp.h"
 #include "util-unittest.h"
 #include "detect.h"

src/detect-threshold.c

@@ -1,6 +1,6 @@
 /* THRESHOLD part of the detection engine. */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "detect.h"
 
 int DetectThresholdSetup (DetectEngineCtx *, Signature *s, SigMatch *m, char *str);

src/detect-tls-version.c

@@ -5,7 +5,7 @@
  * \author Victor Julien <victor@inliniac.net>
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "threads.h"
 #include "debug.h"
 #include "decode.h"

src/detect-ttl.c

@@ -5,7 +5,7 @@
  * ttl rule keyword support for the detection engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "stream-tcp.h"
 #include "util-unittest.h"
 #include "detect.h"

src/detect-uricontent.c

@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2008 by Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "detect-uricontent.h"

src/detect-window.c

@@ -5,7 +5,7 @@
  * WINDOW tcp window option, part of the detection engine.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "debug.h"
 #include "decode.h"
 #include "detect.h"

src/detect-within.c

@@ -4,7 +4,7 @@
  *  \author Victor Julien <victor@inliniac.net>
  *  \todo within logic is not Snort compat atm: it is applied to pcre and uricontent as well */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "decode.h"
 #include "detect.h"
 #include "flow-var.h"

src/detect.c

@@ -1,7 +1,7 @@
 /* Basic detection engine */
 
-#include "eidps-common.h"
-#include "eidps.h"
+#include "suricata-common.h"
+#include "suricata.h"
 #include "debug.h"
 #include "detect.h"
 #include "flow.h"
@@ -2892,7 +2892,7 @@ void SigTableRegisterTests(void) {
 #include "flow-util.h"
 
 static const char *dummy_conf_string =
-    "default-log-dir: /var/log/eidps\n"
+    "default-log-dir: /var/log/suricata\n"
     "\n"
     "logging:\n"
     "\n"
@@ -2910,7 +2910,7 @@ static const char *dummy_conf_string =
     "    log-level: info\n"
     "\n"
     "  - interface: file\n"
-    "    filename: /var/log/eidps.log\n"
+    "    filename: /var/log/suricata.log\n"
     "\n"
     "  - interface: syslog\n"
     "    facility: local5\n"

src/flow-bit.c

@@ -11,7 +11,7 @@
  *   multiple times, we can operate on all of them.
  */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "threads.h"
 #include "flow-bit.h"
 #include "flow.h"

src/flow-hash.c

@@ -1,16 +1,13 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "threads.h"
 #include "decode.h"
 #include "debug.h"
 #include "flow.h"
-
-#include "eidps-common.h"
 #include "flow-hash.h"
 #include "flow-util.h"
 #include "flow-private.h"
-
 #include "util-debug.h"
 
 /* calculate the hash key for this packet

src/flow-hash.h

@@ -10,7 +10,7 @@
 typedef struct FlowBucket_ {
     Flow *f;
     SCMutex m;
-} FlowBucket; 
+} FlowBucket;
 
 /* prototypes */
 

src/flow-queue.c

@@ -1,6 +1,6 @@
 /* Copyright (c) 2008 Victor Julien <victor@inliniac.net> */
 
-#include "eidps-common.h"
+#include "suricata-common.h"
 #include "threads.h"
 #include "debug.h"
 #include "flow-queue.h"