headers: More removal of the BSD Advertising Clause.

Taken from FreeBSD; some minor cleanup elsewhere.

udp.h rewritten entirely as it contained no copyrightable
material and bears little resemblance to BSD's.
This commit is contained in:
Augustin Cavalier
2020-07-03 15:00:37 -04:00
parent ebffd73fc5
commit 6996e5b271
5 changed files with 115 additions and 196 deletions
+12 -20
View File
@@ -1,6 +1,7 @@
/* Copyright (c) 1983, 1989
/*
* Copyright (c) 1983, 1989
* 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:
@@ -9,14 +10,10 @@
* 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. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* 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
@@ -29,12 +26,6 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
* from nameser.h 8.1 (Berkeley) 6/2/93
* $Id: nameser_compat.h 24644 2008-03-29 12:37:05Z bonefish $
*/
#ifndef _ARPA_NAMESER_COMPAT_
#define _ARPA_NAMESER_COMPAT_
@@ -43,14 +34,13 @@
#include <endian.h>
#if !defined(BYTE_ORDER) || \
(BYTE_ORDER != BIG_ENDIAN && BYTE_ORDER != LITTLE_ENDIAN && \
BYTE_ORDER != PDP_ENDIAN)
(BYTE_ORDER != BIG_ENDIAN && BYTE_ORDER != LITTLE_ENDIAN)
/* you must determine what the correct bit order is for
* your compiler - the next line is an intentional error
* which will force your compiles to bomb until you fix
* the above macros.
*/
error "Undefined or invalid BYTE_ORDER";
#error "Undefined or invalid BYTE_ORDER";
#endif
/*
@@ -66,7 +56,7 @@ typedef struct {
/* fields in third byte */
unsigned qr: 1; /* response flag */
unsigned opcode: 4; /* purpose of message */
unsigned aa: 1; /* authoritive answer */
unsigned aa: 1; /* authoritative answer */
unsigned tc: 1; /* truncated message */
unsigned rd: 1; /* recursion desired */
/* fields in fourth byte */
@@ -76,11 +66,11 @@ typedef struct {
unsigned cd: 1; /* checking disabled by resolver */
unsigned rcode :4; /* response code */
#endif
#if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN
#if BYTE_ORDER == LITTLE_ENDIAN
/* fields in third byte */
unsigned rd :1; /* recursion desired */
unsigned tc :1; /* truncated message */
unsigned aa :1; /* authoritive answer */
unsigned aa :1; /* authoritative answer */
unsigned opcode :4; /* purpose of message */
unsigned qr :1; /* response flag */
/* fields in fourth byte */
@@ -178,6 +168,8 @@ typedef struct {
#define T_ATMA ns_t_atma
#define T_NAPTR ns_t_naptr
#define T_A6 ns_t_a6
#define T_DNAME ns_t_dname
#define T_OPT ns_t_opt
#define T_TSIG ns_t_tsig
#define T_IXFR ns_t_ixfr
#define T_AXFR ns_t_axfr
+1 -5
View File
@@ -13,11 +13,7 @@
* 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. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* 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.
*
+62 -69
View File
@@ -1,7 +1,6 @@
/* Parts of this file are covered under the following copyright */
/*
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
* 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
@@ -11,11 +10,7 @@
* 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. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* 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.
*
@@ -30,10 +25,8 @@
* 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.
*
* @(#)ip_icmp.h 8.1 (Berkeley) 6/10/93
*/
#ifndef NETINET_IP_ICMP_H
#define NETINET_IP_ICMP_H
@@ -54,7 +47,7 @@ struct icmp {
uint16_t icd_seq;
} ih_idseq;
int32_t ih_void;
/* ICMP_UNREACH_NEEDFRAG (RFC 1191) */
struct ih_pmtu {
uint16_t ipm_void;
@@ -88,78 +81,78 @@ struct icmp {
#define icmp_ttime icmp_dun.id_ts.its_ttime
#define icmp_ip icmp_dun.id_ip.idi_ip
#define icmp_mask icmp_dun.id_mask
#define icmp_data icmp_dun.id_data
#define icmp_data icmp_dun.id_data
#define ICMP_MINLEN 8 /* absolute minimum length */
#define ICMP_ADVLENMIN (8 + sizeof(struct ip) + 8)
#define ICMP_ADVLEN(p) (8 + ((p)->icmp_ip.ip_hl << 2) + 8)
/* Definition of type and code field values.
*http://www.iana.org/assignments/icmp-parameters
* http://www.iana.org/assignments/icmp-parameters
*/
#define ICMP_ECHOREPLY 0/* echo reply */
#define ICMP_UNREACH 3/* dest unreachable, codes: */
#define ICMP_SOURCEQUENCH 4/* packet lost, slow down */
#define ICMP_REDIRECT 5/* shorter route, codes: */
#define ICMP_ALTHOSTADDR 6/* alternate host address */
#define ICMP_ECHO 8/* echo service */
#define ICMP_ROUTERADVERT 9/* router advertisement */
#define ICMP_ROUTERSOLICIT 10/* router solicitation */
#define ICMP_TIMXCEED 11/* time exceeded, code: */
#define ICMP_PARAMPROB 12/* ip header bad */
#define ICMP_TSTAMP 13/* timestamp request */
#define ICMP_TSTAMPREPLY 14/* timestamp reply */
#define ICMP_IREQ 15/* information request */
#define ICMP_IREQREPLY 16/* information reply */
#define ICMP_MASKREQ 17/* address mask request */
#define ICMP_MASKREPLY 18/* address mask reply */
#define ICMP_TRACEROUTE 30/* traceroute */
#define ICMP_DATACONVERR 31/* data conversion error */
#define ICMP_MOBILE_REDIRECT 32/* mobile host redirect */
#define ICMP_IPV6_WHEREAREYOU 33/* IPv6 where-are-you */
#define ICMP_IPV6_IAMHERE 34/* IPv6 i-am-here */
#define ICMP_MOBILE_REGREQUEST 35/* mobile registration req */
#define ICMP_MOBILE_REGREPLY 36/* mobile registration reply */
#define ICMP_SKIP 39/* SKIP */
#define ICMP_PHOTURIS 40/* Photuris */
#define ICMP_ECHOREPLY 0 /* echo reply */
#define ICMP_UNREACH 3 /* dest unreachable, codes: */
#define ICMP_SOURCEQUENCH 4 /* packet lost, slow down */
#define ICMP_REDIRECT 5 /* shorter route, codes: */
#define ICMP_ALTHOSTADDR 6 /* alternate host address */
#define ICMP_ECHO 8 /* echo service */
#define ICMP_ROUTERADVERT 9 /* router advertisement */
#define ICMP_ROUTERSOLICIT 10 /* router solicitation */
#define ICMP_TIMXCEED 11 /* time exceeded, code: */
#define ICMP_PARAMPROB 12 /* ip header bad */
#define ICMP_TSTAMP 13 /* timestamp request */
#define ICMP_TSTAMPREPLY 14 /* timestamp reply */
#define ICMP_IREQ 15 /* information request */
#define ICMP_IREQREPLY 16 /* information reply */
#define ICMP_MASKREQ 17 /* address mask request */
#define ICMP_MASKREPLY 18 /* address mask reply */
#define ICMP_TRACEROUTE 30 /* traceroute */
#define ICMP_DATACONVERR 31 /* data conversion error */
#define ICMP_MOBILE_REDIRECT 32 /* mobile host redirect */
#define ICMP_IPV6_WHEREAREYOU 33 /* IPv6 where-are-you */
#define ICMP_IPV6_IAMHERE 34 /* IPv6 i-am-here */
#define ICMP_MOBILE_REGREQUEST 35 /* mobile registration req */
#define ICMP_MOBILE_REGREPLY 36 /* mobile registration reply */
#define ICMP_SKIP 39 /* SKIP */
#define ICMP_PHOTURIS 40 /* Photuris */
#define ICMP_MAXTYPE 40
#define ICMP_UNREACH_NET 0/* bad net */
#define ICMP_UNREACH_HOST 1/* bad host */
#define ICMP_UNREACH_PROTOCOL 2/* bad protocol */
#define ICMP_UNREACH_PORT 3/* bad port */
#define ICMP_UNREACH_NEEDFRAG 4/* IP_DF caused drop */
#define ICMP_UNREACH_SRCFAIL 5/* src route failed */
#define ICMP_UNREACH_NET_UNKNOWN 6/* unknown net */
#define ICMP_UNREACH_HOST_UNKNOWN 7/* unknown host */
#define ICMP_UNREACH_ISOLATED 8/* src host isolated */
#define ICMP_UNREACH_NET_PROHIB 9/* for crypto devs */
#define ICMP_UNREACH_HOST_PROHIB 10/* ditto */
#define ICMP_UNREACH_TOSNET 11/* bad tos for net */
#define ICMP_UNREACH_TOSHOST 12/* bad tos for host */
#define ICMP_UNREACH_FILTER_PROHIB 13/* prohibited access */
#define ICMP_UNREACH_HOST_PRECEDENCE 14/* precedence violat'n*/
#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15/* precedence cutoff */
#define ICMP_UNREACH_NET 0 /* bad net */
#define ICMP_UNREACH_HOST 1 /* bad host */
#define ICMP_UNREACH_PROTOCOL 2 /* bad protocol */
#define ICMP_UNREACH_PORT 3 /* bad port */
#define ICMP_UNREACH_NEEDFRAG 4 /* IP_DF caused drop */
#define ICMP_UNREACH_SRCFAIL 5 /* src route failed */
#define ICMP_UNREACH_NET_UNKNOWN 6 /* unknown net */
#define ICMP_UNREACH_HOST_UNKNOWN 7 /* unknown host */
#define ICMP_UNREACH_ISOLATED 8 /* src host isolated */
#define ICMP_UNREACH_NET_PROHIB 9 /* for crypto devs */
#define ICMP_UNREACH_HOST_PROHIB 10 /* ditto */
#define ICMP_UNREACH_TOSNET 11 /* bad tos for net */
#define ICMP_UNREACH_TOSHOST 12 /* bad tos for host */
#define ICMP_UNREACH_FILTER_PROHIB 13 /* prohibited access */
#define ICMP_UNREACH_HOST_PRECEDENCE 14 /* precedence violat'n*/
#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15 /* precedence cutoff */
#define ICMP_REDIRECT_NET 0/* for network */
#define ICMP_REDIRECT_HOST 1/* for host */
#define ICMP_REDIRECT_TOSNET 2/* for tos and net */
#define ICMP_REDIRECT_TOSHOST 3/* for tos and host */
#define ICMP_REDIRECT_NET 0 /* for network */
#define ICMP_REDIRECT_HOST 1 /* for host */
#define ICMP_REDIRECT_TOSNET 2 /* for tos and net */
#define ICMP_REDIRECT_TOSHOST 3 /* for tos and host */
#define ICMP_ROUTERADVERT_NORMAL 0/* normal advertisement */
#define ICMP_ROUTERADVERT_NOROUTE_COMMON16/* selective routing */
#define ICMP_ROUTERADVERT_NORMAL 0 /* normal advertisement */
#define ICMP_ROUTERADVERT_NOROUTE_COMMON 16 /* selective routing */
#define ICMP_TIMXCEED_INTRANS 0/* ttl==0 in transit */
#define ICMP_TIMXCEED_REASS 1/* ttl==0 in reass */
#define ICMP_TIMXCEED_INTRANS 0 /* ttl==0 in transit */
#define ICMP_TIMXCEED_REASS 1 /* ttl==0 in reass */
#define ICMP_PARAMPROB_ERRATPTR 0/* req. opt. absent */
#define ICMP_PARAMPROB_OPTABSENT 1/* req. opt. absent */
#define ICMP_PARAMPROB_LENGTH 2/* bad length */
#define ICMP_PARAMPROB_ERRATPTR 0 /* req. opt. absent */
#define ICMP_PARAMPROB_OPTABSENT 1 /* req. opt. absent */
#define ICMP_PARAMPROB_LENGTH 2 /* bad length */
#define ICMP_PHOTURIS_UNKNOWN_INDEX 1/* unknown sec index */
#define ICMP_PHOTURIS_AUTH_FAILED 2/* auth failed */
#define ICMP_PHOTURIS_DECRYPT_FAILED 3/* decrypt failed */
#define ICMP_PHOTURIS_UNKNOWN_INDEX 1 /* unknown sec index */
#define ICMP_PHOTURIS_AUTH_FAILED 2 /* auth failed */
#define ICMP_PHOTURIS_DECRYPT_FAILED 3 /* decrypt failed */
#define ICMP_INFOTYPE(type) \
@@ -167,6 +160,6 @@ struct icmp {
(type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
(type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \
(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
#endif /* NETINET_IP_ICMP_H */
+34 -63
View File
@@ -1,4 +1,3 @@
/* Parts of this file are covered under the following copyright */
/*
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -11,11 +10,7 @@
* 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. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* 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.
*
@@ -30,8 +25,6 @@
* 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.
*
* @(#)ip_var.h 8.1 (Berkeley) 6/10/93
*/
#ifndef NETINET_IP_VAR_H
@@ -51,7 +44,7 @@ struct ipovly {
uint16_t ih_len; /* protocol length */
struct in_addr ih_src; /* source internet address */
struct in_addr ih_dst; /* destination internet address */
};
};
/*
* Structure stored in mbuf in inpcb.ip_options
@@ -64,7 +57,7 @@ struct ipovly {
struct ipoption {
struct in_addr ipopt_dst; /* first-hop dst if source routed */
int8_t ipopt_list[MAX_IPOPTLEN]; /* options proper */
};
};
/*
* Structure attached to inpcb.ip_moptions and
@@ -106,59 +99,37 @@ struct ipq {
};
struct ipstat {
int32_t ips_total; /* total packets received */
int32_t ips_badsum; /* checksum bad */
int32_t ips_tooshort; /* packet too short */
int32_t ips_toosmall; /* not enough data */
int32_t ips_badhlen; /* ip header length < data size */
int32_t ips_badlen; /* ip length < ip header length */
int32_t ips_fragments; /* fragments received */
int32_t ips_fragdropped; /* frags dropped (dups, out of space) */
int32_t ips_fragtimeout; /* fragments timed out */
int32_t ips_forward; /* packets forwarded */
int32_t ips_cantforward; /* packets rcvd for unreachable dest */
int32_t ips_redirectsent; /* packets forwarded on same net */
int32_t ips_noproto; /* unknown or unsupported protocol */
int32_t ips_delivered; /* datagrams delivered to upper level*/
int32_t ips_localout; /* total ip packets generated here */
int32_t ips_odropped; /* lost packets due to nobufs, etc. */
int32_t ips_reassembled; /* total packets reassembled ok */
int32_t ips_fragmented; /* datagrams sucessfully fragmented */
int32_t ips_ofragments; /* output fragments created */
int32_t ips_cantfrag; /* don't fragment flag was set, etc. */
int32_t ips_badoptions; /* error in option processing */
int32_t ips_noroute; /* packets discarded due to no route */
int32_t ips_badvers; /* ip version != 4 */
int32_t ips_rawout; /* total raw ip packets generated */
int32_t ips_badfrags; /* malformed fragments (bad length) */
int32_t ips_rcvmemdrop; /* frags dropped for lack of memory */
int32_t ips_toolong; /* ip length > max ip packet size */
int32_t ips_nogif; /* no match gif found */
int32_t ips_badaddr; /* invalid address on header */
int32_t ips_inhwcsum; /* hardware checksummed on input */
int32_t ips_outhwcsum; /* hardware checksummed on output */
int32_t ips_total; /* total packets received */
int32_t ips_badsum; /* checksum bad */
int32_t ips_tooshort; /* packet too short */
int32_t ips_toosmall; /* not enough data */
int32_t ips_badhlen; /* ip header length < data size */
int32_t ips_badlen; /* ip length < ip header length */
int32_t ips_fragments; /* fragments received */
int32_t ips_fragdropped; /* frags dropped (dups, out of space) */
int32_t ips_fragtimeout; /* fragments timed out */
int32_t ips_forward; /* packets forwarded */
int32_t ips_cantforward; /* packets rcvd for unreachable dest */
int32_t ips_redirectsent; /* packets forwarded on same net */
int32_t ips_noproto; /* unknown or unsupported protocol */
int32_t ips_delivered; /* datagrams delivered to upper level*/
int32_t ips_localout; /* total ip packets generated here */
int32_t ips_odropped; /* lost packets due to nobufs, etc. */
int32_t ips_reassembled; /* total packets reassembled ok */
int32_t ips_fragmented; /* datagrams sucessfully fragmented */
int32_t ips_ofragments; /* output fragments created */
int32_t ips_cantfrag; /* don't fragment flag was set, etc. */
int32_t ips_badoptions; /* error in option processing */
int32_t ips_noroute; /* packets discarded due to no route */
int32_t ips_badvers; /* ip version != 4 */
int32_t ips_rawout; /* total raw ip packets generated */
int32_t ips_badfrags; /* malformed fragments (bad length) */
int32_t ips_rcvmemdrop; /* frags dropped for lack of memory */
int32_t ips_toolong; /* ip length > max ip packet size */
int32_t ips_nogif; /* no match gif found */
int32_t ips_badaddr; /* invalid address on header */
int32_t ips_inhwcsum; /* hardware checksummed on input */
int32_t ips_outhwcsum; /* hardware checksummed on output */
};
/* #ifdef _KERNEL_MODE */
#define IP_FORWARDING 0x1 /* most of ip header exists */
#define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast packets */
#define IP_RAWOUTPUT 0x4 /* raw ip header exists */
#define IP_ROUTETOIF SO_DONTROUTE /* bypass routing tables */
#define IP_MTUDISC 0x10 /* pmtu discovery, set DF */
#if 0
/* struct ipstat ipstat; */
void ipv4_input(struct mbuf *, int);
int ipv4_output(struct mbuf *, struct mbuf *, struct route *, int, void *);
int ipv4_ctloutput(int, struct socket *, int, int, struct mbuf **);
int ip_dooptions(struct mbuf *);
void ip_stripoptions (struct mbuf *, struct mbuf *);
struct mbuf *ip_srcroute(void);
#endif /* _KERNEL_MODE */
#endif /* NETINET_IP_VAR_H */
+6 -39
View File
@@ -1,42 +1,9 @@
/*
* 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. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
*
* This product includes software developed by the University of
* California, Berkeley and its contributors.
*
* 4. 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.
*
*@(#)udp.h8.1 (Berkeley) 6/10/93
*/
#ifndef NETINET_UDP_H
#define NETINET_UDP_H
* Copyright 2020, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _NETINET_UDP_H
#define _NETINET_UDP_H
#include <stdint.h>
@@ -47,4 +14,4 @@ struct udphdr {
uint16_t uh_sum;
};
#endif /* NETINET_UDP_H */
#endif /* _NETINET_UDP_H */