From 274ac94f7cfcea0264d4bdc94fbcd6369d960835 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 7 Apr 2017 17:56:19 +0200 Subject: sys: use ipv4_addr & ipv6_addr instead of in_addr & in6_addr --- sys/socket_inet.txt | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) (limited to 'sys/socket_inet.txt') 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 -- cgit mrf-deployment