Merge d212450f58 into a7534300bb

Bump actions/upload-artifact from 4.4.0 to 4.4.3

.github/workflows/scorecard.yml

@@ -59,7 +59,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: SARIF file
           path: results.sarif

pcap/logpkt.c

@@ -254,12 +254,16 @@ void logpkt_ctx_init(logpkt_ctx_t *ctx,
                      const struct sockaddr *src_addr,
                      socklen_t src_addr_len,
                      const struct sockaddr *dst_addr,
-                     socklen_t dst_addr_len) {
+                     socklen_t dst_addr_len,
+                     const uint32_t *timestamp_sec,
+                     const uint32_t *timestamp_usec) {
   ctx->libnet = libnet;
   memcpy(ctx->src_ether, src_ether, ETHER_ADDR_LEN);
   memcpy(ctx->dst_ether, dst_ether, ETHER_ADDR_LEN);
   memcpy(&ctx->src_addr, src_addr, src_addr_len);
   memcpy(&ctx->dst_addr, dst_addr, dst_addr_len);
+  memcpy(&ctx->timestamp_sec, timestamp_sec, sizeof(timestamp_sec));
+  memcpy(&ctx->timestamp_usec, timestamp_usec, sizeof(timestamp_usec));
   ctx->src_seq = 0;
   ctx->dst_seq = 0;
   if(mtu) {
@@ -275,13 +279,17 @@ void logpkt_ctx_init(logpkt_ctx_t *ctx,
  * Write the layer 2 frame contained in *pkt* to file descriptor *fd* already
  * open for writing.  First writes a PCAP record header, then the actual frame.
  */
-static int logpkt_pcap_write(const uint8_t *pkt, size_t pktsz, int fd) {
+static int logpkt_pcap_write(const uint8_t *pkt, size_t pktsz, int fd, uint32_t timestamp_sec, uint32_t timestamp_usec) {
   pcap_rec_hdr_t rec_hdr;
   struct timeval tv;
-
+  if (timestamp_sec != 0 || timestamp_usec != 0) {
-  gettimeofday(&tv, NULL);
+    rec_hdr.ts_sec = timestamp_sec;
-  rec_hdr.ts_sec = tv.tv_sec;
+    rec_hdr.ts_usec = timestamp_usec;
-  rec_hdr.ts_usec = tv.tv_usec;
+  } else {
+    gettimeofday(&tv, NULL);
+    rec_hdr.ts_sec = tv.tv_sec;
+    rec_hdr.ts_usec = tv.tv_usec;
+  }
   rec_hdr.orig_len = rec_hdr.incl_len = pktsz;
 
   if(write(fd, &rec_hdr, sizeof(rec_hdr)) != sizeof(rec_hdr)) {
@@ -488,7 +496,8 @@ static int logpkt_write_packet(logpkt_ctx_t *ctx,
                              CSA(&ctx->dst_addr), CSA(&ctx->src_addr), flags,
                              ctx->dst_seq, ctx->src_seq, payload, payloadlen);
     }
-    rv = logpkt_pcap_write(buf, sz, fd);
+
+    rv = logpkt_pcap_write(buf, sz, fd, ctx->timestamp_sec, ctx->timestamp_usec);
     if(rv == -1) {
       printf("Error writing packet to PCAP file\n");
       return -1;

pcap/logpkt.h

@@ -51,6 +51,8 @@ typedef struct {
   uint32_t src_seq;
   uint32_t dst_seq;
   size_t mss;
+  uint32_t timestamp_sec;
+  uint32_t timestamp_usec;
 } logpkt_ctx_t;
 
 #define LOGPKT_REQUEST 0
@@ -65,7 +67,9 @@ void logpkt_ctx_init(logpkt_ctx_t *,
                      const struct sockaddr *,
                      socklen_t,
                      const struct sockaddr *,
-                     socklen_t);
+                     socklen_t,
+                     const uint32_t *,
+                     const uint32_t *);
 int logpkt_write_payload(logpkt_ctx_t *,
                          int,
                          int,

pcap/pcap_logger.c

@@ -72,6 +72,10 @@ static int create_pcap_logger(proto_obj **objp,
   int _status;
   logpkt_ctx_t *pcap_obj = 0;
   struct sockaddr_in src_addr, dst_addr;
+  uint32_t timestamp_sec, timestamp_usec;
+
+  timestamp_sec = base_time->tv_sec;
+  timestamp_usec = base_time->tv_usec;
 
   if(!(pcap_obj = (logpkt_ctx_t *)calloc(1, sizeof(logpkt_ctx_t))))
     ABORT(R_NO_MEMORY);
@@ -89,7 +93,9 @@ static int create_pcap_logger(proto_obj **objp,
   logpkt_ctx_init(pcap_obj, NULL, 0, content_pcap_src_ether,
                   content_pcap_dst_ether, (const struct sockaddr *)&src_addr,
                   sizeof(src_addr), (const struct sockaddr *)&dst_addr,
-                  sizeof(dst_addr));
+                  sizeof(dst_addr),
+                  &timestamp_sec,
+                  &timestamp_usec);
   *objp = (proto_obj *)pcap_obj;
   _status = 0;
 abort: