From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Tue, 1 Jun 2021 19:44:21 +0000 (+0000)
Subject: Merge pull request #2910 in SNORT/snort3 from ~AMARNAYA/snort3:sun_RPC_pinhole to... 
X-Git-Tag: 3.1.6.0~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61e02ed58d97dae60015b1e24fef3614342ea9de;p=thirdparty%2Fsnort3.git

Merge pull request #2910 in SNORT/snort3 from ~AMARNAYA/snort3:sun_RPC_pinhole to master

Squashed commit of the following:

commit 3131b9eacfc44357e312a0a74260b3d21b2bb429
Author: Amarnath Nayak <amarnaya@cisco.com>
Date:   Thu May 27 10:12:06 2021 -0400

    appid: use 32 bits for storing protocol field in RPC port map message
---

diff --git a/src/network_inspectors/appid/service_plugins/service_rpc.cc b/src/network_inspectors/appid/service_plugins/service_rpc.cc
index dbe749554..5853c8dae 100644
--- a/src/network_inspectors/appid/service_plugins/service_rpc.cc
+++ b/src/network_inspectors/appid/service_plugins/service_rpc.cc
@@ -106,7 +106,7 @@ struct ServiceRPCPortmap
 {
     uint32_t program;
     uint32_t version;
-    IpProtocol proto;
+    uint32_t proto;
     uint32_t port;
 };
 
@@ -350,7 +350,7 @@ int RpcServiceDetector::validate_packet(const uint8_t* data, uint16_t size, Appi
                 if (end-data < (int)sizeof(ServiceRPCPortmap))
                     return APPID_NOT_COMPATIBLE;
                 pm = (const ServiceRPCPortmap*)data;
-                rd->proto = pm->proto;
+                rd->proto = (IpProtocol)ntohl(pm->proto);
                 break;
             default:
                 break;
@@ -408,8 +408,7 @@ int RpcServiceDetector::validate_packet(const uint8_t* data, uint16_t size, Appi
 
                         AppIdSession* pf = AppIdSession::create_future_session(
                             pkt, dip, 0, sip, (uint16_t)tmp,
-                            (IpProtocol)ntohl((uint32_t)rd->proto),
-                            asd.config.snort_proto_ids[PROTO_INDEX_SUNRPC]);
+                            rd->proto,asd.config.snort_proto_ids[PROTO_INDEX_SUNRPC]);
 
                         if (pf)
                         {