From: Kirill A. Korinsky <kirill@korins.ky>
Subject: net/tcpreplay: fix for llvm-22 (was: [llvm22] Breakage 2026-05-28)
To: Christian Weisgerber <naddy@mips.inka.de>
Cc: ports@openbsd.org, Nigel Taylor <nigel@openbsd.org>
Date: Tue, 02 Jun 2026 22:30:09 +0200

On Fri, 29 May 2026 23:58:14 +0200,
Christian Weisgerber <naddy@mips.inka.de> wrote:
> 
> net/tcpreplay                       nigel@

Here a diff.

Ok?

Index: patches/patch-src_common_flows_c
===================================================================
RCS file: patches/patch-src_common_flows_c
diff -N patches/patch-src_common_flows_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_common_flows_c	2 Jun 2026 20:27:15 -0000
@@ -0,0 +1,22 @@
+flows.c:320:45: fatal error: incompatible pointer types passing 'const struct bpf_timeval *' to parameter of type 'const struct timeval *'
+
+Index: src/common/flows.c
+--- src/common/flows.c.orig
++++ src/common/flows.c
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <net/bpf.h>
+ 
+ #define JUNIPER_FLAG_NO_L2          0x02     /* L2 header */
+ #define JUNIPER_FLAG_EXT            0x80     /* Juniper extensions present */
+@@ -115,7 +116,7 @@ static inline flow_hash_entry_t *hash_add_entry(flow_h
+  * Only check for expiry if 'expiry' is set
+  */
+ static inline flow_entry_type_t hash_put_data(flow_hash_table_t *fht, const uint32_t key,
+-        const flow_entry_data_t *hash_entry, const struct timeval *tv, const int expiry)
++        const flow_entry_data_t *hash_entry, const struct bpf_timeval *tv, const int expiry)
+ {
+     uint32_t hash_value = key & (fht->num_buckets - 1);
+     flow_hash_entry_t *he;


-- 
wbr, Kirill