From: Jason Ish <ish@unx.ca>
Date: Mon, 20 Mar 2017 16:54:51 +0000 (-0600)
Subject: defrag: fix argument used in macro to match signature
X-Git-Tag: suricata-4.0.0-beta1~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ca1a29bbd6cfe05f20a9d9717be7b98214a3591;p=thirdparty%2Fsuricata.git

defrag: fix argument used in macro to match signature

"p" was being used in the macro but was not an argument to
the macro, but it worked due to the context of the macro.

Use the actual macro argument, d2, instead of p.

Results in no change to generated code.
---

diff --git a/src/defrag-hash.c b/src/defrag-hash.c
index 736099c587..a5355ebda0 100644
--- a/src/defrag-hash.c
+++ b/src/defrag-hash.c
@@ -407,7 +407,7 @@ static inline uint32_t DefragHashGetKey(Packet *p)
        CMP_ADDR(&(d1)->dst_addr, &(d2)->dst)) || \
       (CMP_ADDR(&(d1)->src_addr, &(d2)->dst) && \
        CMP_ADDR(&(d1)->dst_addr, &(d2)->src))) && \
-     (d1)->proto == IP_GET_IPPROTO(p) &&        \
+     (d1)->proto == IP_GET_IPPROTO(d2) &&   \
      (d1)->id == (id) && \
      (d1)->vlan_id[0] == (d2)->vlan_id[0] && \
      (d1)->vlan_id[1] == (d2)->vlan_id[1])