diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | bits/in.h | 6 | ||||
| -rw-r--r-- | sysdeps/generic/bits/in.h | 6 | ||||
| -rw-r--r-- | sysdeps/generic/ifreq.h | 4 |
4 files changed, 17 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2003-06-25 Alfred M. Szmidt <ams@kemisten.nu> + + * sysdeps/generic/bits/in.h (IPV6_HOPOPTS, IPV6_DSTOPTS): New macros. + (IPV6_RXHOPOPTS, IPV6_RXDSTOPTS): Use them. + + * sysdeps/generic/ifreq.h (__if_nextreq) [_HAVE_SA_LEN]: Typo fix. + 2003-06-04 Thorsten Kukuk <kukuk@suse.de> * sysdeps/unix/sysv/linux/net/if_arp.h: Sync with kernel header, @@ -64,8 +64,8 @@ struct ip_mreq /* IPV6 socket options. */ #define IPV6_ADDRFORM 1 #define IPV6_RXINFO 2 -#define IPV6_RXHOPOPTS 3 -#define IPV6_RXDSTOPTS 4 +#define IPV6_HOPOPTS 3 +#define IPV6_DSTOPTS 4 #define IPV6_RTHDR 5 #define IPV6_PKTOPTIONS 6 #define IPV6_CHECKSUM 7 @@ -85,6 +85,8 @@ struct ip_mreq /* Obsolete synonyms for the above. */ #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP +#define IPV6_RXHOPOPTS IPV6_HOPOPTS +#define IPV6_RXDSTOPTS IPV6_DSTOPTS /* Routing header options for IPv6. */ #define IPV6_RTHDR_LOOSE 0 /* Hop doesn't need to be neighbour. */ diff --git a/sysdeps/generic/bits/in.h b/sysdeps/generic/bits/in.h index f94a41becf..a510382245 100644 --- a/sysdeps/generic/bits/in.h +++ b/sysdeps/generic/bits/in.h @@ -64,8 +64,8 @@ struct ip_mreq /* IPV6 socket options. */ #define IPV6_ADDRFORM 1 #define IPV6_RXINFO 2 -#define IPV6_RXHOPOPTS 3 -#define IPV6_RXDSTOPTS 4 +#define IPV6_HOPOPTS 3 +#define IPV6_DSTOPTS 4 #define IPV6_RTHDR 5 #define IPV6_PKTOPTIONS 6 #define IPV6_CHECKSUM 7 @@ -85,6 +85,8 @@ struct ip_mreq /* Obsolete synonyms for the above. */ #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP +#define IPV6_RXHOPOPTS IPV6_HOPOPTS +#define IPV6_RXDSTOPTS IPV6_DSTOPTS /* Routing header options for IPv6. */ #define IPV6_RTHDR_LOOSE 0 /* Hop doesn't need to be neighbour. */ diff --git a/sysdeps/generic/ifreq.h b/sysdeps/generic/ifreq.h index 6e01fb463e..73340d4c93 100644 --- a/sysdeps/generic/ifreq.h +++ b/sysdeps/generic/ifreq.h @@ -28,8 +28,8 @@ static inline struct ifreq * __if_nextreq (struct ifreq *ifr) { #ifdef _HAVE_SA_LEN - if (ifr->ifa_addr > sizeof ifr->ifa_addr) - return (struct ifreq *) ((char *) &ifr->ifa_addr + ifr->ifa_addr.sa_len); + if (ifr->ifr_addr.sa_len > sizeof ifr->ifr_addr) + return (struct ifreq *) ((char *) &ifr->ifr_addr + ifr->ifr_addr.sa_len); #endif return ifr + 1; } |