sys: use ipv4_addr & ipv6_addr instead of in_addr & in6_addr

3 files changed, 25 insertions, 42 deletions

diff --git a/sys/socket_inet.txt b/sys/socket_inet.txt
index 332bb7e30..7ebc92cb3 100644
--- a/sys/socket_inet.txt
+++ b/sys/socket_inet.txt
@@ -16,19 +16,10 @@ sock_in_pair {
 	f1	sock_in
 }
 
-in_addr [
-# 0.0.0.0
-	empty		const[0x00000000, int32be]
-# 127.0.0.1
-	loopback	const[0x7f000001, int32be]
-# 255.255.255.255
-	broadcast	const[0xffffffff, int32be]
-]
-
 sockaddr_in {
 	family	const[AF_INET, int16]
 	port	proc[int16be, 20000, 4]
-	addr	in_addr
+	addr	ipv4_addr
 	pad     array[const[0, int8], 8]
 }
 
@@ -79,34 +70,34 @@ ip_msfilter_mode = MCAST_INCLUDE, MCAST_EXCLUDE
 ip_mtu_discover = IP_PMTUDISC_DONT, IP_PMTUDISC_WANT, IP_PMTUDISC_DO, IP_PMTUDISC_PROBE, IP_PMTUDISC_INTERFACE, IP_PMTUDISC_OMIT
 
 ip_mreq {
-	multi	in_addr
-	addr	in_addr
+	multi	ipv4_addr
+	addr	ipv4_addr
 }
 
 ip_mreqn {
-	multi	in_addr
-	addr	in_addr
+	multi	ipv4_addr
+	addr	ipv4_addr
 	ifindex	int32
 }
 
 ip_mreq_source {
-	multi	in_addr
-	iface	in_addr
-	source	in_addr
+	multi	ipv4_addr
+	iface	ipv4_addr
+	source	ipv4_addr
 }
 
 ip_msfilter {
-	multi	in_addr
-	iface	in_addr
+	multi	ipv4_addr
+	iface	ipv4_addr
 	fmode	flags[ip_msfilter_mode, int32]
 	numsrc	len[slist, int32]
-	slist	array[in_addr]
+	slist	array[ipv4_addr]
 }
 
 in_pktinfo {
 	ifindex	int32
-	dst	in_addr
-	addr	in_addr
+	dst	ipv4_addr
+	addr	ipv4_addr
 }
 
 xfrm_filer {
@@ -179,8 +170,8 @@ xfrm_id {
 }
 
 xfrm_in_addr [
-	in	in_addr
-	in6	in6_addr
+	in	ipv4_addr
+	in6	ipv6_addr
 ]
 
 # IP ioctls
diff --git a/sys/socket_inet6.txt b/sys/socket_inet6.txt
index c0bd80e2c..f7a40ab87 100644
--- a/sys/socket_inet6.txt
+++ b/sys/socket_inet6.txt
@@ -16,26 +16,11 @@ sock_in6_pair {
 }
 
 
-in6_addr_empty {
-	a0		const[0, int64be]
-	a1		const[0, int64be]
-}
-
-in6_addr_loopback {
-	a0		const[0, int64be]
-	a1		const[1, int64be]
-}
-
-in6_addr [
-	empty		in6_addr_empty
-	loopback	in6_addr_loopback
-]
-
 sockaddr_in6 {
 	family	const[AF_INET6, int16]
 	port	proc[int16be, 20000, 4]
 	flow	int32
-	addr	in6_addr
+	addr	ipv6_addr
 	scope	int32
 }
 
@@ -74,8 +59,10 @@ sockopt_opt_ipv6_int = IPV6_ADDRFORM, IPV6_MTU, IPV6_MULTICAST_HOPS, IPV6_MULTIC
 sockopt_opt_ipv6_mreq = IPV6_ADD_MEMBERSHIP, IPV6_DROP_MEMBERSHIP, IPV6_JOIN_ANYCAST, IPV6_LEAVE_ANYCAST
 
 ipv6_mreq {
-	multi	in6_addr
+	multi	ipv6_addr
 	ifindex	int32
 }
 
-# TODO: ipv6 ioctls
+# IPv6 ioctls
+
+# TODO: http://lxr.free-electrons.com/ident?i=inet6_ioctl
diff --git a/sys/vnet.txt b/sys/vnet.txt
index 56c9b88fd..cf439c36e 100644
--- a/sys/vnet.txt
+++ b/sys/vnet.txt
@@ -436,6 +436,10 @@ include <net/ipv6.h>
 
 ipv6_types = IPPROTO_IP, IPPROTO_ICMP, IPPROTO_IGMP, IPPROTO_IPIP, IPPROTO_TCP, IPPROTO_EGP, IPPROTO_PUP, IPPROTO_UDP, IPPROTO_IDP, IPPROTO_TP, IPPROTO_DCCP, IPPROTO_IPV6, IPPROTO_RSVP, IPPROTO_GRE, IPPROTO_ESP, IPPROTO_AH, IPPROTO_MTP, IPPROTO_BEETPH, IPPROTO_ENCAP, IPPROTO_PIM, IPPROTO_COMP, IPPROTO_SCTP, IPPROTO_UDPLITE, IPPROTO_MPLS, IPPROTO_RAW, IPPROTO_HOPOPTS, IPPROTO_ROUTING, IPPROTO_FRAGMENT, IPPROTO_ICMPV6, IPPROTO_NONE, IPPROTO_DSTOPTS, IPPROTO_MH, NEXTHDR_HOP, NEXTHDR_TCP, NEXTHDR_UDP, NEXTHDR_IPV6, NEXTHDR_ROUTING, NEXTHDR_FRAGMENT, NEXTHDR_GRE, NEXTHDR_ESP, NEXTHDR_AUTH, NEXTHDR_ICMP, NEXTHDR_NONE, NEXTHDR_DEST, NEXTHDR_SCTP, NEXTHDR_MOBILITY
 
+ipv6_addr_empty {
+	a0	array[const[0x00, int8], 16]
+}
+
 # This corresponds to LOCAL_IPV6 ("fd00::%02hxaa" % pid) in executor/common.h
 ipv6_addr_local {
 	a0		const[0xfd, int8]
@@ -458,6 +462,7 @@ ipv6_addr_loopback {
 } [packed]
 
 ipv6_addr [
+	empty		ipv6_addr_empty
 	local		ipv6_addr_local
 	remote		ipv6_addr_remote
 	loopback	ipv6_addr_loopback