]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
net: Kill dead code in makesock_addrinfo().
authorAndre Noll <maan@systemlinux.org>
Sun, 8 Sep 2013 04:15:31 +0000 (04:15 +0000)
committerAndre Noll <maan@systemlinux.org>
Wed, 1 Jan 2014 17:40:15 +0000 (17:40 +0000)
Either src or dst is NULL, hence the condition is never true.

net.c

diff --git a/net.c b/net.c
index 07a646b72c89bb8ee442129d9e90d98919f6b94d..d1c6eb510f5b971389968849b713f46995932ab6 100644 (file)
--- a/net.c
+++ b/net.c
@@ -435,10 +435,6 @@ static int makesock_addrinfo(unsigned l4type, bool passive, struct addrinfo *ai,
 
        /* Iterate over all src/dst combination, exhausting dst first */
        for (src = local, dst = remote; src != NULL || dst != NULL; /* no op */ ) {
 
        /* Iterate over all src/dst combination, exhausting dst first */
        for (src = local, dst = remote; src != NULL || dst != NULL; /* no op */ ) {
-               if (src && dst && src->ai_family == AF_INET
-                               && dst->ai_family == AF_INET6)
-                       goto get_next_dst; /* v4 -> v6 is not possible */
-
                ret = socket(src ? src->ai_family : dst->ai_family,
                        sock_type(l4type), l4type);
                if (ret < 0)
                ret = socket(src ? src->ai_family : dst->ai_family,
                        sock_type(l4type), l4type);
                if (ret < 0)