From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Tue, 21 Sep 2021 19:41:18 +0000 (+0000)
Subject: Merge pull request #3062 in SNORT/snort3 from ~KAMURTHI/snort3:sun_rpc_continue to... 
X-Git-Tag: 3.1.13.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abd2c99a3c936f6c27b2305f931a5bfa2d3c31ac;p=thirdparty%2Fsnort3.git

Merge pull request #3062 in SNORT/snort3 from ~KAMURTHI/snort3:sun_rpc_continue to master

Squashed commit of the following:

commit 25faeb22b81be46802883270ade9806e2070a374
Author: Kanimozhi Murthi <kamurthi@cisco.com>
Date:   Fri Sep 10 21:58:58 2021 -0400

    appid: stay in success state after RPC is detected.
---

diff --git a/src/network_inspectors/appid/service_plugins/service_rpc.cc b/src/network_inspectors/appid/service_plugins/service_rpc.cc
index 5853c8dae..a8e321730 100644
--- a/src/network_inspectors/appid/service_plugins/service_rpc.cc
+++ b/src/network_inspectors/appid/service_plugins/service_rpc.cc
@@ -830,6 +830,8 @@ done:
 inprocess:
         if (!args.asd.is_service_detected())
             service_inprocess(args.asd, pkt, dir);
+        else
+            return APPID_SUCCESS;
         return APPID_INPROCESS;
 
     case APPID_SUCCESS:
@@ -862,9 +864,12 @@ inprocess:
 
     case APPID_NOMATCH:
 fail:
-        if (!args.asd.is_service_detected())
-            fail_service(args.asd, pkt, dir);
-        args.asd.clear_session_flags(APPID_SESSION_CONTINUE);
+        if (args.asd.is_service_detected())
+        {
+            args.asd.clear_session_flags(APPID_SESSION_CONTINUE);
+            return APPID_SUCCESS;
+        }
+        fail_service(args.asd, pkt, dir);
         return APPID_NOMATCH;
     default:
         return retval;