Auto merge of #882 - LuoZijun:patch-1, r=alexcrichton
Add some constants for linux and macos macos: ``` netinet/if_ether.h net/route.h ``` linux: ``` linux/if_ether.h ```
This commit is contained in:
bors
commit
5221616a77
|
|
@ -174,6 +174,7 @@ fn main() {
|
|||
cfg.header("crt_externs.h");
|
||||
}
|
||||
cfg.header("net/route.h");
|
||||
cfg.header("netinet/if_ether.h");
|
||||
cfg.header("sys/proc_info.h");
|
||||
}
|
||||
|
||||
|
|
@ -251,7 +252,8 @@ fn main() {
|
|||
if linux || android {
|
||||
cfg.header("sys/fsuid.h");
|
||||
cfg.header("linux/seccomp.h");
|
||||
|
||||
cfg.header("linux/if_ether.h");
|
||||
|
||||
// DCCP support
|
||||
if !uclibc && !musl && !emscripten {
|
||||
cfg.header("linux/dccp.h");
|
||||
|
|
|
|||
|
|
@ -488,6 +488,16 @@ s! {
|
|||
pub sdl_slen: ::c_uchar,
|
||||
pub sdl_data: [::c_char; 12],
|
||||
}
|
||||
|
||||
pub struct sockaddr_inarp {
|
||||
pub sin_len: ::c_uchar,
|
||||
pub sin_family: ::c_uchar,
|
||||
pub sin_port: ::c_ushort,
|
||||
pub sin_addr: ::in_addr,
|
||||
pub sin_srcaddr: ::in_addr,
|
||||
pub sin_tos: ::c_ushort,
|
||||
pub sin_other: ::c_ushort,
|
||||
}
|
||||
}
|
||||
|
||||
pub const _UTX_USERSIZE: usize = 256;
|
||||
|
|
@ -2052,7 +2062,90 @@ pub const XATTR_NODEFAULT: ::c_int = 0x0010;
|
|||
pub const XATTR_SHOWCOMPRESSION: ::c_int = 0x0020;
|
||||
|
||||
pub const NET_RT_IFLIST2: ::c_int = 0x0006;
|
||||
pub const RTM_IFINFO2: ::c_int = 0x0012;
|
||||
|
||||
// net/route.h
|
||||
pub const RTF_UP: ::c_int = 0x1;
|
||||
pub const RTF_GATEWAY: ::c_int = 0x2;
|
||||
pub const RTF_HOST: ::c_int = 0x4;
|
||||
pub const RTF_REJECT: ::c_int = 0x8;
|
||||
pub const RTF_DYNAMIC: ::c_int = 0x10;
|
||||
pub const RTF_MODIFIED: ::c_int = 0x20;
|
||||
pub const RTF_DONE: ::c_int = 0x40;
|
||||
pub const RTF_DELCLONE: ::c_int = 0x80;
|
||||
pub const RTF_CLONING: ::c_int = 0x100;
|
||||
pub const RTF_XRESOLVE: ::c_int = 0x200;
|
||||
pub const RTF_LLINFO: ::c_int = 0x400;
|
||||
pub const RTF_STATIC: ::c_int = 0x800;
|
||||
pub const RTF_BLACKHOLE: ::c_int = 0x1000;
|
||||
pub const RTF_NOIFREF: ::c_int = 0x2000;
|
||||
pub const RTF_PROTO2: ::c_int = 0x4000;
|
||||
pub const RTF_PROTO1: ::c_int = 0x8000;
|
||||
pub const RTF_PRCLONING: ::c_int = 0x10000;
|
||||
pub const RTF_WASCLONED: ::c_int = 0x20000;
|
||||
pub const RTF_PROTO3: ::c_int = 0x40000;
|
||||
pub const RTF_PINNED: ::c_int = 0x100000;
|
||||
pub const RTF_LOCAL: ::c_int = 0x200000;
|
||||
pub const RTF_BROADCAST: ::c_int = 0x400000;
|
||||
pub const RTF_MULTICAST: ::c_int = 0x800000;
|
||||
pub const RTF_IFSCOPE: ::c_int = 0x1000000;
|
||||
pub const RTF_CONDEMNED: ::c_int = 0x2000000;
|
||||
pub const RTF_IFREF: ::c_int = 0x4000000;
|
||||
pub const RTF_PROXY: ::c_int = 0x8000000;
|
||||
pub const RTF_ROUTER: ::c_int = 0x10000000;
|
||||
|
||||
pub const RTM_VERSION: ::c_int = 5;
|
||||
|
||||
// Message types
|
||||
pub const RTM_ADD: ::c_int = 0x1;
|
||||
pub const RTM_DELETE: ::c_int = 0x2;
|
||||
pub const RTM_CHANGE: ::c_int = 0x3;
|
||||
pub const RTM_GET: ::c_int = 0x4;
|
||||
pub const RTM_LOSING: ::c_int = 0x5;
|
||||
pub const RTM_REDIRECT: ::c_int = 0x6;
|
||||
pub const RTM_MISS: ::c_int = 0x7;
|
||||
pub const RTM_LOCK: ::c_int = 0x8;
|
||||
pub const RTM_OLDADD: ::c_int = 0x9;
|
||||
pub const RTM_OLDDEL: ::c_int = 0xa;
|
||||
pub const RTM_RESOLVE: ::c_int = 0xb;
|
||||
pub const RTM_NEWADDR: ::c_int = 0xc;
|
||||
pub const RTM_DELADDR: ::c_int = 0xd;
|
||||
pub const RTM_IFINFO: ::c_int = 0xe;
|
||||
pub const RTM_NEWMADDR: ::c_int = 0xf;
|
||||
pub const RTM_DELMADDR: ::c_int = 0x10;
|
||||
pub const RTM_IFINFO2: ::c_int = 0x12;
|
||||
pub const RTM_NEWMADDR2: ::c_int = 0x13;
|
||||
pub const RTM_GET2: ::c_int = 0x14;
|
||||
|
||||
// Bitmask values for rtm_inits and rmx_locks.
|
||||
pub const RTV_MTU: ::c_int = 0x1;
|
||||
pub const RTV_HOPCOUNT: ::c_int = 0x2;
|
||||
pub const RTV_EXPIRE: ::c_int = 0x4;
|
||||
pub const RTV_RPIPE: ::c_int = 0x8;
|
||||
pub const RTV_SPIPE: ::c_int = 0x10;
|
||||
pub const RTV_SSTHRESH: ::c_int = 0x20;
|
||||
pub const RTV_RTT: ::c_int = 0x40;
|
||||
pub const RTV_RTTVAR: ::c_int = 0x80;
|
||||
|
||||
// Bitmask values for rtm_addrs.
|
||||
pub const RTA_DST: ::c_int = 0x1;
|
||||
pub const RTA_GATEWAY: ::c_int = 0x2;
|
||||
pub const RTA_NETMASK: ::c_int = 0x4;
|
||||
pub const RTA_GENMASK: ::c_int = 0x8;
|
||||
pub const RTA_IFP: ::c_int = 0x10;
|
||||
pub const RTA_IFA: ::c_int = 0x20;
|
||||
pub const RTA_AUTHOR: ::c_int = 0x40;
|
||||
pub const RTA_BRD: ::c_int = 0x80;
|
||||
|
||||
// Index offsets for sockaddr array for alternate internal encoding.
|
||||
pub const RTAX_DST: ::c_int = 0;
|
||||
pub const RTAX_GATEWAY: ::c_int = 1;
|
||||
pub const RTAX_NETMASK: ::c_int = 2;
|
||||
pub const RTAX_GENMASK: ::c_int = 3;
|
||||
pub const RTAX_IFP: ::c_int = 4;
|
||||
pub const RTAX_IFA: ::c_int = 5;
|
||||
pub const RTAX_AUTHOR: ::c_int = 6;
|
||||
pub const RTAX_BRD: ::c_int = 7;
|
||||
pub const RTAX_MAX: ::c_int = 8;
|
||||
|
||||
pub const KERN_PROCARGS2: ::c_int = 49;
|
||||
|
||||
|
|
|
|||
|
|
@ -1137,6 +1137,98 @@ pub const PT_GNU_EH_FRAME: u32 = 0x6474e550;
|
|||
pub const PT_GNU_STACK: u32 = 0x6474e551;
|
||||
pub const PT_GNU_RELRO: u32 = 0x6474e552;
|
||||
|
||||
// linux/if_ether.h
|
||||
pub const ETH_ALEN: ::c_int = 6;
|
||||
pub const ETH_HLEN: ::c_int = 14;
|
||||
pub const ETH_ZLEN: ::c_int = 60;
|
||||
pub const ETH_DATA_LEN: ::c_int = 1500;
|
||||
pub const ETH_FRAME_LEN: ::c_int = 1514;
|
||||
pub const ETH_FCS_LEN: ::c_int = 4;
|
||||
|
||||
// These are the defined Ethernet Protocol ID's.
|
||||
pub const ETH_P_LOOP: ::c_int = 0x0060;
|
||||
pub const ETH_P_PUP: ::c_int = 0x0200;
|
||||
pub const ETH_P_PUPAT: ::c_int = 0x0201;
|
||||
pub const ETH_P_IP: ::c_int = 0x0800;
|
||||
pub const ETH_P_X25: ::c_int = 0x0805;
|
||||
pub const ETH_P_ARP: ::c_int = 0x0806;
|
||||
pub const ETH_P_BPQ: ::c_int = 0x08FF;
|
||||
pub const ETH_P_IEEEPUP: ::c_int = 0x0a00;
|
||||
pub const ETH_P_IEEEPUPAT: ::c_int = 0x0a01;
|
||||
pub const ETH_P_BATMAN: ::c_int = 0x4305;
|
||||
pub const ETH_P_DEC: ::c_int = 0x6000;
|
||||
pub const ETH_P_DNA_DL: ::c_int = 0x6001;
|
||||
pub const ETH_P_DNA_RC: ::c_int = 0x6002;
|
||||
pub const ETH_P_DNA_RT: ::c_int = 0x6003;
|
||||
pub const ETH_P_LAT: ::c_int = 0x6004;
|
||||
pub const ETH_P_DIAG: ::c_int = 0x6005;
|
||||
pub const ETH_P_CUST: ::c_int = 0x6006;
|
||||
pub const ETH_P_SCA: ::c_int = 0x6007;
|
||||
pub const ETH_P_TEB: ::c_int = 0x6558;
|
||||
pub const ETH_P_RARP: ::c_int = 0x8035;
|
||||
pub const ETH_P_ATALK: ::c_int = 0x809B;
|
||||
pub const ETH_P_AARP: ::c_int = 0x80F3;
|
||||
pub const ETH_P_8021Q: ::c_int = 0x8100;
|
||||
pub const ETH_P_IPX: ::c_int = 0x8137;
|
||||
pub const ETH_P_IPV6: ::c_int = 0x86DD;
|
||||
pub const ETH_P_PAUSE: ::c_int = 0x8808;
|
||||
pub const ETH_P_SLOW: ::c_int = 0x8809;
|
||||
pub const ETH_P_WCCP: ::c_int = 0x883E;
|
||||
pub const ETH_P_MPLS_UC: ::c_int = 0x8847;
|
||||
pub const ETH_P_MPLS_MC: ::c_int = 0x8848;
|
||||
pub const ETH_P_ATMMPOA: ::c_int = 0x884c;
|
||||
pub const ETH_P_PPP_DISC: ::c_int = 0x8863;
|
||||
pub const ETH_P_PPP_SES: ::c_int = 0x8864;
|
||||
pub const ETH_P_LINK_CTL: ::c_int = 0x886c;
|
||||
pub const ETH_P_ATMFATE: ::c_int = 0x8884;
|
||||
pub const ETH_P_PAE: ::c_int = 0x888E;
|
||||
pub const ETH_P_AOE: ::c_int = 0x88A2;
|
||||
pub const ETH_P_8021AD: ::c_int = 0x88A8;
|
||||
pub const ETH_P_802_EX1: ::c_int = 0x88B5;
|
||||
pub const ETH_P_TIPC: ::c_int = 0x88CA;
|
||||
pub const ETH_P_MACSEC: ::c_int = 0x88E5;
|
||||
pub const ETH_P_8021AH: ::c_int = 0x88E7;
|
||||
pub const ETH_P_MVRP: ::c_int = 0x88F5;
|
||||
pub const ETH_P_1588: ::c_int = 0x88F7;
|
||||
pub const ETH_P_PRP: ::c_int = 0x88FB;
|
||||
pub const ETH_P_FCOE: ::c_int = 0x8906;
|
||||
pub const ETH_P_TDLS: ::c_int = 0x890D;
|
||||
pub const ETH_P_FIP: ::c_int = 0x8914;
|
||||
pub const ETH_P_80221: ::c_int = 0x8917;
|
||||
pub const ETH_P_LOOPBACK: ::c_int = 0x9000;
|
||||
pub const ETH_P_QINQ1: ::c_int = 0x9100;
|
||||
pub const ETH_P_QINQ2: ::c_int = 0x9200;
|
||||
pub const ETH_P_QINQ3: ::c_int = 0x9300;
|
||||
pub const ETH_P_EDSA: ::c_int = 0xDADA;
|
||||
pub const ETH_P_AF_IUCV: ::c_int = 0xFBFB;
|
||||
|
||||
pub const ETH_P_802_3_MIN: ::c_int = 0x0600;
|
||||
|
||||
// Non DIX types. Won't clash for 1500 types.
|
||||
pub const ETH_P_802_3: ::c_int = 0x0001;
|
||||
pub const ETH_P_AX25: ::c_int = 0x0002;
|
||||
pub const ETH_P_ALL: ::c_int = 0x0003;
|
||||
pub const ETH_P_802_2: ::c_int = 0x0004;
|
||||
pub const ETH_P_SNAP: ::c_int = 0x0005;
|
||||
pub const ETH_P_DDCMP: ::c_int = 0x0006;
|
||||
pub const ETH_P_WAN_PPP: ::c_int = 0x0007;
|
||||
pub const ETH_P_PPP_MP: ::c_int = 0x0008;
|
||||
pub const ETH_P_LOCALTALK: ::c_int = 0x0009;
|
||||
pub const ETH_P_CANFD: ::c_int = 0x000D;
|
||||
pub const ETH_P_PPPTALK: ::c_int = 0x0010;
|
||||
pub const ETH_P_TR_802_2: ::c_int = 0x0011;
|
||||
pub const ETH_P_MOBITEX: ::c_int = 0x0015;
|
||||
pub const ETH_P_CONTROL: ::c_int = 0x0016;
|
||||
pub const ETH_P_IRDA: ::c_int = 0x0017;
|
||||
pub const ETH_P_ECONET: ::c_int = 0x0018;
|
||||
pub const ETH_P_HDLC: ::c_int = 0x0019;
|
||||
pub const ETH_P_ARCNET: ::c_int = 0x001A;
|
||||
pub const ETH_P_DSA: ::c_int = 0x001B;
|
||||
pub const ETH_P_TRAILER: ::c_int = 0x001C;
|
||||
pub const ETH_P_PHONET: ::c_int = 0x00F5;
|
||||
pub const ETH_P_IEEE802154: ::c_int = 0x00F6;
|
||||
pub const ETH_P_CAIF: ::c_int = 0x00F7;
|
||||
|
||||
f! {
|
||||
pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
|
||||
for slot in cpuset.bits.iter_mut() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue