url: fix port type to int (ports above 32766), use AI_NUMERICSERV in tcp and udp...

diff --git a/src/tcp.c b/src/tcp.c
index 5cfc0a63f9090dba4a45c055154e1cd205a6fbec..dc5d18231e52962946c3f6b3a6d5fad71deb562c 100644 (file)
--- 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 b01f114fc19d5e7f86fc7acea4b2cc0a7f8d0fd0..f18d23f05447925837943d3bbee513e0468c8aab 100644 (file)
--- 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 4d7da6f3aa83c6cd229aed5cbc2bba5302ea3c04..5c9b632a2b5bab5b52e7de548aee7d90d283966d 100644 (file)
--- 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;