- fixes parallel builds (make -j)

[oweals/busybox.git] / libbb / xconnect.c

diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 2cbc8400bb6bf795bd9a5bcf9ccf6837f149f436..ec99c58829db8c980a665898037fa1c2e56475b9 100644 (file)
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -2,7 +2,7 @@
 /*
  * Utility routines.
  *
- * Connect to host at port using address resolusion from getaddrinfo
+ * Connect to host at port using address resolution from getaddrinfo
  *
  */
 
@@ -18,30 +18,38 @@
 #include <arpa/inet.h>
 #include "libbb.h"
 
-int bb_getport(const char *port)
+/* Return network byte ordered port number for a service.
+ * If "port" is a number use it as the port.
+ * If "port" is a name it is looked up in /etc/services, if it isnt found return
+ * default_port
+ */
+unsigned short bb_lookup_port(const char *port, const char *protocol, unsigned short default_port)
 {
-       int port_nr;
-       char *endptr;
-       struct servent *tserv;
+       unsigned short port_nr = htons(default_port);
+       if (port) {
+               char *endptr;
+               int old_errno;
+               long port_long;
 
-       if (!port) {
-               return -1;
-       }
-       port_nr=strtol(port, &endptr, 10);
-       if (errno != 0 || *endptr!='\0' || endptr==port || port_nr < 1 || port_nr > 65536) 
-       {
-               if (port_nr==0 && (tserv = getservbyname(port, "tcp")) != NULL) {
-                       port_nr = tserv->s_port;
+               /* Since this is a lib function, we're not allowed to reset errno to 0.
+                * Doing so could break an app that is deferring checking of errno. */
+               old_errno = errno;
+               errno = 0;
+               port_long = strtol(port, &endptr, 10);
+               if (errno != 0 || *endptr!='\0' || endptr==port || port_long < 0 || port_long > 65535) {
+                       struct servent *tserv = getservbyname(port, protocol);
+                       if (tserv) {
+                               port_nr = tserv->s_port;
+                       }
                } else {
-                       return -1;
+                       port_nr = htons(port_long);
                }
-       } else {
-               port_nr = htons(port_nr);
+               errno = old_errno;
        }
        return port_nr;
 }
 
-void bb_lookup_host(struct sockaddr_in *s_in, const char *host, const char *port)
+void bb_lookup_host(struct sockaddr_in *s_in, const char *host)
 {
        struct hostent *he;
 
@@ -49,18 +57,15 @@ void bb_lookup_host(struct sockaddr_in *s_in, const char *host, const char *port
        s_in->sin_family = AF_INET;
        he = xgethostbyname(host);
        memcpy(&(s_in->sin_addr), he->h_addr_list[0], he->h_length);
-
-       if (port) {
-               s_in->sin_port=bb_getport(port);
-       }
 }
 
 int xconnect(struct sockaddr_in *s_addr)
 {
        int s = socket(AF_INET, SOCK_STREAM, 0);
-       if (connect(s, (struct sockaddr_in *)s_addr, sizeof(struct sockaddr_in)) < 0)
+       if (connect(s, (struct sockaddr *)s_addr, sizeof(struct sockaddr_in)) < 0)
        {
-               bb_perror_msg_and_die("Unable to connect to remote host (%s)", 
+               if (ENABLE_FEATURE_CLEAN_UP) close(s);
+               bb_perror_msg_and_die("Unable to connect to remote host (%s)",
                                inet_ntoa(s_addr->sin_addr));
        }
        return s;