@@ -56,169 +56,144 @@
 
 @implementation TestsAppDelegate (SocketTests)
 - (void)socketTests
 {
 	void *pool = objc_autoreleasePoolPush();
-	of_socket_address_t addr;
-	uint16_t port;
+	OFSocketAddress addr;
 
 	TEST(@"Parsing an IPv4",
-	    R(addr = of_socket_address_parse_ip(@"127.0.0.1", 1234)) &&
+	    R(addr = OFSocketAddressParseIP(@"127.0.0.1", 1234)) &&
 	    OF_BSWAP32_IF_LE(addr.sockaddr.in.sin_addr.s_addr) == 0x7F000001 &&
 	    OF_BSWAP16_IF_LE(addr.sockaddr.in.sin_port) == 1234)
 
-	EXPECT_EXCEPTION(@"Refusing invalid IPv4 #1",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"127.0.0.0.1", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv4 #2",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"127.0.0.256", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv4 #3",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"127.0.0. 1", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv4 #4",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@" 127.0.0.1", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv4 #5",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"127.0.a.1", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv4 #6",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"127.0..1", 1234))
+	EXPECT_EXCEPTION(@"Refusing invalid IPv4 #1", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"127.0.0.0.1", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv4 #2", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"127.0.0.256", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv4 #3", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"127.0.0. 1", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv4 #4", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@" 127.0.0.1", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv4 #5", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"127.0.a.1", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv4 #6", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"127.0..1", 1234))
+
+	TEST(@"Port of an IPv4 address", OFSocketAddressPort(&addr) == 1234)
 
 	TEST(@"Converting an IPv4 to a string",
-	    [of_socket_address_ip_string(&addr, &port) isEqual: @"127.0.0.1"] &&
-	    port == 1234)
+	    [OFSocketAddressString(&addr) isEqual: @"127.0.0.1"])
 
 	TEST(@"Parsing an IPv6 #1",
-	    R(addr = of_socket_address_parse_ip(
+	    R(addr = OFSocketAddressParseIP(
 	    @"1122:3344:5566:7788:99aa:bbCc:ddee:ff00", 1234)) &&
 	    COMPARE_V6(addr,
 	    0x1122, 0x3344, 0x5566, 0x7788, 0x99AA, 0xBBCC, 0xDDEE, 0xFF00) &&
 	    OF_BSWAP16_IF_LE(addr.sockaddr.in6.sin6_port) == 1234)
 
 	TEST(@"Parsing an IPv6 #2",
-	    R(addr = of_socket_address_parse_ip(@"::", 1234)) &&
+	    R(addr = OFSocketAddressParseIP(@"::", 1234)) &&
 	    COMPARE_V6(addr, 0, 0, 0, 0, 0, 0, 0, 0) &&
 	    OF_BSWAP16_IF_LE(addr.sockaddr.in6.sin6_port) == 1234)
 
 	TEST(@"Parsing an IPv6 #3",
-	    R(addr = of_socket_address_parse_ip(@"aaAa::bBbb", 1234)) &&
+	    R(addr = OFSocketAddressParseIP(@"aaAa::bBbb", 1234)) &&
 	    COMPARE_V6(addr, 0xAAAA, 0, 0, 0, 0, 0, 0, 0xBBBB) &&
 	    OF_BSWAP16_IF_LE(addr.sockaddr.in6.sin6_port) == 1234)
 
 	TEST(@"Parsing an IPv6 #4",
-	    R(addr = of_socket_address_parse_ip(@"aaAa::", 1234)) &&
+	    R(addr = OFSocketAddressParseIP(@"aaAa::", 1234)) &&
 	    COMPARE_V6(addr, 0xAAAA, 0, 0, 0, 0, 0, 0, 0) &&
 	    OF_BSWAP16_IF_LE(addr.sockaddr.in6.sin6_port) == 1234)
 
 	TEST(@"Parsing an IPv6 #5",
-	    R(addr = of_socket_address_parse_ip(@"::aaAa", 1234)) &&
+	    R(addr = OFSocketAddressParseIP(@"::aaAa", 1234)) &&
 	    COMPARE_V6(addr, 0, 0, 0, 0, 0, 0, 0, 0xAAAA) &&
 	    OF_BSWAP16_IF_LE(addr.sockaddr.in6.sin6_port) == 1234)
 
-	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #1",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"1:::2", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #2",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"1: ::2", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #3",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"1:: :2", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #4",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"1::2::3", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #5",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"10000::1", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #6",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"::10000", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #7",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"::1::", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #8",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"1:2:3:4:5:6:7:", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #9",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"1:2:3:4:5:6:7::", 1234))
-
-	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #10",
-	    OFInvalidFormatException,
-	    of_socket_address_parse_ip(@"1:2", 1234))
+	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #1", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"1:::2", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #2", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"1: ::2", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #3", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"1:: :2", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #4", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"1::2::3", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #5", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"10000::1", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #6", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"::10000", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #7", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"::1::", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #8", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"1:2:3:4:5:6:7:", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #9", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"1:2:3:4:5:6:7::", 1234))
+
+	EXPECT_EXCEPTION(@"Refusing invalid IPv6 #10", OFInvalidFormatException,
+	    OFSocketAddressParseIP(@"1:2", 1234))
+
+	TEST(@"Port of an IPv6 address", OFSocketAddressPort(&addr) == 1234)
 
 	SET_V6(addr, 0, 0, 0, 0, 0, 0, 0, 0)
 	TEST(@"Converting an IPv6 to a string #1",
-	    [of_socket_address_ip_string(&addr, &port) isEqual: @"::"] &&
-	    port == 1234)
+	    [OFSocketAddressString(&addr) isEqual: @"::"])
 
 	SET_V6(addr, 0, 0, 0, 0, 0, 0, 0, 1)
 	TEST(@"Converting an IPv6 to a string #2",
-	    [of_socket_address_ip_string(&addr, &port) isEqual: @"::1"] &&
-	    port == 1234)
+	    [OFSocketAddressString(&addr) isEqual: @"::1"])
 
 	SET_V6(addr, 1, 0, 0, 0, 0, 0, 0, 0)
 	TEST(@"Converting an IPv6 to a string #3",
-	    [of_socket_address_ip_string(&addr, &port) isEqual: @"1::"] &&
-	    port == 1234)
+	    [OFSocketAddressString(&addr) isEqual: @"1::"])
 
 	SET_V6(addr,
 	    0x1122, 0x3344, 0x5566, 0x7788, 0x99AA, 0xBBCC, 0xDDEE, 0xFF00)
 	TEST(@"Converting an IPv6 to a string #4",
-	    [of_socket_address_ip_string(&addr, &port) isEqual:
-	    @"1122:3344:5566:7788:99aa:bbcc:ddee:ff00"] &&
-	    port == 1234)
+	    [OFSocketAddressString(&addr)
+	    isEqual: @"1122:3344:5566:7788:99aa:bbcc:ddee:ff00"])
 
 	SET_V6(addr, 0x1122, 0x3344, 0x5566, 0x7788, 0x99AA, 0xBBCC, 0xDDEE, 0)
 	TEST(@"Converting an IPv6 to a string #5",
-	    [of_socket_address_ip_string(&addr, &port) isEqual:
-	    @"1122:3344:5566:7788:99aa:bbcc:ddee:0"] &&
-	    port == 1234)
+	    [OFSocketAddressString(&addr)
+	    isEqual: @"1122:3344:5566:7788:99aa:bbcc:ddee:0"])
 
 	SET_V6(addr, 0x1122, 0x3344, 0x5566, 0x7788, 0x99AA, 0xBBCC, 0, 0)
 	TEST(@"Converting an IPv6 to a string #6",
-	    [of_socket_address_ip_string(&addr, &port) isEqual:
-	    @"1122:3344:5566:7788:99aa:bbcc::"] &&
-	    port == 1234)
+	    [OFSocketAddressString(&addr)
+	    isEqual: @"1122:3344:5566:7788:99aa:bbcc::"])
 
 	SET_V6(addr, 0, 0x3344, 0x5566, 0x7788, 0x99AA, 0xBBCC, 0xDDEE, 0xFF00)
 	TEST(@"Converting an IPv6 to a string #7",
-	    [of_socket_address_ip_string(&addr, &port) isEqual:
-	    @"0:3344:5566:7788:99aa:bbcc:ddee:ff00"] &&
-	    port == 1234)
+	    [OFSocketAddressString(&addr)
+	    isEqual: @"0:3344:5566:7788:99aa:bbcc:ddee:ff00"])
 
 	SET_V6(addr, 0, 0, 0x5566, 0x7788, 0x99AA, 0xBBCC, 0xDDEE, 0xFF00)
 	TEST(@"Converting an IPv6 to a string #8",
-	    [of_socket_address_ip_string(&addr, &port) isEqual:
-	    @"::5566:7788:99aa:bbcc:ddee:ff00"] &&
-	    port == 1234)
+	    [OFSocketAddressString(&addr)
+	    isEqual: @"::5566:7788:99aa:bbcc:ddee:ff00"])
 
 	SET_V6(addr, 0, 0, 0x5566, 0, 0, 0, 0xDDEE, 0xFF00)
 	TEST(@"Converting an IPv6 to a string #9",
-	    [of_socket_address_ip_string(&addr, &port) isEqual:
-	    @"0:0:5566::ddee:ff00"] &&
-	    port == 1234)
+	    [OFSocketAddressString(&addr) isEqual: @"0:0:5566::ddee:ff00"])
 
 	SET_V6(addr, 0, 0, 0x5566, 0x7788, 0x99AA, 0xBBCC, 0, 0)
 	TEST(@"Converting an IPv6 to a string #10",
-	    [of_socket_address_ip_string(&addr, &port) isEqual:
-	    @"::5566:7788:99aa:bbcc:0:0"] &&
-	    port == 1234)
+	    [OFSocketAddressString(&addr)
+	    isEqual: @"::5566:7788:99aa:bbcc:0:0"])
 
 	objc_autoreleasePoolPop(pool);
 }
 @end