From aafe81555677d0d81ebdff005461ca775534c101 Mon Sep 17 00:00:00 2001
From: Gleb Popov <6yearold@gmail.com>
Date: Sat, 21 Sep 2024 20:30:11 +0300
Subject: [PATCH] Move the ifr_ifindex FreeBSD definition into a header file to
 reduce code duplication

---
 src/modules/module-netjack2-manager.c | 4 ----
 src/modules/module-rtp-sap.c          | 1 -
 src/modules/module-rtp-session.c      | 4 ----
 src/modules/module-rtp-source.c       | 4 ----
 src/modules/module-vban-recv.c        | 4 ----
 src/modules/network-utils.h           | 4 ++++
 6 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/modules/module-netjack2-manager.c b/src/modules/module-netjack2-manager.c
index e5afc6f47..8229b5d5f 100644
--- a/src/modules/module-netjack2-manager.c
+++ b/src/modules/module-netjack2-manager.c
@@ -39,10 +39,6 @@
 #include "module-netjack2/peer.c"
 #include "network-utils.h"
 
-#ifdef __FreeBSD__
-#define ifr_ifindex ifr_index
-#endif
-
 #ifndef IPTOS_DSCP
 #define IPTOS_DSCP_MASK 0xfc
 #define IPTOS_DSCP(x) ((x) & IPTOS_DSCP_MASK)
diff --git a/src/modules/module-rtp-sap.c b/src/modules/module-rtp-sap.c
index f17bfac8e..cc0c27035 100644
--- a/src/modules/module-rtp-sap.c
+++ b/src/modules/module-rtp-sap.c
@@ -29,7 +29,6 @@
 #include "network-utils.h"
 
 #ifdef __FreeBSD__
-#define ifr_ifindex ifr_index
 #define SO_PASSCRED LOCAL_CREDS_PERSISTENT
 #endif
 
diff --git a/src/modules/module-rtp-session.c b/src/modules/module-rtp-session.c
index 4c4e47922..ab5e1d8a7 100644
--- a/src/modules/module-rtp-session.c
+++ b/src/modules/module-rtp-session.c
@@ -39,10 +39,6 @@
 #include <module-rtp/stream.h>
 #include "network-utils.h"
 
-#ifdef __FreeBSD__
-#define ifr_ifindex ifr_index
-#endif
-
 /** \page page_module_rtp_session RTP session
  *
  * The `rtp-session` module creates a media session that is announced
diff --git a/src/modules/module-rtp-source.c b/src/modules/module-rtp-source.c
index 123fa515d..488ba3738 100644
--- a/src/modules/module-rtp-source.c
+++ b/src/modules/module-rtp-source.c
@@ -32,10 +32,6 @@
 #include <module-rtp/stream.h>
 #include "network-utils.h"
 
-#ifdef __FreeBSD__
-#define ifr_ifindex ifr_index
-#endif
-
 /** \page page_module_rtp_source RTP source
  *
  * The `rtp-source` module creates a PipeWire source that receives audio
diff --git a/src/modules/module-vban-recv.c b/src/modules/module-vban-recv.c
index 4f94ad594..52cf363a0 100644
--- a/src/modules/module-vban-recv.c
+++ b/src/modules/module-vban-recv.c
@@ -32,10 +32,6 @@
 #include <module-vban/stream.h>
 #include "network-utils.h"
 
-#ifdef __FreeBSD__
-#define ifr_ifindex ifr_index
-#endif
-
 /** \page page_module_vban_recv VBAN receiver
  *
  * The `vban-recv` module creates a PipeWire source that receives audio
diff --git a/src/modules/network-utils.h b/src/modules/network-utils.h
index 720b049fd..25354f4c4 100644
--- a/src/modules/network-utils.h
+++ b/src/modules/network-utils.h
@@ -8,6 +8,10 @@
 #include <net/if.h>
 #include <errno.h>
 
+#ifdef __FreeBSD__
+#define ifr_ifindex ifr_index
+#endif
+
 static inline int pw_net_parse_address(const char *address, uint16_t port,
 		struct sockaddr_storage *addr, socklen_t *len)
 {