tweaked lua defaults

diff --git a/lua/snort_defaults.lua b/lua/snort_defaults.lua
index b5f020e35110e8c1b8ed3313400d76fa5e2feef6..a2726d1bc1e23319809daa85890e8142b71f4af4 100644 (file)
--- a/lua/snort_defaults.lua
+++ b/lua/snort_defaults.lua
@@ -147,6 +147,50 @@ ftp_format_commands =
     XSEN XSHA1 XSHA256
 ]]
 
+ftp_command_specs =
+{
+    { command = 'ABOR', length = 0 },
+    { command = 'CCC', length = 0 },
+    { command = 'CDUP', length = 0 },
+    { command = 'ESTA', length = 0 },
+    { command = 'FEAT', length = 0 },
+    { command = 'LPSV', length = 0 },
+    { command = 'NOOP', length = 0 },
+    { command = 'PASV', length = 0 },
+    { command = 'PWD', length = 0 },
+    { command = 'QUIT', length = 0 },
+    { command = 'REIN', length = 0 },
+    { command = 'SYST', length = 0 },
+    { command = 'XCUP', length = 0 },
+    { command = 'XPWD', length = 0 },
+
+    { command = 'APPE', length = 200 },
+    { command = 'CMD', length = 200 },
+    { command = 'HELP', length = 200 },
+    { command = 'NLST', length = 200 },
+    { command = 'RETR', length = 200 },
+    { command = 'RNFR', length = 200 },
+    { command = 'STOR', length = 200 },
+    { command = 'STOU', length = 200 },
+    { command = 'XMKD', length = 200 },
+
+    { command = 'CWD', length = 256 },
+    { command = 'RNTO', length = 256 },
+    { command = 'SIZE', length = 512 },
+
+    { command = 'ALLO', length = 200, format = '< int [ char R int ] >' },
+    { command = 'PORT', length = 400, format = '< host_port >' },
+
+    { command = 'EPSV', format = '< [ { char 12 | char A char L char L } ] >' },
+    { command = 'MACB', format = '< string >' },
+    { command = 'MDTM', format = '< [ date nnnnnnnnnnnnnn[.n[n[n]]] ] string >' },
+    { command = 'MODE', format = '< char ASBCZ >' },
+    { command = 'PROT', format = '< char CSEP >' },
+    { command = 'STRU', format = '< char FRPO [ string ] >' },
+    { command = 'TYPE', 
+      format = '< { char AE [ char NTC ] | char I | char L [ number ] } >' }
+}
+
 default_ftp_server =
 {
     def_max_param_len = 100,
@@ -160,53 +204,7 @@ default_ftp_server =
 
     ftp_cmds = ftp_default_commands,
     chk_str_fmt = ftp_format_commands,
-}
-
-ignore =
-{
-    cmd_validity =
-    {
-        { command = 'ABOR', length = 0 },
-        { command = 'CCC', length = 0 },
-        { command = 'CDUP', length = 0 },
-        { command = 'ESTA', length = 0 },
-        { command = 'FEAT', length = 0 },
-        { command = 'LPSV', length = 0 },
-        { command = 'NOOP', length = 0 },
-        { command = 'PASV', length = 0 },
-        { command = 'PWD', length = 0 },
-        { command = 'QUIT', length = 0 },
-        { command = 'REIN', length = 0 },
-        { command = 'SYST', length = 0 },
-        { command = 'XCUP', length = 0 },
-        { command = 'XPWD', length = 0 },
-
-        { command = 'APPE', length = 200 },
-        { command = 'CMD', length = 200 },
-        { command = 'HELP', length = 200 },
-        { command = 'NLST', length = 200 },
-        { command = 'RETR', length = 200 },
-        { command = 'RNFR', length = 200 },
-        { command = 'STOR', length = 200 },
-        { command = 'STOU', length = 200 },
-        { command = 'XMKD', length = 200 },
-
-        { command = 'CWD', length = 256 },
-        { command = 'RNTO', length = 256 },
-        { command = 'SIZE', length = 512 },
-
-        { command = 'ALLO', length = 200, format = '< int [ char R int ] >' },
-        { command = 'PORT', length = 400, format = '< host_port >' },
-
-        { command = 'EPSV', format = '< [ { char 12 | char A char L char L } ] >' },
-        { command = 'MACB', format = '< string >' },
-        { command = 'MDTM', format = '< [ date nnnnnnnnnnnnnn[.n[n[n]]] ] string >' },
-        { command = 'MODE', format = '< char ASBCZ >' },
-        { command = 'PROT', format = '< char CSEP >' },
-        { command = 'STRU', format = '< char FRPO [ string ] >' },
-        { command = 'TYPE', 
-          format = '< { char AE [ char NTC ] | char I | char L [ number ] } >' }
-    },
+    cmd_validity = ftp_command_specs
 }
 
 ---------------------------------------------------------------------------