diff options
| author | Gert Doering | 2018-11-30 14:56:41 +0100 |
|---|---|---|
| committer | David Sommerseth | 2018-12-12 13:43:17 +0100 |
| commit | f57431cdc88f22fa4d7962946f0d3187fe058539 (patch) | |
| tree | 6e606561672de812959563f555c591479d406e81 /src/openvpn/socket.c | |
| parent | a7b5993d9d6319c77d80212db61c74060cd7e7f1 (diff) | |
| download | openvpn-f57431cdc88f22fa4d7962946f0d3187fe058539.zip openvpn-f57431cdc88f22fa4d7962946f0d3187fe058539.tar.gz | |
uncrustify openvpn/ sources
There are an amazing number of brackets that were either
totally missing, or have snuck up on the "for(...){"
line. Further, uncrustify wants "|" in multi-line
logical expressions now at the beginning of the new
line, and "PRIi64" now gets surrounding spaces.
Added "sp_after_semi_for_empty=Add" to uncrustify.conf
to leave a few for() statements alone that look better
the way they are.
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: David Sommerseth <davids@openvpn.net>
Message-Id: <20181130135641.11533-3-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17970.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
Diffstat (limited to 'src/openvpn/socket.c')
| -rw-r--r-- | src/openvpn/socket.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 3f2b97e..db94424 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -100,10 +100,12 @@ get_addr_generic(sa_family_t af, unsigned int flags, const char *hostname, bits = 0; max_bits = sizeof(in_addr_t) * 8; break; + case AF_INET6: bits = 64; max_bits = sizeof(struct in6_addr) * 8; break; + default: msg(M_WARN, "Unsupported AF family passed to getaddrinfo for %s (%d)", @@ -125,7 +127,7 @@ get_addr_generic(sa_family_t af, unsigned int flags, const char *hostname, } /* check if this hostname has a /bits suffix */ - sep = strchr(var_host , '/'); + sep = strchr(var_host, '/'); if (sep) { bits = strtoul(sep + 1, &endp, 10); @@ -156,10 +158,12 @@ get_addr_generic(sa_family_t af, unsigned int flags, const char *hostname, *ip4 = ntohl(*ip4); } break; + case AF_INET6: ip6 = network; *ip6 = ((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr; break; + default: /* can't get here because 'af' was previously checked */ msg(M_WARN, |