diff options
author | ajs <ajs> | 2005-01-04 17:24:43 +0100 |
---|---|---|
committer | ajs <ajs> | 2005-01-04 17:24:43 +0100 |
commit | b99760ab51abf8c4c9a1f89dab0c1630a6768ff7 (patch) | |
tree | daaf8cabb567c5ff1a01368fa1382d8257b56854 /ripngd | |
parent | 2005-01-04 Andrew J. Schorr <ajschorr@alumni.princeton.edu> (diff) | |
download | frr-b99760ab51abf8c4c9a1f89dab0c1630a6768ff7.tar.xz frr-b99760ab51abf8c4c9a1f89dab0c1630a6768ff7.zip |
2005-01-04 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* configure.ac: Added test for broken CMSG_FIRSTHDR macro
(relevant for Solaris 8 and unpatched Solaris 9, don't know
whether other platforms are affected).
* zebra.h: Define ZCMSG_FIRSTHDR appropriately based on whether
config.h indicates HAVE_BROKEN_CMSG_FIRSTHDR (as determined
by the configure test program).
* sockopt.c: (getsockopt_cmsg_data) Use ZCMSG_FIRSTHDR instead
of CMSG_FIRSTHDR.
* rtadv.c: (rtadv_recv_packet,rtadv_send_packet) Use ZCMSG_FIRSTHDR
instead of CMSG_FIRSTHDR.
* ripd.c: (rip_recvmsg) Use ZCMSG_FIRSTHDR instead of CMSG_FIRSTHDR.
* ripngd.c: (ripng_recv_packet) Use ZCMSG_FIRSTHDR instead of
CMSG_FIRSTHDR.
Diffstat (limited to 'ripngd')
-rw-r--r-- | ripngd/ChangeLog | 5 | ||||
-rw-r--r-- | ripngd/ripngd.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ripngd/ChangeLog b/ripngd/ChangeLog index 7f85cc474..dcd8dedf4 100644 --- a/ripngd/ChangeLog +++ b/ripngd/ChangeLog @@ -1,3 +1,8 @@ +2005-01-04 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + + * ripngd.c: (ripng_recv_packet) Use ZCMSG_FIRSTHDR instead of + CMSG_FIRSTHDR. + 2004-12-16 Andrew J. Schorr <ajschorr@alumni.princeton.edu> * ripng_nexthop.c: Replace NEXTHOP_OUT macro with NEXTHOP_OUT_PTR, diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index 84ed45eef..34282b8e7 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -263,7 +263,7 @@ ripng_recv_packet (int sock, u_char *buf, int bufsize, if (ret < 0) return ret; - for (cmsgptr = CMSG_FIRSTHDR(&msg); cmsgptr != NULL; + for (cmsgptr = ZCMSG_FIRSTHDR(&msg); cmsgptr != NULL; cmsgptr = CMSG_NXTHDR(&msg, cmsgptr)) { /* I want interface index which this packet comes from. */ |