move macros

baresip · Dec 12, 2024 · 3ac7ded · 3ac7ded
1 parent c7179de
commit 3ac7ded
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 27 deletions.
diff --git a/src/net/linux/addrs.c b/src/net/linux/addrs.c
@@ -8,26 +8,12 @@
 #include <re_fmt.h>
 #include <re_sa.h>
 #include <re_net.h>
+#include "macros.h"
 
 #define DEBUG_MODULE "linuxaddrs"
 #define DEBUG_LEVEL 5
 #include <re_dbg.h>
 
-/* Override macros to avoid casting alignment warning */
-#undef RTM_RTA
-#define RTM_RTA(r) (void *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct rtmsg)))
-#undef RTA_NEXT
-#define RTA_NEXT(rta, len)                                                    \
-	((len) -= RTA_ALIGN((rta)->rta_len),                                  \
-	 (void *)(((char *)(rta)) + RTA_ALIGN((rta)->rta_len)))
-#undef NLMSG_NEXT
-#define NLMSG_NEXT(nlh, len)                                                  \
-	((len) -= NLMSG_ALIGN((nlh)->nlmsg_len),                              \
-	 (void *)(((char *)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
-#undef IFA_RTA
-#define IFA_RTA(r)                                                            \
-	((void *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
-
 
 static void parse_rtattr(struct rtattr *tb[], struct rtattr *rta, int len)
 {

diff --git a/src/net/linux/macros.h b/src/net/linux/macros.h
@@ -0,0 +1,14 @@
+/* Override macros to avoid casting alignment warning */
+#undef RTM_RTA
+#define RTM_RTA(r) (void *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct rtmsg)))
+#undef RTA_NEXT
+#define RTA_NEXT(rta, len)                                                    \
+	((len) -= RTA_ALIGN((rta)->rta_len),                                  \
+	 (void *)(((char *)(rta)) + RTA_ALIGN((rta)->rta_len)))
+#undef NLMSG_NEXT
+#define NLMSG_NEXT(nlh, len)                                                  \
+	((len) -= NLMSG_ALIGN((nlh)->nlmsg_len),                              \
+	 (void *)(((char *)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
+#undef IFA_RTA
+#define IFA_RTA(r)                                                            \
+	((void *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
diff --git a/src/net/linux/rt.c b/src/net/linux/rt.c
@@ -15,24 +15,13 @@
 #include <re_fmt.h>
 #include <re_sa.h>
 #include <re_net.h>
+#include "macros.h"
 
 
 #define DEBUG_MODULE "linuxrt"
 #define DEBUG_LEVEL 5
 #include <re_dbg.h>
 
-
-/* Override macros to avoid casting alignment warning */
-#undef RTM_RTA
-#define RTM_RTA(r) (void *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct rtmsg)))
-#undef RTA_NEXT
-#define RTA_NEXT(rta, len) ((len) -= RTA_ALIGN((rta)->rta_len), \
-		(void *)(((char *)(rta)) + RTA_ALIGN((rta)->rta_len)))
-#undef NLMSG_NEXT
-#define NLMSG_NEXT(nlh,len)	 ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \
-		  (void*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len)))
-
-
 enum {BUFSIZE = 8192};