diff options
Diffstat (limited to 'include/netinet')
| -rw-r--r-- | include/netinet/icmp6.h | 1 | ||||
| -rw-r--r-- | include/netinet/if_ether.h | 4 | ||||
| -rw-r--r-- | include/netinet/in.h | 13 | ||||
| -rw-r--r-- | include/netinet/ip.h | 3 | ||||
| -rw-r--r-- | include/netinet/ip6.h | 1 | ||||
| -rw-r--r-- | include/netinet/tcp.h | 33 | ||||
| -rw-r--r-- | include/netinet/udp.h | 1 | 
7 files changed, 45 insertions, 11 deletions
diff --git a/include/netinet/icmp6.h b/include/netinet/icmp6.h index cf951d91..01269e7d 100644 --- a/include/netinet/icmp6.h +++ b/include/netinet/icmp6.h @@ -9,7 +9,6 @@ extern "C" {  #include <string.h>  #include <sys/types.h>  #include <netinet/in.h> -#include <endian.h>  #define ICMP6_FILTER 1 diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h index ecd6c73c..3479f511 100644 --- a/include/netinet/if_ether.h +++ b/include/netinet/if_ether.h @@ -58,12 +58,15 @@  #define ETH_P_ERSPAN	0x88BE  #define ETH_P_PREAUTH	0x88C7  #define ETH_P_TIPC	0x88CA +#define ETH_P_LLDP	0x88CC +#define ETH_P_MRP	0x88E3  #define ETH_P_MACSEC	0x88E5  #define ETH_P_8021AH	0x88E7  #define ETH_P_MVRP	0x88F5  #define ETH_P_1588	0x88F7  #define ETH_P_NCSI	0x88F8  #define ETH_P_PRP	0x88FB +#define ETH_P_CFM	0x8902  #define ETH_P_FCOE	0x8906  #define ETH_P_TDLS	0x890D  #define ETH_P_FIP	0x8914 @@ -76,6 +79,7 @@  #define ETH_P_QINQ2	0x9200  #define ETH_P_QINQ3	0x9300  #define ETH_P_EDSA	0xDADA +#define ETH_P_DSA_8021Q	0xDADB  #define ETH_P_IFE	0xED3E  #define ETH_P_AF_IUCV	0xFBFB diff --git a/include/netinet/in.h b/include/netinet/in.h index 3ba7546c..60bbaa75 100644 --- a/include/netinet/in.h +++ b/include/netinet/in.h @@ -48,10 +48,12 @@ struct ipv6_mreq {  #define INADDR_BROADCAST  ((in_addr_t) 0xffffffff)  #define INADDR_NONE       ((in_addr_t) 0xffffffff)  #define INADDR_LOOPBACK   ((in_addr_t) 0x7f000001) +#define INADDR_DUMMY      ((in_addr_t) 0xc0000008)  #define INADDR_UNSPEC_GROUP     ((in_addr_t) 0xe0000000)  #define INADDR_ALLHOSTS_GROUP   ((in_addr_t) 0xe0000001)  #define INADDR_ALLRTRS_GROUP    ((in_addr_t) 0xe0000002) +#define INADDR_ALLSNOOPERS_GROUP ((in_addr_t) 0xe000006a)  #define INADDR_MAX_LOCAL_GROUP  ((in_addr_t) 0xe00000ff)  #define IN6ADDR_ANY_INIT      { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } @@ -59,8 +61,6 @@ struct ipv6_mreq {  extern const struct in6_addr in6addr_any, in6addr_loopback; -#undef INET_ADDRSTRLEN -#undef INET6_ADDRSTRLEN  #define INET_ADDRSTRLEN  16  #define INET6_ADDRSTRLEN 46 @@ -102,8 +102,10 @@ uint16_t ntohs(uint16_t);  #define IPPROTO_MH       135  #define IPPROTO_UDPLITE  136  #define IPPROTO_MPLS     137 +#define IPPROTO_ETHERNET 143  #define IPPROTO_RAW      255 -#define IPPROTO_MAX      256 +#define IPPROTO_MPTCP    262 +#define IPPROTO_MAX      263  #define IN6_IS_ADDR_UNSPECIFIED(a) \          (((uint32_t *) (a))[0] == 0 && ((uint32_t *) (a))[1] == 0 && \ @@ -130,7 +132,8 @@ uint16_t ntohs(uint16_t);  #define IN6_IS_ADDR_V4COMPAT(a) \          (((uint32_t *) (a))[0] == 0 && ((uint32_t *) (a))[1] == 0 && \ -         ((uint32_t *) (a))[2] == 0 && ((uint8_t *) (a))[15] > 1) +         ((uint32_t *) (a))[2] == 0 && \ +         !IN6_IS_ADDR_UNSPECIFIED(a) && !IN6_IS_ADDR_LOOPBACK(a))  #define IN6_IS_ADDR_MC_NODELOCAL(a) \          (IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0x1)) @@ -201,6 +204,7 @@ uint16_t ntohs(uint16_t);  #define IP_CHECKSUM        23  #define IP_BIND_ADDRESS_NO_PORT 24  #define IP_RECVFRAGSIZE    25 +#define IP_RECVERR_RFC4884 26  #define IP_MULTICAST_IF    32  #define IP_MULTICAST_TTL   33  #define IP_MULTICAST_LOOP  34 @@ -336,6 +340,7 @@ struct ip6_mtuinfo {  #define IPV6_JOIN_ANYCAST       27  #define IPV6_LEAVE_ANYCAST      28  #define IPV6_MULTICAST_ALL      29 +#define IPV6_ROUTER_ALERT_ISOLATE 30  #define IPV6_IPSEC_POLICY       34  #define IPV6_XFRM_POLICY        35  #define IPV6_HDRINCL            36 diff --git a/include/netinet/ip.h b/include/netinet/ip.h index d7fa8d5e..0ae132a5 100644 --- a/include/netinet/ip.h +++ b/include/netinet/ip.h @@ -7,7 +7,6 @@ extern "C" {  #include <stdint.h>  #include <netinet/in.h> -#include <endian.h>  struct timestamp {  	uint8_t len; @@ -191,6 +190,8 @@ struct ip_timestamp {  #define	IP_MSS		576 +#define __UAPI_DEF_IPHDR	0 +  #ifdef __cplusplus  }  #endif diff --git a/include/netinet/ip6.h b/include/netinet/ip6.h index a4347a53..50c626a6 100644 --- a/include/netinet/ip6.h +++ b/include/netinet/ip6.h @@ -7,7 +7,6 @@ extern "C" {  #include <stdint.h>  #include <netinet/in.h> -#include <endian.h>  struct ip6_hdr {  	union { diff --git a/include/netinet/tcp.h b/include/netinet/tcp.h index c7a86480..fad1d844 100644 --- a/include/netinet/tcp.h +++ b/include/netinet/tcp.h @@ -38,6 +38,7 @@  #define TCP_FASTOPEN_NO_COOKIE 34  #define TCP_ZEROCOPY_RECEIVE   35  #define TCP_INQ          36 +#define TCP_TX_DELAY     37  #define TCP_CM_INQ TCP_INQ @@ -77,6 +78,10 @@ enum {  	TCP_NLA_DSACK_DUPS,  	TCP_NLA_REORD_SEEN,  	TCP_NLA_SRTT, +	TCP_NLA_TIMEOUT_REHASH, +	TCP_NLA_BYTES_NOTSENT, +	TCP_NLA_EDT, +	TCP_NLA_TTL,  };  #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) @@ -97,7 +102,6 @@ enum {  #include <sys/types.h>  #include <sys/socket.h>  #include <stdint.h> -#include <endian.h>  typedef uint32_t tcp_seq; @@ -181,6 +185,13 @@ struct tcphdr {  #define TCP_CA_Recovery		3  #define TCP_CA_Loss		4 +enum tcp_fastopen_client_fail { +	TFO_STATUS_UNSPEC, +	TFO_COOKIE_UNAVAILABLE, +	TFO_DATA_NOT_ACKED, +	TFO_SYN_RETRANSMITTED, +}; +  struct tcp_info {  	uint8_t tcpi_state;  	uint8_t tcpi_ca_state; @@ -189,7 +200,7 @@ struct tcp_info {  	uint8_t tcpi_backoff;  	uint8_t tcpi_options;  	uint8_t tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4; -	uint8_t tcpi_delivery_rate_app_limited : 1; +	uint8_t tcpi_delivery_rate_app_limited : 1, tcpi_fastopen_client_fail : 2;  	uint32_t tcpi_rto;  	uint32_t tcpi_ato;  	uint32_t tcpi_snd_mss; @@ -234,18 +245,21 @@ struct tcp_info {  	uint64_t tcpi_bytes_retrans;  	uint32_t tcpi_dsack_dups;  	uint32_t tcpi_reord_seen; +	uint32_t tcpi_rcv_ooopack; +	uint32_t tcpi_snd_wnd;  };  #define TCP_MD5SIG_MAXKEYLEN    80 -#define TCP_MD5SIG_FLAG_PREFIX  1 +#define TCP_MD5SIG_FLAG_PREFIX  0x1 +#define TCP_MD5SIG_FLAG_IFINDEX 0x2  struct tcp_md5sig {  	struct sockaddr_storage tcpm_addr;  	uint8_t tcpm_flags;  	uint8_t tcpm_prefixlen;  	uint16_t tcpm_keylen; -	uint32_t __tcpm_pad; +	int tcpm_ifindex;  	uint8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN];  }; @@ -269,10 +283,21 @@ struct tcp_repair_window {  	uint32_t rcv_wup;  }; +#define TCP_RECEIVE_ZEROCOPY_FLAG_TLB_CLEAN_HINT 0x1 +  struct tcp_zerocopy_receive {  	uint64_t address;  	uint32_t length;  	uint32_t recv_skip_hint; +	uint32_t inq; +	int32_t err; +	uint64_t copybuf_address; +	int32_t copybuf_len; +	uint32_t flags; +	uint64_t msg_control; +	uint64_t msg_controllen; +	uint32_t msg_flags; +	uint32_t reserved;  };  #endif diff --git a/include/netinet/udp.h b/include/netinet/udp.h index ffd89079..40c3f203 100644 --- a/include/netinet/udp.h +++ b/include/netinet/udp.h @@ -35,6 +35,7 @@ struct udphdr {  #define UDP_ENCAP_GTP0		4  #define UDP_ENCAP_GTP1U		5  #define UDP_ENCAP_RXRPC		6 +#define TCP_ENCAP_ESPINTCP	7  #define SOL_UDP            17  | 
