Index: uspace/lib/c/generic/inet/addr.c =================================================================== --- uspace/lib/c/generic/inet/addr.c (revision 695b6ff32cdb5ebb7fa100f5cba53b124a106990) +++ uspace/lib/c/generic/inet/addr.c (revision f023251c3aa6327894b6d7424d62f7d2d8581485) @@ -33,4 +33,5 @@ */ +#include #include #include @@ -59,10 +60,10 @@ static const inet_addr_t inet_addr_any_addr = { - .family = AF_INET, + .version = ip_v4, .addr = 0 }; static const inet_addr_t inet_addr_any_addr6 = { - .family = AF_INET6, + .version = ip_v6, .addr6 = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }; @@ -150,5 +151,5 @@ void inet_addr(inet_addr_t *addr, uint8_t a, uint8_t b, uint8_t c, uint8_t d) { - addr->family = AF_INET; + addr->version = ip_v4; addr->addr = ((addr32_t) a << 24) | ((addr32_t) b << 16) | ((addr32_t) c << 8) | ((addr32_t) d); @@ -158,5 +159,5 @@ uint8_t prefix) { - naddr->family = AF_INET; + naddr->version = ip_v4; naddr->addr = ((addr32_t) a << 24) | ((addr32_t) b << 16) | ((addr32_t) c << 8) | ((addr32_t) d); @@ -167,5 +168,5 @@ uint16_t d, uint16_t e, uint16_t f, uint16_t g, uint16_t h) { - addr->family = AF_INET6; + addr->version = ip_v6; addr->addr6[0] = (a >> 8) & 0xff; addr->addr6[1] = a & 0xff; @@ -189,5 +190,5 @@ uint16_t d, uint16_t e, uint16_t f, uint16_t g, uint16_t h, uint8_t prefix) { - naddr->family = AF_INET6; + naddr->version = ip_v6; naddr->addr6[0] = (a >> 8) & 0xff; naddr->addr6[1] = a & 0xff; @@ -209,32 +210,47 @@ } -/** Parse network address family. - * - * @param text Network address in common notation. - * @param af Place to store network address family. +/** Determine address version. + * + * @param text Address in common notation. + * @param af Place to store address version. * * @return EOK on success, EINVAL if input is not in valid format. * */ -int inet_addr_family(const char *text, uint16_t *af) +static int inet_addr_version(const char *text, ip_ver_t *ver) { char *dot = str_chr(text, '.'); if (dot != NULL) { - *af = AF_INET; + *ver = ip_v4; return EOK; } - + char *collon = str_chr(text, ':'); if (collon != NULL) { - *af = AF_INET6; + *ver = ip_v6; return EOK; } - + return EINVAL; } +static int ipver_af(ip_ver_t ver) +{ + switch (ver) { + case ip_any: + return AF_NONE; + case ip_v4: + return AF_INET; + case ip_v6: + return AF_INET6; + default: + assert(false); + return EINVAL; + } +} + void inet_naddr_addr(const inet_naddr_t *naddr, inet_addr_t *addr) { - addr->family = naddr->family; + addr->version = naddr->version; memcpy(addr->addr6, naddr->addr6, 16); } @@ -243,5 +259,5 @@ inet_naddr_t *naddr) { - naddr->family = addr->family; + naddr->version = addr->version; memcpy(naddr->addr6, addr->addr6, 16); naddr->prefix = prefix; @@ -250,5 +266,5 @@ void inet_addr_any(inet_addr_t *addr) { - addr->family = AF_NONE; + addr->version = ip_any; memset(addr->addr6, 0, 16); } @@ -256,5 +272,5 @@ void inet_naddr_any(inet_naddr_t *naddr) { - naddr->family = AF_NONE; + naddr->version = ip_any; memset(naddr->addr6, 0, 16); naddr->prefix = 0; @@ -263,11 +279,11 @@ int inet_addr_compare(const inet_addr_t *a, const inet_addr_t *b) { - if (a->family != b->family) + if (a->version != b->version) return 0; - - switch (a->family) { - case AF_INET: + + switch (a->version) { + case ip_v4: return (a->addr == b->addr); - case AF_INET6: + case ip_v6: return addr128_compare(a->addr6, b->addr6); default: @@ -278,5 +294,5 @@ int inet_addr_is_any(const inet_addr_t *addr) { - return ((addr->family == 0) || + return ((addr->version == ip_any) || (inet_addr_compare(addr, &inet_addr_any_addr)) || (inet_addr_compare(addr, &inet_addr_any_addr6))); @@ -285,11 +301,11 @@ int inet_naddr_compare(const inet_naddr_t *naddr, const inet_addr_t *addr) { - if (naddr->family != addr->family) + if (naddr->version != addr->version) return 0; - switch (naddr->family) { - case AF_INET: + switch (naddr->version) { + case ip_v4: return (naddr->addr == addr->addr); - case AF_INET6: + case ip_v6: return addr128_compare(naddr->addr6, addr->addr6); default: @@ -300,16 +316,16 @@ int inet_naddr_compare_mask(const inet_naddr_t *naddr, const inet_addr_t *addr) { - if (naddr->family != addr->family) + if (naddr->version != addr->version) return 0; - - switch (naddr->family) { - case AF_INET: + + switch (naddr->version) { + case ip_v4: if (naddr->prefix > 32) return 0; - + addr32_t mask = BIT_RANGE(addr32_t, 31, 31 - (naddr->prefix - 1)); return ((naddr->addr & mask) == (addr->addr & mask)); - case AF_INET6: + case ip_v6: if (naddr->prefix > 128) return 0; @@ -352,19 +368,19 @@ int inet_addr_parse(const char *text, inet_addr_t *addr) { - int rc = inet_addr_family(text, &addr->family); + int rc = inet_addr_version(text, &addr->version); if (rc != EOK) return rc; uint8_t buf[16]; - rc = inet_pton(addr->family, text, buf); + rc = inet_pton(ipver_af(addr->version), text, buf); if (rc != EOK) return rc; - switch (addr->family) { - case AF_INET: + switch (addr->version) { + case ip_v4: addr->addr = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; break; - case AF_INET6: + case ip_v6: memcpy(addr->addr6, buf, 16); break; @@ -392,10 +408,10 @@ *slash = 0; - int rc = inet_addr_family(text, &naddr->family); + int rc = inet_addr_version(text, &naddr->version); if (rc != EOK) return rc; uint8_t buf[16]; - rc = inet_pton(naddr->family, text, buf); + rc = inet_pton(ipver_af(naddr->version), text, buf); *slash = '/'; @@ -406,6 +422,6 @@ uint8_t prefix; - switch (naddr->family) { - case AF_INET: + switch (naddr->version) { + case ip_v4: prefix = strtoul(slash, &slash, 10); if (prefix > 32) @@ -417,5 +433,5 @@ break; - case AF_INET6: + case ip_v6: prefix = strtoul(slash, &slash, 10); if (prefix > 128) @@ -447,14 +463,14 @@ int rc = 0; - switch (addr->family) { - case AF_NONE: + switch (addr->version) { + case ip_any: rc = asprintf(bufp, "none"); break; - case AF_INET: + case ip_v4: rc = asprintf(bufp, "%u.%u.%u.%u", (addr->addr >> 24) & 0xff, (addr->addr >> 16) & 0xff, (addr->addr >> 8) & 0xff, addr->addr & 0xff); break; - case AF_INET6: + case ip_v6: *bufp = (char *) malloc(INET6_ADDRSTRLEN); if (*bufp == NULL) @@ -487,9 +503,9 @@ char prefix[INET_PREFIXSTRSIZE]; - switch (naddr->family) { - case AF_NONE: + switch (naddr->version) { + case ip_any: rc = asprintf(bufp, "none"); break; - case AF_INET: + case ip_v4: rc = asprintf(bufp, "%" PRIu8 ".%" PRIu8 ".%" PRIu8 ".%" PRIu8 "/%" PRIu8, (naddr->addr >> 24) & 0xff, @@ -497,5 +513,5 @@ naddr->addr & 0xff, naddr->prefix); break; - case AF_INET6: + case ip_v6: *bufp = (char *) malloc(INET6_ADDRSTRLEN + INET_PREFIXSTRSIZE); if (*bufp == NULL) @@ -529,50 +545,50 @@ } -uint16_t inet_addr_get(const inet_addr_t *addr, addr32_t *v4, addr128_t *v6) -{ - switch (addr->family) { - case AF_INET: +ip_ver_t inet_addr_get(const inet_addr_t *addr, addr32_t *v4, addr128_t *v6) +{ + switch (addr->version) { + case ip_v4: if (v4 != NULL) *v4 = addr->addr; - - break; - case AF_INET6: + break; + case ip_v6: if (v6 != NULL) memcpy(*v6, addr->addr6, 16); - - break; - } - - return addr->family; -} - -uint16_t inet_naddr_get(const inet_naddr_t *naddr, addr32_t *v4, addr128_t *v6, + break; + default: + assert(false); + break; + } + + return addr->version; +} + +ip_ver_t inet_naddr_get(const inet_naddr_t *naddr, addr32_t *v4, addr128_t *v6, uint8_t *prefix) { - switch (naddr->family) { - case AF_INET: + switch (naddr->version) { + case ip_v4: if (v4 != NULL) *v4 = naddr->addr; - if (prefix != NULL) *prefix = naddr->prefix; - - break; - case AF_INET6: + break; + case ip_v6: if (v6 != NULL) memcpy(*v6, naddr->addr6, 16); - if (prefix != NULL) *prefix = naddr->prefix; - - break; - } - - return naddr->family; + break; + default: + assert(false); + break; + } + + return naddr->version; } void inet_addr_set(addr32_t v4, inet_addr_t *addr) { - addr->family = AF_INET; + addr->version = ip_v4; addr->addr = v4; } @@ -580,5 +596,5 @@ void inet_naddr_set(addr32_t v4, uint8_t prefix, inet_naddr_t *naddr) { - naddr->family = AF_INET; + naddr->version = ip_v4; naddr->addr = v4; naddr->prefix = prefix; @@ -587,5 +603,5 @@ void inet_sockaddr_in_addr(const sockaddr_in_t *sockaddr_in, inet_addr_t *addr) { - addr->family = AF_INET; + addr->version = ip_v4; addr->addr = uint32_t_be2host(sockaddr_in->sin_addr.s_addr); } @@ -593,5 +609,5 @@ void inet_addr_set6(addr128_t v6, inet_addr_t *addr) { - addr->family = AF_INET6; + addr->version = ip_v6; memcpy(addr->addr6, v6, 16); } @@ -599,5 +615,5 @@ void inet_naddr_set6(addr128_t v6, uint8_t prefix, inet_naddr_t *naddr) { - naddr->family = AF_INET6; + naddr->version = ip_v6; memcpy(naddr->addr6, v6, 16); naddr->prefix = prefix; @@ -607,5 +623,5 @@ inet_addr_t *addr) { - addr->family = AF_INET6; + addr->version = ip_v6; addr128_t_be2host(sockaddr_in6->sin6_addr.s6_addr, addr->addr6); } @@ -614,22 +630,23 @@ sockaddr_in_t *sockaddr_in, sockaddr_in6_t *sockaddr_in6) { - switch (addr->family) { - case AF_INET: + switch (addr->version) { + case ip_v4: if (sockaddr_in != NULL) { sockaddr_in->sin_family = AF_INET; sockaddr_in->sin_addr.s_addr = host2uint32_t_be(addr->addr); } - - break; - case AF_INET6: + break; + case ip_v6: if (sockaddr_in6 != NULL) { sockaddr_in6->sin6_family = AF_INET6; host2addr128_t_be(addr->addr6, sockaddr_in6->sin6_addr.s6_addr); } - - break; - } - - return addr->family; + break; + default: + assert(false); + break; + } + + return ipver_af(addr->version); }