lineedit: do not hang on error, but return error indicator.

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

diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index f018ca9d9e66fcf9ededfe6961e388e1aafd779d..3a6585caa8763aeb473ca6c6e4a7d15eff51b1a2 100644 (file)
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -4,9 +4,10 @@
  *
  * Connect to host at port using address resolution from getaddrinfo
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
+#include <sys/types.h>
 #include <sys/socket.h> /* netinet/in.h needs it */
 #include <netinet/in.h>
 #include <net/if.h>
@@ -21,6 +22,8 @@ int FAST_FUNC setsockopt_broadcast(int fd)
 {
        return setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &const_int_1, sizeof(const_int_1));
 }
+
+#ifdef SO_BINDTODEVICE
 int FAST_FUNC setsockopt_bindtodevice(int fd, const char *iface)
 {
        int r;
@@ -36,26 +39,44 @@ int FAST_FUNC setsockopt_bindtodevice(int fd, const char *iface)
                bb_perror_msg("can't bind to interface %s", iface);
        return r;
 }
+#else
+int FAST_FUNC setsockopt_bindtodevice(int fd UNUSED_PARAM,
+               const char *iface UNUSED_PARAM)
+{
+       bb_error_msg("SO_BINDTODEVICE is not supported on this system");
+       return -1;
+}
+#endif
 
-len_and_sockaddr* FAST_FUNC get_sock_lsa(int fd)
+static len_and_sockaddr* get_lsa(int fd, int (*get_name)(int fd, struct sockaddr *addr, socklen_t *addrlen))
 {
        len_and_sockaddr lsa;
        len_and_sockaddr *lsa_ptr;
 
        lsa.len = LSA_SIZEOF_SA;
-       if (getsockname(fd, &lsa.u.sa, &lsa.len) != 0)
+       if (get_name(fd, &lsa.u.sa, &lsa.len) != 0)
                return NULL;
 
        lsa_ptr = xzalloc(LSA_LEN_SIZE + lsa.len);
        if (lsa.len > LSA_SIZEOF_SA) { /* rarely (if ever) happens */
                lsa_ptr->len = lsa.len;
-               getsockname(fd, &lsa_ptr->u.sa, &lsa_ptr->len);
+               get_name(fd, &lsa_ptr->u.sa, &lsa_ptr->len);
        } else {
                memcpy(lsa_ptr, &lsa, LSA_LEN_SIZE + lsa.len);
        }
        return lsa_ptr;
 }
 
+len_and_sockaddr* FAST_FUNC get_sock_lsa(int fd)
+{
+       return get_lsa(fd, getsockname);
+}
+
+len_and_sockaddr* FAST_FUNC get_peer_lsa(int fd)
+{
+       return get_lsa(fd, getpeername);
+}
+
 void FAST_FUNC xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
 {
        if (connect(s, s_addr, addrlen) < 0) {
@@ -96,28 +117,6 @@ unsigned FAST_FUNC bb_lookup_port(const char *port, const char *protocol, unsign
 }
 
 
-/* "Old" networking API - only IPv4 */
-
-/*
-void FAST_FUNC bb_lookup_host(struct sockaddr_in *s_in, const char *host)
-{
-       struct hostent *he;
-
-       memset(s_in, 0, sizeof(struct sockaddr_in));
-       s_in->sin_family = AF_INET;
-       he = xgethostbyname(host);
-       memcpy(&(s_in->sin_addr), he->h_addr_list[0], he->h_length);
-}
-
-
-int FAST_FUNC xconnect_tcp_v4(struct sockaddr_in *s_addr)
-{
-       int s = xsocket(AF_INET, SOCK_STREAM, 0);
-       xconnect(s, (struct sockaddr*) s_addr, sizeof(*s_addr));
-       return s;
-}
-*/
-
 /* "New" networking API */
 
 
@@ -161,6 +160,7 @@ static len_and_sockaddr* str2sockaddr(
 IF_FEATURE_IPV6(sa_family_t af,)
                int ai_flags)
 {
+IF_NOT_FEATURE_IPV6(sa_family_t af = AF_INET;)
        int rc;
        len_and_sockaddr *r;
        struct addrinfo *result = NULL;
@@ -221,12 +221,40 @@ IF_FEATURE_IPV6(sa_family_t af,)
  skip: ;
        }
 
+       /* Next two if blocks allow to skip getaddrinfo()
+        * in case host name is a numeric IP(v6) address.
+        * getaddrinfo() initializes DNS resolution machinery,
+        * scans network config and such - tens of syscalls.
+        */
+       /* If we were not asked specifically for IPv6,
+        * check whether this is a numeric IPv4 */
+       IF_FEATURE_IPV6(if(af != AF_INET6)) {
+               struct in_addr in4;
+               if (inet_aton(host, &in4) != 0) {
+                       r = xzalloc(LSA_LEN_SIZE + sizeof(struct sockaddr_in));
+                       r->len = sizeof(struct sockaddr_in);
+                       r->u.sa.sa_family = AF_INET;
+                       r->u.sin.sin_addr = in4;
+                       goto set_port;
+               }
+       }
+#if ENABLE_FEATURE_IPV6
+       /* If we were not asked specifically for IPv4,
+        * check whether this is a numeric IPv6 */
+       if (af != AF_INET) {
+               struct in6_addr in6;
+               if (inet_pton(AF_INET6, host, &in6) > 0) {
+                       r = xzalloc(LSA_LEN_SIZE + sizeof(struct sockaddr_in6));
+                       r->len = sizeof(struct sockaddr_in6);
+                       r->u.sa.sa_family = AF_INET6;
+                       r->u.sin6.sin6_addr = in6;
+                       goto set_port;
+               }
+       }
+#endif
+
        memset(&hint, 0 , sizeof(hint));
-#if !ENABLE_FEATURE_IPV6
-       hint.ai_family = AF_INET; /* do not try to find IPv6 */
-#else
        hint.ai_family = af;
-#endif
        /* Needed. Or else we will get each address thrice (or more)
         * for each possible socket type (tcp,udp,raw...): */
        hint.ai_socktype = SOCK_STREAM;
@@ -250,9 +278,11 @@ IF_FEATURE_IPV6(sa_family_t af,)
                }
        }
 #endif
-       r = xmalloc(offsetof(len_and_sockaddr, u.sa) + used_res->ai_addrlen);
+       r = xmalloc(LSA_LEN_SIZE + used_res->ai_addrlen);
        r->len = used_res->ai_addrlen;
        memcpy(&r->u.sa, used_res->ai_addr, used_res->ai_addrlen);
+
+ set_port:
        set_nport(r, htons(port));
  ret:
        freeaddrinfo(result);
@@ -315,7 +345,7 @@ int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, IF_FEATURE_IPV6(int family,)
                len = sizeof(struct sockaddr_in6);
        }
 #endif
-       lsa = xzalloc(offsetof(len_and_sockaddr, u.sa) + len);
+       lsa = xzalloc(LSA_LEN_SIZE + len);
        lsa->len = len;
        lsa->u.sa.sa_family = family;
        *lsap = lsa;