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 --- sys/openbsd/gen/amd64.go | 22 +--------------------- sys/openbsd/socket_inet.txt | 6 ------ sys/openbsd/socket_inet6.txt | 6 ------ sys/openbsd/socket_inet6_amd64.const | 1 - sys/openbsd/socket_inet_amd64.const | 1 - 5 files changed, 1 insertion(+), 35 deletions(-) (limited to 'sys/openbsd') diff --git a/sys/openbsd/gen/amd64.go b/sys/openbsd/gen/amd64.go index 9b3b04f64..73da027e9 100644 --- a/sys/openbsd/gen/amd64.go +++ b/sys/openbsd/gen/amd64.go @@ -256,14 +256,6 @@ var structDescs_amd64 = []*KeyedStruct{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "unused1", TypeSize: 8}}}, &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "unused2", TypeSize: 8}}}, }}}, - {Key: StructKey{Name: "sock_in6_pair", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sock_in6_pair", TypeSize: 8, ArgDir: 1}, Fields: []Type{ - &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_in6", FldName: "f0", TypeSize: 4, ArgDir: 1}}, - &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_in6", FldName: "f1", TypeSize: 4, ArgDir: 1}}, - }}}, - {Key: StructKey{Name: "sock_in_pair", Dir: 1}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sock_in_pair", TypeSize: 8, ArgDir: 1}, Fields: []Type{ - &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_in", FldName: "f0", TypeSize: 4, ArgDir: 1}}, - &ResourceType{TypeCommon: TypeCommon{TypeName: "sock_in", FldName: "f1", TypeSize: 4, ArgDir: 1}}, - }}}, {Key: StructKey{Name: "sockaddr_in"}, Desc: &StructDesc{TypeCommon: TypeCommon{TypeName: "sockaddr_in", TypeSize: 12}, Fields: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "family", TypeSize: 2}}, Val: 2}, &ProcType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "proc", FldName: "port", TypeSize: 2}, ArgFormat: 1}, ValuesStart: 20000, ValuesPerProc: 4}, @@ -1434,18 +1426,6 @@ var syscalls_amd64 = []*Syscall{ &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "proto", TypeSize: 1}}}, &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "fds", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "pipefd", Dir: 1}}}, }}, - {NR: 135, Name: "socketpair$inet", CallName: "socketpair", Args: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "domain", TypeSize: 8}}, Val: 2}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "socket_type", FldName: "type", TypeSize: 8}}, Vals: []uint64{1, 2, 3, 4, 5, 16384, 32768}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "proto", TypeSize: 1}}}, - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "fds", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "sock_in_pair", Dir: 1}}}, - }}, - {NR: 135, Name: "socketpair$inet6", CallName: "socketpair", Args: []Type{ - &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "domain", TypeSize: 8}}, Val: 24}, - &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "socket_type", FldName: "type", TypeSize: 8}}, Vals: []uint64{1, 2, 3, 4, 5, 16384, 32768}}, - &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int8", FldName: "proto", TypeSize: 1}}}, - &PtrType{TypeCommon: TypeCommon{TypeName: "ptr", FldName: "fds", TypeSize: 8}, Type: &StructType{Key: StructKey{Name: "sock_in6_pair", Dir: 1}}}, - }}, {NR: 135, Name: "socketpair$unix", CallName: "socketpair", Args: []Type{ &ConstType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "const", FldName: "domain", TypeSize: 8}}, Val: 1}, &FlagsType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "unix_socket_type", FldName: "type", TypeSize: 8}}, Vals: []uint64{1, 2, 5}}, @@ -1912,4 +1892,4 @@ var consts_amd64 = []ConstValue{ {Name: "__MAP_NOREPLACE", Value: 2048}, } -const revision_amd64 = "05e6185f1ea57bbe311ffe3829b1cca890f472fc" +const revision_amd64 = "c2110f93ae48e34a74b88b9a72075b7a376f55cb" diff --git a/sys/openbsd/socket_inet.txt b/sys/openbsd/socket_inet.txt index 98b72d23c..c1903aa5d 100644 --- a/sys/openbsd/socket_inet.txt +++ b/sys/openbsd/socket_inet.txt @@ -10,11 +10,6 @@ include resource sock_in[sock] -sock_in_pair { - f0 sock_in - f1 sock_in -} - sockaddr_in { family const[AF_INET, int16] port sock_port @@ -22,7 +17,6 @@ sockaddr_in { } socket$inet(domain const[AF_INET], type flags[socket_type], proto int8) sock_in -socketpair$inet(domain const[AF_INET], type flags[socket_type], proto int8, fds ptr[out, sock_in_pair]) accept$inet(fd sock_in, peer ptr[out, sockaddr_in, opt], peerlen ptr[inout, len[peer, int32]]) sock_in bind$inet(fd sock_in, addr ptr[in, sockaddr_in], addrlen len[addr]) connect$inet(fd sock_in, addr ptr[in, sockaddr_in], addrlen len[addr]) diff --git a/sys/openbsd/socket_inet6.txt b/sys/openbsd/socket_inet6.txt index 3efb5dce1..48aef6b33 100644 --- a/sys/openbsd/socket_inet6.txt +++ b/sys/openbsd/socket_inet6.txt @@ -14,11 +14,6 @@ include resource sock_in6[sock] -sock_in6_pair { - f0 sock_in6 - f1 sock_in6 -} - sockaddr_in6 { family const[AF_INET6, int16] port sock_port @@ -27,7 +22,6 @@ sockaddr_in6 { } socket$inet6(domain const[AF_INET6], type flags[socket_type], proto int8) sock_in6 -socketpair$inet6(domain const[AF_INET6], type flags[socket_type], proto int8, fds ptr[out, sock_in6_pair]) accept$inet6(fd sock_in6, peer ptr[out, sockaddr_in6, opt], peerlen ptr[inout, len[peer, int32]]) sock_in6 bind$inet6(fd sock_in6, addr ptr[in, sockaddr_in6], addrlen len[addr]) connect$inet6(fd sock_in6, addr ptr[in, sockaddr_in6], addrlen len[addr]) diff --git a/sys/openbsd/socket_inet6_amd64.const b/sys/openbsd/socket_inet6_amd64.const index a67f199bc..e498a8fd1 100644 --- a/sys/openbsd/socket_inet6_amd64.const +++ b/sys/openbsd/socket_inet6_amd64.const @@ -14,4 +14,3 @@ SYS_recvfrom = 29 SYS_sendto = 133 SYS_setsockopt = 105 SYS_socket = 97 -SYS_socketpair = 135 diff --git a/sys/openbsd/socket_inet_amd64.const b/sys/openbsd/socket_inet_amd64.const index a5b5c7cf3..9ef875631 100644 --- a/sys/openbsd/socket_inet_amd64.const +++ b/sys/openbsd/socket_inet_amd64.const @@ -12,4 +12,3 @@ SYS_recvfrom = 29 SYS_sendto = 133 SYS_setsockopt = 105 SYS_socket = 97 -SYS_socketpair = 135 -- cgit mrf-deployment