From: Victor Julien <vjulien@oisf.net>
Date: Mon, 25 Mar 2024 08:34:25 +0000 (+0100)
Subject: validate: remove ip4h/ip6h check
X-Git-Tag: suricata-8.0.0-beta1~1405
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1535c88601302575efe89597cc7686d6f3dabf2b;p=thirdparty%2Fsuricata.git

validate: remove ip4h/ip6h check

In preparation of making them union members.
---

diff --git a/src/util-validate.h b/src/util-validate.h
index f892c7aecc..7d543404f1 100644
--- a/src/util-validate.h
+++ b/src/util-validate.h
@@ -65,33 +65,32 @@
  *
  *  BUG_ON's on problems
  */
-#define DEBUG_VALIDATE_PACKET(p) do {               \
-    if ((p) != NULL) {                              \
-        if ((p)->flow != NULL) {                    \
-            DEBUG_VALIDATE_FLOW((p)->flow);         \
-        }                                           \
-        if (!((p)->flags & (PKT_IS_FRAGMENT|PKT_IS_INVALID))) {          \
-            if ((p)->proto == IPPROTO_TCP) {            \
-                BUG_ON((p)->tcph == NULL);              \
-            } else if ((p)->proto == IPPROTO_UDP) {     \
-                BUG_ON((p)->udph == NULL);              \
-            } else if ((p)->proto == IPPROTO_ICMP) {    \
-                BUG_ON((p)->icmpv4h == NULL);           \
-            } else if ((p)->proto == IPPROTO_SCTP) {    \
-                BUG_ON((p)->sctph == NULL);             \
-            } else if ((p)->proto == IPPROTO_ICMPV6) {  \
-                BUG_ON((p)->icmpv6h == NULL);           \
-            }                                           \
-        }                                           \
-        if ((p)->payload_len > 0) {                 \
-            BUG_ON((p)->payload == NULL);           \
-        }                                           \
-        BUG_ON((p)->ip4h != NULL && (p)->ip6h != NULL);     \
-        BUG_ON((p)->flowflags != 0 && (p)->flow == NULL);   \
-        BUG_ON((p)->flowflags & FLOW_PKT_TOSERVER &&\
-               (p)->flowflags & FLOW_PKT_TOCLIENT); \
-    }                                               \
-} while(0)
+#define DEBUG_VALIDATE_PACKET(p)                                                                   \
+    do {                                                                                           \
+        if ((p) != NULL) {                                                                         \
+            if ((p)->flow != NULL) {                                                               \
+                DEBUG_VALIDATE_FLOW((p)->flow);                                                    \
+            }                                                                                      \
+            if (!((p)->flags & (PKT_IS_FRAGMENT | PKT_IS_INVALID))) {                              \
+                if ((p)->proto == IPPROTO_TCP) {                                                   \
+                    BUG_ON((p)->tcph == NULL);                                                     \
+                } else if ((p)->proto == IPPROTO_UDP) {                                            \
+                    BUG_ON((p)->udph == NULL);                                                     \
+                } else if ((p)->proto == IPPROTO_ICMP) {                                           \
+                    BUG_ON((p)->icmpv4h == NULL);                                                  \
+                } else if ((p)->proto == IPPROTO_SCTP) {                                           \
+                    BUG_ON((p)->sctph == NULL);                                                    \
+                } else if ((p)->proto == IPPROTO_ICMPV6) {                                         \
+                    BUG_ON((p)->icmpv6h == NULL);                                                  \
+                }                                                                                  \
+            }                                                                                      \
+            if ((p)->payload_len > 0) {                                                            \
+                BUG_ON((p)->payload == NULL);                                                      \
+            }                                                                                      \
+            BUG_ON((p)->flowflags != 0 && (p)->flow == NULL);                                      \
+            BUG_ON((p)->flowflags &FLOW_PKT_TOSERVER && (p)->flowflags & FLOW_PKT_TOCLIENT);       \
+        }                                                                                          \
+    } while (0)
 
 #define DEBUG_VALIDATE_BUG_ON(exp) BUG_ON((exp))