From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 14 Oct 2014 07:12:56 +0000 (+0200)
Subject: url: fix port type to int (ports above 32766), use AI_NUMERICSERV in tcp and udp... 
X-Git-Tag: v4.1~1041
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc276263a3d9512cfbd9f743fde837fce3db511e;p=thirdparty%2Ftvheadend.git

url: fix port type to int (ports above 32766), use AI_NUMERICSERV in tcp and udp, fixes #2369
---

diff --git a/src/tcp.c b/src/tcp.c
index 5cfc0a63f..dc5d18231 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -647,7 +647,7 @@ tcp_server_create
   snprintf(port_buf, 6, "%d", port);
 
   memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_flags = AI_PASSIVE;
+  hints.ai_flags = AI_PASSIVE | AI_NUMERICSERV;
   if (bindaddr != NULL)
       hints.ai_flags |= AI_NUMERICHOST;
   hints.ai_family = AF_UNSPEC;
diff --git a/src/udp.c b/src/udp.c
index b01f114fc..f18d23f05 100644
--- a/src/udp.c
+++ b/src/udp.c
@@ -48,7 +48,7 @@ udp_resolve( udp_connection_t *uc, int receiver )
   snprintf(port_buf, 6, "%d", uc->port);
 
   memset(&hints, 0, sizeof(struct addrinfo));
-  hints.ai_flags = receiver ? AI_PASSIVE : 0;
+  hints.ai_flags = (receiver ? AI_PASSIVE : 0) | AI_NUMERICSERV;
   hints.ai_family = AF_UNSPEC;
   hints.ai_socktype = SOCK_DGRAM;
   
diff --git a/src/url.h b/src/url.h
index 4d7da6f3a..5c9b632a2 100644
--- a/src/url.h
+++ b/src/url.h
@@ -29,7 +29,7 @@ typedef struct url
   char  *user;
   char  *pass;
   char  *host;
-  short  port;
+  int    port;
   char  *path;
   char  *query;
   char  *frag;