Module Name: src
Committed By: roy
Date: Wed Feb 3 18:13:14 UTC 2021
Modified Files:
src/sys/net: if_arp.h if_ether.h if_gre.h if_llc.h
src/sys/netinet: igmp.h in.h ip.h ip6.h ip_carp.h ip_icmp.h ip_mroute.h
ip_var.h tcp.h tcp_debug.h udp.h
Log Message:
CTASSERT -> __CTASSERT to unbreak userland build.
While here move __packed in tcp_debug.h back to where it was and
note removal warrants more investigation.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/net/if_arp.h
cvs rdiff -u -r1.83 -r1.84 src/sys/net/if_ether.h
cvs rdiff -u -r1.46 -r1.47 src/sys/net/if_gre.h
cvs rdiff -u -r1.22 -r1.23 src/sys/net/if_llc.h
cvs rdiff -u -r1.14 -r1.15 src/sys/netinet/igmp.h
cvs rdiff -u -r1.113 -r1.114 src/sys/netinet/in.h
cvs rdiff -u -r1.37 -r1.38 src/sys/netinet/ip.h
cvs rdiff -u -r1.28 -r1.29 src/sys/netinet/ip6.h
cvs rdiff -u -r1.13 -r1.14 src/sys/netinet/ip_carp.h
cvs rdiff -u -r1.42 -r1.43 src/sys/netinet/ip_icmp.h
cvs rdiff -u -r1.34 -r1.35 src/sys/netinet/ip_mroute.h
cvs rdiff -u -r1.132 -r1.133 src/sys/netinet/ip_var.h
cvs rdiff -u -r1.36 -r1.37 src/sys/netinet/tcp.h
cvs rdiff -u -r1.20 -r1.21 src/sys/netinet/tcp_debug.h
cvs rdiff -u -r1.18 -r1.19 src/sys/netinet/udp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_arp.h
diff -u src/sys/net/if_arp.h:1.36 src/sys/net/if_arp.h:1.37
--- src/sys/net/if_arp.h:1.36 Wed Feb 3 11:53:43 2021
+++ src/sys/net/if_arp.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.h,v 1.36 2021/02/03 11:53:43 roy Exp $ */
+/* $NetBSD: if_arp.h,v 1.37 2021/02/03 18:13:13 roy Exp $ */
/*
* Copyright (c) 1986, 1993
@@ -72,8 +72,8 @@ struct arphdr {
uint8_t ar_tpa[]; /* target protocol address */
#endif
};
-#ifdef CTASSERT
-CTASSERT(sizeof(struct arphdr) == 8);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct arphdr) == 8);
#endif
static __inline uint8_t *
Index: src/sys/net/if_ether.h
diff -u src/sys/net/if_ether.h:1.83 src/sys/net/if_ether.h:1.84
--- src/sys/net/if_ether.h:1.83 Wed Feb 3 11:53:43 2021
+++ src/sys/net/if_ether.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ether.h,v 1.83 2021/02/03 11:53:43 roy Exp $ */
+/* $NetBSD: if_ether.h,v 1.84 2021/02/03 18:13:13 roy Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -90,9 +90,9 @@ struct ether_header {
uint16_t ether_type;
};
-#ifdef CTASSERT
-CTASSERT(sizeof(struct ether_addr) == 6);
-CTASSERT(sizeof(struct ether_header) == 14);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct ether_addr) == 6);
+__CTASSERT(sizeof(struct ether_header) == 14);
#endif
#include <net/ethertypes.h>
Index: src/sys/net/if_gre.h
diff -u src/sys/net/if_gre.h:1.46 src/sys/net/if_gre.h:1.47
--- src/sys/net/if_gre.h:1.46 Wed Feb 3 11:53:43 2021
+++ src/sys/net/if_gre.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.h,v 1.46 2021/02/03 11:53:43 roy Exp $ */
+/* $NetBSD: if_gre.h,v 1.47 2021/02/03 18:13:13 roy Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -131,8 +131,8 @@ struct gre_h {
Present if (rt_pres == 1)
*/
};
-#ifdef CTASSERT
-CTASSERT(sizeof(struct gre_h) == 4);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct gre_h) == 4);
#endif
#define GRE_CP 0x8000 /* Checksum Present */
Index: src/sys/net/if_llc.h
diff -u src/sys/net/if_llc.h:1.22 src/sys/net/if_llc.h:1.23
--- src/sys/net/if_llc.h:1.22 Wed Feb 3 12:11:34 2021
+++ src/sys/net/if_llc.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_llc.h,v 1.22 2021/02/03 12:11:34 roy Exp $ */
+/* $NetBSD: if_llc.h,v 1.23 2021/02/03 18:13:13 roy Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -92,9 +92,9 @@ struct frmrinfo {
uint8_t frmr_cause;
};
-#ifdef CTASSERT
-CTASSERT(sizeof(struct llc) == 8);
-CTASSERT(sizeof(struct frmrinfo) == 5);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct llc) == 8);
+__CTASSERT(sizeof(struct frmrinfo) == 5);
#endif
#define llc_control llc_un.type_u.control
Index: src/sys/netinet/igmp.h
diff -u src/sys/netinet/igmp.h:1.14 src/sys/netinet/igmp.h:1.15
--- src/sys/netinet/igmp.h:1.14 Wed Feb 3 11:53:43 2021
+++ src/sys/netinet/igmp.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: igmp.h,v 1.14 2021/02/03 11:53:43 roy Exp $ */
+/* $NetBSD: igmp.h,v 1.15 2021/02/03 18:13:13 roy Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -89,8 +89,8 @@ struct igmp {
uint16_t igmp_cksum; /* IP-style checksum */
struct in_addr igmp_group; /* group address being reported */
}; /* (zero for queries) */
-#ifdef CTASSERT
-CTASSERT(sizeof(struct igmp) == 8);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct igmp) == 8);
#endif
#define IGMP_MINLEN 8
Index: src/sys/netinet/in.h
diff -u src/sys/netinet/in.h:1.113 src/sys/netinet/in.h:1.114
--- src/sys/netinet/in.h:1.113 Wed Feb 3 11:53:43 2021
+++ src/sys/netinet/in.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: in.h,v 1.113 2021/02/03 11:53:43 roy Exp $ */
+/* $NetBSD: in.h,v 1.114 2021/02/03 18:13:13 roy Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -158,8 +158,8 @@ typedef __sa_family_t sa_family_t;
struct in_addr {
in_addr_t s_addr;
};
-#ifdef CTASSERT
-CTASSERT(sizeof(struct in_addr) == 4);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct in_addr) == 4);
#endif
/*
Index: src/sys/netinet/ip.h
diff -u src/sys/netinet/ip.h:1.37 src/sys/netinet/ip.h:1.38
--- src/sys/netinet/ip.h:1.37 Wed Feb 3 11:53:43 2021
+++ src/sys/netinet/ip.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ip.h,v 1.37 2021/02/03 11:53:43 roy Exp $ */
+/* $NetBSD: ip.h,v 1.38 2021/02/03 18:13:13 roy Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -248,10 +248,10 @@ struct ippseudo {
u_int16_t ippseudo_len; /* protocol length */
};
-#ifdef CTASSERT
-CTASSERT(sizeof(struct ip) == 20);
-CTASSERT(sizeof(struct ip_timestamp) == 12);
-CTASSERT(sizeof(struct ippseudo) == 12);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct ip) == 20);
+__CTASSERT(sizeof(struct ip_timestamp) == 12);
+__CTASSERT(sizeof(struct ippseudo) == 12);
#endif
#endif /* !_NETINET_IP_H_ */
Index: src/sys/netinet/ip6.h
diff -u src/sys/netinet/ip6.h:1.28 src/sys/netinet/ip6.h:1.29
--- src/sys/netinet/ip6.h:1.28 Wed Feb 3 11:53:43 2021
+++ src/sys/netinet/ip6.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6.h,v 1.28 2021/02/03 11:53:43 roy Exp $ */
+/* $NetBSD: ip6.h,v 1.29 2021/02/03 18:13:13 roy Exp $ */
/* $KAME: ip6.h,v 1.45 2003/06/05 04:46:38 keiichi Exp $ */
/*
@@ -120,8 +120,8 @@ struct ip6_hdr_pseudo {
u_int8_t ip6ph_zero[3];
u_int8_t ip6ph_nxt;
};
-CTASSERT(sizeof(struct ip6_hdr) == 40);
-CTASSERT(sizeof(struct ip6_hdr_pseudo) == 40);
+__CTASSERT(sizeof(struct ip6_hdr) == 40);
+__CTASSERT(sizeof(struct ip6_hdr_pseudo) == 40);
#endif
/*
Index: src/sys/netinet/ip_carp.h
diff -u src/sys/netinet/ip_carp.h:1.13 src/sys/netinet/ip_carp.h:1.14
--- src/sys/netinet/ip_carp.h:1.13 Wed Feb 3 05:51:40 2021
+++ src/sys/netinet/ip_carp.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.h,v 1.13 2021/02/03 05:51:40 roy Exp $ */
+/* $NetBSD: ip_carp.h,v 1.14 2021/02/03 18:13:13 roy Exp $ */
/* $OpenBSD: ip_carp.h,v 1.18 2005/04/20 23:00:41 mpf Exp $ */
/*
@@ -76,8 +76,8 @@ struct carp_header {
unsigned char carp_md[20]; /* SHA1 HMAC */
};
-#ifdef CTASSERT
-CTASSERT(sizeof(struct carp_header) == 36);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct carp_header) == 36);
#endif
#define CARP_DFLTTL 255
Index: src/sys/netinet/ip_icmp.h
diff -u src/sys/netinet/ip_icmp.h:1.42 src/sys/netinet/ip_icmp.h:1.43
--- src/sys/netinet/ip_icmp.h:1.42 Wed Feb 3 11:53:43 2021
+++ src/sys/netinet/ip_icmp.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.h,v 1.42 2021/02/03 11:53:43 roy Exp $ */
+/* $NetBSD: ip_icmp.h,v 1.43 2021/02/03 18:13:13 roy Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -160,11 +160,11 @@ struct icmp_ext_obj_hdr {
uint8_t c_type;
};
-#ifdef CTASSERT
-CTASSERT(sizeof(struct icmp_ra_addr) == 8);
-CTASSERT(sizeof(struct icmp) == 28);
-CTASSERT(sizeof(struct icmp_ext_hdr) == 4);
-CTASSERT(sizeof(struct icmp_ext_obj_hdr) == 4);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct icmp_ra_addr) == 8);
+__CTASSERT(sizeof(struct icmp) == 28);
+__CTASSERT(sizeof(struct icmp_ext_hdr) == 4);
+__CTASSERT(sizeof(struct icmp_ext_obj_hdr) == 4);
#endif
/*
Index: src/sys/netinet/ip_mroute.h
diff -u src/sys/netinet/ip_mroute.h:1.34 src/sys/netinet/ip_mroute.h:1.35
--- src/sys/netinet/ip_mroute.h:1.34 Wed Feb 3 11:53:43 2021
+++ src/sys/netinet/ip_mroute.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_mroute.h,v 1.34 2021/02/03 11:53:43 roy Exp $ */
+/* $NetBSD: ip_mroute.h,v 1.35 2021/02/03 18:13:13 roy Exp $ */
#ifndef _NETINET_IP_MROUTE_H_
#define _NETINET_IP_MROUTE_H_
@@ -284,8 +284,8 @@ struct igmpmsg {
u_int8_t unused3;
struct in_addr im_src, im_dst;
};
-#ifdef CTASSERT
-CTASSERT(sizeof(struct igmpmsg) == 20);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct igmpmsg) == 20);
#endif
/*
Index: src/sys/netinet/ip_var.h
diff -u src/sys/netinet/ip_var.h:1.132 src/sys/netinet/ip_var.h:1.133
--- src/sys/netinet/ip_var.h:1.132 Wed Feb 3 11:53:43 2021
+++ src/sys/netinet/ip_var.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_var.h,v 1.132 2021/02/03 11:53:43 roy Exp $ */
+/* $NetBSD: ip_var.h,v 1.133 2021/02/03 18:13:13 roy Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -47,8 +47,8 @@ struct ipovly {
struct in_addr ih_src; /* source internet address */
struct in_addr ih_dst; /* destination internet address */
};
-#ifdef CTASSERT
-CTASSERT(sizeof(struct ipovly) == 20);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct ipovly) == 20);
#endif
/*
Index: src/sys/netinet/tcp.h
diff -u src/sys/netinet/tcp.h:1.36 src/sys/netinet/tcp.h:1.37
--- src/sys/netinet/tcp.h:1.36 Wed Feb 3 11:53:43 2021
+++ src/sys/netinet/tcp.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp.h,v 1.36 2021/02/03 11:53:43 roy Exp $ */
+/* $NetBSD: tcp.h,v 1.37 2021/02/03 18:13:13 roy Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -73,8 +73,8 @@ struct tcphdr {
uint16_t th_sum; /* checksum */
uint16_t th_urp; /* urgent pointer */
};
-#ifdef CTASSERT
-CTASSERT(sizeof(struct tcphdr) == 20);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct tcphdr) == 20);
#endif
#define TCPOPT_EOL 0
Index: src/sys/netinet/tcp_debug.h
diff -u src/sys/netinet/tcp_debug.h:1.20 src/sys/netinet/tcp_debug.h:1.21
--- src/sys/netinet/tcp_debug.h:1.20 Wed Feb 3 11:52:23 2021
+++ src/sys/netinet/tcp_debug.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_debug.h,v 1.20 2021/02/03 11:52:23 roy Exp $ */
+/* $NetBSD: tcp_debug.h,v 1.21 2021/02/03 18:13:13 roy Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -47,7 +47,7 @@ struct tcp_debug {
struct {
struct ip ip4;
struct tcphdr th;
- } td_ti;
+ } __packed td_ti; /* XXX is __packed needed here? */
struct {
#ifdef INET6
struct ip6_hdr ip6;
@@ -58,7 +58,7 @@ struct tcp_debug {
} td_ti6;
short td_req;
struct tcpcb td_cb;
-} __packed;
+};
#define TA_INPUT 0
#define TA_OUTPUT 1
Index: src/sys/netinet/udp.h
diff -u src/sys/netinet/udp.h:1.18 src/sys/netinet/udp.h:1.19
--- src/sys/netinet/udp.h:1.18 Wed Feb 3 11:53:43 2021
+++ src/sys/netinet/udp.h Wed Feb 3 18:13:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: udp.h,v 1.18 2021/02/03 11:53:43 roy Exp $ */
+/* $NetBSD: udp.h,v 1.19 2021/02/03 18:13:13 roy Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -45,8 +45,8 @@ struct udphdr {
uint16_t uh_ulen; /* udp length */
uint16_t uh_sum; /* udp checksum */
};
-#ifdef CTASSERT
-CTASSERT(sizeof(struct udphdr) == 8);
+#ifdef __CTASSERT
+__CTASSERT(sizeof(struct udphdr) == 8);
#endif
/* socket options for UDP */
