Skip to content

Commit

Permalink
Auto merge of #3287 - gennyble:main, r=JohnTitor
Browse files Browse the repository at this point in the history
linux: add a few kTLS defintions

related: nix-rust/nix#2065

i think android has support, too, but if I put it in `linux-like` does that imply emscripten support?
  • Loading branch information
bors committed Jul 16, 2023
2 parents 9253fca + 94cfcd2 commit af676d1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions libc-test/build.rs
Expand Up @@ -3346,6 +3346,7 @@ fn test_linux(target: &str) {
"linux/seccomp.h",
"linux/sock_diag.h",
"linux/sockios.h",
"linux/tls.h",
"linux/uinput.h",
"linux/vm_sockets.h",
"linux/wait.h",
Expand Down
2 changes: 2 additions & 0 deletions libc-test/semver/linux.txt
Expand Up @@ -2461,6 +2461,7 @@ SOL_NETBEUI
SOL_NETLINK
SOL_TCP
SOL_TIPC
SOL_TLS
SOL_UDP
SOL_X25
SOMAXCONN
Expand Down Expand Up @@ -2853,6 +2854,7 @@ TIOCSCTTY
TIOCSPGRP
TIOCSSOFTCAR
TIOCSTI
TLS_GET_RECORD_TYPE
TUN_READQ_SIZE
TUN_TAP_DEV
TUN_TUN_DEV
Expand Down
5 changes: 5 additions & 0 deletions src/unix/linux_like/linux/mod.rs
Expand Up @@ -3182,6 +3182,11 @@ pub const HWTSTAMP_FILTER_PTP_V2_SYNC: ::c_uint = 13;
pub const HWTSTAMP_FILTER_PTP_V2_DELAY_REQ: ::c_uint = 14;
pub const HWTSTAMP_FILTER_NTP_ALL: ::c_uint = 15;

// linux/tls.h
pub const TLS_GET_RECORD_TYPE: ::c_int = 2;

pub const SOL_TLS: ::c_int = 282;

// linux/if_alg.h
pub const ALG_SET_KEY: ::c_int = 1;
pub const ALG_SET_IV: ::c_int = 2;
Expand Down

0 comments on commit af676d1

Please sign in to comment.