From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Mon, 15 Aug 2016 17:47:23 +0000 (-0400)
Subject: Merge pull request #593 in SNORT/snort3 from ips_rpc_warnings to master
X-Git-Tag: 3.0.0-233~289
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b76cbd8b8626e815c3f1bfae2ecd7f9a9fc14d64;p=thirdparty%2Fsnort3.git

Merge pull request #593 in SNORT/snort3 from ips_rpc_warnings to master

Squashed commit of the following:

commit 7e46c2d9a52823a017f494a6faacc65cf968bc85
Author: alewis <albert.l.lewis@gmail.com>
Date:   Mon Aug 15 13:41:33 2016 -0400

    changed increment to packet_data +=4

commit 1a6c5588f578fca01ea8952688eca3f7b7d5fb3f
Author: alewis <albert.l.lewis@gmail.com>
Date:   Mon Aug 15 12:54:55 2016 -0400

    cleaned up blank spaces

commit a518988789186fb6af679bfd727f9e1951b67fa9
Author: alewis <albert.l.lewis@gmail.com>
Date:   Mon Aug 15 12:20:13 2016 -0400

    changes to fix variable warnings
---

diff --git a/src/ips_options/ips_rpc.cc b/src/ips_options/ips_rpc.cc
index bf8964aee..55a6732bb 100644
--- a/src/ips_options/ips_rpc.cc
+++ b/src/ips_options/ips_rpc.cc
@@ -76,7 +76,6 @@ private:
 
     const uint32_t RPC_MSG_VERSION = 2;
     const uint32_t CALL = 0;
-    const uint32_t REPLY = 1;
     
     RpcCheckData config;
 };
@@ -144,8 +143,9 @@ bool RpcOption::is_match(Packet * p)
     // get pointer to packet data 
     const uint8_t* packet_data = p->data;
         
-    // read xid.. not being used currently 
-    uint32_t xid = get_int(packet_data);
+    // read xid.. not being used currently
+    // so just move to the next int
+    packet_data += 4; 
 
     // read direction .. CALL or REPLY etc..
     uint32_t message_type =  get_int(packet_data);