tcp: add IP_PORT_SET() macro

diff --git a/src/tcp.c b/src/tcp.c
index e4558bad184d123aba6d2cdee8585e7432562843..d47b1c54e9504c4c7d9ae5a2a2670535e500eb4b 100644 (file)
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -771,10 +771,7 @@ tcp_default_ip_addr ( struct sockaddr_storage *deflt )
                 IP_IN_ADDR(ss)) <= 0)
     return -1;
 
-  if (ss.ss_family == AF_INET)
-    IP_AS_V4(ss, port) = htons(53);
-  else
-    IP_AS_V6(ss, port) = htons(53);
+  IP_PORT_SET(ss, htons(53));
 
   sock = tvh_socket(ss.ss_family, SOCK_STREAM, 0);
   if (sock < 0)

diff --git a/src/tcp.h b/src/tcp.h
index 33b4d86bc691f5b7638a42f836eec62d1f8d0ada..7bf4190498a72d46f1aa5e8f44c5585ca6d2160a 100644 (file)
--- a/src/tcp.h
+++ b/src/tcp.h
@@ -36,6 +36,10 @@
   ((storage).ss_family == AF_INET6 ? \
       ((struct sockaddr_in6 *)&(storage))->sin6_port : \
       ((struct sockaddr_in  *)&(storage))->sin_port)
+#define IP_PORT_SET(storage, port) \
+  if ((storage).ss_family == AF_INET6) \
+      ((struct sockaddr_in6 *)&(storage))->sin6_port = (port); else \
+      ((struct sockaddr_in  *)&(storage))->sin_port  = (port);
 
 typedef struct tcp_server_ops
 {