From: Victor Julien <vjulien@oisf.net>
Date: Tue, 10 May 2022 11:26:07 +0000 (+0200)
Subject: detect: address parsing variable rename to match code style
X-Git-Tag: suricata-7.0.0-beta1~554
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffef10c5d786a9c006d98515e3108f3c5f0ac99b;p=thirdparty%2Fsuricata.git

detect: address parsing variable rename to match code style
---

diff --git a/src/detect-engine-iponly.c b/src/detect-engine-iponly.c
index e9604384a3..6a3740b64a 100644
--- a/src/detect-engine-iponly.c
+++ b/src/detect-engine-iponly.c
@@ -842,15 +842,15 @@ int IPOnlySigParseAddress(const DetectEngineCtx *de_ctx,
         if (strcasecmp(addrstr, "any") == 0) {
             s->flags |= SIG_FLAG_SRC_ANY;
 
-            if (IPOnlyCIDRListParse(de_ctx, &s->CidrSrc, (char *)"0.0.0.0/0") < 0)
+            if (IPOnlyCIDRListParse(de_ctx, &s->cidr_src, (char *)"0.0.0.0/0") < 0)
                 goto error;
 
             if (IPOnlyCIDRListParse(de_ctx, &tmp, (char *)"::/0") < 0)
                 goto error;
 
-            s->CidrSrc = IPOnlyCIDRItemInsert(s->CidrSrc, tmp);
+            s->cidr_src = IPOnlyCIDRItemInsert(s->cidr_src, tmp);
 
-        } else if (IPOnlyCIDRListParse(de_ctx, &s->CidrSrc, (char *)addrstr) < 0) {
+        } else if (IPOnlyCIDRListParse(de_ctx, &s->cidr_src, (char *)addrstr) < 0) {
             goto error;
         }
 
@@ -862,12 +862,12 @@ int IPOnlySigParseAddress(const DetectEngineCtx *de_ctx,
             if (IPOnlyCIDRListParse(de_ctx, &tmp, (char *)"0.0.0.0/0") < 0)
                 goto error;
 
-            if (IPOnlyCIDRListParse(de_ctx, &s->CidrDst, (char *)"::/0") < 0)
+            if (IPOnlyCIDRListParse(de_ctx, &s->cidr_dst, (char *)"::/0") < 0)
                 goto error;
 
-            s->CidrDst = IPOnlyCIDRItemInsert(s->CidrDst, tmp);
+            s->cidr_dst = IPOnlyCIDRItemInsert(s->cidr_dst, tmp);
 
-        } else if (IPOnlyCIDRListParse(de_ctx, &s->CidrDst, (char *)addrstr) < 0) {
+        } else if (IPOnlyCIDRListParse(de_ctx, &s->cidr_dst, (char *)addrstr) < 0) {
             goto error;
         }
 
@@ -1562,23 +1562,23 @@ void IPOnlyAddSignature(DetectEngineCtx *de_ctx, DetectEngineIPOnlyCtx *io_ctx,
         return;
 
     /* Set the internal signum to the list before merging */
-    IPOnlyCIDRListSetSigNum(s->CidrSrc, s->num);
+    IPOnlyCIDRListSetSigNum(s->cidr_src, s->num);
 
-    IPOnlyCIDRListSetSigNum(s->CidrDst, s->num);
+    IPOnlyCIDRListSetSigNum(s->cidr_dst, s->num);
 
     /**
      * ipv4 and ipv6 are mixed, but later we will separate them into
      * different trees
      */
-    io_ctx->ip_src = IPOnlyCIDRItemInsert(io_ctx->ip_src, s->CidrSrc);
-    io_ctx->ip_dst = IPOnlyCIDRItemInsert(io_ctx->ip_dst, s->CidrDst);
+    io_ctx->ip_src = IPOnlyCIDRItemInsert(io_ctx->ip_src, s->cidr_src);
+    io_ctx->ip_dst = IPOnlyCIDRItemInsert(io_ctx->ip_dst, s->cidr_dst);
 
     if (s->num > io_ctx->max_idx)
         io_ctx->max_idx = s->num;
 
     /** no longer ref to this, it's in the table now */
-    s->CidrSrc = NULL;
-    s->CidrDst = NULL;
+    s->cidr_src = NULL;
+    s->cidr_dst = NULL;
 }
 
 #ifdef UNITTESTS
diff --git a/src/detect-parse.c b/src/detect-parse.c
index cd367921a1..a93be388ca 100644
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -1391,11 +1391,11 @@ void SigFree(DetectEngineCtx *de_ctx, Signature *s)
     if (s == NULL)
         return;
 
-    if (s->CidrDst != NULL)
-        IPOnlyCIDRListFree(s->CidrDst);
+    if (s->cidr_dst != NULL)
+        IPOnlyCIDRListFree(s->cidr_dst);
 
-    if (s->CidrSrc != NULL)
-        IPOnlyCIDRListFree(s->CidrSrc);
+    if (s->cidr_src != NULL)
+        IPOnlyCIDRListFree(s->cidr_src);
 
     int i;
 
diff --git a/src/detect.h b/src/detect.h
index e1b4ef5f6e..8b92323b1b 100644
--- a/src/detect.h
+++ b/src/detect.h
@@ -592,7 +592,7 @@ typedef struct Signature_ {
 #endif
 
     /** netblocks and hosts specified at the sid, in CIDR format */
-    IPOnlyCIDRItem *CidrSrc, *CidrDst;
+    IPOnlyCIDRItem *cidr_src, *cidr_dst;
 
     DetectEngineAppInspectionEngine *app_inspect;
     DetectEnginePktInspectionEngine *pkt_inspect;