Add size-guards evaluated at compile-time to the main struct vnet_*
which are not in a module of their own like gif. Single kernel compiles and universe will fail if the size of the struct changes. Th expected values are given in sys/vimage.h. See the comments where how to handle this. Requested by: peter
This commit is contained in:
parent
09ea36e39b
commit
4321e2a8f4
@ -56,6 +56,9 @@ struct vnet_net {
|
||||
int _ether_ipfw;
|
||||
};
|
||||
|
||||
/* Size guard. See sys/vimage.h. */
|
||||
VIMAGE_CTASSERT(SIZEOF_vnet_net, sizeof(struct vnet_net));
|
||||
|
||||
#ifndef VIMAGE
|
||||
#ifndef VIMAGE_GLOBALS
|
||||
extern struct vnet_net vnet_net_0;
|
||||
|
@ -196,6 +196,9 @@ struct vnet_inet {
|
||||
int _fw_one_pass;
|
||||
};
|
||||
|
||||
/* Size guard. See sys/vimage.h. */
|
||||
VIMAGE_CTASSERT(SIZEOF_vnet_inet, sizeof(struct vnet_inet));
|
||||
|
||||
#ifndef VIMAGE
|
||||
#ifndef VIMAGE_GLOBALS
|
||||
extern struct vnet_inet vnet_inet_0;
|
||||
|
@ -155,6 +155,9 @@ struct vnet_inet6 {
|
||||
struct ip6_pktopts _ip6_opts;
|
||||
};
|
||||
|
||||
/* Size guard. See sys/vimage.h. */
|
||||
VIMAGE_CTASSERT(SIZEOF_vnet_inet6, sizeof(struct vnet_inet6));
|
||||
|
||||
#ifndef VIMAGE
|
||||
#ifndef VIMAGE_GLOBALS
|
||||
extern struct vnet_inet6 vnet_inet6_0;
|
||||
|
@ -107,6 +107,9 @@ struct vnet_ipsec {
|
||||
LIST_HEAD(, secspacq) _spacqtree;
|
||||
};
|
||||
|
||||
/* Size guard. See sys/vimage.h. */
|
||||
VIMAGE_CTASSERT(SIZEOF_vnet_ipsec, sizeof(struct vnet_ipsec));
|
||||
|
||||
#ifndef VIMAGE
|
||||
#ifndef VIMAGE_GLOBALS
|
||||
extern struct vnet_ipsec vnet_ipsec_0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user