url: fix port type to int (ports above 32766), use AI_NUMERICSERV in …

…tcp and udp, fixes #2369
tvheadend · Oct 14, 2014 · cc27626 · cc27626
1 parent 73bf840
commit cc27626
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -29,7 +29,7 @@ typedef struct url
   char  *user;
   char  *pass;
   char  *host;
-  short  port;
+  int    port;
   char  *path;
   char  *query;
   char  *frag;