fix includes to work with dynamic examples

diff --git a/src/codecs/Makefile.am b/src/codecs/Makefile.am
index d2f0d07047fc345b6361c6193ff16edbf68901e1..22b9252b0c9b0c22ca673126b96a3ebc822c0a86 100644 (file)
--- a/src/codecs/Makefile.am
+++ b/src/codecs/Makefile.am
@@ -1,15 +1,19 @@
 AUTOMAKE_OPTIONS=foreign no-dependencies
 
+x_includedir = $(pkgincludedir)/codecs
+
 noinst_LIBRARIES = libcodecs.a
 noinst_LIBRARIES += libcodec_utils.a
 
+x_include_HEADERS = \
+layer.h \
+sf_protocols.h
+
 libcodecs_a_SOURCES = \
 codec_api.cc \
 codec_api.h \
 decode.h \
-decode_module.h \
-layer.h \
-sf_protocols.h
+decode_module.h
 
 libcodec_utils_a_SOURCES = \
 codec_events.cc \
@@ -19,7 +23,6 @@ ipv6_util.cc  \
 checksum.h \
 checksum.cc
 
-
 SUBDIRS = \
 ip \
 link \

diff --git a/src/codecs/layer.h b/src/codecs/layer.h
index 0b86f4228c09fa5e277f25856e65ba3858d6629a..2520647bb2942ff563a28740b4a2e36a011e40fa 100644 (file)
--- a/src/codecs/layer.h
+++ b/src/codecs/layer.h
@@ -23,13 +23,13 @@
 
 #include "codecs/sf_protocols.h"
 
-
-struct Layer {
+struct Layer
+{
     uint16_t prot_id;
     PROTO_ID proto;
     uint16_t length;
     uint8_t* start;
 };
 
-
 #endif
+

diff --git a/src/detection/rules.h b/src/detection/rules.h
index aafa2e90ccbaeb2083c0266191696bf8d1d14017..52d37b9fc6ffafb9e7bcdc78d510bca88acb16f8 100644 (file)
--- a/src/detection/rules.h
+++ b/src/detection/rules.h
@@ -26,7 +26,7 @@
 #include "config.h"
 #endif
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "actions/actions.h"
 
 #define EXCEPT_SRC_IP   0x0001

diff --git a/src/detection/signature.h b/src/detection/signature.h
index 3bb0f8ae00ee5131bb8bf8e73409d73801188eae..2170b1758275f1aa357cbb9343ef32cc8c710467 100644 (file)
--- a/src/detection/signature.h
+++ b/src/detection/signature.h
@@ -29,7 +29,7 @@
 #include <stdio.h>
 
 #include "hash/sfghash.h"
-#include "snort_types.h"
+#include "main/snort_types.h"
 
 struct SnortConfig;
 struct OptTreeNode;

diff --git a/src/detection/treenodes.h b/src/detection/treenodes.h
index 2c02ecc56917fdc3dd7fa4a0e0f978e6bfd1e3e5..21de6849d3e727e157de36db32047462bbe424d2 100644 (file)
--- a/src/detection/treenodes.h
+++ b/src/detection/treenodes.h
@@ -22,7 +22,7 @@
 #ifndef TREENODES_H
 #define TREENODES_H
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/src/events/event.h b/src/events/event.h
index 5e13608c408f891b554809f84d7e9755e281960b..52dcc3a534d2d703700e5538929aa66d25f3f5bc 100644 (file)
--- a/src/events/event.h
+++ b/src/events/event.h
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "main/thread.h"
 
 extern THREAD_LOCAL uint16_t event_id;

diff --git a/src/events/event_queue.h b/src/events/event_queue.h
index 9a21d2704c2a0a3e1ffc037ef23edce74abd532b..a97a23878bc7ba4f7705e6ad4752cbff644fea4f 100644 (file)
--- a/src/events/event_queue.h
+++ b/src/events/event_queue.h
@@ -23,7 +23,7 @@
 #ifndef EVENT_QUEUE_H
 #define EVENT_QUEUE_H
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "actions/actions.h"
 
 #define SNORT_EVENTQ_PRIORITY    1

diff --git a/src/flow/flow_key.h b/src/flow/flow_key.h
index 9864ade881589c3e68f8b43bb2672ddfa6cdb49d..2ec43ffb7ac7054a7ff3a778c24c72a9ca593dd2 100644 (file)
--- a/src/flow/flow_key.h
+++ b/src/flow/flow_key.h
@@ -23,7 +23,7 @@
 #ifndef FLOW_KEY_H
 #define FLOW_KEY_H
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "hash/sfhashfcn.h"
 #include "sfip/ipv6_port.h"
 

diff --git a/src/framework/codec.h b/src/framework/codec.h
index 80aa55a667a10731ce4429f823113e0915d9c8cb..aa852348e2485d55ea592aee886d731108cb20db 100644 (file)
--- a/src/framework/codec.h
+++ b/src/framework/codec.h
@@ -22,9 +22,9 @@
 
 #include <vector>
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "framework/base_api.h"
-#include "packet.h"
+#include "protocols/packet.h"
 
 
 // REMOVE WHEN POSSIBLE!!!

diff --git a/src/framework/inspector.h b/src/framework/inspector.h
index 3e494309df594004b2872d2fbca532f6fc06438b..823e2aa583b60ac2e38f72817a82bb316b3a603c 100644 (file)
--- a/src/framework/inspector.h
+++ b/src/framework/inspector.h
@@ -21,7 +21,7 @@
 #ifndef INSPECTOR_H
 #define INSPECTOR_H
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "main/thread.h"
 #include "framework/base_api.h"
 

diff --git a/src/framework/ips_option.h b/src/framework/ips_option.h
index 699d4ad346140217fdd7283f2b6e8fc364245ae2..d02ec2be32f7b9224d84716b04341bb2e85bce56 100644 (file)
--- a/src/framework/ips_option.h
+++ b/src/framework/ips_option.h
@@ -21,7 +21,7 @@
 #ifndef IPS_OPTION_H
 #define IPS_OPTION_H
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "framework/base_api.h"
 #include "detection/rule_option_types.h"
 

diff --git a/src/framework/logger.h b/src/framework/logger.h
index e188d6b97559ae47af74fae566d493604223707e..cfab014625e88128603d2438f5badf1ca28756a6 100644 (file)
--- a/src/framework/logger.h
+++ b/src/framework/logger.h
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "events/event.h"
 #include "framework/base_api.h"
 

diff --git a/src/framework/mpse.h b/src/framework/mpse.h
index 3ab7b6755399a57715a71bc80568c4f28def948a..e30c80dd2bd55f228c86a482042169fdf05bea96 100644 (file)
--- a/src/framework/mpse.h
+++ b/src/framework/mpse.h
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "main/thread.h"
 #include "framework/base_api.h"
 #include "time/profiler.h"

diff --git a/src/framework/so_rule.h b/src/framework/so_rule.h
index d169ce6d1ecb08c3ee5e1825f2c5cd51ad9a570e..ee7b8eb6d02f156bdf3c3572c58c04ad7ecbb921 100644 (file)
--- a/src/framework/so_rule.h
+++ b/src/framework/so_rule.h
@@ -21,7 +21,7 @@
 #ifndef SO_RULE_H
 #define SO_RULE_H
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "framework/base_api.h"
 #include "framework/ips_option.h"
 

diff --git a/src/framework/value.h b/src/framework/value.h
index 0fa9c5ae94384c35dc70796f0ceaf66ad38a0858..ddc27e80afc0dca11330ebd941f1846bcde6a906 100644 (file)
--- a/src/framework/value.h
+++ b/src/framework/value.h
@@ -26,8 +26,8 @@
 #include <algorithm>
 #include <string>
 
-#include "bits.h"
-#include "parameter.h"
+#include "framework/bits.h"
+#include "framework/parameter.h"
 #include "sfip/sfip_t.h"
 
 class Value

diff --git a/src/hash/sfhashfcn.h b/src/hash/sfhashfcn.h
index 1425d18fdbefb08022ddc6f04e6703cf39266d20..449dd2a57d45a13099b87250d138486152d4b60b 100644 (file)
--- a/src/hash/sfhashfcn.h
+++ b/src/hash/sfhashfcn.h
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <time.h>
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 
 #define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
 

diff --git a/src/log/messages.h b/src/log/messages.h
index 3280fb769596ba69aec884066dc202e1d54b1804..90b7d0b1cb95142f08699e00aca596f28a3a95e9 100644 (file)
--- a/src/log/messages.h
+++ b/src/log/messages.h
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "sfip/sf_ipvar.h"
 #include "sfip/ipv6_port.h"
 

diff --git a/src/protocols/Makefile.am b/src/protocols/Makefile.am
index 08c8f72de14e0d15578bba6335e7ea8cae19b3a1..fafca5d7eff4ae09e161c2219fc9783981dbbb25 100644 (file)
--- a/src/protocols/Makefile.am
+++ b/src/protocols/Makefile.am
@@ -3,12 +3,8 @@ AUTOMAKE_OPTIONS=foreign no-dependencies
 x_includedir = $(pkgincludedir)/protocols
 
 x_include_HEADERS = \
-packet.h
-
-EXTRA_DIST = \
 arp.h \
 decode.h \
-encode.h \
 eth.h \
 gre.h \
 icmp4.h \
@@ -16,6 +12,7 @@ icmp6.h \
 ipv4.h \
 ipv6.h \
 mpls.h \
+packet.h \
 protocol_ids.h \
 tcp.h \
 teredo.h \

diff --git a/src/protocols/icmp4.h b/src/protocols/icmp4.h
index 017ec37711f6d0e1a19d46c7a2e955fd27d72ca7..171afcb90cb799a316c14753cb9532cae1e0bc3c 100644 (file)
--- a/src/protocols/icmp4.h
+++ b/src/protocols/icmp4.h
@@ -23,7 +23,7 @@
 #define ICMP4_H
 
 #include <cstdint>
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "protocols/ipv4.h"
 
 namespace icmp4

diff --git a/src/protocols/packet.h b/src/protocols/packet.h
index 0d45603b96e47c9a44bfaf222d8c9d6ec4edf2e8..b18fe1b8e95085891a5e8b57ae02d1f19c6013a0 100644 (file)
--- a/src/protocols/packet.h
+++ b/src/protocols/packet.h
@@ -46,7 +46,7 @@ extern "C" {
 #include <sfbpf_dlt.h>
 }
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "sfip/ipv6_port.h"
 #include "sfip/sf_ip.h"
 #include "sfip/sf_iph.h"

diff --git a/src/search_engines/pat_stats.h b/src/search_engines/pat_stats.h
index d5ce2d2779ecdd9dd2b0b7ab1574b692ec3c430f..4a3a9ace8529587638e9da04e2f78d320e214b60 100644 (file)
--- a/src/search_engines/pat_stats.h
+++ b/src/search_engines/pat_stats.h
@@ -21,7 +21,7 @@
 #ifndef PAT_STATS_H
 #define PAT_STATS_H
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "main/thread.h"
 #include "utils/stats.h"
 

diff --git a/src/sfip/sf_ip.h b/src/sfip/sf_ip.h
index 500e20a6df6d356e91631fe7d49e377627200af2..887556bb2b89fcaa7718305ba6c41b3692c506a6 100644 (file)
--- a/src/sfip/sf_ip.h
+++ b/src/sfip/sf_ip.h
@@ -40,7 +40,7 @@
 #include <arpa/inet.h>
 
 #include "sfip/sfip_t.h"
-#include "snort_debug.h"
+#include "main/snort_debug.h"
 
 /* define SFIP_ROBUST to check pointers passed into the sfip libs.
  * Robustification should not be enabled if the client code is trustworthy.

diff --git a/src/sfrt/sfrt.h b/src/sfrt/sfrt.h
index a269d8240cc85e63e69520975d89ce99d728fa79..3bc4ba1b8646aaef5885012a070739cc6a1601dd 100644 (file)
--- a/src/sfrt/sfrt.h
+++ b/src/sfrt/sfrt.h
@@ -103,7 +103,7 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
-#include "snort_debug.h"
+#include "main/snort_debug.h"
 #include "sfrt/sfrt_trie.h"
 #include "sfip/ipv6_port.h"
 

diff --git a/src/stream/stream_splitter.h b/src/stream/stream_splitter.h
index 44ebaf083ddbc189b505bca543f467d362b9cbb9..ec58c2b9e424a06a982301e8099ca665ed9a7291 100644 (file)
--- a/src/stream/stream_splitter.h
+++ b/src/stream/stream_splitter.h
@@ -22,7 +22,7 @@
 #ifndef TCP_SPLITTER_H
 #define TCP_SPLITTER_H
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "main/thread.h"
 
 class Flow;

diff --git a/src/utils/bitop_funcs.h b/src/utils/bitop_funcs.h
index 19677e21ccbc6322e50e1d8201539da160b3f9af..a8a993c433f723f913859a4265127a6775728471 100644 (file)
--- a/src/utils/bitop_funcs.h
+++ b/src/utils/bitop_funcs.h
@@ -41,7 +41,7 @@
 #include "config.h"
 #endif
 
-#include "snort_debug.h"
+#include "main/snort_debug.h"
 #include "utils/bitop.h"
 
 /*

diff --git a/src/utils/segment_mem.h b/src/utils/segment_mem.h
index bf0166f6e58922289a282a26c064f5bf7526aa11..0c4ee8b2fda59b6475b5d237ee46b4bf38373d3a 100644 (file)
--- a/src/utils/segment_mem.h
+++ b/src/utils/segment_mem.h
@@ -25,7 +25,7 @@
 #define SEGMENT_MEM_H
 
 #include <stdlib.h>
-#include "snort_types.h"
+#include "main/snort_types.h"
 
 typedef uint32_t MEM_OFFSET;
 

diff --git a/src/utils/stats.h b/src/utils/stats.h
index 1ac41ef0200b36b544169db6b0e6bc97023a0893..69aa6f6c8b19e59371da0ce2f51b966a490b05f3 100644 (file)
--- a/src/utils/stats.h
+++ b/src/utils/stats.h
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "snort_types.h"
+#include "main/snort_types.h"
 #include "main/thread.h"
 #include "sfip/sf_ipvar.h"
 #include "sfip/ipv6_port.h"