From 1fe0542711ad88544f77ce8a93fa1edfdbd47a97 Mon Sep 17 00:00:00 2001 From: wangyingdong Date: Wed, 18 Oct 2023 17:10:28 +0800 Subject: [PATCH] Expose IPTOS_xxx to the application layer Signed-off-by: wangyingdong --- include/netinet/ip.h | 20 ++++++++++++++++++++ include/nuttx/net/ip.h | 20 -------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/netinet/ip.h b/include/netinet/ip.h index 8aa9660a25..ebc6a86a11 100644 --- a/include/netinet/ip.h +++ b/include/netinet/ip.h @@ -35,6 +35,26 @@ #define IPVERSION 4 /* IP version number */ #define IPDEFTTL 64 /* default ttl, from RFC 1340 */ +/* Values for the TOS field */ + +#define IPTOS_TOS_MASK 0x1e +#define IPTOS_TOS(tos) ((tos) & IPTOS_TOS_MASK) +#define IPTOS_LOWDELAY 0x10 +#define IPTOS_THROUGHPUT 0x08 +#define IPTOS_RELIABILITY 0x04 +#define IPTOS_MINCOST 0x02 + +#define IPTOS_PREC_MASK 0xe0 +#define IPTOS_PREC(tos) ((tos) & IPTOS_PREC_MASK) +#define IPTOS_PREC_NETCONTROL 0xe0 +#define IPTOS_PREC_INTERNETCONTROL 0xc0 +#define IPTOS_PREC_CRITIC_ECP 0xa0 +#define IPTOS_PREC_FLASHOVERRIDE 0x80 +#define IPTOS_PREC_FLASH 0x60 +#define IPTOS_PREC_IMMEDIATE 0x40 +#define IPTOS_PREC_PRIORITY 0x20 +#define IPTOS_PREC_ROUTINE 0x00 + struct iphdr { #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/include/nuttx/net/ip.h b/include/nuttx/net/ip.h index 6e6db2c0da..eb712d09b2 100644 --- a/include/nuttx/net/ip.h +++ b/include/nuttx/net/ip.h @@ -78,26 +78,6 @@ #define IP_PROTO_UDP 17 #define IP_PROTO_ICMP6 58 -/* Values for the TOS field */ - -#define IPTOS_TOS_MASK 0x1e -#define IPTOS_TOS(tos) ((tos) & IPTOS_TOS_MASK) -#define IPTOS_LOWDELAY 0x10 -#define IPTOS_THROUGHPUT 0x08 -#define IPTOS_RELIABILITY 0x04 -#define IPTOS_MINCOST 0x02 - -#define IPTOS_PREC_MASK 0xe0 -#define IPTOS_PREC(tos) ((tos) & IPTOS_PREC_MASK) -#define IPTOS_PREC_NETCONTROL 0xe0 -#define IPTOS_PREC_INTERNETCONTROL 0xc0 -#define IPTOS_PREC_CRITIC_ECP 0xa0 -#define IPTOS_PREC_FLASHOVERRIDE 0x80 -#define IPTOS_PREC_FLASH 0x60 -#define IPTOS_PREC_IMMEDIATE 0x40 -#define IPTOS_PREC_PRIORITY 0x20 -#define IPTOS_PREC_ROUTINE 0x00 - /* Flag bits in 16-bit flags + fragment offset IPv4 header field */ #define IP_FLAG_RESERVED 0x8000