From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 9 Oct 2024 21:21:32 +0000 (-0600)
Subject: examples/lib: use packet setter functions
X-Git-Tag: suricata-8.0.0-beta1~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=461e9110b637556572d967391d1f164ea4ec7f4a;p=thirdparty%2Fsuricata.git

examples/lib: use packet setter functions

Instead of direct field access.

Ticket: #7240
---

diff --git a/examples/lib/custom/main.c b/examples/lib/custom/main.c
index 12fb1f6bcb..7aa797f35f 100644
--- a/examples/lib/custom/main.c
+++ b/examples/lib/custom/main.c
@@ -107,11 +107,11 @@ static void *SimpleWorker(void *arg)
 
         /* Setup the packet, these will become functions to avoid
          * internal Packet access. */
-        PKT_SET_SRC(p, PKT_SRC_WIRE);
-        p->ts = SCTIME_FROM_TIMEVAL(&pkthdr.ts);
-        p->datalink = datalink;
-        p->livedev = device;
-        p->ReleasePacket = ReleasePacket;
+        SCPacketSetSource(p, PKT_SRC_WIRE);
+        SCPacketSetTime(p, SCTIME_FROM_TIMEVAL(&pkthdr.ts));
+        SCPacketSetDatalink(p, datalink);
+        SCPacketSetLiveDevice(p, device);
+        SCPacketSetReleasePacket(p, ReleasePacket);
 
         if (PacketSetData(p, packet, pkthdr.len) == -1) {
             TmqhOutputPacketpool(tv, p);
diff --git a/examples/plugins/ci-capture/source.c b/examples/plugins/ci-capture/source.c
index c6953b2f25..c6bce18613 100644
--- a/examples/plugins/ci-capture/source.c
+++ b/examples/plugins/ci-capture/source.c
@@ -20,6 +20,7 @@
 #include "tm-modules.h"
 #include "tm-threads-common.h"
 #include "tm-threads.h"
+#include "packet.h"
 
 #include "source.h"
 
@@ -69,11 +70,11 @@ static TmEcode ReceiveLoop(ThreadVars *tv, void *data, void *slot)
     if (unlikely(p == NULL)) {
         return TM_ECODE_FAILED;
     }
-    PKT_SET_SRC(p, PKT_SRC_WIRE);
+    SCPacketSetSource(p, PKT_SRC_WIRE);
     struct timeval now;
     gettimeofday(&now, NULL);
-    p->ts = SCTIME_FROM_TIMEVAL(&now);
-    p->datalink = LINKTYPE_ETHERNET;
+    SCPacketSetTime(p, SCTIME_FROM_TIMEVAL(&now));
+    SCPacketSetDatalink(p, LINKTYPE_ETHERNET);
     p->flags |= PKT_IGNORE_CHECKSUM;
 
     if (unlikely(PacketCopyData(p, DNS_REQUEST, sizeof(DNS_REQUEST)) != 0)) {