[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree
zrouter-src-freebsd at zrouter.org
zrouter-src-freebsd at zrouter.org
Wed Feb 1 10:56:48 UTC 2012
details: http://zrouter.org/hg/FreeBSD/head//rev/2c7e9f76c40e
changeset: 316:2c7e9f76c40e
user: ray at terran.dlink.ua
date: Wed Feb 01 11:52:38 2012 +0200
description:
Update sys/netinet6
diffstat:
head/sys/netinet6/in6.c | 13 ++++---------
head/sys/netinet6/in6.h | 34 +++++++++++++++++-----------------
head/sys/netinet6/ip6_ipsec.c | 4 ++--
head/sys/netinet6/nd6.c | 4 +---
4 files changed, 24 insertions(+), 31 deletions(-)
diffs (166 lines):
diff -r 319d2099782e -r 2c7e9f76c40e head/sys/netinet6/in6.c
--- a/head/sys/netinet6/in6.c Wed Feb 01 11:33:42 2012 +0200
+++ b/head/sys/netinet6/in6.c Wed Feb 01 11:52:38 2012 +0200
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet6/in6.c 229621 2012-01-05 19:00:36Z jhb $");
+__FBSDID("$FreeBSD: head/sys/netinet6/in6.c 230506 2012-01-24 13:57:30Z bz $");
#include "opt_compat.h"
#include "opt_inet.h"
@@ -154,10 +154,6 @@
ifp = ifa->ifa_ifp;
IF_AFDATA_LOCK(ifp);
ifa->ifa_rtrequest = nd6_rtrequest;
-
- /* XXX QL
- * we need to report rt_newaddrmsg
- */
ln = lla_lookup(LLTABLE6(ifp), (LLE_CREATE | LLE_IFADDR |
LLE_EXCLUSIVE), (struct sockaddr *)&ia->ia_addr);
IF_AFDATA_UNLOCK(ifp);
@@ -1387,8 +1383,7 @@
mltaddr.sin6_family = AF_INET6;
mltaddr.sin6_addr = in6addr_linklocal_allnodes;
- if ((error = in6_setscope(&mltaddr.sin6_addr, ifp, NULL)) !=
- 0)
+ if ((error = in6_setscope(&mltaddr.sin6_addr, ifp, NULL)) != 0)
goto cleanup;
rt = rtalloc1((struct sockaddr *)&mltaddr, 0, 0UL);
@@ -1482,6 +1477,8 @@
}
cleanup:
+ if (ifa0 != NULL)
+ ifa_free(ifa0);
plen = in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL); /* XXX */
if ((ia->ia_flags & IFA_ROUTE) && plen == 128) {
@@ -1506,8 +1503,6 @@
return;
ia->ia_flags &= ~IFA_ROUTE;
}
- if (ifa0 != NULL)
- ifa_free(ifa0);
in6_unlink_ifa(ia, ifp);
}
diff -r 319d2099782e -r 2c7e9f76c40e head/sys/netinet6/in6.h
--- a/head/sys/netinet6/in6.h Wed Feb 01 11:33:42 2012 +0200
+++ b/head/sys/netinet6/in6.h Wed Feb 01 11:52:38 2012 +0200
@@ -58,7 +58,7 @@
* SUCH DAMAGE.
*
* @(#)in.h 8.3 (Berkeley) 1/3/94
- * $FreeBSD: head/sys/netinet6/in6.h 225698 2011-09-20 20:27:26Z kmacy $
+ * $FreeBSD: head/sys/netinet6/in6.h 230584 2012-01-26 12:04:19Z glebius $
*/
#ifndef __KAME_NETINET_IN_H_INCLUDED_
@@ -235,37 +235,37 @@
* Unspecified
*/
#define IN6_IS_ADDR_UNSPECIFIED(a) \
- ((*(const u_int32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \
- (*(const u_int32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
- (*(const u_int32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \
- (*(const u_int32_t *)(const void *)(&(a)->s6_addr[12]) == 0))
+ ((a)->__u6_addr.__u6_addr32[0] == 0 && \
+ (a)->__u6_addr.__u6_addr32[1] == 0 && \
+ (a)->__u6_addr.__u6_addr32[2] == 0 && \
+ (a)->__u6_addr.__u6_addr32[3] == 0)
/*
* Loopback
*/
#define IN6_IS_ADDR_LOOPBACK(a) \
- ((*(const u_int32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \
- (*(const u_int32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
- (*(const u_int32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \
- (*(const u_int32_t *)(const void *)(&(a)->s6_addr[12]) == ntohl(1)))
+ ((a)->__u6_addr.__u6_addr32[0] == 0 && \
+ (a)->__u6_addr.__u6_addr32[1] == 0 && \
+ (a)->__u6_addr.__u6_addr32[2] == 0 && \
+ (a)->__u6_addr.__u6_addr32[3] == ntohl(1))
/*
* IPv4 compatible
*/
#define IN6_IS_ADDR_V4COMPAT(a) \
- ((*(const u_int32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \
- (*(const u_int32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
- (*(const u_int32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \
- (*(const u_int32_t *)(const void *)(&(a)->s6_addr[12]) != 0) && \
- (*(const u_int32_t *)(const void *)(&(a)->s6_addr[12]) != ntohl(1)))
+ ((a)->__u6_addr.__u6_addr32[0] == 0 && \
+ (a)->__u6_addr.__u6_addr32[1] == 0 && \
+ (a)->__u6_addr.__u6_addr32[2] == 0 && \
+ (a)->__u6_addr.__u6_addr32[3] != 0 && \
+ (a)->__u6_addr.__u6_addr32[3] != ntohl(1))
/*
* Mapped
*/
#define IN6_IS_ADDR_V4MAPPED(a) \
- ((*(const u_int32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \
- (*(const u_int32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
- (*(const u_int32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
+ ((a)->__u6_addr.__u6_addr32[0] == 0 && \
+ (a)->__u6_addr.__u6_addr32[1] == 0 && \
+ (a)->__u6_addr.__u6_addr32[2] == ntohl(0x0000ffff))
/*
* KAME Scope Values
diff -r 319d2099782e -r 2c7e9f76c40e head/sys/netinet6/ip6_ipsec.c
--- a/head/sys/netinet6/ip6_ipsec.c Wed Feb 01 11:33:42 2012 +0200
+++ b/head/sys/netinet6/ip6_ipsec.c Wed Feb 01 11:52:38 2012 +0200
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet6/ip6_ipsec.c 222845 2011-06-08 03:02:11Z bz $");
+__FBSDID("$FreeBSD: head/sys/netinet6/ip6_ipsec.c 230442 2012-01-22 02:13:19Z bz $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -103,7 +103,7 @@
int
ip6_ipsec_filtertunnel(struct mbuf *m)
{
-#if defined(IPSEC)
+#ifdef IPSEC
/*
* Bypass packet filtering for packets previously handled by IPsec.
diff -r 319d2099782e -r 2c7e9f76c40e head/sys/netinet6/nd6.c
--- a/head/sys/netinet6/nd6.c Wed Feb 01 11:33:42 2012 +0200
+++ b/head/sys/netinet6/nd6.c Wed Feb 01 11:52:38 2012 +0200
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet6/nd6.c 229621 2012-01-05 19:00:36Z jhb $");
+__FBSDID("$FreeBSD: head/sys/netinet6/nd6.c 230531 2012-01-25 08:53:42Z pluknet $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -575,7 +575,6 @@
struct nd_defrouter *dr, *ndr;
struct nd_prefix *pr, *npr;
struct in6_ifaddr *ia6, *nia6;
- struct in6_addrlifetime *lt6;
callout_reset(&V_nd6_timer_ch, V_nd6_prune * hz,
nd6_timer, curvnet);
@@ -598,7 +597,6 @@
addrloop:
TAILQ_FOREACH_SAFE(ia6, &V_in6_ifaddrhead, ia_link, nia6) {
/* check address lifetime */
- lt6 = &ia6->ia6_lifetime;
if (IFA6_IS_INVALID(ia6)) {
int regen = 0;
More information about the Zrouter-src-freebsd
mailing list