decode/icmpv4: add and use PacketIsICMPv4 inline func

For better readability and type checking.

Ticket: #5517.

diff --git a/src/decode.h b/src/decode.h
index 6e52ddcd596bd54a7314a08710e9e77dda549f79..8a7870e2e4decac1439ba90eabc66421b0bd44bc 100644 (file)
--- a/src/decode.h
+++ b/src/decode.h
@@ -769,6 +769,11 @@ static inline bool PacketIsUDP(const Packet *p)
     return PKT_IS_UDP(p);
 }
 
+static inline bool PacketIsICMPv4(const Packet *p)
+{
+    return PKT_IS_ICMPV4(p);
+}
+
 /** \brief Structure to hold thread specific data for all decode modules */
 typedef struct DecodeThreadVars_
 {

diff --git a/src/detect-csum.c b/src/detect-csum.c
index a19234c4b6eb4b85b4c8b17ead360a207713c258..bd2e612593c724409dd28a7f0c85d2745a893a3a 100644 (file)
--- a/src/detect-csum.c
+++ b/src/detect-csum.c
@@ -686,7 +686,7 @@ static int DetectICMPV4CsumMatch(DetectEngineThreadCtx *det_ctx,
 {
     const DetectCsumData *cd = (const DetectCsumData *)ctx;
 
-    if (!PacketIsIPv4(p) || !PKT_IS_ICMPV4(p) || p->proto != IPPROTO_ICMP || PKT_IS_PSEUDOPKT(p))
+    if (!PacketIsIPv4(p) || !PacketIsICMPv4(p) || p->proto != IPPROTO_ICMP || PKT_IS_PSEUDOPKT(p))
         return 0;
 
     if (p->flags & PKT_IGNORE_CHECKSUM) {

diff --git a/src/detect-icmp-id.c b/src/detect-icmp-id.c
index 8c75dae60d7b3c8f88184d96f6b9624b80565b20..09233d597e2e2ef606123c1530040b12115e1108 100644 (file)
--- a/src/detect-icmp-id.c
+++ b/src/detect-icmp-id.c
@@ -79,7 +79,7 @@ static inline bool GetIcmpId(Packet *p, uint16_t *id)
         return false;
 
     uint16_t pid;
-    if (PKT_IS_ICMPV4(p)) {
+    if (PacketIsICMPv4(p)) {
         switch (ICMPV4_GET_TYPE(p)){
             case ICMP_ECHOREPLY:
             case ICMP_ECHO:

diff --git a/src/detect-icmp-seq.c b/src/detect-icmp-seq.c
index ca32d2cec7ac0cfd0968b0143fa583f9f0b7b5d3..d7fef80d9cea91a740345b479bfb3f5909028b95 100644 (file)
--- a/src/detect-icmp-seq.c
+++ b/src/detect-icmp-seq.c
@@ -79,7 +79,7 @@ static inline bool GetIcmpSeq(Packet *p, uint16_t *seq)
     if (PKT_IS_PSEUDOPKT(p))
         return false;
 
-    if (PKT_IS_ICMPV4(p)) {
+    if (PacketIsICMPv4(p)) {
         switch (ICMPV4_GET_TYPE(p)){
             case ICMP_ECHOREPLY:
             case ICMP_ECHO:

diff --git a/src/detect-icmpv4hdr.c b/src/detect-icmpv4hdr.c
index 72c9156b2ebea06a2ebb37526febd5ad1532d7b7..fe029ec9fa83eab2284f318056f1c9bf67b98ba6 100644 (file)
--- a/src/detect-icmpv4hdr.c
+++ b/src/detect-icmpv4hdr.c
@@ -95,7 +95,7 @@ static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
 {
     SCEnter();
 
-    if (!PKT_IS_ICMPV4(p)) {
+    if (!PacketIsICMPv4(p)) {
         SCReturnPtr(NULL, "InspectionBuffer");
     }
 

diff --git a/src/detect-icode.c b/src/detect-icode.c
index 1e7d1cc060afa6b8a0686b1689771ff089d277b7..6b40c0a156fdf25aca948332192661e64836c578 100644 (file)
--- a/src/detect-icode.c
+++ b/src/detect-icode.c
@@ -91,7 +91,7 @@ static int DetectICodeMatch (DetectEngineThreadCtx *det_ctx, Packet *p,
         return 0;
 
     uint8_t picode;
-    if (PKT_IS_ICMPV4(p)) {
+    if (PacketIsICMPv4(p)) {
         picode = ICMPV4_GET_CODE(p);
     } else if (PKT_IS_ICMPV6(p)) {
         picode = ICMPV6_GET_CODE(p);
@@ -156,7 +156,7 @@ static void PrefilterPacketICodeMatch(DetectEngineThreadCtx *det_ctx,
     }
 
     uint8_t picode;
-    if (PKT_IS_ICMPV4(p)) {
+    if (PacketIsICMPv4(p)) {
         picode = ICMPV4_GET_CODE(p);
     } else if (PKT_IS_ICMPV6(p)) {
         picode = ICMPV6_GET_CODE(p);

diff --git a/src/detect-itype.c b/src/detect-itype.c
index 3f8da9568aec54889ba7578f10aa16ff7bd5d34c..f67db70ae2ae5777abc8664d73a37af7b789002a 100644 (file)
--- a/src/detect-itype.c
+++ b/src/detect-itype.c
@@ -88,7 +88,7 @@ static int DetectITypeMatch (DetectEngineThreadCtx *det_ctx, Packet *p,
         return 0;
 
     uint8_t pitype;
-    if (PKT_IS_ICMPV4(p)) {
+    if (PacketIsICMPv4(p)) {
         pitype = ICMPV4_GET_TYPE(p);
     } else if (PKT_IS_ICMPV6(p)) {
         pitype = ICMPV6_GET_TYPE(p);
@@ -172,7 +172,7 @@ static void PrefilterPacketITypeMatch(DetectEngineThreadCtx *det_ctx,
     }
 
     uint8_t pitype;
-    if (PKT_IS_ICMPV4(p)) {
+    if (PacketIsICMPv4(p)) {
         pitype = ICMPV4_GET_TYPE(p);
     } else if (PKT_IS_ICMPV6(p)) {
         pitype = ICMPV6_GET_TYPE(p);

diff --git a/src/detect.c b/src/detect.c
index 2c4611447754b37329241a40aea974d2ea7d95b8..f7b2b79e71c8df7780af017e73f2d5eaaaf5f45a 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -534,7 +534,7 @@ static inline void DetectRunGetRuleGroup(
 
             /* HACK: prevent the wrong sgh (or NULL) from being stored in the
              * flow's sgh pointers */
-            if (PKT_IS_ICMPV4(p) && ICMPV4_DEST_UNREACH_IS_VALID(p)) {
+            if (PacketIsICMPv4(p) && ICMPV4_DEST_UNREACH_IS_VALID(p)) {
                 ; /* no-op */
             } else {
                 /* store the found sgh (or NULL) in the flow to save us

diff --git a/src/flow-hash.c b/src/flow-hash.c
index c9ba024e0122c0b63b58f5a9e272c343391c81b5..48277065890f54b93eea181aa4dafa0e989d1183 100644 (file)
--- a/src/flow-hash.c
+++ b/src/flow-hash.c
@@ -560,7 +560,7 @@ static inline int FlowCreateCheck(const Packet *p, const bool emerg)
         }
     }
 
-    if (PKT_IS_ICMPV4(p)) {
+    if (PacketIsICMPv4(p)) {
         if (ICMPV4_IS_ERROR_MSG(p)) {
             return 0;
         }

diff --git a/src/flow-util.c b/src/flow-util.c
index bfacc4dcf7d697b8c01d438dab7646be4f68c136..9c524b2e704dff6ffc1beac34e2f617179387753 100644 (file)
--- a/src/flow-util.c
+++ b/src/flow-util.c
@@ -176,7 +176,7 @@ void FlowInit(Flow *f, const Packet *p)
     } else if (PacketIsUDP(p)) {
         SET_UDP_SRC_PORT(p,&f->sp);
         SET_UDP_DST_PORT(p,&f->dp);
-    } else if (PKT_IS_ICMPV4(p)) {
+    } else if (PacketIsICMPv4(p)) {
         f->icmp_s.type = p->icmp_s.type;
         f->icmp_s.code = p->icmp_s.code;
         FlowSetICMPv4CounterPart(f);

diff --git a/src/flow.c b/src/flow.c
index 8a179d2b1cc28ddc48d23b57b9e6fbff4c007b2c..f11b024eb130dd7f467c0a4baa98e39f84b9dbf0 100644 (file)
--- a/src/flow.c
+++ b/src/flow.c
@@ -328,7 +328,7 @@ int FlowGetPacketDirection(const Flow *f, const Packet *p)
  */
 static inline int FlowUpdateSeenFlag(const Packet *p)
 {
-    if (PKT_IS_ICMPV4(p)) {
+    if (PacketIsICMPv4(p)) {
         if (ICMPV4_IS_ERROR_MSG(p)) {
             return 0;
         }

diff --git a/src/output-json-drop.c b/src/output-json-drop.c
index 19b9d3a900e986e124b110e87c8e64f2d8781fff..337bfb8d9ba42bd69a1b58d6ad5441302679ddae 100644 (file)
--- a/src/output-json-drop.c
+++ b/src/output-json-drop.c
@@ -144,10 +144,10 @@ static int DropLogJSON (JsonDropLogThread *aft, const Packet *p)
             }
             break;
         case IPPROTO_ICMP:
-            if (PKT_IS_ICMPV4(p)) {
+            if (PacketIsICMPv4(p)) {
                 jb_set_uint(js, "icmp_id", ICMPV4_GET_ID(p));
                 jb_set_uint(js, "icmp_seq", ICMPV4_GET_SEQ(p));
-            } else if(PKT_IS_ICMPV6(p)) {
+            } else if (PKT_IS_ICMPV6(p)) {
                 jb_set_uint(js, "icmp_id", ICMPV6_GET_ID(p));
                 jb_set_uint(js, "icmp_seq", ICMPV6_GET_SEQ(p));
             }