From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Wed, 29 Jul 2020 02:31:35 +0000 (+0000)
Subject: Merge pull request #2355 in SNORT/snort3 from ~SMINUT/snort3:tcp_fp_io_utests to... 
X-Git-Tag: 3.0.2-4~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c0f38a54e9b9226baf0cd0e85b7da62a962af67;p=thirdparty%2Fsnort3.git

Merge pull request #2355 in SNORT/snort3 from ~SMINUT/snort3:tcp_fp_io_utests to master

Squashed commit of the following:

commit 5828d286745205da9201466f9f09fd2ba609f8b2
Author: Silviu Minut <sminut@cisco.com>
Date:   Tue Jul 28 14:03:44 2020 -0400

    rna: tcp fingerprint input and retrieval
---

diff --git a/src/network_inspectors/rna/rna_fingerprint_tcp.cc b/src/network_inspectors/rna/rna_fingerprint_tcp.cc
index 206961f8c..f26d1df3b 100644
--- a/src/network_inspectors/rna/rna_fingerprint_tcp.cc
+++ b/src/network_inspectors/rna/rna_fingerprint_tcp.cc
@@ -24,6 +24,10 @@
 
 #include "rna_fingerprint_tcp.h"
 
+#ifdef UNIT_TEST
+#include "catch/snort_catch.h"
+#endif
+
 using namespace snort;
 using namespace std;
 
@@ -60,3 +64,15 @@ void TcpFpProcessor::push(const vector<FpTcpFingerprint>& fplist, TCP_FP_MODE mo
 }
 
 }
+
+#ifdef UNIT_TEST
+TEST_CASE("get_tcp_fp_processor", "[tcp_processor]")
+{
+    vector<FpTcpFingerprint> fplist;
+    tcp_fp_processor.push(fplist, TcpFpProcessor::TCP_FP_MODE::SERVER);
+
+    snort::TcpFpProcessor* tfp = snort::get_tcp_fp_processor();
+    CHECK(tfp == &tcp_fp_processor);
+}
+
+#endif
diff --git a/src/network_inspectors/rna/rna_fp_reader.cc b/src/network_inspectors/rna/rna_fp_reader.cc
index 67efd1f1a..57ef652ad 100644
--- a/src/network_inspectors/rna/rna_fp_reader.cc
+++ b/src/network_inspectors/rna/rna_fp_reader.cc
@@ -24,6 +24,10 @@
 
 #include "rna_fp_reader.h"
 
+#ifdef UNIT_TEST
+#include "catch/snort_catch.h"
+#endif
+
 using namespace snort;
 
 static RnaFingerprintReader* fp_reader = nullptr;
@@ -42,3 +46,16 @@ void set_rna_fp_reader(RnaFingerprintReader* fpr)
 }
 
 }
+
+#ifdef UNIT_TEST
+TEST_CASE("rna_fp_reader", "[rna_fp_reader]")
+{
+    RnaFingerprintReader rna_fp_reader;
+    snort::set_rna_fp_reader(&rna_fp_reader);
+    CHECK(fp_reader == &rna_fp_reader);
+
+    const RnaFingerprintReader* fpr = snort::get_rna_fp_reader();
+    CHECK(fp_reader == fpr);
+}
+
+#endif