diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-09 22:52:54 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-10-10 09:08:23 +0200 |
| commit | e599318e912d8836c59d8b5202e3e31a6b8dcae9 (patch) | |
| tree | 1172b8b830a1c3236e45c834c2b80e01325ea144 /freebsd/sys/netipsec | |
| parent | Move files to match FreeBSD layout (diff) | |
| download | rtems-libbsd-e599318e912d8836c59d8b5202e3e31a6b8dcae9.tar.bz2 | |
Update files to match FreeBSD layout
Add compatibility with Newlib header files. Some FreeBSD header files
are mapped by the translation script:
o rtems/bsd/sys/_types.h
o rtems/bsd/sys/errno.h
o rtems/bsd/sys/lock.h
o rtems/bsd/sys/param.h
o rtems/bsd/sys/resource.h
o rtems/bsd/sys/time.h
o rtems/bsd/sys/timespec.h
o rtems/bsd/sys/types.h
o rtems/bsd/sys/unistd.h
It is now possible to include <sys/socket.h> directly for example.
Generate one Makefile which builds everything including tests.
Diffstat (limited to 'freebsd/sys/netipsec')
27 files changed, 475 insertions, 475 deletions
diff --git a/freebsd/sys/netipsec/ah.h b/freebsd/sys/netipsec/ah.h index 6a35089b..1ffeacdc 100644 --- a/freebsd/sys/netipsec/ah.h +++ b/freebsd/sys/netipsec/ah.h @@ -34,8 +34,8 @@ * RFC1826/2402 authentication header. */ -#ifndef _NETIPSEC_AH_HH_ -#define _NETIPSEC_AH_HH_ +#ifndef _NETIPSEC_AH_H_ +#define _NETIPSEC_AH_H_ struct ah { u_int8_t ah_nxt; /* Next Header */ @@ -53,4 +53,4 @@ struct newah { u_int32_t ah_seq; /* Sequence number field */ /* variable size, 32bit bound*/ /* Authentication data */ }; -#endif /*_NETIPSEC_AH_HH_*/ +#endif /*_NETIPSEC_AH_H_*/ diff --git a/freebsd/sys/netipsec/ah_var.h b/freebsd/sys/netipsec/ah_var.h index f82ea401..6145dba9 100644 --- a/freebsd/sys/netipsec/ah_var.h +++ b/freebsd/sys/netipsec/ah_var.h @@ -36,8 +36,8 @@ * PURPOSE. */ -#ifndef _NETIPSEC_AH_VAR_HH_ -#define _NETIPSEC_AH_VAR_HH_ +#ifndef _NETIPSEC_AH_VAR_H_ +#define _NETIPSEC_AH_VAR_H_ /* * These define the algorithm indices into the histogram. They're @@ -79,4 +79,4 @@ VNET_DECLARE(struct ahstat, ahstat); #define V_ah_cleartos VNET(ah_cleartos) #define V_ahstat VNET(ahstat) #endif /* _KERNEL */ -#endif /*_NETIPSEC_AH_VAR_HH_*/ +#endif /*_NETIPSEC_AH_VAR_H_*/ diff --git a/freebsd/sys/netipsec/esp.h b/freebsd/sys/netipsec/esp.h index 282883b2..eb373970 100644 --- a/freebsd/sys/netipsec/esp.h +++ b/freebsd/sys/netipsec/esp.h @@ -34,8 +34,8 @@ * RFC1827/2406 Encapsulated Security Payload. */ -#ifndef _NETIPSEC_ESP_HH_ -#define _NETIPSEC_ESP_HH_ +#ifndef _NETIPSEC_ESP_H_ +#define _NETIPSEC_ESP_H_ struct esp { u_int32_t esp_spi; /* ESP */ @@ -66,4 +66,4 @@ struct esptail { }; #define ESP_ALEN 12 /* 96-bit authenticator */ -#endif /*_NETIPSEC_ESP_HH_*/ +#endif /*_NETIPSEC_ESP_H_*/ diff --git a/freebsd/sys/netipsec/esp_var.h b/freebsd/sys/netipsec/esp_var.h index eda4033b..477dcbf5 100644 --- a/freebsd/sys/netipsec/esp_var.h +++ b/freebsd/sys/netipsec/esp_var.h @@ -36,8 +36,8 @@ * PURPOSE. */ -#ifndef _NETIPSEC_ESP_VAR_HH_ -#define _NETIPSEC_ESP_VAR_HH_ +#ifndef _NETIPSEC_ESP_VAR_H_ +#define _NETIPSEC_ESP_VAR_H_ /* * These define the algorithm indices into the histogram. They're @@ -78,4 +78,4 @@ VNET_DECLARE(struct espstat, espstat); #define V_esp_enable VNET(esp_enable) #define V_espstat VNET(espstat) #endif /* _KERNEL */ -#endif /*_NETIPSEC_ESP_VAR_HH_*/ +#endif /*_NETIPSEC_ESP_VAR_H_*/ diff --git a/freebsd/sys/netipsec/ipcomp.h b/freebsd/sys/netipsec/ipcomp.h index a43bf2e8..47e9305e 100644 --- a/freebsd/sys/netipsec/ipcomp.h +++ b/freebsd/sys/netipsec/ipcomp.h @@ -34,8 +34,8 @@ * RFC2393 IP payload compression protocol (IPComp). */ -#ifndef _NETIPSEC_IPCOMP_HH_ -#define _NETIPSEC_IPCOMP_HH_ +#ifndef _NETIPSEC_IPCOMP_H_ +#define _NETIPSEC_IPCOMP_H_ struct ipcomp { u_int8_t comp_nxt; /* Next Header */ @@ -52,4 +52,4 @@ struct ipcomp { #define IPCOMP_MAX 4 #define IPCOMP_CPI_NEGOTIATE_MIN 256 -#endif /*_NETIPSEC_IPCOMP_HH_*/ +#endif /*_NETIPSEC_IPCOMP_H_*/ diff --git a/freebsd/sys/netipsec/ipcomp_var.h b/freebsd/sys/netipsec/ipcomp_var.h index bf4598f4..c99a3be7 100644 --- a/freebsd/sys/netipsec/ipcomp_var.h +++ b/freebsd/sys/netipsec/ipcomp_var.h @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef _NETIPSEC_IPCOMP_VAR_HH_ -#define _NETIPSEC_IPCOMP_VAR_HH_ +#ifndef _NETIPSEC_IPCOMP_VAR_H_ +#define _NETIPSEC_IPCOMP_VAR_H_ /* * These define the algorithm indices into the histogram. They're @@ -71,4 +71,4 @@ VNET_DECLARE(struct ipcompstat, ipcompstat); #define V_ipcomp_enable VNET(ipcomp_enable) #define V_ipcompstat VNET(ipcompstat) #endif /* _KERNEL */ -#endif /*_NETIPSEC_IPCOMP_VAR_HH_*/ +#endif /*_NETIPSEC_IPCOMP_VAR_H_*/ diff --git a/freebsd/sys/netipsec/ipip_var.h b/freebsd/sys/netipsec/ipip_var.h index 51d8a554..3c8c3974 100644 --- a/freebsd/sys/netipsec/ipip_var.h +++ b/freebsd/sys/netipsec/ipip_var.h @@ -36,8 +36,8 @@ * PURPOSE. */ -#ifndef _NETINET_IPIP_HH_ -#define _NETINET_IPIP_HH_ +#ifndef _NETINET_IPIP_H_ +#define _NETINET_IPIP_H_ /* * IP-inside-IP processing. @@ -65,4 +65,4 @@ VNET_DECLARE(struct ipipstat, ipipstat); #define V_ipip_allow VNET(ipip_allow) #define V_ipipstat VNET(ipipstat) #endif /* _KERNEL */ -#endif /* _NETINET_IPIP_HH_ */ +#endif /* _NETINET_IPIP_H_ */ diff --git a/freebsd/sys/netipsec/ipsec.c b/freebsd/sys/netipsec/ipsec.c index 95aefca3..4c19caec 100644 --- a/freebsd/sys/netipsec/ipsec.c +++ b/freebsd/sys/netipsec/ipsec.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ @@ -36,68 +36,68 @@ * IPsec controller part. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> -#include <freebsd/local/opt_ipsec.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/domain.h> -#include <freebsd/sys/priv.h> -#include <freebsd/sys/protosw.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/socketvar.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/time.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/syslog.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/proc.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/route.h> -#include <freebsd/net/vnet.h> - -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_var.h> -#include <freebsd/netinet/in_var.h> -#include <freebsd/netinet/udp.h> -#include <freebsd/netinet/udp_var.h> -#include <freebsd/netinet/tcp.h> -#include <freebsd/netinet/udp.h> - -#include <freebsd/netinet/ip6.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_ipsec.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/domain.h> +#include <sys/priv.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <rtems/bsd/sys/errno.h> +#include <rtems/bsd/sys/time.h> +#include <sys/kernel.h> +#include <sys/syslog.h> +#include <sys/sysctl.h> +#include <sys/proc.h> + +#include <net/if.h> +#include <net/route.h> +#include <net/vnet.h> + +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_var.h> +#include <netinet/in_var.h> +#include <netinet/udp.h> +#include <netinet/udp_var.h> +#include <netinet/tcp.h> +#include <netinet/udp.h> + +#include <netinet/ip6.h> #ifdef INET6 -#include <freebsd/netinet6/ip6_var.h> +#include <netinet6/ip6_var.h> #endif -#include <freebsd/netinet/in_pcb.h> +#include <netinet/in_pcb.h> #ifdef INET6 -#include <freebsd/netinet/icmp6.h> +#include <netinet/icmp6.h> #endif -#include <freebsd/sys/types.h> -#include <freebsd/netipsec/ipsec.h> +#include <rtems/bsd/sys/types.h> +#include <netipsec/ipsec.h> #ifdef INET6 -#include <freebsd/netipsec/ipsec6.h> +#include <netipsec/ipsec6.h> #endif -#include <freebsd/netipsec/ah_var.h> -#include <freebsd/netipsec/esp_var.h> -#include <freebsd/netipsec/ipcomp.h> /*XXX*/ -#include <freebsd/netipsec/ipcomp_var.h> +#include <netipsec/ah_var.h> +#include <netipsec/esp_var.h> +#include <netipsec/ipcomp.h> /*XXX*/ +#include <netipsec/ipcomp_var.h> -#include <freebsd/netipsec/key.h> -#include <freebsd/netipsec/keydb.h> -#include <freebsd/netipsec/key_debug.h> +#include <netipsec/key.h> +#include <netipsec/keydb.h> +#include <netipsec/key_debug.h> -#include <freebsd/netipsec/xform.h> +#include <netipsec/xform.h> -#include <freebsd/machine/in_cksum.h> +#include <machine/in_cksum.h> -#include <freebsd/opencrypto/cryptodev.h> +#include <opencrypto/cryptodev.h> #ifdef IPSEC_DEBUG VNET_DEFINE(int, ipsec_debug) = 1; diff --git a/freebsd/sys/netipsec/ipsec.h b/freebsd/sys/netipsec/ipsec.h index ca9a52f3..d54e7cff 100644 --- a/freebsd/sys/netipsec/ipsec.h +++ b/freebsd/sys/netipsec/ipsec.h @@ -34,16 +34,16 @@ * IPsec controller part. */ -#ifndef _NETIPSEC_IPSEC_HH_ -#define _NETIPSEC_IPSEC_HH_ +#ifndef _NETIPSEC_IPSEC_H_ +#define _NETIPSEC_IPSEC_H_ #if defined(_KERNEL) && !defined(_LKM) && !defined(KLD_MODULE) -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_ipsec.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_ipsec.h> #endif -#include <freebsd/net/pfkeyv2.h> -#include <freebsd/netipsec/keydb.h> +#include <net/pfkeyv2.h> +#include <netipsec/keydb.h> #ifdef _KERNEL @@ -450,4 +450,4 @@ extern const char *ipsec_strerror __P((void)); #endif /* ! KERNEL */ -#endif /* _NETIPSEC_IPSEC_HH_ */ +#endif /* _NETIPSEC_IPSEC_H_ */ diff --git a/freebsd/sys/netipsec/ipsec6.h b/freebsd/sys/netipsec/ipsec6.h index 7213fce7..c004220e 100644 --- a/freebsd/sys/netipsec/ipsec6.h +++ b/freebsd/sys/netipsec/ipsec6.h @@ -34,11 +34,11 @@ * IPsec controller part. */ -#ifndef _NETIPSEC_IPSEC6_HH_ -#define _NETIPSEC_IPSEC6_HH_ +#ifndef _NETIPSEC_IPSEC6_H_ +#define _NETIPSEC_IPSEC6_H_ -#include <freebsd/net/pfkeyv2.h> -#include <freebsd/netipsec/keydb.h> +#include <net/pfkeyv2.h> +#include <netipsec/keydb.h> #ifdef _KERNEL VNET_DECLARE(struct ipsecstat, ipsec6stat); @@ -75,4 +75,4 @@ extern int ipsec6_output_tunnel __P((struct ipsec_output_state *, struct secpolicy *, int)); #endif /*_KERNEL*/ -#endif /*_NETIPSEC_IPSEC6_HH_*/ +#endif /*_NETIPSEC_IPSEC6_H_*/ diff --git a/freebsd/sys/netipsec/ipsec_input.c b/freebsd/sys/netipsec/ipsec_input.c index d8714348..ace3eaea 100644 --- a/freebsd/sys/netipsec/ipsec_input.c +++ b/freebsd/sys/netipsec/ipsec_input.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $ */ @@ -42,62 +42,62 @@ * IPsec input processing. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> -#include <freebsd/local/opt_ipsec.h> -#include <freebsd/local/opt_enc.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/domain.h> -#include <freebsd/sys/protosw.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/syslog.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/pfil.h> -#include <freebsd/net/route.h> -#include <freebsd/net/netisr.h> -#include <freebsd/net/vnet.h> - -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_var.h> -#include <freebsd/netinet/in_var.h> - -#include <freebsd/netinet/ip6.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_ipsec.h> +#include <rtems/bsd/local/opt_enc.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/syslog.h> + +#include <net/if.h> +#include <net/pfil.h> +#include <net/route.h> +#include <net/netisr.h> +#include <net/vnet.h> + +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_var.h> +#include <netinet/in_var.h> + +#include <netinet/ip6.h> #ifdef INET6 -#include <freebsd/netinet6/ip6_var.h> +#include <netinet6/ip6_var.h> #endif -#include <freebsd/netinet/in_pcb.h> +#include <netinet/in_pcb.h> #ifdef INET6 -#include <freebsd/netinet/icmp6.h> +#include <netinet/icmp6.h> #endif -#include <freebsd/netipsec/ipsec.h> +#include <netipsec/ipsec.h> #ifdef INET6 -#include <freebsd/netipsec/ipsec6.h> +#include <netipsec/ipsec6.h> #endif -#include <freebsd/netipsec/ah_var.h> -#include <freebsd/netipsec/esp.h> -#include <freebsd/netipsec/esp_var.h> -#include <freebsd/netipsec/ipcomp_var.h> +#include <netipsec/ah_var.h> +#include <netipsec/esp.h> +#include <netipsec/esp_var.h> +#include <netipsec/ipcomp_var.h> -#include <freebsd/netipsec/key.h> -#include <freebsd/netipsec/keydb.h> +#include <netipsec/key.h> +#include <netipsec/keydb.h> -#include <freebsd/netipsec/xform.h> -#include <freebsd/netinet6/ip6protosw.h> +#include <netipsec/xform.h> +#include <netinet6/ip6protosw.h> -#include <freebsd/machine/in_cksum.h> -#include <freebsd/machine/stdarg.h> +#include <machine/in_cksum.h> +#include <machine/stdarg.h> #ifdef DEV_ENC -#include <freebsd/net/if_enc.h> +#include <net/if_enc.h> #endif diff --git a/freebsd/sys/netipsec/ipsec_mbuf.c b/freebsd/sys/netipsec/ipsec_mbuf.c index f888e60d..24e1ea81 100644 --- a/freebsd/sys/netipsec/ipsec_mbuf.c +++ b/freebsd/sys/netipsec/ipsec_mbuf.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting @@ -32,19 +32,19 @@ * IPsec-specific mbuf routines. */ -#include <freebsd/local/opt_param.h> +#include <rtems/bsd/local/opt_param.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/socket.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/socket.h> -#include <freebsd/net/route.h> -#include <freebsd/net/vnet.h> +#include <net/route.h> +#include <net/vnet.h> -#include <freebsd/netinet/in.h> +#include <netinet/in.h> -#include <freebsd/netipsec/ipsec.h> +#include <netipsec/ipsec.h> /* * Make space for a new header of length hlen at skip bytes diff --git a/freebsd/sys/netipsec/ipsec_output.c b/freebsd/sys/netipsec/ipsec_output.c index 5fdaa0e5..d477b5f4 100644 --- a/freebsd/sys/netipsec/ipsec_output.c +++ b/freebsd/sys/netipsec/ipsec_output.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /*- * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting @@ -31,66 +31,66 @@ /* * IPsec output processing. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> -#include <freebsd/local/opt_ipsec.h> -#include <freebsd/local/opt_enc.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/domain.h> -#include <freebsd/sys/protosw.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/syslog.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/pfil.h> -#include <freebsd/net/route.h> -#include <freebsd/net/vnet.h> - -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_var.h> -#include <freebsd/netinet/in_var.h> -#include <freebsd/netinet/ip_ecn.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_ipsec.h> +#include <rtems/bsd/local/opt_enc.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/socket.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/syslog.h> + +#include <net/if.h> +#include <net/pfil.h> +#include <net/route.h> +#include <net/vnet.h> + +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_var.h> +#include <netinet/in_var.h> +#include <netinet/ip_ecn.h> #ifdef INET6 -#include <freebsd/netinet6/ip6_ecn.h> +#include <netinet6/ip6_ecn.h> #endif -#include <freebsd/netinet/ip6.h> +#include <netinet/ip6.h> #ifdef INET6 -#include <freebsd/netinet6/ip6_var.h> +#include <netinet6/ip6_var.h> #endif -#include <freebsd/netinet/in_pcb.h> +#include <netinet/in_pcb.h> #ifdef INET6 -#include <freebsd/netinet/icmp6.h> +#include <netinet/icmp6.h> #endif -#include <freebsd/netipsec/ipsec.h> +#include <netipsec/ipsec.h> #ifdef INET6 -#include <freebsd/netipsec/ipsec6.h> +#include <netipsec/ipsec6.h> #endif -#include <freebsd/netipsec/ah_var.h> -#include <freebsd/netipsec/esp_var.h> -#include <freebsd/netipsec/ipcomp_var.h> +#include <netipsec/ah_var.h> +#include <netipsec/esp_var.h> +#include <netipsec/ipcomp_var.h> -#include <freebsd/netipsec/xform.h> +#include <netipsec/xform.h> -#include <freebsd/netipsec/key.h> -#include <freebsd/netipsec/keydb.h> -#include <freebsd/netipsec/key_debug.h> +#include <netipsec/key.h> +#include <netipsec/keydb.h> +#include <netipsec/key_debug.h> -#include <freebsd/machine/in_cksum.h> +#include <machine/in_cksum.h> #ifdef IPSEC_NAT_T -#include <freebsd/netinet/udp.h> +#include <netinet/udp.h> #endif #ifdef DEV_ENC -#include <freebsd/net/if_enc.h> +#include <net/if_enc.h> #endif diff --git a/freebsd/sys/netipsec/key.c b/freebsd/sys/netipsec/key.c index 1bf41660..b6fb97a0 100644 --- a/freebsd/sys/netipsec/key.c +++ b/freebsd/sys/netipsec/key.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ @@ -36,69 +36,69 @@ * This code is referd to RFC 2367 */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> -#include <freebsd/local/opt_ipsec.h> - -#include <freebsd/sys/types.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/domain.h> -#include <freebsd/sys/protosw.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/socketvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/proc.h> -#include <freebsd/sys/queue.h> -#include <freebsd/sys/refcount.h> -#include <freebsd/sys/syslog.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/route.h> -#include <freebsd/net/raw_cb.h> -#include <freebsd/net/vnet.h> - -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/in_var.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_ipsec.h> + +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/kernel.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/mbuf.h> +#include <sys/domain.h> +#include <sys/protosw.h> +#include <sys/malloc.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/sysctl.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/proc.h> +#include <sys/queue.h> +#include <sys/refcount.h> +#include <sys/syslog.h> + +#include <net/if.h> +#include <net/route.h> +#include <net/raw_cb.h> +#include <net/vnet.h> + +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/in_var.h> #ifdef INET6 -#include <freebsd/netinet/ip6.h> -#include <freebsd/netinet6/in6_var.h> -#include <freebsd/netinet6/ip6_var.h> +#include <netinet/ip6.h> +#include <netinet6/in6_var.h> +#include <netinet6/ip6_var.h> #endif /* INET6 */ #ifdef INET -#include <freebsd/netinet/in_pcb.h> +#include <netinet/in_pcb.h> #endif #ifdef INET6 -#include <freebsd/netinet6/in6_pcb.h> +#include <netinet6/in6_pcb.h> #endif /* INET6 */ -#include <freebsd/net/pfkeyv2.h> -#include <freebsd/netipsec/keydb.h> -#include <freebsd/netipsec/key.h> -#include <freebsd/netipsec/keysock.h> -#include <freebsd/netipsec/key_debug.h> +#include <net/pfkeyv2.h> +#include <netipsec/keydb.h> +#include <netipsec/key.h> +#include <netipsec/keysock.h> +#include <netipsec/key_debug.h> -#include <freebsd/netipsec/ipsec.h> +#include <netipsec/ipsec.h> #ifdef INET6 -#include <freebsd/netipsec/ipsec6.h> +#include <netipsec/ipsec6.h> #endif -#include <freebsd/netipsec/xform.h> +#include <netipsec/xform.h> -#include <freebsd/machine/stdarg.h> +#include <machine/stdarg.h> /* randomness */ -#include <freebsd/sys/random.h> +#include <sys/random.h> #define FULLMASK 0xff #define _BITS(bytes) ((bytes) << 3) @@ -3962,7 +3962,7 @@ key_ismyaddr(sa) * 0: other * NOTE: derived ip6_input() in KAME. This is necessary to modify more. */ -#include <freebsd/netinet6/in6_var.h> +#include <netinet6/in6_var.h> static int key_ismyaddr6(sin6) diff --git a/freebsd/sys/netipsec/key.h b/freebsd/sys/netipsec/key.h index 4d2b3083..e85acd1e 100644 --- a/freebsd/sys/netipsec/key.h +++ b/freebsd/sys/netipsec/key.h @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef _NETIPSEC_KEY_HH_ -#define _NETIPSEC_KEY_HH_ +#ifndef _NETIPSEC_KEY_H_ +#define _NETIPSEC_KEY_H_ #ifdef _KERNEL @@ -124,4 +124,4 @@ MALLOC_DECLARE(M_IPSEC_INPCB); #endif /* MALLOC_DECLARE */ #endif /* defined(_KERNEL) */ -#endif /* _NETIPSEC_KEY_HH_ */ +#endif /* _NETIPSEC_KEY_H_ */ diff --git a/freebsd/sys/netipsec/key_debug.c b/freebsd/sys/netipsec/key_debug.c index b8d909b3..0fc9308f 100644 --- a/freebsd/sys/netipsec/key_debug.c +++ b/freebsd/sys/netipsec/key_debug.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $ */ @@ -33,36 +33,36 @@ */ #ifdef _KERNEL -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> -#include <freebsd/local/opt_ipsec.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_ipsec.h> #endif -#include <freebsd/sys/types.h> -#include <freebsd/sys/param.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> #ifdef _KERNEL -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/queue.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/queue.h> #endif -#include <freebsd/sys/socket.h> +#include <sys/socket.h> -#include <freebsd/net/route.h> -#include <freebsd/net/vnet.h> +#include <net/route.h> +#include <net/vnet.h> -#include <freebsd/netipsec/key_var.h> -#include <freebsd/netipsec/key_debug.h> +#include <netipsec/key_var.h> +#include <netipsec/key_debug.h> -#include <freebsd/netinet/in.h> -#include <freebsd/netipsec/ipsec.h> +#include <netinet/in.h> +#include <netipsec/ipsec.h> #ifdef _KERNEL -#include <freebsd/netipsec/keydb.h> +#include <netipsec/keydb.h> #endif #ifndef _KERNEL -#include <freebsd/ctype.h> -#include <freebsd/stdio.h> -#include <freebsd/stdlib.h> +#include <ctype.h> +#include <stdio.h> +#include <stdlib.h> #endif /* !_KERNEL */ static void kdebug_sadb_prop __P((struct sadb_ext *)); diff --git a/freebsd/sys/netipsec/key_debug.h b/freebsd/sys/netipsec/key_debug.h index 26dfdbcf..1a3782b1 100644 --- a/freebsd/sys/netipsec/key_debug.h +++ b/freebsd/sys/netipsec/key_debug.h @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef _NETIPSEC_KEY_DEBUG_HH_ -#define _NETIPSEC_KEY_DEBUG_HH_ +#ifndef _NETIPSEC_KEY_DEBUG_H_ +#define _NETIPSEC_KEY_DEBUG_H_ #ifdef _KERNEL /* debug flags */ @@ -86,4 +86,4 @@ extern void kdebug_sockaddr __P((struct sockaddr *)); extern void ipsec_hexdump __P((caddr_t, int)); extern void ipsec_bindump __P((caddr_t, int)); -#endif /* _NETIPSEC_KEY_DEBUG_HH_ */ +#endif /* _NETIPSEC_KEY_DEBUG_H_ */ diff --git a/freebsd/sys/netipsec/key_var.h b/freebsd/sys/netipsec/key_var.h index 127b6abf..edf232d8 100644 --- a/freebsd/sys/netipsec/key_var.h +++ b/freebsd/sys/netipsec/key_var.h @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef _NETIPSEC_KEY_VAR_HH_ -#define _NETIPSEC_KEY_VAR_HH_ +#ifndef _NETIPSEC_KEY_VAR_H_ +#define _NETIPSEC_KEY_VAR_H_ /* sysctl */ #define KEYCTL_DEBUG_LEVEL 1 @@ -71,4 +71,4 @@ #define _KEYBUF(key) ((caddr_t)((caddr_t)(key) + sizeof(struct sadb_key))) #endif /*_KERNEL*/ -#endif /* _NETIPSEC_KEY_VAR_HH_ */ +#endif /* _NETIPSEC_KEY_VAR_H_ */ diff --git a/freebsd/sys/netipsec/keydb.h b/freebsd/sys/netipsec/keydb.h index 7fe8ab39..f16d1ea2 100644 --- a/freebsd/sys/netipsec/keydb.h +++ b/freebsd/sys/netipsec/keydb.h @@ -30,12 +30,12 @@ * SUCH DAMAGE. */ -#ifndef _NETIPSEC_KEYDB_HH_ -#define _NETIPSEC_KEYDB_HH_ +#ifndef _NETIPSEC_KEYDB_H_ +#define _NETIPSEC_KEYDB_H_ #ifdef _KERNEL -#include <freebsd/netipsec/key_var.h> +#include <netipsec/key_var.h> #ifndef _SOCKADDR_UNION_DEFINED #define _SOCKADDR_UNION_DEFINED @@ -224,4 +224,4 @@ extern void keydb_delsecreg __P((struct secreg *)); #endif /* _KERNEL */ -#endif /* _NETIPSEC_KEYDB_HH_ */ +#endif /* _NETIPSEC_KEYDB_H_ */ diff --git a/freebsd/sys/netipsec/keysock.c b/freebsd/sys/netipsec/keysock.c index bd8d2170..21502bb9 100644 --- a/freebsd/sys/netipsec/keysock.c +++ b/freebsd/sys/netipsec/keysock.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */ @@ -32,41 +32,41 @@ * SUCH DAMAGE. */ -#include <freebsd/local/opt_ipsec.h> +#include <rtems/bsd/local/opt_ipsec.h> /* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */ -#include <freebsd/sys/types.h> -#include <freebsd/sys/param.h> -#include <freebsd/sys/domain.h> -#include <freebsd/sys/errno.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/malloc.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/priv.h> -#include <freebsd/sys/protosw.h> -#include <freebsd/sys/signalvar.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/socketvar.h> -#include <freebsd/sys/sysctl.h> -#include <freebsd/sys/systm.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/raw_cb.h> -#include <freebsd/net/route.h> -#include <freebsd/net/vnet.h> - -#include <freebsd/netinet/in.h> - -#include <freebsd/net/pfkeyv2.h> -#include <freebsd/netipsec/key.h> -#include <freebsd/netipsec/keysock.h> -#include <freebsd/netipsec/key_debug.h> -#include <freebsd/netipsec/ipsec.h> - -#include <freebsd/machine/stdarg.h> +#include <rtems/bsd/sys/types.h> +#include <rtems/bsd/sys/param.h> +#include <sys/domain.h> +#include <rtems/bsd/sys/errno.h> +#include <sys/kernel.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/mutex.h> +#include <sys/priv.h> +#include <sys/protosw.h> +#include <sys/signalvar.h> +#include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/sysctl.h> +#include <sys/systm.h> + +#include <net/if.h> +#include <net/raw_cb.h> +#include <net/route.h> +#include <net/vnet.h> + +#include <netinet/in.h> + +#include <net/pfkeyv2.h> +#include <netipsec/key.h> +#include <netipsec/keysock.h> +#include <netipsec/key_debug.h> +#include <netipsec/ipsec.h> + +#include <machine/stdarg.h> struct key_cb { int key_count; diff --git a/freebsd/sys/netipsec/keysock.h b/freebsd/sys/netipsec/keysock.h index 2d147b7a..3c0cc8b8 100644 --- a/freebsd/sys/netipsec/keysock.h +++ b/freebsd/sys/netipsec/keysock.h @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef _NETIPSEC_KEYSOCK_HH_ -#define _NETIPSEC_KEYSOCK_HH_ +#ifndef _NETIPSEC_KEYSOCK_H_ +#define _NETIPSEC_KEYSOCK_H_ /* statistics for pfkey socket */ struct pfkeystat { @@ -80,4 +80,4 @@ extern int key_sendup __P((struct socket *, struct sadb_msg *, u_int, int)); extern int key_sendup_mbuf __P((struct socket *, struct mbuf *, int)); #endif /* _KERNEL */ -#endif /*_NETIPSEC_KEYSOCK_HH_*/ +#endif /*_NETIPSEC_KEYSOCK_H_*/ diff --git a/freebsd/sys/netipsec/xform.h b/freebsd/sys/netipsec/xform.h index d229e17d..fc259c91 100644 --- a/freebsd/sys/netipsec/xform.h +++ b/freebsd/sys/netipsec/xform.h @@ -38,12 +38,12 @@ * PURPOSE. */ -#ifndef _NETIPSEC_XFORM_HH_ -#define _NETIPSEC_XFORM_HH_ +#ifndef _NETIPSEC_XFORM_H_ +#define _NETIPSEC_XFORM_H_ -#include <freebsd/sys/types.h> -#include <freebsd/netinet/in.h> -#include <freebsd/opencrypto/xform.h> +#include <rtems/bsd/sys/types.h> +#include <netinet/in.h> +#include <opencrypto/xform.h> #define AH_HMAC_HASHLEN 12 /* 96 bits of authenticator */ #define AH_HMAC_INITIAL_RPL 1 /* replay counter initial value */ @@ -126,4 +126,4 @@ extern size_t esp_hdrsiz(struct secasvar *sav); extern struct comp_algo *ipcomp_algorithm_lookup(int alg); #endif /* _KERNEL */ -#endif /* _NETIPSEC_XFORM_HH_ */ +#endif /* _NETIPSEC_XFORM_H_ */ diff --git a/freebsd/sys/netipsec/xform_ah.c b/freebsd/sys/netipsec/xform_ah.c index 34014eef..f5c0929b 100644 --- a/freebsd/sys/netipsec/xform_ah.c +++ b/freebsd/sys/netipsec/xform_ah.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */ @@ -38,42 +38,42 @@ * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR * PURPOSE. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/syslog.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/vnet.h> - -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_ecn.h> -#include <freebsd/netinet/ip6.h> - -#include <freebsd/net/route.h> -#include <freebsd/netipsec/ipsec.h> -#include <freebsd/netipsec/ah.h> -#include <freebsd/netipsec/ah_var.h> -#include <freebsd/netipsec/xform.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/socket.h> +#include <sys/syslog.h> +#include <sys/kernel.h> +#include <sys/sysctl.h> + +#include <net/if.h> +#include <net/vnet.h> + +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_ecn.h> +#include <netinet/ip6.h> + +#include <net/route.h> +#include <netipsec/ipsec.h> +#include <netipsec/ah.h> +#include <netipsec/ah_var.h> +#include <netipsec/xform.h> #ifdef INET6 -#include <freebsd/netinet6/ip6_var.h> -#include <freebsd/netipsec/ipsec6.h> -#include <freebsd/netinet6/ip6_ecn.h> +#include <netinet6/ip6_var.h> +#include <netipsec/ipsec6.h> +#include <netinet6/ip6_ecn.h> #endif -#include <freebsd/netipsec/key.h> -#include <freebsd/netipsec/key_debug.h> +#include <netipsec/key.h> +#include <netipsec/key_debug.h> -#include <freebsd/opencrypto/cryptodev.h> +#include <opencrypto/cryptodev.h> /* * Return header size in bytes. The old protocol did not support diff --git a/freebsd/sys/netipsec/xform_esp.c b/freebsd/sys/netipsec/xform_esp.c index 3a550d17..04d7bd51 100644 --- a/freebsd/sys/netipsec/xform_esp.c +++ b/freebsd/sys/netipsec/xform_esp.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */ @@ -37,46 +37,46 @@ * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR * PURPOSE. */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/syslog.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/random.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/vnet.h> - -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_ecn.h> -#include <freebsd/netinet/ip6.h> - -#include <freebsd/net/route.h> -#include <freebsd/netipsec/ipsec.h> -#include <freebsd/netipsec/ah.h> -#include <freebsd/netipsec/ah_var.h> -#include <freebsd/netipsec/esp.h> -#include <freebsd/netipsec/esp_var.h> -#include <freebsd/netipsec/xform.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/socket.h> +#include <sys/syslog.h> +#include <sys/kernel.h> +#include <sys/random.h> +#include <sys/sysctl.h> + +#include <net/if.h> +#include <net/vnet.h> + +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_ecn.h> +#include <netinet/ip6.h> + +#include <net/route.h> +#include <netipsec/ipsec.h> +#include <netipsec/ah.h> +#include <netipsec/ah_var.h> +#include <netipsec/esp.h> +#include <netipsec/esp_var.h> +#include <netipsec/xform.h> #ifdef INET6 -#include <freebsd/netinet6/ip6_var.h> -#include <freebsd/netipsec/ipsec6.h> -#include <freebsd/netinet6/ip6_ecn.h> +#include <netinet6/ip6_var.h> +#include <netipsec/ipsec6.h> +#include <netinet6/ip6_ecn.h> #endif -#include <freebsd/netipsec/key.h> -#include <freebsd/netipsec/key_debug.h> +#include <netipsec/key.h> +#include <netipsec/key_debug.h> -#include <freebsd/opencrypto/cryptodev.h> -#include <freebsd/opencrypto/xform.h> +#include <opencrypto/cryptodev.h> +#include <opencrypto/xform.h> VNET_DEFINE(int, esp_enable) = 1; VNET_DEFINE(struct espstat, espstat); diff --git a/freebsd/sys/netipsec/xform_ipcomp.c b/freebsd/sys/netipsec/xform_ipcomp.c index a4a65953..2c0f961f 100644 --- a/freebsd/sys/netipsec/xform_ipcomp.c +++ b/freebsd/sys/netipsec/xform_ipcomp.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */ @@ -31,44 +31,44 @@ */ /* IP payload compression protocol (IPComp), see RFC 2393 */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/mutex.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/protosw.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_var.h> - -#include <freebsd/net/route.h> -#include <freebsd/net/vnet.h> - -#include <freebsd/netipsec/ipsec.h> -#include <freebsd/netipsec/xform.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/mutex.h> +#include <sys/socket.h> +#include <sys/kernel.h> +#include <sys/protosw.h> +#include <sys/sysctl.h> + +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_var.h> + +#include <net/route.h> +#include <net/vnet.h> + +#include <netipsec/ipsec.h> +#include <netipsec/xform.h> #ifdef INET6 -#include <freebsd/netinet/ip6.h> -#include <freebsd/netipsec/ipsec6.h> +#include <netinet/ip6.h> +#include <netipsec/ipsec6.h> #endif -#include <freebsd/netipsec/ipcomp.h> -#include <freebsd/netipsec/ipcomp_var.h> +#include <netipsec/ipcomp.h> +#include <netipsec/ipcomp_var.h> -#include <freebsd/netipsec/key.h> -#include <freebsd/netipsec/key_debug.h> +#include <netipsec/key.h> +#include <netipsec/key_debug.h> -#include <freebsd/opencrypto/cryptodev.h> -#include <freebsd/opencrypto/deflate.h> -#include <freebsd/opencrypto/xform.h> +#include <opencrypto/cryptodev.h> +#include <opencrypto/deflate.h> +#include <opencrypto/xform.h> VNET_DEFINE(int, ipcomp_enable) = 1; VNET_DEFINE(struct ipcompstat, ipcompstat); diff --git a/freebsd/sys/netipsec/xform_ipip.c b/freebsd/sys/netipsec/xform_ipip.c index cf89239a..87214ec0 100644 --- a/freebsd/sys/netipsec/xform_ipip.c +++ b/freebsd/sys/netipsec/xform_ipip.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ /* $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */ @@ -41,52 +41,52 @@ /* * IP-inside-IP processing */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> -#include <freebsd/local/opt_enc.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/protosw.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/net/if.h> -#include <freebsd/net/pfil.h> -#include <freebsd/net/route.h> -#include <freebsd/net/netisr.h> -#include <freebsd/net/vnet.h> - -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/in_var.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_ecn.h> -#include <freebsd/netinet/ip_var.h> -#include <freebsd/netinet/ip_encap.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> +#include <rtems/bsd/local/opt_enc.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <sys/socket.h> +#include <sys/kernel.h> +#include <sys/protosw.h> +#include <sys/sysctl.h> + +#include <net/if.h> +#include <net/pfil.h> +#include <net/route.h> +#include <net/netisr.h> +#include <net/vnet.h> + +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/in_var.h> +#include <netinet/ip.h> +#include <netinet/ip_ecn.h> +#include <netinet/ip_var.h> +#include <netinet/ip_encap.h> #ifdef MROUTING -#include <freebsd/netinet/ip_mroute.h> +#include <netinet/ip_mroute.h> #endif -#include <freebsd/netipsec/ipsec.h> -#include <freebsd/netipsec/xform.h> +#include <netipsec/ipsec.h> +#include <netipsec/xform.h> -#include <freebsd/netipsec/ipip_var.h> +#include <netipsec/ipip_var.h> #ifdef INET6 -#include <freebsd/netinet/ip6.h> -#include <freebsd/netipsec/ipsec6.h> -#include <freebsd/netinet6/ip6_ecn.h> -#include <freebsd/netinet6/in6_var.h> -#include <freebsd/netinet6/ip6protosw.h> +#include <netinet/ip6.h> +#include <netipsec/ipsec6.h> +#include <netinet6/ip6_ecn.h> +#include <netinet6/in6_var.h> +#include <netinet6/ip6protosw.h> #endif -#include <freebsd/netipsec/key.h> -#include <freebsd/netipsec/key_debug.h> +#include <netipsec/key.h> +#include <netipsec/key_debug.h> -#include <freebsd/machine/stdarg.h> +#include <machine/stdarg.h> /* * We can control the acceptance of IP4 packets by altering the sysctl diff --git a/freebsd/sys/netipsec/xform_tcp.c b/freebsd/sys/netipsec/xform_tcp.c index 2b099639..ca1a3a1b 100644 --- a/freebsd/sys/netipsec/xform_tcp.c +++ b/freebsd/sys/netipsec/xform_tcp.c @@ -1,4 +1,4 @@ -#include <freebsd/machine/rtems-bsd-config.h> +#include <machine/rtems-bsd-config.h> /* $FreeBSD$ */ @@ -30,38 +30,38 @@ */ /* TCP MD5 Signature Option (RFC2385) */ -#include <freebsd/local/opt_inet.h> -#include <freebsd/local/opt_inet6.h> - -#include <freebsd/sys/param.h> -#include <freebsd/sys/systm.h> -#include <freebsd/sys/mbuf.h> -#include <freebsd/sys/lock.h> -#include <freebsd/sys/socket.h> -#include <freebsd/sys/kernel.h> -#include <freebsd/sys/protosw.h> -#include <freebsd/sys/sysctl.h> - -#include <freebsd/netinet/in.h> -#include <freebsd/netinet/in_systm.h> -#include <freebsd/netinet/ip.h> -#include <freebsd/netinet/ip_var.h> -#include <freebsd/netinet/tcp.h> -#include <freebsd/netinet/tcp_var.h> - -#include <freebsd/net/route.h> -#include <freebsd/net/vnet.h> - -#include <freebsd/netipsec/ipsec.h> -#include <freebsd/netipsec/xform.h> +#include <rtems/bsd/local/opt_inet.h> +#include <rtems/bsd/local/opt_inet6.h> + +#include <rtems/bsd/sys/param.h> +#include <sys/systm.h> +#include <sys/mbuf.h> +#include <rtems/bsd/sys/lock.h> +#include <sys/socket.h> +#include <sys/kernel.h> +#include <sys/protosw.h> +#include <sys/sysctl.h> + +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> +#include <netinet/ip_var.h> +#include <netinet/tcp.h> +#include <netinet/tcp_var.h> + +#include <net/route.h> +#include <net/vnet.h> + +#include <netipsec/ipsec.h> +#include <netipsec/xform.h> #ifdef INET6 -#include <freebsd/netinet/ip6.h> -#include <freebsd/netipsec/ipsec6.h> +#include <netinet/ip6.h> +#include <netipsec/ipsec6.h> #endif -#include <freebsd/netipsec/key.h> -#include <freebsd/netipsec/key_debug.h> +#include <netipsec/key.h> +#include <netipsec/key_debug.h> /* * Initialize a TCP-MD5 SA. Called when the SA is being set up. |