From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 28 Jan 2016 19:58:24 +0000 (-0500)
Subject: Merge pull request #219 in SNORT/snort3 from dce_so_fix to master
X-Git-Tag: 3.0.0-233~651
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3316478596f663bbe7651e5c82ef8f84b0bfa9ac;p=thirdparty%2Fsnort3.git

Merge pull request #219 in SNORT/snort3 from dce_so_fix to master

Squashed commit of the following:

commit 48770da057b8e156d183658d94d05b37b75c297a
Author: rrp <rrp@cisco.com>
Date:   Thu Jan 28 13:05:19 2016 -0500

    Get DCE-RPC SO library to build - clean with uncrustify

commit 684304c664210c1f14556e1c07100eaf166d8f58
Author: rrp <rrp@cisco.com>
Date:   Thu Jan 28 12:46:52 2016 -0500

    Get DCE-RPC SO library to build
---

diff --git a/src/service_inspectors/dce_rpc/dce2_common.cc b/src/service_inspectors/dce_rpc/dce2_common.cc
index 83036620f..76781354d 100644
--- a/src/service_inspectors/dce_rpc/dce2_common.cc
+++ b/src/service_inspectors/dce_rpc/dce2_common.cc
@@ -20,6 +20,7 @@
 
 #include "dce2_common.h"
 #include "framework/module.h"
+#include "framework/base_api.h"
 #include "log/messages.h"
 
 const char* dce2_get_policy_name(DCE2_POLICY policy)
@@ -89,3 +90,25 @@ void print_dce2_common_config(dce2CommonProtoConf& common)
         dce2_get_policy_name(common.policy));
 }
 
+#ifdef BUILDING_SO
+
+extern const BaseApi* ips_dce_iface;
+extern const BaseApi* ips_dce_opnum;
+extern const BaseApi* ips_dce_stub_data;
+
+SO_PUBLIC const BaseApi* snort_plugins[] =
+{
+    &dce2_tcp_api.base,
+    &dce2_smb_api.base,
+    ips_dce_iface,
+    ips_dce_opnum,
+    ips_dce_stub_data,
+    nullptr
+};
+#else
+
+const BaseApi* sin_dce_tcp = &dce2_tcp_api.base;
+const BaseApi* sin_dce_smb = &dce2_smb_api.base;
+
+#endif
+
diff --git a/src/service_inspectors/dce_rpc/dce2_common.h b/src/service_inspectors/dce_rpc/dce2_common.h
index ff047bbf5..552b955a8 100644
--- a/src/service_inspectors/dce_rpc/dce2_common.h
+++ b/src/service_inspectors/dce_rpc/dce2_common.h
@@ -14,7 +14,7 @@
 // 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.
-//--------------------------------------------------------------------------
+//-------------------------------------------------------------------------
 
 //dce2_common.h author Rashmi Pitre <rrp@cisco.com>
 
@@ -23,6 +23,10 @@
 
 #include "main/snort_types.h"
 #include "framework/module.h"
+#include "framework/inspector.h"
+
+extern const InspectApi dce2_smb_api;
+extern const InspectApi dce2_tcp_api;
 
 #define GID_DCE2 145
 
diff --git a/src/service_inspectors/dce_rpc/dce2_smb.cc b/src/service_inspectors/dce_rpc/dce2_smb.cc
index e8ef0faf6..5ba0119f4 100644
--- a/src/service_inspectors/dce_rpc/dce2_smb.cc
+++ b/src/service_inspectors/dce_rpc/dce2_smb.cc
@@ -139,16 +139,3 @@ const InspectApi dce2_smb_api =
     nullptr  // reset
 };
 
-#ifdef BUILDING_SO
-SO_PUBLIC const BaseApi* snort_plugins[] =
-{
-    &dce2_smb_api.base,
-    ips_dce_iface,
-    ips_dce_opnum,
-    ips_dce_stub_data,
-    nullptr
-};
-#else
-const BaseApi* sin_dce_smb = &dce2_smb_api.base;
-#endif
-
diff --git a/src/service_inspectors/dce_rpc/dce2_tcp.cc b/src/service_inspectors/dce_rpc/dce2_tcp.cc
index 752076ac0..e47bd4c48 100644
--- a/src/service_inspectors/dce_rpc/dce2_tcp.cc
+++ b/src/service_inspectors/dce_rpc/dce2_tcp.cc
@@ -120,16 +120,3 @@ const InspectApi dce2_tcp_api =
     nullptr  // reset
 };
 
-#ifdef BUILDING_SO
-SO_PUBLIC const BaseApi* snort_plugins[] =
-{
-    &dce2_tcp_api.base,
-    ips_dce_iface,
-    ips_dce_opnum,
-    ips_dce_stub_data,
-    nullptr
-};
-#else
-const BaseApi* sin_dce_tcp = &dce2_tcp_api.base;
-#endif
-