--- libelwix/example/test_n2.c	2018/04/04 01:25:26	1.5
+++ libelwix/example/test_n2.c	2020/05/27 15:03:28	1.6
@@ -16,14 +16,24 @@ main(int argc, char **argv)
 	char str[BUFSIZ];
 	int res;
 
+	a.s_addr = E_CIDRMASK(4);
+	printf("/4 = %08X %08x\n", a.s_addr, ntohl(a.s_addr));
 	a.s_addr = E_CIDRMASK(8);
-	printf("/8 = %08X %08x\n", a.s_addr, htonl(a.s_addr));
+	printf("/8 = %08X %08x\n", a.s_addr, ntohl(a.s_addr));
 	a.s_addr = E_CIDRMASK(24);
-	printf("/24 = %08X %08x\n", a.s_addr, htonl(a.s_addr));
+	printf("/24 = %08X %08x\n", a.s_addr, ntohl(a.s_addr));
 	a.s_addr = E_CIDRMASK(26);
-	printf("/26 = %08X %08x\n", a.s_addr, htonl(a.s_addr));
+	printf("/26 = %08X %08x\n", a.s_addr, ntohl(a.s_addr));
+	a.s_addr = E_CIDRMASK(28);
+	printf("/28 = %08X %08x\n", a.s_addr, ntohl(a.s_addr));
+	a.s_addr = E_CIDRMASK(29);
+	printf("/29 = %08X %08x\n", a.s_addr, ntohl(a.s_addr));
 	a.s_addr = E_CIDRMASK(30);
-	printf("/30 = %08X %08x\n", a.s_addr, htonl(a.s_addr));
+	printf("/30 = %08X %08x\n", a.s_addr, ntohl(a.s_addr));
+	a.s_addr = E_CIDRMASK(31);
+	printf("/31 = %08X %08x\n", a.s_addr, ntohl(a.s_addr));
+	a.s_addr = E_CIDRMASK(32);
+	printf("/32 = %08X %08x\n", a.s_addr, ntohl(a.s_addr));
 
 	memset(&n, 0, sizeof n);
 	n.addr.sin.sin_family = AF_INET;
@@ -49,11 +59,66 @@ main(int argc, char **argv)
 		printf("addr=%s/%x\n", inet_ntoa(n0->addr.sin.sin_addr), ntohl(n0->mask.in.s_addr));
 		e_free(n0);
 	}
+	n0 = e_getnet("2.2.2.2/32");
+	if (n0) {
+		printf("addr=%s/%x\n", inet_ntoa(n0->addr.sin.sin_addr), ntohl(n0->mask.in.s_addr));
+		e_free(n0);
+	}
 	n0 = e_getnet("elwix.org/29");
 	if (n0) {
 		printf("addr=%s/%x\n", inet_ntoa(n0->addr.sin.sin_addr), ntohl(n0->mask.in.s_addr));
 		e_free(n0);
 	}
+
+	memset(&n, 0, sizeof n);
+	printf("ret=%d should be -1\n", e_network("4.4.4.4", NULL));
+	printf("ret=%d should be 1\n", e_network("4.4.4.4", &n));
+	printf("ret=%d should be 0\n", e_network("4.4.4.5/32", &n));
+	printf("4.4.4.5/32 mask=0x%X addr=%s\n", ntohl(n.mask.in.s_addr), inet_ntoa(n.addr.sin.sin_addr));
+	printf("ret=%d should be 0\n", e_network("4.4.4.5/30", &n));
+	printf("4.4.4.5/30 mask=0x%X addr=%s\n", ntohl(n.mask.in.s_addr), inet_ntoa(n.addr.sin.sin_addr));
+	printf("ret=%d should be 0\n", e_network("4.4.4.4/24", &n));
+	printf("4.4.4.4/24 mask=0x%X addr=%s\n", ntohl(n.mask.in.s_addr), inet_ntoa(n.addr.sin.sin_addr));
+	printf("ret=%d should be 0\n", e_network("253.4.4.4/4", &n));
+	printf("253.4.4.4/8 mask=0x%X addr=%s\n", ntohl(n.mask.in.s_addr), inet_ntoa(n.addr.sin.sin_addr));
+	printf("ret=%d should be 0\n", e_network("4.4.4.4/0", &n));
+	printf("4.4.4.4/0 mask=0x%X addr=%s\n", ntohl(n.mask.in.s_addr), inet_ntoa(n.addr.sin.sin_addr));
+	printf("ret=%d should be 0\n", e_network("2a01:9980:b:20::deba/128", &n));
+	inet_ntop(AF_INET6, &n.addr.sin6.sin6_addr, str, sizeof str);
+	printf("ipv6/128 mask=0x%X,0x%X,0x%X,0x%X addr=%s\n", ntohl(n.mask.in6.__u6_addr.__u6_addr32[0]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[1]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[2]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[3]), str);
+	printf("ret=%d should be 0\n", e_network("2a01:9980:b:20::deba/126", &n));
+	inet_ntop(AF_INET6, &n.addr.sin6.sin6_addr, str, sizeof str);
+	printf("ipv6/126 mask=0x%X,0x%X,0x%X,0x%X addr=%s\n", ntohl(n.mask.in6.__u6_addr.__u6_addr32[0]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[1]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[2]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[3]), str);
+	printf("ret=%d should be 0\n", e_network("2a01:9980:b:20::deba/112", &n));
+	inet_ntop(AF_INET6, &n.addr.sin6.sin6_addr, str, sizeof str);
+	printf("ipv6/112 mask=0x%X,0x%X,0x%X,0x%X addr=%s\n", ntohl(n.mask.in6.__u6_addr.__u6_addr32[0]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[1]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[2]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[3]), str);
+	printf("ret=%d should be 0\n", e_network("2a01:9980:b:20::deba/64", &n));
+	inet_ntop(AF_INET6, &n.addr.sin6.sin6_addr, str, sizeof str);
+	printf("ipv6/64 mask=0x%X,0x%X,0x%X,0x%X addr=%s\n", ntohl(n.mask.in6.__u6_addr.__u6_addr32[0]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[1]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[2]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[3]), str);
+	printf("ret=%d should be 0\n", e_network("2a01:9980:b:20::deba/4", &n));
+	inet_ntop(AF_INET6, &n.addr.sin6.sin6_addr, str, sizeof str);
+	printf("ipv6/4 mask=0x%X,0x%X,0x%X,0x%X addr=%s\n", ntohl(n.mask.in6.__u6_addr.__u6_addr32[0]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[1]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[2]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[3]), str);
+	printf("ret=%d should be 0\n", e_network("2a01:9980:b:20::deba/0", &n));
+	inet_ntop(AF_INET6, &n.addr.sin6.sin6_addr, str, sizeof str);
+	printf("ipv6/0 mask=0x%X,0x%X,0x%X,0x%X addr=%s\n", ntohl(n.mask.in6.__u6_addr.__u6_addr32[0]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[1]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[2]), 
+		ntohl(n.mask.in6.__u6_addr.__u6_addr32[3]), str);
 
 	if (argc < 2)
 		return 0;