diff options
| author | gdt <gdt> | 2004-11-15 18:51:15 +0000 |
|---|---|---|
| committer | gdt <gdt> | 2004-11-15 18:51:15 +0000 |
| commit | 07d450f34649aebb1885a04c02ff1d87f58fb0c3 (patch) | |
| tree | dc8ec06f081b35ad7828d5fa468626cebb8777a1 /ospfd/ospf_packet.c | |
| parent | 199f21faf9724fe8b19416a4d268c2d158120799 (diff) | |
| download | quagga-07d450f34649aebb1885a04c02ff1d87f58fb0c3.tar.bz2 quagga-07d450f34649aebb1885a04c02ff1d87f58fb0c3.tar.xz | |
Rationalize CMSG_SPACE usage:
in lib/zebra.h, ensure that RFC3542-required CMSG_SPACE and CMSG_LEN
are defined. Warn if alignment assumptions are made, since they are
i386-centric.
in lib/sockopt.h, declare that sockopt sizes are without
CMSG_SPACE-required padding - just simple sizeof.
in ospfd/ospf_packet.c, simply use CMSG_SPACE
This should remove all instances of CMSG_ALIGN from the source code.
This is a nonstandard, though rational, construct; quagga should use
only those defines in RFC3542.
Diffstat (limited to 'ospfd/ospf_packet.c')
| -rw-r--r-- | ospfd/ospf_packet.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index 5a1c0916..c582533b 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -2007,12 +2007,8 @@ ospf_recv_packet (int fd, struct interface **ifp) struct stream *ibuf; unsigned int ifindex = 0; struct iovec iov; -#if defined(CMSG_SPACE) /* Header and data both require alignment. */ char buff [CMSG_SPACE(SOPT_SIZE_CMSG_IFINDEX_IPV4())]; -#else - char buff [sizeof (struct cmsghdr) + SOPT_SIZE_CMSG_IFINDEX_IPV4()]; -#endif struct msghdr msgh; memset (&msgh, 0, sizeof (struct msghdr)); |