From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 13 Feb 2015 15:02:33 +0000 (+0100)
Subject: tcp: add IP_PORT_SET() macro
X-Git-Tag: v4.1~320
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53984a38a43373bac31762c3603be9be576247dc;p=thirdparty%2Ftvheadend.git

tcp: add IP_PORT_SET() macro
---

diff --git a/src/tcp.c b/src/tcp.c
index e4558bad1..d47b1c54e 100644
--- 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 33b4d86bc..7bf419049 100644
--- 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
 {