Skip to content

Commit faa087c

Browse files
committed
Auto merge of #3316 - sunfishcode:sunfishcode/openbsd-socket-options, r=JohnTitor
Define `SO_PROTOCOL` and `SO_DOMAIN` on OpenBSD and Solarish. This follows the definitions [here]. [here]: https://github.com/openbsd/src/blob/c5ac8393b86d7549b2b878fd46deeb0e8ee06ae0/sys/sys/socket.h#L116
2 parents 19eaa81 + 4e664cc commit faa087c

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

libc-test/semver/openbsd.txt

+2
Original file line numberDiff line numberDiff line change
@@ -778,8 +778,10 @@ SOCK_RAW
778778
SOCK_RDM
779779
SOMAXCONN
780780
SO_BINDANY
781+
SO_DOMAIN
781782
SO_NETPROC
782783
SO_PEERCRED
784+
SO_PROTOCOL
783785
SO_RTABLE
784786
SO_SPLICE
785787
SO_TIMESTAMP

src/unix/bsd/netbsdlike/openbsd/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -999,6 +999,8 @@ pub const SO_NETPROC: ::c_int = 0x1020;
999999
pub const SO_RTABLE: ::c_int = 0x1021;
10001000
pub const SO_PEERCRED: ::c_int = 0x1022;
10011001
pub const SO_SPLICE: ::c_int = 0x1023;
1002+
pub const SO_DOMAIN: ::c_int = 0x1024;
1003+
pub const SO_PROTOCOL: ::c_int = 0x1025;
10021004

10031005
// sys/netinet/in.h
10041006
// Protocols (RFC 1700)

src/unix/solarish/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1825,6 +1825,8 @@ pub const SO_SNDTIMEO: ::c_int = 0x1005;
18251825
pub const SO_RCVTIMEO: ::c_int = 0x1006;
18261826
pub const SO_ERROR: ::c_int = 0x1007;
18271827
pub const SO_TYPE: ::c_int = 0x1008;
1828+
pub const SO_PROTOTYPE: ::c_int = 0x1009;
1829+
pub const SO_DOMAIN: ::c_int = 0x100c;
18281830
pub const SO_TIMESTAMP: ::c_int = 0x1013;
18291831

18301832
pub const SCM_RIGHTS: ::c_int = 0x1010;

0 commit comments

Comments
 (0)