From: Russ Combs <rucombs@cisco.com>
Date: Fri, 21 Nov 2014 01:16:57 +0000 (-0500)
Subject: fixed copyrights, added -R <rules file>
X-Git-Tag: 3.0.0-233~1168^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=178d581291893eed58a3da700ea372917a73745f;p=thirdparty%2Fsnort3.git

fixed copyrights, added -R <rules file>
---

diff --git a/src/main/snort_module.cc b/src/main/snort_module.cc
index d6631361c..d9e39594a 100644
--- a/src/main/snort_module.cc
+++ b/src/main/snort_module.cc
@@ -178,6 +178,9 @@ static const Parameter s_params[] =
     { "-q", Parameter::PT_IMPLIED, nullptr, nullptr,
       "quiet mode - Don't show banner and status report" },
 
+    { "-R", Parameter::PT_STRING, nullptr, nullptr, 
+      "<rules> include this rules file in the default policy" },
+
     { "-r", Parameter::PT_STRING, nullptr, nullptr, 
       "<pcap>... (same as --pcap-list)" },
 
@@ -538,6 +541,12 @@ bool SnortModule::set(const char*, Value& v, SnortConfig* sc)
     else if ( v.is("-q") )
         ConfigQuiet(sc, v.get_string());
 
+    else if ( v.is("-R") )
+    {
+        string s = "include ";
+        s += v.get_string();
+        parser_append_rules(s.c_str());
+    }
     else if ( v.is("-r") || v.is("--pcap-list") )
     {
         Trough_Multi(SOURCE_LIST, v.get_string());
diff --git a/src/utils/ring.h b/src/utils/ring.h
index 7063882b8..0920df0fb 100644
--- a/src/utils/ring.h
+++ b/src/utils/ring.h
@@ -16,6 +16,7 @@
 ** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
+// ring.h author Russ Combs <rucombs@cisco.com>
 
 //-------------------------------------------------------------------
 // simple ring
diff --git a/src/utils/ring_logic.h b/src/utils/ring_logic.h
index a20be0afb..ee6e7bcd7 100644
--- a/src/utils/ring_logic.h
+++ b/src/utils/ring_logic.h
@@ -1,3 +1,23 @@
+/*
+** Copyright (C) 2014 Cisco and/or its affiliates. All rights reserved.
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License Version 2 as
+** published by the Free Software Foundation.  You may not use, modify or
+** distribute this program under any other version of the GNU General
+** Public License.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+// ring_logic.h author Russ Combs <rucombs@cisco.com>
+
 //-------------------------------------------------------------------
 // simple ring logic
 //-------------------------------------------------------------------