From 6ad0ae6171ea0891838243683f174c6d6eecc90c Mon Sep 17 00:00:00 2001 From: Michael Tüxen Date: Tue, 4 Dec 2018 09:58:22 +0100 Subject: sys: remove socketpair for AF_INET and AF_INET6 * OpebBSD: remove socketpair() for AF_INET and AF_INET6. socketpair() is only supported on AF_UNIX. * NetBSD: remove socketpair() for AF_INET and AF_INET6. socketpair() is only supported for AF_UNIX. * FreeBSD: remove socketpair() for AF_INET and AF_INET6. socketpair() only supports AF_UNIX. * Linux: remove socketpair for AF_INET and AF_INET6. socketpair only supports AF_UNIX. * Autogenerated files. These are manually generated for all platforms you are not running on. FreeBSD in this case. * executor: rebase. * sys/freebsd: rebase. * sys/linux: use AF_UNIX based socketpair for nbd. This was suggested by Dmitry. Fixes #845 --- executor/syscalls.h | 114 ---------------------------------------------------- 1 file changed, 114 deletions(-) (limited to 'executor/syscalls.h') diff --git a/executor/syscalls.h b/executor/syscalls.h index 34131e947..98c9f99f4 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -463,16 +463,6 @@ const call_t syscalls[] = { {"socket$inet_udplite", 97}, {"socket$unix", 97}, {"socketpair", 135}, - {"socketpair$inet", 135}, - {"socketpair$inet6", 135}, - {"socketpair$inet6_icmp", 135}, - {"socketpair$inet6_icmp_raw", 135}, - {"socketpair$inet6_tcp", 135}, - {"socketpair$inet6_udp", 135}, - {"socketpair$inet_icmp", 135}, - {"socketpair$inet_icmp_raw", 135}, - {"socketpair$inet_tcp", 135}, - {"socketpair$inet_udp", 135}, {"socketpair$unix", 135}, {"stat", 188}, {"symlink", 57}, @@ -3385,27 +3375,7 @@ const call_t syscalls[] = { {"socket$vsock_stream", 359}, {"socket$xdp", 359}, {"socketpair", 360}, - {"socketpair$ax25", 360}, - {"socketpair$inet", 360}, - {"socketpair$inet6", 360}, - {"socketpair$inet6_dccp", 360}, - {"socketpair$inet6_icmp", 360}, - {"socketpair$inet6_icmp_raw", 360}, - {"socketpair$inet6_sctp", 360}, - {"socketpair$inet6_tcp", 360}, - {"socketpair$inet6_udp", 360}, - {"socketpair$inet6_udplite", 360}, - {"socketpair$inet_dccp", 360}, - {"socketpair$inet_icmp", 360}, - {"socketpair$inet_icmp_raw", 360}, - {"socketpair$inet_sctp", 360}, - {"socketpair$inet_smc", 360}, - {"socketpair$inet_tcp", 360}, - {"socketpair$inet_udp", 360}, - {"socketpair$inet_udplite", 360}, - {"socketpair$ipx", 360}, {"socketpair$nbd", 360}, - {"socketpair$packet", 360}, {"socketpair$unix", 360}, {"splice", 313}, {"stat", 106}, @@ -5754,27 +5724,7 @@ const call_t syscalls[] = { {"socket$vsock_stream", 41}, {"socket$xdp", 41}, {"socketpair", 53}, - {"socketpair$ax25", 53}, - {"socketpair$inet", 53}, - {"socketpair$inet6", 53}, - {"socketpair$inet6_dccp", 53}, - {"socketpair$inet6_icmp", 53}, - {"socketpair$inet6_icmp_raw", 53}, - {"socketpair$inet6_sctp", 53}, - {"socketpair$inet6_tcp", 53}, - {"socketpair$inet6_udp", 53}, - {"socketpair$inet6_udplite", 53}, - {"socketpair$inet_dccp", 53}, - {"socketpair$inet_icmp", 53}, - {"socketpair$inet_icmp_raw", 53}, - {"socketpair$inet_sctp", 53}, - {"socketpair$inet_smc", 53}, - {"socketpair$inet_tcp", 53}, - {"socketpair$inet_udp", 53}, - {"socketpair$inet_udplite", 53}, - {"socketpair$ipx", 53}, {"socketpair$nbd", 53}, - {"socketpair$packet", 53}, {"socketpair$unix", 53}, {"splice", 275}, {"stat", 4}, @@ -8076,27 +8026,7 @@ const call_t syscalls[] = { {"socket$vsock_stream", 281}, {"socket$xdp", 281}, {"socketpair", 288}, - {"socketpair$ax25", 288}, - {"socketpair$inet", 288}, - {"socketpair$inet6", 288}, - {"socketpair$inet6_dccp", 288}, - {"socketpair$inet6_icmp", 288}, - {"socketpair$inet6_icmp_raw", 288}, - {"socketpair$inet6_sctp", 288}, - {"socketpair$inet6_tcp", 288}, - {"socketpair$inet6_udp", 288}, - {"socketpair$inet6_udplite", 288}, - {"socketpair$inet_dccp", 288}, - {"socketpair$inet_icmp", 288}, - {"socketpair$inet_icmp_raw", 288}, - {"socketpair$inet_sctp", 288}, - {"socketpair$inet_smc", 288}, - {"socketpair$inet_tcp", 288}, - {"socketpair$inet_udp", 288}, - {"socketpair$inet_udplite", 288}, - {"socketpair$ipx", 288}, {"socketpair$nbd", 288}, - {"socketpair$packet", 288}, {"socketpair$unix", 288}, {"splice", 340}, {"stat", 106}, @@ -10375,27 +10305,7 @@ const call_t syscalls[] = { {"socket$vsock_stream", 198}, {"socket$xdp", 198}, {"socketpair", 199}, - {"socketpair$ax25", 199}, - {"socketpair$inet", 199}, - {"socketpair$inet6", 199}, - {"socketpair$inet6_dccp", 199}, - {"socketpair$inet6_icmp", 199}, - {"socketpair$inet6_icmp_raw", 199}, - {"socketpair$inet6_sctp", 199}, - {"socketpair$inet6_tcp", 199}, - {"socketpair$inet6_udp", 199}, - {"socketpair$inet6_udplite", 199}, - {"socketpair$inet_dccp", 199}, - {"socketpair$inet_icmp", 199}, - {"socketpair$inet_icmp_raw", 199}, - {"socketpair$inet_sctp", 199}, - {"socketpair$inet_smc", 199}, - {"socketpair$inet_tcp", 199}, - {"socketpair$inet_udp", 199}, - {"socketpair$inet_udplite", 199}, - {"socketpair$ipx", 199}, {"socketpair$nbd", 199}, - {"socketpair$packet", 199}, {"socketpair$unix", 199}, {"splice", 76}, {"statfs", 43}, @@ -12543,27 +12453,7 @@ const call_t syscalls[] = { {"socket$vsock_stream", 326}, {"socket$xdp", 326}, {"socketpair", 333}, - {"socketpair$ax25", 333}, - {"socketpair$inet", 333}, - {"socketpair$inet6", 333}, - {"socketpair$inet6_dccp", 333}, - {"socketpair$inet6_icmp", 333}, - {"socketpair$inet6_icmp_raw", 333}, - {"socketpair$inet6_sctp", 333}, - {"socketpair$inet6_tcp", 333}, - {"socketpair$inet6_udp", 333}, - {"socketpair$inet6_udplite", 333}, - {"socketpair$inet_dccp", 333}, - {"socketpair$inet_icmp", 333}, - {"socketpair$inet_icmp_raw", 333}, - {"socketpair$inet_sctp", 333}, - {"socketpair$inet_smc", 333}, - {"socketpair$inet_tcp", 333}, - {"socketpair$inet_udp", 333}, - {"socketpair$inet_udplite", 333}, - {"socketpair$ipx", 333}, {"socketpair$nbd", 333}, - {"socketpair$packet", 333}, {"socketpair$unix", 333}, {"splice", 283}, {"stat", 106}, @@ -12991,8 +12881,6 @@ const call_t syscalls[] = { {"socket$inet6", 394}, {"socket$unix", 394}, {"socketpair", 135}, - {"socketpair$inet", 135}, - {"socketpair$inet6", 135}, {"socketpair$unix", 135}, {"stat", 439}, {"symlink", 57}, @@ -13225,8 +13113,6 @@ const call_t syscalls[] = { {"socket$inet6", 97}, {"socket$unix", 97}, {"socketpair", 135}, - {"socketpair$inet", 135}, - {"socketpair$inet6", 135}, {"socketpair$unix", 135}, {"stat", 38}, {"symlink", 57}, -- cgit mrf-deployment