From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Thu, 9 Dec 2021 19:41:34 +0000 (+0000)
Subject: Pull request #3173: loggers: Fixing truncated alert_syslog messages
X-Git-Tag: 3.1.19.0~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e290ef53aa718e236d36c57e15aae82ccbb339a8;p=thirdparty%2Fsnort3.git

Pull request #3173: loggers: Fixing truncated alert_syslog messages

Merge in SNORT/snort3 from ~ALLEWI/snort3:truncated_alert_syslog to master

Squashed commit of the following:

commit 92bbe04935c7fafa61d77c7f109d1e0dc0ff16f9
Author: allewi@cisco.com <allewi@cisco.com>
Date:   Tue Nov 16 10:55:58 2021 -0500

    loggers: Fixing truncated alert_syslog messages
---

diff --git a/src/loggers/alert_syslog.cc b/src/loggers/alert_syslog.cc
index 3dcfbb301..1ca842622 100644
--- a/src/loggers/alert_syslog.cc
+++ b/src/loggers/alert_syslog.cc
@@ -228,10 +228,8 @@ static void AlertSyslog(
             SnortSnprintfAppend(event_string, sizeof(event_string),
                 "<%s> ", SFDAQ::get_input_spec());
         }
-    }
-    if ((p != nullptr) && p->ptrs.ip_api.is_ip())
-    {
-        IpProtocol ip_proto = p->get_ip_proto_next();
+
+	IpProtocol ip_proto = p->get_ip_proto_next();
         if (protocol_names[to_utype(ip_proto)] != nullptr)
         {
             SnortSnprintfAppend(event_string, sizeof(event_string),
@@ -293,7 +291,7 @@ static void AlertSyslog(
 
         syslog(priority, "%s", event_string);
     }
-    else
+    else if (msg != nullptr)
     {
         syslog(priority, "%s", msg == nullptr ? "ALERT" : msg);
     }