GNUTLS: Forward-port release/3.5 improvements

[solanum.git] / librb / src / commio.c

diff --git a/librb/src/commio.c b/librb/src/commio.c
index b40a5cc2d2483408ecc93bbd5cb25cadef869068..945c0a773c99bb14c6c0d0608913d210821249ad 100644 (file)
--- a/librb/src/commio.c
+++ b/librb/src/commio.c
@@ -1323,6 +1323,7 @@ rb_inet_pton_sock(const char *src, struct sockaddr *dst)
        if(rb_inet_pton(AF_INET, src, &((struct sockaddr_in *)dst)->sin_addr))
        {
                SET_SS_FAMILY(dst, AF_INET);
+               SET_SS_PORT(dst, 0);
                SET_SS_LEN(dst, sizeof(struct sockaddr_in));
                return 1;
        }
@@ -1330,11 +1331,11 @@ rb_inet_pton_sock(const char *src, struct sockaddr *dst)
        else if(rb_inet_pton(AF_INET6, src, &((struct sockaddr_in6 *)dst)->sin6_addr))
        {
                SET_SS_FAMILY(dst, AF_INET6);
+               SET_SS_PORT(dst, 0);
                SET_SS_LEN(dst, sizeof(struct sockaddr_in6));
                return 1;
        }
 #endif
-       SET_SS_PORT(dst, 0);
        return 0;
 }
 
@@ -1345,16 +1346,13 @@ rb_inet_ntop_sock(struct sockaddr *src, char *dst, unsigned int size)
        {
        case AF_INET:
                return (rb_inet_ntop(AF_INET, &((struct sockaddr_in *)src)->sin_addr, dst, size));
-               break;
 #ifdef RB_IPV6
        case AF_INET6:
                return (rb_inet_ntop
                        (AF_INET6, &((struct sockaddr_in6 *)src)->sin6_addr, dst, size));
-               break;
 #endif
        default:
                return NULL;
-               break;
        }
 }