updated for linux builds; updated snort.lua bindings

diff --git a/ChangeLog b/ChangeLog
index c5f21fac2ba66110d9d128f2babd42b8e61d60fd..61bc630b11110c00d00c02dfe30813dfde786df8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+77
+-- pulled in josh's changes to make on Linux
+-- updated snort.lua for bindings
+
 76
 -- moved all src/*.{h,cc} except main.{h,cc} to src/main/
 -- updated prototype bindings

diff --git a/configure.ac b/configure.ac
index f44a79b7b0ad849c399555233b296514db38302a..97883fa1438c432c28cece2f2e745a836b531ba1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@
 # initialization
 #--------------------------------------------------------------------------
 
-AC_INIT([snort], [2.10.076])
+AC_INIT([snort], [2.10.077])
 AC_PREREQ([2.68])
 
 AC_CONFIG_SRCDIR([src/main.h])

diff --git a/lua/snort.lua b/lua/snort.lua
index 6d3a18613e1193cc8dd06f7ae9176b3282d96d3f..fba2dd82bef082998385ad74e68161f3d2a94754 100644 (file)
--- a/lua/snort.lua
+++ b/lua/snort.lua
@@ -651,51 +651,20 @@ ips =
 -- prototype bindings:
 -- nets and ports move out of inspector configurations
 -- only need to specify non-default bindings
--- match = id | ((vlans | networks) [protocol [ports]])
--- config = type [name [direction]]
--- type = module | 'file'
--- name = type (default) | instance | filename
--- action = block | allow | inspect (default)
--- direction = from client | from server | any (default) | none
 
 bindings =
 {
     {
-        match = { id = 5 },
-        config = { type = 'bo', name = 'bo2' }
+        when =
+        {
+            id = 'uuid', vlans = '123', nets = '1.2.3.0/24',
+            protos = 'tcp', ports = '80', role = 'any'
+        },
+        use = { type = 'http_inspect', name = 'hi2' }
     },
-
-    {
-        match = { id = 4 },
-        config = { type = 'file', name = '4.lua' }
-    },
-
-    {
-        match = { vlans = '123' },
-        config = { type = 'detect', name = '123.detect' }
-    },
-
-    {
-        match = { networks = '1.2.3.0/24', protocol = 'tcp' },
-        config = { type = 'stream_tcp', name = 'last', direction = 'any' }
-    },
-
     {
-        match = { networks = '1.2.3.4', protocol = 'tcp', ports = '80 8080' },
-        config = { type = 'http_inspect' },
-        action = 'inspect'
-    },
-
-    {
-        match = { networks = '1.2.3.4', protocol = 'tcp', ports = '88 8088' },
-        config = { type = 'http', name = 'iis' },
-    },
-
-    {
-        match = { networks = '192.168.1.0/24', protocol = 'udp', ports = '53' },
+        when = { nets = '1.2.3.4', protos = 'tcp', ports = '80 8080' },
         action = 'block'
-    }
+    },
 }
  
--- lowmem_q = { var = "test" }
-

diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 2c21de90c907e3bba5ff5b712b9434df454d7ed4..0257cecc59971c83d998358ce8400db8856af29d 100644 (file)
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -8,6 +8,8 @@ set (INCLUDES
 add_library (main STATIC
     analyzer.h
     analyzer.cc 
+    binder.cc
+    binder.h
     build.h
     modules.cc
     modules.h