The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b26fb63f2b96fddf640260dc4a5acd703c7d425c
commit b26fb63f2b96fddf640260dc4a5acd703c7d425c Author: Bjoern A. Zeeb <[email protected]> AuthorDate: 2021-05-24 18:17:30 +0000 Commit: Bjoern A. Zeeb <[email protected]> CommitDate: 2021-05-25 18:01:47 +0000 LinuxKPI: add linux/{ip,tcp,udp}.h Add header files for struct and accessors for IPv4, UDP, and TCP. Only parts of the fields of the structs have been seen while working on wireless drivers. The remaining field names are filled up with the FreeBSD field names for now. If you have insights into their correct naming in Linux, feel free to adjust. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D30428 --- sys/compat/linuxkpi/common/include/linux/ip.h | 74 ++++++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/tcp.h | 72 +++++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/udp.h | 54 +++++++++++++++++++ 3 files changed, 200 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/ip.h b/sys/compat/linuxkpi/common/include/linux/ip.h new file mode 100644 index 000000000000..3507c6fe9b97 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/ip.h @@ -0,0 +1,74 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2020-2021 The FreeBSD Foundation + * + * This software was developed by Björn Zeeb under sponsorship from + * the FreeBSD Foundation. + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. + * + * $FreeBSD$ + */ + +#ifndef __LKPI_LINUX_IP_H +#define __LKPI_LINUX_IP_H + +#include <sys/types.h> + +#include <netinet/ip.h> +#include <machine/in_cksum.h> + +#include <linux/skbuff.h> + +/* (u) unconfirmed structure field names; using FreeBSD's meanwhile. */ +struct iphdr { + uint8_t ip_hl:4, ip_ver:4; /* (u) */ + uint8_t ip_tos; /* (u) */ + uint16_t ip_len; /* (u) */ + uint16_t id; + uint16_t ip_off; /* (u) */ + uint8_t ip_ttl; /* (u) */ + uint8_t protocol; + uint16_t check; + uint32_t saddr; + uint32_t daddr; +}; + +static __inline struct iphdr * +ip_hdr(struct sk_buff *skb) +{ + + return (struct iphdr *)skb_network_header(skb); +} + +static __inline void +ip_send_check(struct iphdr *iph) +{ + + /* Clear the checksum before computing! */ + iph->check = 0; + /* An IPv4 header is the same everywhere even if names differ. */ + iph->check = in_cksum_hdr((const void *)iph); +} + +#endif /* __LKPI_LINUX_IP_H */ diff --git a/sys/compat/linuxkpi/common/include/linux/tcp.h b/sys/compat/linuxkpi/common/include/linux/tcp.h new file mode 100644 index 000000000000..1197f38b7898 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/tcp.h @@ -0,0 +1,72 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2020-2021 The FreeBSD Foundation + * + * This software was developed by Björn Zeeb under sponsorship from + * the FreeBSD Foundation. + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. + * + * $FreeBSD$ + */ + +#ifndef __LKPI_LINUX_TCP_H +#define __LKPI_LINUX_TCP_H + +#include <sys/types.h> +#include <linux/skbuff.h> + +/* (u) unconfirmed structure field names; using FreeBSD's meanwhile. */ +struct tcphdr { + uint16_t source; /* (u) */ + uint16_t dest; /* (u) */ + uint32_t th_seq; /* (u) */ + uint32_t th_ack; /* (u) */ +#if BYTE_ORDER == LITTLE_ENDIAN + uint8_t th_x2:4, doff:4; +#elif BYTE_ORDER == BIG_ENDIAN + uint8_t doff:4, th_x2:4; +#endif + uint8_t th_flags; /* (u) */ + uint16_t th_win; /* (u) */ + uint16_t check; + uint16_t th_urg; /* (u) */ +}; + +static __inline struct tcphdr * +tcp_hdr(struct sk_buff *skb) +{ + + return (struct tcphdr *)skb_transport_header(skb); +} + +static __inline uint32_t +tcp_hdrlen(struct sk_buff *skb) +{ + struct tcphdr *th; + + th = tcp_hdr(skb); + return (4 * th->doff); +} + +#endif /* __LKPI_LINUX_TCP_H */ diff --git a/sys/compat/linuxkpi/common/include/linux/udp.h b/sys/compat/linuxkpi/common/include/linux/udp.h new file mode 100644 index 000000000000..259bdbfc1199 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/udp.h @@ -0,0 +1,54 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2020-2021 The FreeBSD Foundation + * + * This software was developed by Björn Zeeb under sponsorship from + * the FreeBSD Foundation. + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. + * + * $FreeBSD$ + */ + +#ifndef __LKPI_LINUX_UDP_H +#define __LKPI_LINUX_UDP_H + +#include <sys/types.h> +#include <linux/skbuff.h> + +/* (u) unconfirmed structure field names. */ +struct udphdr { + uint16_t source; /* (u) */ + uint16_t dest; + uint16_t len; /* (u) */ + uint16_t check; +}; + +static __inline struct udphdr * +udp_hdr(struct sk_buff *skb) +{ + + return (struct udphdr *)skb_transport_header(skb); +} + +#endif /* __LKPI_LINUX_UDP_H */ _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
