Index: src/OFDNSResolver.m ================================================================== --- src/OFDNSResolver.m +++ src/OFDNSResolver.m @@ -591,11 +591,11 @@ #endif if (_staticHosts == nil) { OFArray *localhost = -#ifdef HAVE_IPV6 +#ifdef OF_HAVE_IPV6 localhost = [OFArray arrayWithObjects: @"::1", @"127.0.0.1", nil]; #else localhost = [OFArray arrayWithObject: @"127.0.0.1"]; #endif @@ -604,11 +604,11 @@ initWithObject: localhost forKey: @"localhost"]; } if (_nameServers == nil) -#ifdef HAVE_IPV6 +#ifdef OF_HAVE_IPV6 _nameServers = [[OFArray alloc] initWithObjects: @"127.0.0.1", @"::1", nil]; #else _nameServers = [[OFArray alloc] initWithObject: @"127.0.0.1"]; Index: src/OFTCPSocket.m ================================================================== --- src/OFTCPSocket.m +++ src/OFTCPSocket.m @@ -366,11 +366,11 @@ const int one = 1; #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS) union { struct sockaddr_storage storage; struct sockaddr_in in; -# ifdef HAVE_IPV6 +# ifdef OF_HAVE_IPV6 struct sockaddr_in6 in6; # endif } addr; socklen_t addrLen; #endif @@ -434,11 +434,11 @@ case AF_INET: ((struct sockaddr_in *) results[0]->address)->sin_port = OF_BSWAP16_IF_LE(rnd); break; -# ifdef HAVE_IPV6 +# ifdef OF_HAVE_IPV6 case AF_INET6: ((struct sockaddr_in6 *) results[0]->address)->sin6_port = OF_BSWAP16_IF_LE(rnd); break; @@ -493,11 +493,11 @@ errNo: errNo]; } if (addr.storage.ss_family == AF_INET) return OF_BSWAP16_IF_LE(addr.in.sin_port); -# ifdef HAVE_IPV6 +# ifdef OF_HAVE_IPV6 if (addr.storage.ss_family == AF_INET6) return OF_BSWAP16_IF_LE(addr.in6.sin6_port); # endif #endif Index: src/OFUDPSocket.m ================================================================== --- src/OFUDPSocket.m +++ src/OFUDPSocket.m @@ -280,11 +280,11 @@ of_resolver_result_t **results; #if !defined(OF_WII) && !defined(OF_NINTENDO_3DS) union { struct sockaddr_storage storage; struct sockaddr_in in; -# ifdef HAVE_IPV6 +# ifdef OF_HAVE_IPV6 struct sockaddr_in6 in6; # endif } addr; socklen_t addrLen; #endif @@ -338,11 +338,11 @@ case AF_INET: ((struct sockaddr_in *) results[0]->address)->sin_port = OF_BSWAP16_IF_LE(rnd); break; -# ifdef HAVE_IPV6 +# ifdef OF_HAVE_IPV6 case AF_INET6: ((struct sockaddr_in6 *) results[0]->address)->sin6_port = OF_BSWAP16_IF_LE(rnd); break; @@ -397,11 +397,11 @@ errNo: errNo]; } if (addr.storage.ss_family == AF_INET) return OF_BSWAP16_IF_LE(addr.in.sin_port); -# ifdef HAVE_IPV6 +# ifdef OF_HAVE_IPV6 if (addr.storage.ss_family == AF_INET6) return OF_BSWAP16_IF_LE(addr.in6.sin6_port); # endif #endif Index: src/socket.m ================================================================== --- src/socket.m +++ src/socket.m @@ -243,11 +243,11 @@ objc_autoreleasePoolPop(pool); return ret; } -#ifdef HAVE_IPV6 +#ifdef OF_HAVE_IPV6 static of_socket_address_t parseIPv6(OFString *IPv6, uint16_t port) { void *pool = objc_autoreleasePoolPush(); of_socket_address_t ret; @@ -258,11 +258,11 @@ addrIn6->sin6_family = AF_INET6; addrIn6->sin6_port = OF_BSWAP16_IF_LE(port); if (inet_pton(AF_INET6, [IPv6 cStringWithEncoding: [OFLocale encoding]], - &addrIn6->sin_addr6) != 1) + &addrIn6->sin6_addr) != 1) @throw [OFInvalidFormatException exception]; objc_autoreleasePoolPop(pool); return ret; @@ -270,27 +270,27 @@ #endif of_socket_address_t of_socket_address_parse_ip(OFString *IP, uint16_t port) { -#ifdef HAVE_IPV6 +#ifdef OF_HAVE_IPV6 @try { return parseIPv6(IP, port); } @catch (OFInvalidFormatException *e) { #endif return parseIPv4(IP, port); -#ifdef HAVE_IPV6 +#ifdef OF_HAVE_IPV6 } #endif } bool of_socket_address_equal(of_socket_address_t *address1, of_socket_address_t *address2) { struct sockaddr_in *addrIn1, *addrIn2; -#ifdef HAVE_IPV6 +#ifdef OF_HAVE_IPV6 struct sockaddr_in6 *addrIn6_1, *addrIn6_2; #endif if (address1->address.ss_family != address2->address.ss_family) return false; @@ -313,11 +313,11 @@ return false; if (addrIn1->sin_addr.s_addr != addrIn2->sin_addr.s_addr) return false; break; -#ifdef HAVE_IPV6 +#ifdef OF_HAVE_IPV6 case AF_INET6: if (address1->length < sizeof(struct sockaddr_in6) || address2->length < sizeof(struct sockaddr_in6)) @throw [OFInvalidArgumentException exception]; @@ -343,11 +343,11 @@ uint32_t of_socket_address_hash(of_socket_address_t *address) { uint32_t hash = of_hash_seed; struct sockaddr_in *addrIn; -#ifdef HAVE_IPV6 +#ifdef OF_HAVE_IPV6 struct sockaddr_in6 *addrIn6; uint32_t subhash; #endif hash += address->address.ss_family; @@ -366,11 +366,11 @@ hash += (addrIn->sin_port << 1); hash ^= addrIn->sin_addr.s_addr; break; -#ifdef HAVE_IPV6 +#ifdef OF_HAVE_IPV6 case AF_INET6: if (address->length < sizeof(struct sockaddr_in6)) @throw [OFInvalidArgumentException exception]; addrIn6 = (struct sockaddr_in6 *)&address->address; @@ -378,11 +378,11 @@ hash += (addrIn6->sin6_port << 1); OF_HASH_INIT(subhash); for (size_t i = 0; i < sizeof(addrIn6->sin6_addr.s6_addr); i++) - OF_HASH_ADD(subhash, adrIn6->sin6_addr.s6_addr[i]); + OF_HASH_ADD(subhash, addrIn6->sin6_addr.s6_addr[i]); OF_HASH_FINALIZE(subhash); hash ^= subhash; @@ -411,24 +411,24 @@ return [OFString stringWithCString: buffer encoding: [OFLocale encoding]]; } -#ifdef HAVE_IPV6 +#ifdef OF_HAVE_IPV6 static OFString * IPv6String(const of_socket_address_t *address, uint16_t *port) { const struct sockaddr_in6 *addrIn6 = (const struct sockaddr_in6 *)&address->address; char buffer[INET6_ADDRSTRLEN]; - if (inet_ntop(AF_INET, &addrIn6->sin_addr6, buffer, sizeof(buffer)) == + if (inet_ntop(AF_INET, &addrIn6->sin6_addr, buffer, sizeof(buffer)) == NULL) @throw [OFInvalidArgumentException exception]; if (port != NULL) - *port = OF_BSWAP16_IF_LE(addrIn6->sin_port); + *port = OF_BSWAP16_IF_LE(addrIn6->sin6_port); return [OFString stringWithCString: buffer encoding: [OFLocale encoding]]; } #endif @@ -437,13 +437,13 @@ of_socket_address_ip_string(const of_socket_address_t *address, uint16_t *port) { switch (address->address.ss_family) { case AF_INET: return IPv4String(address, port); -#ifdef HAVE_IPV6 +#ifdef OF_HAVE_IPV6 case AF_INET6: return IPv6String(address, port); #endif default: @throw [OFInvalidArgumentException exception]; } }