From 0110584e3912c3be9cd32628128caa46d4740ed2 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Fri, 1 Nov 2024 18:51:59 +0800 Subject: [PATCH] NetIO (*BSD): support OpenBSD & NetBSD --- CMakeLists.txt | 4 ++-- src/detection/netio/netio_bsd.c | 4 ++++ src/modules/netio/netio.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 89ae8800e..7e4ae502f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -722,7 +722,7 @@ elseif(NetBSD) src/detection/media/media_linux.c src/detection/memory/memory_obsd.c src/detection/mouse/mouse_nosupport.c - src/detection/netio/netio_nosupport.c + src/detection/netio/netio_bsd.c src/detection/opengl/opengl_linux.c src/detection/os/os_nbsd.c src/detection/packages/packages_obsd.c @@ -804,7 +804,7 @@ elseif(OpenBSD) src/detection/media/media_linux.c src/detection/memory/memory_obsd.c src/detection/mouse/mouse_nosupport.c - src/detection/netio/netio_nosupport.c + src/detection/netio/netio_bsd.c src/detection/opengl/opengl_linux.c src/detection/os/os_obsd.c src/detection/packages/packages_obsd.c diff --git a/src/detection/netio/netio_bsd.c b/src/detection/netio/netio_bsd.c index 6bf9a8ce6..5328949a9 100644 --- a/src/detection/netio/netio_bsd.c +++ b/src/detection/netio/netio_bsd.c @@ -48,7 +48,11 @@ const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options) .rxPackets = ifm->ifm_data.ifi_ipackets, .txErrors = ifm->ifm_data.ifi_oerrors, .rxErrors = ifm->ifm_data.ifi_ierrors, + #ifdef _IFI_OQDROPS + .txDrops = if2m->ifm_data.ifi_oqdrops, + #else .txDrops = 0, // unsupported + #endif .rxDrops = ifm->ifm_data.ifi_iqdrops, .defaultRoute = sdl->sdl_index == defaultRouteIfIndex, }; diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c index 89113c375..6dd3e8a98 100644 --- a/src/modules/netio/netio.c +++ b/src/modules/netio/netio.c @@ -264,7 +264,7 @@ void ffInitNetIOOptions(FFNetIOOptions* options) ffStrbufInit(&options->namePrefix); options->defaultRouteOnly = - #ifdef __ANDROID__ + #if __ANDROID__ || __OpenBSD__ false #else true