diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-05-23 13:18:31 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-06-08 13:19:54 +0200 |
| commit | 02373194fe0be1ef82db419bedbf9d6ffd31dc93 (patch) | |
| tree | f151591d23221ec221c57496d07f7fba8dff137a /freebsd/sys/netinet | |
| parent | Update scripts to include support for input devices - USB Keyboard, USB mouse... (diff) | |
| download | rtems-libbsd-02373194fe0be1ef82db419bedbf9d6ffd31dc93.tar.bz2 | |
Update due to Newlib 2017-06-07 changes
The following files are now provided by Newlib:
* arpa/inet.h
* net/if.h
* netinet/in.h
* netinet/tcp.h
* sys/socket.h
* sys/uio.h
* sys/un.h
The <sys/param.h> and <sys/cpuset.h> are now compatible enough to be
used directly.
Update #2833.
Diffstat (limited to 'freebsd/sys/netinet')
62 files changed, 65 insertions, 1002 deletions
diff --git a/freebsd/sys/netinet/accf_data.c b/freebsd/sys/netinet/accf_data.c index 4d4037f0..ae91bfa6 100644 --- a/freebsd/sys/netinet/accf_data.c +++ b/freebsd/sys/netinet/accf_data.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #define ACCEPT_FILTER_MOD -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/netinet/accf_dns.c b/freebsd/sys/netinet/accf_dns.c index b6d2ff63..5d11a024 100644 --- a/freebsd/sys/netinet/accf_dns.c +++ b/freebsd/sys/netinet/accf_dns.c @@ -30,7 +30,7 @@ #define ACCEPT_FILTER_MOD -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/accf_http.c b/freebsd/sys/netinet/accf_http.c index 83093db3..65dc2621 100644 --- a/freebsd/sys/netinet/accf_http.c +++ b/freebsd/sys/netinet/accf_http.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #define ACCEPT_FILTER_MOD -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/cc/cc.c b/freebsd/sys/netinet/cc/cc.c index ab3e831e..3cd0ef79 100644 --- a/freebsd/sys/netinet/cc/cc.c +++ b/freebsd/sys/netinet/cc/cc.c @@ -51,7 +51,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/libkern.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet/cc/cc_newreno.c b/freebsd/sys/netinet/cc/cc_newreno.c index 4c21036a..fb6c1087 100644 --- a/freebsd/sys/netinet/cc/cc_newreno.c +++ b/freebsd/sys/netinet/cc/cc_newreno.c @@ -53,7 +53,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/if_atm.c b/freebsd/sys/netinet/if_atm.c index cb0317fb..b38de023 100644 --- a/freebsd/sys/netinet/if_atm.c +++ b/freebsd/sys/netinet/if_atm.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #if defined(INET) || defined(INET6) -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/queue.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netinet/if_ether.c b/freebsd/sys/netinet/if_ether.c index d2b0595a..fd4ae62e 100644 --- a/freebsd/sys/netinet/if_ether.c +++ b/freebsd/sys/netinet/if_ether.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/queue.h> diff --git a/freebsd/sys/netinet/igmp.c b/freebsd/sys/netinet/igmp.c index 9443bb64..cd41e781 100644 --- a/freebsd/sys/netinet/igmp.c +++ b/freebsd/sys/netinet/igmp.c @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ddb.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/module.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/in.c b/freebsd/sys/netinet/in.c index a02e3034..48768f9a 100644 --- a/freebsd/sys/netinet/in.c +++ b/freebsd/sys/netinet/in.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_mpath.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/eventhandler.h> #include <sys/systm.h> #include <sys/sockio.h> diff --git a/freebsd/sys/netinet/in.h b/freebsd/sys/netinet/in.h deleted file mode 100644 index 6b831344..00000000 --- a/freebsd/sys/netinet/in.h +++ /dev/null @@ -1,676 +0,0 @@ -/*- - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD$ - */ - -#ifndef _NETINET_IN_H_ -#define _NETINET_IN_H_ - -#include <sys/cdefs.h> -#include <sys/_types.h> -#ifndef __rtems__ -#include <machine/endian.h> -#else /* __rtems__ */ -#include <machine/endian.h> -#endif /* __rtems__ */ - -/* Protocols common to RFC 1700, POSIX, and X/Open. */ -#define IPPROTO_IP 0 /* dummy for IP */ -#define IPPROTO_ICMP 1 /* control message protocol */ -#define IPPROTO_TCP 6 /* tcp */ -#define IPPROTO_UDP 17 /* user datagram protocol */ - -#define INADDR_ANY ((in_addr_t)0x00000000) -#define INADDR_BROADCAST ((in_addr_t)0xffffffff) /* must be masked */ - -#ifndef _UINT8_T_DECLARED -typedef __uint8_t uint8_t; -#define _UINT8_T_DECLARED -#endif - -#ifndef _UINT16_T_DECLARED -typedef __uint16_t uint16_t; -#define _UINT16_T_DECLARED -#endif - -#ifndef _UINT32_T_DECLARED -typedef __uint32_t uint32_t; -#define _UINT32_T_DECLARED -#endif - -#ifndef _IN_ADDR_T_DECLARED -typedef uint32_t in_addr_t; -#define _IN_ADDR_T_DECLARED -#endif - -#ifndef _IN_PORT_T_DECLARED -typedef uint16_t in_port_t; -#define _IN_PORT_T_DECLARED -#endif - -#ifndef _SA_FAMILY_T_DECLARED -typedef __sa_family_t sa_family_t; -#define _SA_FAMILY_T_DECLARED -#endif - -/* Internet address (a structure for historical reasons). */ -#ifndef _STRUCT_IN_ADDR_DECLARED -struct in_addr { - in_addr_t s_addr; -}; -#define _STRUCT_IN_ADDR_DECLARED -#endif - -#ifndef _SOCKLEN_T_DECLARED -typedef __socklen_t socklen_t; -#define _SOCKLEN_T_DECLARED -#endif - -#include <sys/_sockaddr_storage.h> - -/* Socket address, internet style. */ -struct sockaddr_in { - uint8_t sin_len; - sa_family_t sin_family; - in_port_t sin_port; - struct in_addr sin_addr; - char sin_zero[8]; -}; - -#if !defined(_KERNEL) && __POSIX_VISIBLE >= 200112 - -#ifndef _BYTEORDER_PROTOTYPED -#define _BYTEORDER_PROTOTYPED -__BEGIN_DECLS -uint32_t htonl(uint32_t); -uint16_t htons(uint16_t); -uint32_t ntohl(uint32_t); -uint16_t ntohs(uint16_t); -__END_DECLS -#endif - -#ifndef _BYTEORDER_FUNC_DEFINED -#define _BYTEORDER_FUNC_DEFINED -#define htonl(x) __htonl(x) -#define htons(x) __htons(x) -#define ntohl(x) __ntohl(x) -#define ntohs(x) __ntohs(x) -#endif - -#endif /* !_KERNEL && __POSIX_VISIBLE >= 200112 */ - -#if __POSIX_VISIBLE >= 200112 -#define IPPROTO_IPV6 41 /* IP6 header */ -#define IPPROTO_RAW 255 /* raw IP packet */ -#define INET_ADDRSTRLEN 16 -#endif - -#if __BSD_VISIBLE -/* - * Constants and structures defined by the internet system, - * Per RFC 790, September 1981, and numerous additions. - */ - -/* - * Protocols (RFC 1700) - */ -#define IPPROTO_HOPOPTS 0 /* IP6 hop-by-hop options */ -#define IPPROTO_IGMP 2 /* group mgmt protocol */ -#define IPPROTO_GGP 3 /* gateway^2 (deprecated) */ -#define IPPROTO_IPV4 4 /* IPv4 encapsulation */ -#define IPPROTO_IPIP IPPROTO_IPV4 /* for compatibility */ -#define IPPROTO_ST 7 /* Stream protocol II */ -#define IPPROTO_EGP 8 /* exterior gateway protocol */ -#define IPPROTO_PIGP 9 /* private interior gateway */ -#define IPPROTO_RCCMON 10 /* BBN RCC Monitoring */ -#define IPPROTO_NVPII 11 /* network voice protocol*/ -#define IPPROTO_PUP 12 /* pup */ -#define IPPROTO_ARGUS 13 /* Argus */ -#define IPPROTO_EMCON 14 /* EMCON */ -#define IPPROTO_XNET 15 /* Cross Net Debugger */ -#define IPPROTO_CHAOS 16 /* Chaos*/ -#define IPPROTO_MUX 18 /* Multiplexing */ -#define IPPROTO_MEAS 19 /* DCN Measurement Subsystems */ -#define IPPROTO_HMP 20 /* Host Monitoring */ -#define IPPROTO_PRM 21 /* Packet Radio Measurement */ -#define IPPROTO_IDP 22 /* xns idp */ -#define IPPROTO_TRUNK1 23 /* Trunk-1 */ -#define IPPROTO_TRUNK2 24 /* Trunk-2 */ -#define IPPROTO_LEAF1 25 /* Leaf-1 */ -#define IPPROTO_LEAF2 26 /* Leaf-2 */ -#define IPPROTO_RDP 27 /* Reliable Data */ -#define IPPROTO_IRTP 28 /* Reliable Transaction */ -#define IPPROTO_TP 29 /* tp-4 w/ class negotiation */ -#define IPPROTO_BLT 30 /* Bulk Data Transfer */ -#define IPPROTO_NSP 31 /* Network Services */ -#define IPPROTO_INP 32 /* Merit Internodal */ -#define IPPROTO_SEP 33 /* Sequential Exchange */ -#define IPPROTO_3PC 34 /* Third Party Connect */ -#define IPPROTO_IDPR 35 /* InterDomain Policy Routing */ -#define IPPROTO_XTP 36 /* XTP */ -#define IPPROTO_DDP 37 /* Datagram Delivery */ -#define IPPROTO_CMTP 38 /* Control Message Transport */ -#define IPPROTO_TPXX 39 /* TP++ Transport */ -#define IPPROTO_IL 40 /* IL transport protocol */ -#define IPPROTO_SDRP 42 /* Source Demand Routing */ -#define IPPROTO_ROUTING 43 /* IP6 routing header */ -#define IPPROTO_FRAGMENT 44 /* IP6 fragmentation header */ -#define IPPROTO_IDRP 45 /* InterDomain Routing*/ -#define IPPROTO_RSVP 46 /* resource reservation */ -#define IPPROTO_GRE 47 /* General Routing Encap. */ -#define IPPROTO_MHRP 48 /* Mobile Host Routing */ -#define IPPROTO_BHA 49 /* BHA */ -#define IPPROTO_ESP 50 /* IP6 Encap Sec. Payload */ -#define IPPROTO_AH 51 /* IP6 Auth Header */ -#define IPPROTO_INLSP 52 /* Integ. Net Layer Security */ -#define IPPROTO_SWIPE 53 /* IP with encryption */ -#define IPPROTO_NHRP 54 /* Next Hop Resolution */ -#define IPPROTO_MOBILE 55 /* IP Mobility */ -#define IPPROTO_TLSP 56 /* Transport Layer Security */ -#define IPPROTO_SKIP 57 /* SKIP */ -#define IPPROTO_ICMPV6 58 /* ICMP6 */ -#define IPPROTO_NONE 59 /* IP6 no next header */ -#define IPPROTO_DSTOPTS 60 /* IP6 destination option */ -#define IPPROTO_AHIP 61 /* any host internal protocol */ -#define IPPROTO_CFTP 62 /* CFTP */ -#define IPPROTO_HELLO 63 /* "hello" routing protocol */ -#define IPPROTO_SATEXPAK 64 /* SATNET/Backroom EXPAK */ -#define IPPROTO_KRYPTOLAN 65 /* Kryptolan */ -#define IPPROTO_RVD 66 /* Remote Virtual Disk */ -#define IPPROTO_IPPC 67 /* Pluribus Packet Core */ -#define IPPROTO_ADFS 68 /* Any distributed FS */ -#define IPPROTO_SATMON 69 /* Satnet Monitoring */ -#define IPPROTO_VISA 70 /* VISA Protocol */ -#define IPPROTO_IPCV 71 /* Packet Core Utility */ -#define IPPROTO_CPNX 72 /* Comp. Prot. Net. Executive */ -#define IPPROTO_CPHB 73 /* Comp. Prot. HeartBeat */ -#define IPPROTO_WSN 74 /* Wang Span Network */ -#define IPPROTO_PVP 75 /* Packet Video Protocol */ -#define IPPROTO_BRSATMON 76 /* BackRoom SATNET Monitoring */ -#define IPPROTO_ND 77 /* Sun net disk proto (temp.) */ -#define IPPROTO_WBMON 78 /* WIDEBAND Monitoring */ -#define IPPROTO_WBEXPAK 79 /* WIDEBAND EXPAK */ -#define IPPROTO_EON 80 /* ISO cnlp */ -#define IPPROTO_VMTP 81 /* VMTP */ -#define IPPROTO_SVMTP 82 /* Secure VMTP */ -#define IPPROTO_VINES 83 /* Banyon VINES */ -#define IPPROTO_TTP 84 /* TTP */ -#define IPPROTO_IGP 85 /* NSFNET-IGP */ -#define IPPROTO_DGP 86 /* dissimilar gateway prot. */ -#define IPPROTO_TCF 87 /* TCF */ -#define IPPROTO_IGRP 88 /* Cisco/GXS IGRP */ -#define IPPROTO_OSPFIGP 89 /* OSPFIGP */ -#define IPPROTO_SRPC 90 /* Strite RPC protocol */ -#define IPPROTO_LARP 91 /* Locus Address Resoloution */ -#define IPPROTO_MTP 92 /* Multicast Transport */ -#define IPPROTO_AX25 93 /* AX.25 Frames */ -#define IPPROTO_IPEIP 94 /* IP encapsulated in IP */ -#define IPPROTO_MICP 95 /* Mobile Int.ing control */ -#define IPPROTO_SCCSP 96 /* Semaphore Comm. security */ -#define IPPROTO_ETHERIP 97 /* Ethernet IP encapsulation */ -#define IPPROTO_ENCAP 98 /* encapsulation header */ -#define IPPROTO_APES 99 /* any private encr. scheme */ -#define IPPROTO_GMTP 100 /* GMTP*/ -#define IPPROTO_IPCOMP 108 /* payload compression (IPComp) */ -#define IPPROTO_SCTP 132 /* SCTP */ -#define IPPROTO_MH 135 /* IPv6 Mobility Header */ -#define IPPROTO_UDPLITE 136 /* UDP-Lite */ -#define IPPROTO_HIP 139 /* IP6 Host Identity Protocol */ -#define IPPROTO_SHIM6 140 /* IP6 Shim6 Protocol */ -/* 101-254: Partly Unassigned */ -#define IPPROTO_PIM 103 /* Protocol Independent Mcast */ -#define IPPROTO_CARP 112 /* CARP */ -#define IPPROTO_PGM 113 /* PGM */ -#define IPPROTO_MPLS 137 /* MPLS-in-IP */ -#define IPPROTO_PFSYNC 240 /* PFSYNC */ -#define IPPROTO_RESERVED_253 253 /* Reserved */ -#define IPPROTO_RESERVED_254 254 /* Reserved */ -/* 255: Reserved */ -/* BSD Private, local use, namespace incursion, no longer used */ -#define IPPROTO_OLD_DIVERT 254 /* OLD divert pseudo-proto */ -#define IPPROTO_MAX 256 - -/* last return value of *_input(), meaning "all job for this pkt is done". */ -#define IPPROTO_DONE 257 - -/* Only used internally, so can be outside the range of valid IP protocols. */ -#define IPPROTO_DIVERT 258 /* divert pseudo-protocol */ -#define IPPROTO_SEND 259 /* SeND pseudo-protocol */ - -/* - * Defined to avoid confusion. The master value is defined by - * PROTO_SPACER in sys/protosw.h. - */ -#define IPPROTO_SPACER 32767 /* spacer for loadable protos */ - -/* - * Local port number conventions: - * - * When a user does a bind(2) or connect(2) with a port number of zero, - * a non-conflicting local port address is chosen. - * The default range is IPPORT_HIFIRSTAUTO through - * IPPORT_HILASTAUTO, although that is settable by sysctl. - * - * A user may set the IPPROTO_IP option IP_PORTRANGE to change this - * default assignment range. - * - * The value IP_PORTRANGE_DEFAULT causes the default behavior. - * - * The value IP_PORTRANGE_HIGH changes the range of candidate port numbers - * into the "high" range. These are reserved for client outbound connections - * which do not want to be filtered by any firewalls. - * - * The value IP_PORTRANGE_LOW changes the range to the "low" are - * that is (by convention) restricted to privileged processes. This - * convention is based on "vouchsafe" principles only. It is only secure - * if you trust the remote host to restrict these ports. - * - * The default range of ports and the high range can be changed by - * sysctl(3). (net.inet.ip.port{hi,low}{first,last}_auto) - * - * Changing those values has bad security implications if you are - * using a stateless firewall that is allowing packets outside of that - * range in order to allow transparent outgoing connections. - * - * Such a firewall configuration will generally depend on the use of these - * default values. If you change them, you may find your Security - * Administrator looking for you with a heavy object. - * - * For a slightly more orthodox text view on this: - * - * ftp://ftp.isi.edu/in-notes/iana/assignments/port-numbers - * - * port numbers are divided into three ranges: - * - * 0 - 1023 Well Known Ports - * 1024 - 49151 Registered Ports - * 49152 - 65535 Dynamic and/or Private Ports - * - */ - -/* - * Ports < IPPORT_RESERVED are reserved for - * privileged processes (e.g. root). (IP_PORTRANGE_LOW) - */ -#define IPPORT_RESERVED 1024 - -/* - * Default local port range, used by IP_PORTRANGE_DEFAULT - */ -#define IPPORT_EPHEMERALFIRST 10000 -#define IPPORT_EPHEMERALLAST 65535 - -/* - * Dynamic port range, used by IP_PORTRANGE_HIGH. - */ -#define IPPORT_HIFIRSTAUTO 49152 -#define IPPORT_HILASTAUTO 65535 - -/* - * Scanning for a free reserved port return a value below IPPORT_RESERVED, - * but higher than IPPORT_RESERVEDSTART. Traditionally the start value was - * 512, but that conflicts with some well-known-services that firewalls may - * have a fit if we use. - */ -#define IPPORT_RESERVEDSTART 600 - -#define IPPORT_MAX 65535 - -/* - * Definitions of bits in internet address integers. - * On subnets, the decomposition of addresses to host and net parts - * is done according to subnet mask, not the masks here. - */ -#define IN_CLASSA(i) (((in_addr_t)(i) & 0x80000000) == 0) -#define IN_CLASSA_NET 0xff000000 -#define IN_CLASSA_NSHIFT 24 -#define IN_CLASSA_HOST 0x00ffffff -#define IN_CLASSA_MAX 128 - -#define IN_CLASSB(i) (((in_addr_t)(i) & 0xc0000000) == 0x80000000) -#define IN_CLASSB_NET 0xffff0000 -#define IN_CLASSB_NSHIFT 16 -#define IN_CLASSB_HOST 0x0000ffff -#define IN_CLASSB_MAX 65536 - -#define IN_CLASSC(i) (((in_addr_t)(i) & 0xe0000000) == 0xc0000000) -#define IN_CLASSC_NET 0xffffff00 -#define IN_CLASSC_NSHIFT 8 -#define IN_CLASSC_HOST 0x000000ff - -#define IN_CLASSD(i) (((in_addr_t)(i) & 0xf0000000) == 0xe0000000) -#define IN_CLASSD_NET 0xf0000000 /* These ones aren't really */ -#define IN_CLASSD_NSHIFT 28 /* net and host fields, but */ -#define IN_CLASSD_HOST 0x0fffffff /* routing needn't know. */ -#define IN_MULTICAST(i) IN_CLASSD(i) - -#define IN_EXPERIMENTAL(i) (((in_addr_t)(i) & 0xf0000000) == 0xf0000000) -#define IN_BADCLASS(i) (((in_addr_t)(i) & 0xf0000000) == 0xf0000000) - -#define IN_LINKLOCAL(i) (((in_addr_t)(i) & 0xffff0000) == 0xa9fe0000) -#define IN_LOOPBACK(i) (((in_addr_t)(i) & 0xff000000) == 0x7f000000) -#define IN_ZERONET(i) (((in_addr_t)(i) & 0xff000000) == 0) - -#define IN_PRIVATE(i) ((((in_addr_t)(i) & 0xff000000) == 0x0a000000) || \ - (((in_addr_t)(i) & 0xfff00000) == 0xac100000) || \ - (((in_addr_t)(i) & 0xffff0000) == 0xc0a80000)) - -#define IN_LOCAL_GROUP(i) (((in_addr_t)(i) & 0xffffff00) == 0xe0000000) - -#define IN_ANY_LOCAL(i) (IN_LINKLOCAL(i) || IN_LOCAL_GROUP(i)) - -#define INADDR_LOOPBACK ((in_addr_t)0x7f000001) -#ifndef _KERNEL -#define INADDR_NONE ((in_addr_t)0xffffffff) /* -1 return */ -#endif - -#define INADDR_UNSPEC_GROUP ((in_addr_t)0xe0000000) /* 224.0.0.0 */ -#define INADDR_ALLHOSTS_GROUP ((in_addr_t)0xe0000001) /* 224.0.0.1 */ -#define INADDR_ALLRTRS_GROUP ((in_addr_t)0xe0000002) /* 224.0.0.2 */ -#define INADDR_ALLRPTS_GROUP ((in_addr_t)0xe0000016) /* 224.0.0.22, IGMPv3 */ -#define INADDR_CARP_GROUP ((in_addr_t)0xe0000012) /* 224.0.0.18 */ -#define INADDR_PFSYNC_GROUP ((in_addr_t)0xe00000f0) /* 224.0.0.240 */ -#define INADDR_ALLMDNS_GROUP ((in_addr_t)0xe00000fb) /* 224.0.0.251 */ -#define INADDR_MAX_LOCAL_GROUP ((in_addr_t)0xe00000ff) /* 224.0.0.255 */ - -#define IN_LOOPBACKNET 127 /* official! */ - -#define IN_RFC3021_MASK ((in_addr_t)0xfffffffe) - -/* - * Options for use with [gs]etsockopt at the IP level. - * First word of comment is data type; bool is stored in int. - */ -#define IP_OPTIONS 1 /* buf/ip_opts; set/get IP options */ -#define IP_HDRINCL 2 /* int; header is included with data */ -#define IP_TOS 3 /* int; IP type of service and preced. */ -#define IP_TTL 4 /* int; IP time to live */ -#define IP_RECVOPTS 5 /* bool; receive all IP opts w/dgram */ -#define IP_RECVRETOPTS 6 /* bool; receive IP opts for response */ -#define IP_RECVDSTADDR 7 /* bool; receive IP dst addr w/dgram */ -#define IP_SENDSRCADDR IP_RECVDSTADDR /* cmsg_type to set src addr */ -#define IP_RETOPTS 8 /* ip_opts; set/get IP options */ -#define IP_MULTICAST_IF 9 /* struct in_addr *or* struct ip_mreqn; - * set/get IP multicast i/f */ -#define IP_MULTICAST_TTL 10 /* u_char; set/get IP multicast ttl */ -#define IP_MULTICAST_LOOP 11 /* u_char; set/get IP multicast loopback */ -#define IP_ADD_MEMBERSHIP 12 /* ip_mreq; add an IP group membership */ -#define IP_DROP_MEMBERSHIP 13 /* ip_mreq; drop an IP group membership */ -#define IP_MULTICAST_VIF 14 /* set/get IP mcast virt. iface */ -#define IP_RSVP_ON 15 /* enable RSVP in kernel */ -#define IP_RSVP_OFF 16 /* disable RSVP in kernel */ -#define IP_RSVP_VIF_ON 17 /* set RSVP per-vif socket */ -#define IP_RSVP_VIF_OFF 18 /* unset RSVP per-vif socket */ -#define IP_PORTRANGE 19 /* int; range to choose for unspec port */ -#define IP_RECVIF 20 /* bool; receive reception if w/dgram */ -/* for IPSEC */ -#define IP_IPSEC_POLICY 21 /* int; set/get security policy */ - /* unused; was IP_FAITH */ -#define IP_ONESBCAST 23 /* bool: send all-ones broadcast */ -#define IP_BINDANY 24 /* bool: allow bind to any address */ -#define IP_BINDMULTI 25 /* bool: allow multiple listeners on a tuple */ -#define IP_RSS_LISTEN_BUCKET 26 /* int; set RSS listen bucket */ -#define IP_ORIGDSTADDR 27 /* bool: receive IP dst addr/port w/dgram */ -#define IP_RECVORIGDSTADDR IP_ORIGDSTADDR - -/* - * Options for controlling the firewall and dummynet. - * Historical options (from 40 to 64) will eventually be - * replaced by only two options, IP_FW3 and IP_DUMMYNET3. - */ -#define IP_FW_TABLE_ADD 40 /* add entry */ -#define IP_FW_TABLE_DEL 41 /* delete entry */ -#define IP_FW_TABLE_FLUSH 42 /* flush table */ -#define IP_FW_TABLE_GETSIZE 43 /* get table size */ -#define IP_FW_TABLE_LIST 44 /* list table contents */ - -#define IP_FW3 48 /* generic ipfw v.3 sockopts */ -#define IP_DUMMYNET3 49 /* generic dummynet v.3 sockopts */ - -#define IP_FW_ADD 50 /* add a firewall rule to chain */ -#define IP_FW_DEL 51 /* delete a firewall rule from chain */ -#define IP_FW_FLUSH 52 /* flush firewall rule chain */ -#define IP_FW_ZERO 53 /* clear single/all firewall counter(s) */ -#define IP_FW_GET 54 /* get entire firewall rule chain */ -#define IP_FW_RESETLOG 55 /* reset logging counters */ - -#define IP_FW_NAT_CFG 56 /* add/config a nat rule */ -#define IP_FW_NAT_DEL 57 /* delete a nat rule */ -#define IP_FW_NAT_GET_CONFIG 58 /* get configuration of a nat rule */ -#define IP_FW_NAT_GET_LOG 59 /* get log of a nat rule */ - -#define IP_DUMMYNET_CONFIGURE 60 /* add/configure a dummynet pipe */ -#define IP_DUMMYNET_DEL 61 /* delete a dummynet pipe from chain */ -#define IP_DUMMYNET_FLUSH 62 /* flush dummynet */ -#define IP_DUMMYNET_GET 64 /* get entire dummynet pipes */ - -#define IP_RECVTTL 65 /* bool; receive IP TTL w/dgram */ -#define IP_MINTTL 66 /* minimum TTL for packet or drop */ -#define IP_DONTFRAG 67 /* don't fragment packet */ -#define IP_RECVTOS 68 /* bool; receive IP TOS w/dgram */ - -/* IPv4 Source Filter Multicast API [RFC3678] */ -#define IP_ADD_SOURCE_MEMBERSHIP 70 /* join a source-specific group */ -#define IP_DROP_SOURCE_MEMBERSHIP 71 /* drop a single source */ -#define IP_BLOCK_SOURCE 72 /* block a source */ -#define IP_UNBLOCK_SOURCE 73 /* unblock a source */ - -/* The following option is private; do not use it from user applications. */ -#define IP_MSFILTER 74 /* set/get filter list */ - -/* Protocol Independent Multicast API [RFC3678] */ -#define MCAST_JOIN_GROUP 80 /* join an any-source group */ -#define MCAST_LEAVE_GROUP 81 /* leave all sources for group */ -#define MCAST_JOIN_SOURCE_GROUP 82 /* join a source-specific group */ -#define MCAST_LEAVE_SOURCE_GROUP 83 /* leave a single source */ -#define MCAST_BLOCK_SOURCE 84 /* block a source */ -#define MCAST_UNBLOCK_SOURCE 85 /* unblock a source */ - -/* Flow and RSS definitions */ -#define IP_FLOWID 90 /* get flow id for the given socket/inp */ -#define IP_FLOWTYPE 91 /* get flow type (M_HASHTYPE) */ -#define IP_RSSBUCKETID 92 /* get RSS flowid -> bucket mapping */ -#define IP_RECVFLOWID 93 /* bool; receive IP flowid/flowtype w/ datagram */ -#define IP_RECVRSSBUCKETID 94 /* bool; receive IP RSS bucket id w/ datagram */ - -/* - * Defaults and limits for options - */ -#define IP_DEFAULT_MULTICAST_TTL 1 /* normally limit m'casts to 1 hop */ -#define IP_DEFAULT_MULTICAST_LOOP 1 /* normally hear sends if a member */ - -/* - * The imo_membership vector for each socket is now dynamically allocated at - * run-time, bounded by USHRT_MAX, and is reallocated when needed, sized - * according to a power-of-two increment. - */ -#define IP_MIN_MEMBERSHIPS 31 -#define IP_MAX_MEMBERSHIPS 4095 -#define IP_MAX_SOURCE_FILTER 1024 /* XXX to be unused */ - -/* - * Default resource limits for IPv4 multicast source filtering. - * These may be modified by sysctl. - */ -#define IP_MAX_GROUP_SRC_FILTER 512 /* sources per group */ -#define IP_MAX_SOCK_SRC_FILTER 128 /* sources per socket/group */ -#define IP_MAX_SOCK_MUTE_FILTER 128 /* XXX no longer used */ - -/* - * Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP. - */ -struct ip_mreq { - struct in_addr imr_multiaddr; /* IP multicast address of group */ - struct in_addr imr_interface; /* local IP address of interface */ -}; - -/* - * Modified argument structure for IP_MULTICAST_IF, obtained from Linux. - * This is used to specify an interface index for multicast sends, as - * the IPv4 legacy APIs do not support this (unless IP_SENDIF is available). - */ -struct ip_mreqn { - struct in_addr imr_multiaddr; /* IP multicast address of group */ - struct in_addr imr_address; /* local IP address of interface */ - int imr_ifindex; /* Interface index; cast to uint32_t */ -}; - -/* - * Argument structure for IPv4 Multicast Source Filter APIs. [RFC3678] - */ -struct ip_mreq_source { - struct in_addr imr_multiaddr; /* IP multicast address of group */ - struct in_addr imr_sourceaddr; /* IP address of source */ - struct in_addr imr_interface; /* local IP address of interface */ -}; - -/* - * Argument structures for Protocol-Independent Multicast Source - * Filter APIs. [RFC3678] - */ -struct group_req { - uint32_t gr_interface; /* interface index */ - struct sockaddr_storage gr_group; /* group address */ -}; - -struct group_source_req { - uint32_t gsr_interface; /* interface index */ - struct sockaddr_storage gsr_group; /* group address */ - struct sockaddr_storage gsr_source; /* source address */ -}; - -#ifndef __MSFILTERREQ_DEFINED -#define __MSFILTERREQ_DEFINED -/* - * The following structure is private; do not use it from user applications. - * It is used to communicate IP_MSFILTER/IPV6_MSFILTER information between - * the RFC 3678 libc functions and the kernel. - */ -struct __msfilterreq { - uint32_t msfr_ifindex; /* interface index */ - uint32_t msfr_fmode; /* filter mode for group */ - uint32_t msfr_nsrcs; /* # of sources in msfr_srcs */ - struct sockaddr_storage msfr_group; /* group address */ - struct sockaddr_storage *msfr_srcs; /* pointer to the first member - * of a contiguous array of - * sources to filter in full. - */ -}; -#endif - -struct sockaddr; - -/* - * Advanced (Full-state) APIs [RFC3678] - * The RFC specifies uint_t for the 6th argument to [sg]etsourcefilter(). - * We use uint32_t here to be consistent. - */ -int setipv4sourcefilter(int, struct in_addr, struct in_addr, uint32_t, - uint32_t, struct in_addr *); -int getipv4sourcefilter(int, struct in_addr, struct in_addr, uint32_t *, - uint32_t *, struct in_addr *); -int setsourcefilter(int, uint32_t, struct sockaddr *, socklen_t, - uint32_t, uint32_t, struct sockaddr_storage *); -int getsourcefilter(int, uint32_t, struct sockaddr *, socklen_t, - uint32_t *, uint32_t *, struct sockaddr_storage *); - -/* - * Filter modes; also used to represent per-socket filter mode internally. - */ -#define MCAST_UNDEFINED 0 /* fmode: not yet defined */ -#define MCAST_INCLUDE 1 /* fmode: include these source(s) */ -#define MCAST_EXCLUDE 2 /* fmode: exclude these source(s) */ - -/* - * Argument for IP_PORTRANGE: - * - which range to search when port is unspecified at bind() or connect() - */ -#define IP_PORTRANGE_DEFAULT 0 /* default range */ -#define IP_PORTRANGE_HIGH 1 /* "high" - request firewall bypass */ -#define IP_PORTRANGE_LOW 2 /* "low" - vouchsafe security */ - -/* - * Identifiers for IP sysctl nodes - */ -#define IPCTL_FORWARDING 1 /* act as router */ -#define IPCTL_SENDREDIRECTS 2 /* may send redirects when forwarding */ -#define IPCTL_DEFTTL 3 /* default TTL */ -#ifdef notyet -#define IPCTL_DEFMTU 4 /* default MTU */ -#endif -/* IPCTL_RTEXPIRE 5 deprecated */ -/* IPCTL_RTMINEXPIRE 6 deprecated */ -/* IPCTL_RTMAXCACHE 7 deprecated */ -#define IPCTL_SOURCEROUTE 8 /* may perform source routes */ -#define IPCTL_DIRECTEDBROADCAST 9 /* may re-broadcast received packets */ -#define IPCTL_INTRQMAXLEN 10 /* max length of netisr queue */ -#define IPCTL_INTRQDROPS 11 /* number of netisr q drops */ -#define IPCTL_STATS 12 /* ipstat structure */ -#define IPCTL_ACCEPTSOURCEROUTE 13 /* may accept source routed packets */ -#define IPCTL_FASTFORWARDING 14 /* use fast IP forwarding code */ - /* 15, unused, was: IPCTL_KEEPFAITH */ -#define IPCTL_GIF_TTL 16 /* default TTL for gif encap packet */ - -#endif /* __BSD_VISIBLE */ - -#ifdef _KERNEL - -struct ifnet; struct mbuf; /* forward declarations for Standard C */ -struct in_ifaddr; - -int in_broadcast(struct in_addr, struct ifnet *); -int in_ifaddr_broadcast(struct in_addr, struct in_ifaddr *); -int in_canforward(struct in_addr); -int in_localaddr(struct in_addr); -int in_localip(struct in_addr); -int in_ifhasaddr(struct ifnet *, struct in_addr); -int inet_aton(const char *, struct in_addr *); /* in libkern */ -char *inet_ntoa_r(struct in_addr ina, char *buf); /* in libkern */ -char *inet_ntop(int, const void *, char *, socklen_t); /* in libkern */ -int inet_pton(int af, const char *, void *); /* in libkern */ -void in_ifdetach(struct ifnet *); - -#define in_hosteq(s, t) ((s).s_addr == (t).s_addr) -#define in_nullhost(x) ((x).s_addr == INADDR_ANY) -#define in_allhosts(x) ((x).s_addr == htonl(INADDR_ALLHOSTS_GROUP)) - -#define satosin(sa) ((struct sockaddr_in *)(sa)) -#define sintosa(sin) ((struct sockaddr *)(sin)) -#define ifatoia(ifa) ((struct in_ifaddr *)(ifa)) -#endif /* _KERNEL */ - -/* INET6 stuff */ -#if __POSIX_VISIBLE >= 200112 -#define __KAME_NETINET_IN_H_INCLUDED_ -#include <netinet6/in6.h> -#undef __KAME_NETINET_IN_H_INCLUDED_ -#endif - -#endif /* !_NETINET_IN_H_*/ diff --git a/freebsd/sys/netinet/in_fib.c b/freebsd/sys/netinet/in_fib.c index 159b8f28..323821b8 100644 --- a/freebsd/sys/netinet/in_fib.c +++ b/freebsd/sys/netinet/in_fib.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_route.h> #include <rtems/bsd/local/opt_mpath.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> #include <sys/rwlock.h> diff --git a/freebsd/sys/netinet/in_gif.c b/freebsd/sys/netinet/in_gif.c index 02e2efd8..b994de8a 100644 --- a/freebsd/sys/netinet/in_gif.c +++ b/freebsd/sys/netinet/in_gif.c @@ -37,14 +37,14 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/rmlock.h> #include <sys/systm.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/protosw.h> diff --git a/freebsd/sys/netinet/in_mcast.c b/freebsd/sys/netinet/in_mcast.c index 635b2579..f4ea91a3 100644 --- a/freebsd/sys/netinet/in_mcast.c +++ b/freebsd/sys/netinet/in_mcast.c @@ -37,7 +37,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet/in_pcb.c b/freebsd/sys/netinet/in_pcb.c index e423eed8..677cdb86 100644 --- a/freebsd/sys/netinet/in_pcb.c +++ b/freebsd/sys/netinet/in_pcb.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_pcbgroup.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/in_proto.c b/freebsd/sys/netinet/in_proto.c index 62472d7e..de2f2057 100644 --- a/freebsd/sys/netinet/in_proto.c +++ b/freebsd/sys/netinet/in_proto.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_sctp.h> #include <rtems/bsd/local/opt_mpath.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/in_rmx.c b/freebsd/sys/netinet/in_rmx.c index 2062d1d1..5e07e7e6 100644 --- a/freebsd/sys/netinet/in_rmx.c +++ b/freebsd/sys/netinet/in_rmx.c @@ -32,7 +32,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/netinet/ip_carp.c b/freebsd/sys/netinet/ip_carp.c index da29ecc9..8b09a8c3 100644 --- a/freebsd/sys/netinet/ip_carp.c +++ b/freebsd/sys/netinet/ip_carp.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/jail.h> diff --git a/freebsd/sys/netinet/ip_divert.c b/freebsd/sys/netinet/ip_divert.c index 9fb17fb2..854e25ed 100644 --- a/freebsd/sys/netinet/ip_divert.c +++ b/freebsd/sys/netinet/ip_divert.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #error "IPDIVERT requires INET" #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/eventhandler.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet/ip_ecn.c b/freebsd/sys/netinet/ip_ecn.c index cee961bf..cc5fd9dd 100644 --- a/freebsd/sys/netinet/ip_ecn.c +++ b/freebsd/sys/netinet/ip_ecn.c @@ -42,10 +42,10 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/freebsd/sys/netinet/ip_encap.c b/freebsd/sys/netinet/ip_encap.c index 19ff1a09..f55fed91 100644 --- a/freebsd/sys/netinet/ip_encap.c +++ b/freebsd/sys/netinet/ip_encap.c @@ -65,14 +65,14 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/mbuf.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/protosw.h> #include <sys/queue.h> diff --git a/freebsd/sys/netinet/ip_fastfwd.c b/freebsd/sys/netinet/ip_fastfwd.c index 1d948781..823dee35 100644 --- a/freebsd/sys/netinet/ip_fastfwd.c +++ b/freebsd/sys/netinet/ip_fastfwd.c @@ -80,7 +80,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipstealth.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/ip_gre.c b/freebsd/sys/netinet/ip_gre.c index 36d3ed69..e7738a6b 100644 --- a/freebsd/sys/netinet/ip_gre.c +++ b/freebsd/sys/netinet/ip_gre.c @@ -40,13 +40,13 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/protosw.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet/ip_icmp.c b/freebsd/sys/netinet/ip_icmp.c index 77a1c179..d74b13ff 100644 --- a/freebsd/sys/netinet/ip_icmp.c +++ b/freebsd/sys/netinet/ip_icmp.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/protosw.h> diff --git a/freebsd/sys/netinet/ip_id.c b/freebsd/sys/netinet/ip_id.c index 17352cfb..41195651 100644 --- a/freebsd/sys/netinet/ip_id.c +++ b/freebsd/sys/netinet/ip_id.c @@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$"); * enabled. */ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/counter.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netinet/ip_input.c b/freebsd/sys/netinet/ip_input.c index 4e500e7c..05a40a3a 100644 --- a/freebsd/sys/netinet/ip_input.c +++ b/freebsd/sys/netinet/ip_input.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_route.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/hhook.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netinet/ip_mroute.c b/freebsd/sys/netinet/ip_mroute.c index 85623b21..7859bd92 100644 --- a/freebsd/sys/netinet/ip_mroute.c +++ b/freebsd/sys/netinet/ip_mroute.c @@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$"); #define _PIM_VT 1 -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/stddef.h> #include <sys/eventhandler.h> diff --git a/freebsd/sys/netinet/ip_options.c b/freebsd/sys/netinet/ip_options.c index 72eed66b..9d5310f1 100644 --- a/freebsd/sys/netinet/ip_options.c +++ b/freebsd/sys/netinet/ip_options.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipstealth.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/domain.h> diff --git a/freebsd/sys/netinet/ip_output.c b/freebsd/sys/netinet/ip_output.c index dfb3f8ad..256173c1 100644 --- a/freebsd/sys/netinet/ip_output.c +++ b/freebsd/sys/netinet/ip_output.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_sctp.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet/ip_reass.c b/freebsd/sys/netinet/ip_reass.c index 4cfabc8f..bf46a726 100644 --- a/freebsd/sys/netinet/ip_reass.c +++ b/freebsd/sys/netinet/ip_reass.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/eventhandler.h> #include <sys/hash.h> diff --git a/freebsd/sys/netinet/libalias/alias.c b/freebsd/sys/netinet/libalias/alias.c index a2cd987c..cd3b5e05 100644 --- a/freebsd/sys/netinet/libalias/alias.c +++ b/freebsd/sys/netinet/libalias/alias.c @@ -114,7 +114,7 @@ __FBSDID("$FreeBSD$"); */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/netinet/libalias/alias_cuseeme.c b/freebsd/sys/netinet/libalias/alias_cuseeme.c index d6c9520c..1d3cfa54 100644 --- a/freebsd/sys/netinet/libalias/alias_cuseeme.c +++ b/freebsd/sys/netinet/libalias/alias_cuseeme.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/module.h> #else diff --git a/freebsd/sys/netinet/libalias/alias_db.c b/freebsd/sys/netinet/libalias/alias_db.c index 219d5d34..9040273c 100644 --- a/freebsd/sys/netinet/libalias/alias_db.c +++ b/freebsd/sys/netinet/libalias/alias_db.c @@ -146,7 +146,7 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL #include <machine/stdarg.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> #include <rtems/bsd/sys/lock.h> @@ -157,7 +157,7 @@ __FBSDID("$FreeBSD$"); #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#include <rtems/bsd/sys/errno.h> +#include <sys/errno.h> #include <sys/time.h> #include <unistd.h> #endif diff --git a/freebsd/sys/netinet/libalias/alias_dummy.c b/freebsd/sys/netinet/libalias/alias_dummy.c index b4c00c20..8b5ba1eb 100644 --- a/freebsd/sys/netinet/libalias/alias_dummy.c +++ b/freebsd/sys/netinet/libalias/alias_dummy.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/module.h> #else diff --git a/freebsd/sys/netinet/libalias/alias_ftp.c b/freebsd/sys/netinet/libalias/alias_ftp.c index ccf15275..2e1f4d3a 100644 --- a/freebsd/sys/netinet/libalias/alias_ftp.c +++ b/freebsd/sys/netinet/libalias/alias_ftp.c @@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$"); /* Includes */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ctype.h> #include <sys/systm.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netinet/libalias/alias_irc.c b/freebsd/sys/netinet/libalias/alias_irc.c index 44ff6d92..19bf0db1 100644 --- a/freebsd/sys/netinet/libalias/alias_irc.c +++ b/freebsd/sys/netinet/libalias/alias_irc.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); /* Includes */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ctype.h> #include <sys/limits.h> #include <sys/systm.h> diff --git a/freebsd/sys/netinet/libalias/alias_local.h b/freebsd/sys/netinet/libalias/alias_local.h index b8632359..873ea11d 100644 --- a/freebsd/sys/netinet/libalias/alias_local.h +++ b/freebsd/sys/netinet/libalias/alias_local.h @@ -51,7 +51,7 @@ #ifdef _KERNEL #include <sys/malloc.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> diff --git a/freebsd/sys/netinet/libalias/alias_mod.c b/freebsd/sys/netinet/libalias/alias_mod.c index 6acbbee6..d6f60ac0 100644 --- a/freebsd/sys/netinet/libalias/alias_mod.c +++ b/freebsd/sys/netinet/libalias/alias_mod.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL #include <sys/libkern.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <rtems/bsd/sys/lock.h> #include <sys/rwlock.h> #else diff --git a/freebsd/sys/netinet/libalias/alias_nbt.c b/freebsd/sys/netinet/libalias/alias_nbt.c index d3fbb98d..9e3b8b00 100644 --- a/freebsd/sys/netinet/libalias/alias_nbt.c +++ b/freebsd/sys/netinet/libalias/alias_nbt.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); /* Includes */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/libalias/alias_pptp.c b/freebsd/sys/netinet/libalias/alias_pptp.c index 39861c5c..e3da53b7 100644 --- a/freebsd/sys/netinet/libalias/alias_pptp.c +++ b/freebsd/sys/netinet/libalias/alias_pptp.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); /* Includes */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/limits.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/libalias/alias_proxy.c b/freebsd/sys/netinet/libalias/alias_proxy.c index fdd46b1d..233d5154 100644 --- a/freebsd/sys/netinet/libalias/alias_proxy.c +++ b/freebsd/sys/netinet/libalias/alias_proxy.c @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); /* System includes */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ctype.h> #include <sys/libkern.h> #include <sys/limits.h> diff --git a/freebsd/sys/netinet/libalias/alias_sctp.c b/freebsd/sys/netinet/libalias/alias_sctp.c index c4048410..c3d76c3b 100644 --- a/freebsd/sys/netinet/libalias/alias_sctp.c +++ b/freebsd/sys/netinet/libalias/alias_sctp.c @@ -74,7 +74,7 @@ #ifdef _KERNEL #include <machine/stdarg.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/libalias/alias_sctp.h b/freebsd/sys/netinet/libalias/alias_sctp.h index 99cceee4..7bef6f8f 100644 --- a/freebsd/sys/netinet/libalias/alias_sctp.h +++ b/freebsd/sys/netinet/libalias/alias_sctp.h @@ -50,7 +50,7 @@ #ifndef _ALIAS_SCTP_H_ #define _ALIAS_SCTP_H_ -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #ifdef _KERNEL #include <sys/malloc.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/libalias/alias_skinny.c b/freebsd/sys/netinet/libalias/alias_skinny.c index b1f8f8c7..49e80eeb 100644 --- a/freebsd/sys/netinet/libalias/alias_skinny.c +++ b/freebsd/sys/netinet/libalias/alias_skinny.c @@ -33,7 +33,7 @@ */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/module.h> #else diff --git a/freebsd/sys/netinet/libalias/alias_smedia.c b/freebsd/sys/netinet/libalias/alias_smedia.c index 9578a4af..93f93296 100644 --- a/freebsd/sys/netinet/libalias/alias_smedia.c +++ b/freebsd/sys/netinet/libalias/alias_smedia.c @@ -101,7 +101,7 @@ __FBSDID("$FreeBSD$"); */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/module.h> diff --git a/freebsd/sys/netinet/libalias/alias_util.c b/freebsd/sys/netinet/libalias/alias_util.c index 6455fb43..622121ee 100644 --- a/freebsd/sys/netinet/libalias/alias_util.c +++ b/freebsd/sys/netinet/libalias/alias_util.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); */ #ifdef _KERNEL -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/proc.h> #else #include <sys/types.h> diff --git a/freebsd/sys/netinet/raw_ip.c b/freebsd/sys/netinet/raw_ip.c index b9fae844..5a615a03 100644 --- a/freebsd/sys/netinet/raw_ip.c +++ b/freebsd/sys/netinet/raw_ip.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_ipsec.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/jail.h> #include <sys/kernel.h> #include <sys/eventhandler.h> diff --git a/freebsd/sys/netinet/sctp_os_bsd.h b/freebsd/sys/netinet/sctp_os_bsd.h index f603cec6..8ddb4808 100644 --- a/freebsd/sys/netinet/sctp_os_bsd.h +++ b/freebsd/sys/netinet/sctp_os_bsd.h @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_sctp.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/ktr.h> #include <sys/systm.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/tcp.h b/freebsd/sys/netinet/tcp.h deleted file mode 100644 index 62a177de..00000000 --- a/freebsd/sys/netinet/tcp.h +++ /dev/null @@ -1,261 +0,0 @@ -/*- - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)tcp.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ - */ - -#ifndef _NETINET_TCP_H_ -#define _NETINET_TCP_H_ - -#include <sys/cdefs.h> -#include <sys/types.h> - -#if __BSD_VISIBLE - -typedef u_int32_t tcp_seq; - -#define tcp6_seq tcp_seq /* for KAME src sync over BSD*'s */ -#define tcp6hdr tcphdr /* for KAME src sync over BSD*'s */ - -/* - * TCP header. - * Per RFC 793, September, 1981. - */ -struct tcphdr { - u_short th_sport; /* source port */ - u_short th_dport; /* destination port */ - tcp_seq th_seq; /* sequence number */ - tcp_seq th_ack; /* acknowledgement number */ -#if BYTE_ORDER == LITTLE_ENDIAN - u_char th_x2:4, /* (unused) */ - th_off:4; /* data offset */ -#endif -#if BYTE_ORDER == BIG_ENDIAN - u_char th_off:4, /* data offset */ - th_x2:4; /* (unused) */ -#endif - u_char th_flags; -#define TH_FIN 0x01 -#define TH_SYN 0x02 -#define TH_RST 0x04 -#define TH_PUSH 0x08 -#define TH_ACK 0x10 -#define TH_URG 0x20 -#define TH_ECE 0x40 -#define TH_CWR 0x80 -#define TH_FLAGS (TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG|TH_ECE|TH_CWR) -#define PRINT_TH_FLAGS "\20\1FIN\2SYN\3RST\4PUSH\5ACK\6URG\7ECE\10CWR" - - u_short th_win; /* window */ - u_short th_sum; /* checksum */ - u_short th_urp; /* urgent pointer */ -}; - -#define TCPOPT_EOL 0 -#define TCPOLEN_EOL 1 -#define TCPOPT_PAD 0 /* padding after EOL */ -#define TCPOLEN_PAD 1 -#define TCPOPT_NOP 1 -#define TCPOLEN_NOP 1 -#define TCPOPT_MAXSEG 2 -#define TCPOLEN_MAXSEG 4 -#define TCPOPT_WINDOW 3 -#define TCPOLEN_WINDOW 3 -#define TCPOPT_SACK_PERMITTED 4 -#define TCPOLEN_SACK_PERMITTED 2 -#define TCPOPT_SACK 5 -#define TCPOLEN_SACKHDR 2 -#define TCPOLEN_SACK 8 /* 2*sizeof(tcp_seq) */ -#define TCPOPT_TIMESTAMP 8 -#define TCPOLEN_TIMESTAMP 10 -#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ -#define TCPOPT_SIGNATURE 19 /* Keyed MD5: RFC 2385 */ -#define TCPOLEN_SIGNATURE 18 -#define TCPOPT_FAST_OPEN 34 -#define TCPOLEN_FAST_OPEN_EMPTY 2 -#define TCPOLEN_FAST_OPEN_MIN 6 -#define TCPOLEN_FAST_OPEN_MAX 18 - -/* Miscellaneous constants */ -#define MAX_SACK_BLKS 6 /* Max # SACK blocks stored at receiver side */ -#define TCP_MAX_SACK 4 /* MAX # SACKs sent in any segment */ - - -/* - * The default maximum segment size (MSS) to be used for new TCP connections - * when path MTU discovery is not enabled. - * - * RFC879 derives the default MSS from the largest datagram size hosts are - * minimally required to handle directly or through IP reassembly minus the - * size of the IP and TCP header. With IPv6 the minimum MTU is specified - * in RFC2460. - * - * For IPv4 the MSS is 576 - sizeof(struct tcpiphdr) - * For IPv6 the MSS is IPV6_MMTU - sizeof(struct ip6_hdr) - sizeof(struct tcphdr) - * - * We use explicit numerical definition here to avoid header pollution. - */ -#define TCP_MSS 536 -#define TCP6_MSS 1220 - -/* - * Limit the lowest MSS we accept for path MTU discovery and the TCP SYN MSS - * option. Allowing low values of MSS can consume significant resources and - * be used to mount a resource exhaustion attack. - * Connections requesting lower MSS values will be rounded up to this value - * and the IP_DF flag will be cleared to allow fragmentation along the path. - * - * See tcp_subr.c tcp_minmss SYSCTL declaration for more comments. Setting - * it to "0" disables the minmss check. - * - * The default value is fine for TCP across the Internet's smallest official - * link MTU (256 bytes for AX.25 packet radio). However, a connection is very - * unlikely to come across such low MTU interfaces these days (anno domini 2003). - */ -#define TCP_MINMSS 216 - -#define TCP_MAXWIN 65535 /* largest value for (unscaled) window */ -#define TTCP_CLIENT_SND_WND 4096 /* dflt send window for T/TCP client */ - -#define TCP_MAX_WINSHIFT 14 /* maximum window shift */ - -#define TCP_MAXBURST 4 /* maximum segments in a burst */ - -#define TCP_MAXHLEN (0xf<<2) /* max length of header in bytes */ -#define TCP_MAXOLEN (TCP_MAXHLEN - sizeof(struct tcphdr)) - /* max space left for options */ -#endif /* __BSD_VISIBLE */ - -/* - * User-settable options (used with setsockopt). These are discrete - * values and are not masked together. Some values appear to be - * bitmasks for historical reasons. - */ -#define TCP_NODELAY 1 /* don't delay send to coalesce packets */ -#if __BSD_VISIBLE -#define TCP_MAXSEG 2 /* set maximum segment size */ -#define TCP_NOPUSH 4 /* don't push last block of write */ -#define TCP_NOOPT 8 /* don't use TCP options */ -#define TCP_MD5SIG 16 /* use MD5 digests (RFC2385) */ -#define TCP_INFO 32 /* retrieve tcp_info structure */ -#define TCP_CONGESTION 64 /* get/set congestion control algorithm */ -#define TCP_CCALGOOPT 65 /* get/set cc algorithm specific options */ -#define TCP_KEEPINIT 128 /* N, time to establish connection */ -#define TCP_KEEPIDLE 256 /* L,N,X start keeplives after this period */ -#define TCP_KEEPINTVL 512 /* L,N interval between keepalives */ -#define TCP_KEEPCNT 1024 /* L,N number of keepalives before close */ -#define TCP_FASTOPEN 1025 /* enable TFO / was created via TFO */ -#define TCP_PCAP_OUT 2048 /* number of output packets to keep */ -#define TCP_PCAP_IN 4096 /* number of input packets to keep */ -#define TCP_FUNCTION_BLK 8192 /* Set the tcp function pointers to the specified stack */ -/* Start of reserved space for third-party user-settable options. */ -#define TCP_VENDOR SO_VENDOR - -#define TCP_CA_NAME_MAX 16 /* max congestion control name length */ - -#define TCPI_OPT_TIMESTAMPS 0x01 -#define TCPI_OPT_SACK 0x02 -#define TCPI_OPT_WSCALE 0x04 -#define TCPI_OPT_ECN 0x08 -#define TCPI_OPT_TOE 0x10 - -/* - * The TCP_INFO socket option comes from the Linux 2.6 TCP API, and permits - * the caller to query certain information about the state of a TCP - * connection. We provide an overlapping set of fields with the Linux - * implementation, but since this is a fixed size structure, room has been - * left for growth. In order to maximize potential future compatibility with - * the Linux API, the same variable names and order have been adopted, and - * padding left to make room for omitted fields in case they are added later. - * - * XXX: This is currently an unstable ABI/API, in that it is expected to - * change. - */ -struct tcp_info { - u_int8_t tcpi_state; /* TCP FSM state. */ - u_int8_t __tcpi_ca_state; - u_int8_t __tcpi_retransmits; - u_int8_t __tcpi_probes; - u_int8_t __tcpi_backoff; - u_int8_t tcpi_options; /* Options enabled on conn. */ - u_int8_t tcpi_snd_wscale:4, /* RFC1323 send shift value. */ - tcpi_rcv_wscale:4; /* RFC1323 recv shift value. */ - - u_int32_t tcpi_rto; /* Retransmission timeout (usec). */ - u_int32_t __tcpi_ato; - u_int32_t tcpi_snd_mss; /* Max segment size for send. */ - u_int32_t tcpi_rcv_mss; /* Max segment size for receive. */ - - u_int32_t __tcpi_unacked; - u_int32_t __tcpi_sacked; - u_int32_t __tcpi_lost; - u_int32_t __tcpi_retrans; - u_int32_t __tcpi_fackets; - - /* Times; measurements in usecs. */ - u_int32_t __tcpi_last_data_sent; - u_int32_t __tcpi_last_ack_sent; /* Also unimpl. on Linux? */ - u_int32_t tcpi_last_data_recv; /* Time since last recv data. */ - u_int32_t __tcpi_last_ack_recv; - - /* Metrics; variable units. */ - u_int32_t __tcpi_pmtu; - u_int32_t __tcpi_rcv_ssthresh; - u_int32_t tcpi_rtt; /* Smoothed RTT in usecs. */ - u_int32_t tcpi_rttvar; /* RTT variance in usecs. */ - u_int32_t tcpi_snd_ssthresh; /* Slow start threshold. */ - u_int32_t tcpi_snd_cwnd; /* Send congestion window. */ - u_int32_t __tcpi_advmss; - u_int32_t __tcpi_reordering; - - u_int32_t __tcpi_rcv_rtt; - u_int32_t tcpi_rcv_space; /* Advertised recv window. */ - - /* FreeBSD extensions to tcp_info. */ - u_int32_t tcpi_snd_wnd; /* Advertised send window. */ - u_int32_t tcpi_snd_bwnd; /* No longer used. */ - u_int32_t tcpi_snd_nxt; /* Next egress seqno */ - u_int32_t tcpi_rcv_nxt; /* Next ingress seqno */ - u_int32_t tcpi_toe_tid; /* HWTID for TOE endpoints */ - u_int32_t tcpi_snd_rexmitpack; /* Retransmitted packets */ - u_int32_t tcpi_rcv_ooopack; /* Out-of-order packets */ - u_int32_t tcpi_snd_zerowin; /* Zero-sized windows sent */ - - /* Padding to grow without breaking ABI. */ - u_int32_t __tcpi_pad[26]; /* Padding. */ -}; -#endif -#define TCP_FUNCTION_NAME_LEN_MAX 32 - -struct tcp_function_set { - char function_set_name[TCP_FUNCTION_NAME_LEN_MAX]; - uint32_t pcbcnt; -}; - -#endif /* !_NETINET_TCP_H_ */ diff --git a/freebsd/sys/netinet/tcp_debug.c b/freebsd/sys/netinet/tcp_debug.c index 3a9b6d6a..03eba1d4 100644 --- a/freebsd/sys/netinet/tcp_debug.c +++ b/freebsd/sys/netinet/tcp_debug.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #define TANAMES #endif -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> diff --git a/freebsd/sys/netinet/tcp_hostcache.c b/freebsd/sys/netinet/tcp_hostcache.c index ef04cf98..02462fa4 100644 --- a/freebsd/sys/netinet/tcp_hostcache.c +++ b/freebsd/sys/netinet/tcp_hostcache.c @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/jail.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netinet/tcp_input.c b/freebsd/sys/netinet/tcp_input.c index d23e1d31..89f2bf0c 100644 --- a/freebsd/sys/netinet/tcp_input.c +++ b/freebsd/sys/netinet/tcp_input.c @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #ifdef TCP_HHOOK #include <sys/hhook.h> diff --git a/freebsd/sys/netinet/tcp_lro.c b/freebsd/sys/netinet/tcp_lro.c index f318e78b..13866134 100644 --- a/freebsd/sys/netinet/tcp_lro.c +++ b/freebsd/sys/netinet/tcp_lro.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> #include <rtems/bsd/local/opt_inet6.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/tcp_offload.c b/freebsd/sys/netinet/tcp_offload.c index 78275fb8..12882225 100644 --- a/freebsd/sys/netinet/tcp_offload.c +++ b/freebsd/sys/netinet/tcp_offload.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/types.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netinet/tcp_output.c b/freebsd/sys/netinet/tcp_output.c index 75b52df5..6ecc0cc2 100644 --- a/freebsd/sys/netinet/tcp_output.c +++ b/freebsd/sys/netinet/tcp_output.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/domain.h> #ifdef TCP_HHOOK diff --git a/freebsd/sys/netinet/tcp_reass.c b/freebsd/sys/netinet/tcp_reass.c index ba973e5c..779de5e0 100644 --- a/freebsd/sys/netinet/tcp_reass.c +++ b/freebsd/sys/netinet/tcp_reass.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <sys/eventhandler.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/tcp_sack.c b/freebsd/sys/netinet/tcp_sack.c index 170d263e..00876890 100644 --- a/freebsd/sys/netinet/tcp_sack.c +++ b/freebsd/sys/netinet/tcp_sack.c @@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> diff --git a/freebsd/sys/netinet/tcp_subr.c b/freebsd/sys/netinet/tcp_subr.c index e4e4ca6a..48f4cfda 100644 --- a/freebsd/sys/netinet/tcp_subr.c +++ b/freebsd/sys/netinet/tcp_subr.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/callout.h> #include <sys/eventhandler.h> diff --git a/freebsd/sys/netinet/tcp_syncache.c b/freebsd/sys/netinet/tcp_syncache.c index 78303625..05e076f8 100644 --- a/freebsd/sys/netinet/tcp_syncache.c +++ b/freebsd/sys/netinet/tcp_syncache.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_pcbgroup.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/hash.h> #include <sys/refcount.h> diff --git a/freebsd/sys/netinet/tcp_timer.c b/freebsd/sys/netinet/tcp_timer.c index 4743b4fd..7e7836ab 100644 --- a/freebsd/sys/netinet/tcp_timer.c +++ b/freebsd/sys/netinet/tcp_timer.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_tcpdebug.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/kernel.h> #include <rtems/bsd/sys/lock.h> #include <sys/mbuf.h> diff --git a/freebsd/sys/netinet/tcp_timewait.c b/freebsd/sys/netinet/tcp_timewait.c index 8ff6e63b..de7d08da 100644 --- a/freebsd/sys/netinet/tcp_timewait.c +++ b/freebsd/sys/netinet/tcp_timewait.c @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_inet6.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/callout.h> #include <sys/kernel.h> diff --git a/freebsd/sys/netinet/tcp_usrreq.c b/freebsd/sys/netinet/tcp_usrreq.c index 314bc954..05fed2d5 100644 --- a/freebsd/sys/netinet/tcp_usrreq.c +++ b/freebsd/sys/netinet/tcp_usrreq.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_tcpdebug.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/systm.h> #include <sys/limits.h> #include <sys/malloc.h> diff --git a/freebsd/sys/netinet/udp_usrreq.c b/freebsd/sys/netinet/udp_usrreq.c index 093b7f32..44be4d52 100644 --- a/freebsd/sys/netinet/udp_usrreq.c +++ b/freebsd/sys/netinet/udp_usrreq.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <rtems/bsd/local/opt_ipsec.h> #include <rtems/bsd/local/opt_rss.h> -#include <rtems/bsd/sys/param.h> +#include <sys/param.h> #include <sys/domain.h> #include <sys/eventhandler.h> #include <sys/jail.h> |