Merge pull request #2942 in SNORT/snort3 from ~SMULKA/snort3:si_ip to master

Squashed commit of the following:

commit ec2eb797ce03425f2c8ebcc0ec5d40313c381f56
Author: smulka <smulka@cisco.com>
Date:   Sun Jun 13 21:05:12 2021 -0400

    reputation: include list id for daq trace log

diff --git a/src/network_inspectors/reputation/reputation_inspect.cc b/src/network_inspectors/reputation/reputation_inspect.cc
index 6318c4bf9ba44d42b3e74f3cc029e2592866dfda..903a78ee2ebcb102ad2be03dad7b8e59af364e08 100644 (file)
--- a/src/network_inspectors/reputation/reputation_inspect.cc
+++ b/src/network_inspectors/reputation/reputation_inspect.cc
@@ -481,12 +481,13 @@ static void populate_trace_data(IPdecision& decision, Packet* p)
     {
         ip = p->ptrs.ip_api.get_dst();
     }
-
+    
     sfip_ntop(ip, addr, sizeof(addr));
 
-    PacketTracer::daq_log("SI-IP+%" PRId64"++Matched ip %s, action %s$",
-        TO_NSECS(pt_timer->get()),
-        addr, to_string(decision));
+    PacketTracer::daq_log("SI-IP+%" PRId64"+%s list id %u+Matched ip %s, action %s$",
+        TO_NSECS(pt_timer->get()), 
+        (TRUSTED_SRC == decision or TRUSTED_DST == decision)?"Do_not_block":"Block", 
+        p->iplist_id, addr, to_string(decision));
 }
 
 class AuxiliaryIpRepHandler : public DataHandler