[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:22 UTC 2012


details:   http://zrouter.org/hg/FreeBSD/head//rev/e0562ffa123c
changeset: 304:e0562ffa123c
user:      ray at terran.dlink.ua
date:      Wed Feb 01 11:30:18 2012 +0200
description:
Update sys/netinet

diffstat:

 head/sys/netinet/if_ether.c          |   4 ++--
 head/sys/netinet/in_mcast.c          |   5 +----
 head/sys/netinet/in_pcb.c            |  27 +++++++++++++--------------
 head/sys/netinet/ip_divert.c         |   8 +++-----
 head/sys/netinet/ip_gre.c            |   4 ++--
 head/sys/netinet/ip_ipsec.c          |   4 ++--
 head/sys/netinet/ipfw/dn_sched_qfq.c |   4 ++--
 head/sys/netinet/ipfw/ip_fw2.c       |   4 ++--
 head/sys/netinet/sctp_input.c        |   5 ++---
 9 files changed, 29 insertions(+), 36 deletions(-)

diffs (294 lines):

diff -r 6ab479c649a8 -r e0562ffa123c head/sys/netinet/if_ether.c
--- a/head/sys/netinet/if_ether.c	Wed Feb 01 11:29:57 2012 +0200
+++ b/head/sys/netinet/if_ether.c	Wed Feb 01 11:30:18 2012 +0200
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/if_ether.c 229816 2012-01-08 17:25:15Z glebius $");
+__FBSDID("$FreeBSD: head/sys/netinet/if_ether.c 230442 2012-01-22 02:13:19Z bz $");
 
 #include "opt_inet.h"
 
@@ -64,7 +64,7 @@
 #include <netinet/in_var.h>
 #include <net/if_llatbl.h>
 #include <netinet/if_ether.h>
-#if defined(INET) || defined(INET6)
+#ifdef INET
 #include <netinet/ip_carp.h>
 #endif
 
diff -r 6ab479c649a8 -r e0562ffa123c head/sys/netinet/in_mcast.c
--- a/head/sys/netinet/in_mcast.c	Wed Feb 01 11:29:57 2012 +0200
+++ b/head/sys/netinet/in_mcast.c	Wed Feb 01 11:30:18 2012 +0200
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/in_mcast.c 229621 2012-01-05 19:00:36Z jhb $");
+__FBSDID("$FreeBSD: head/sys/netinet/in_mcast.c 230508 2012-01-24 14:27:14Z glebius $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1178,11 +1178,8 @@
 int
 in_leavegroup(struct in_multi *inm, /*const*/ struct in_mfilter *imf)
 {
-	struct ifnet *ifp;
 	int error;
 
-	ifp = inm->inm_ifp;
-
 	IN_MULTI_LOCK();
 	error = in_leavegroup_locked(inm, imf);
 	IN_MULTI_UNLOCK();
diff -r 6ab479c649a8 -r e0562ffa123c head/sys/netinet/in_pcb.c
--- a/head/sys/netinet/in_pcb.c	Wed Feb 01 11:29:57 2012 +0200
+++ b/head/sys/netinet/in_pcb.c	Wed Feb 01 11:30:18 2012 +0200
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/in_pcb.c 229621 2012-01-05 19:00:36Z jhb $");
+__FBSDID("$FreeBSD: head/sys/netinet/in_pcb.c 230442 2012-01-22 02:13:19Z bz $");
 
 #include "opt_ddb.h"
 #include "opt_ipsec.h"
@@ -196,7 +196,7 @@
 	&VNET_NAME(ipport_randomtime), 0,
 	"Minimum time to keep sequental port "
 	"allocation before switching to a random one");
-#endif
+#endif /* INET */
 
 /*
  * in_pcb.c: manage the Protocol Control Blocks.
@@ -1038,7 +1038,7 @@
 	inp->inp_fport = 0;
 	in_pcbrehash(inp);
 }
-#endif
+#endif /* INET */
 
 /*
  * in_pcbdetach() is responsibe for disassociating a socket from an inpcb.
@@ -1169,7 +1169,7 @@
 #ifdef IPSEC
 	if (inp->inp_sp != NULL)
 		ipsec_delete_pcbpolicy(inp);
-#endif /* IPSEC */
+#endif
 	inp->inp_gencnt = ++pcbinfo->ipi_gencnt;
 	in_pcbremlists(inp);
 #ifdef INET6
@@ -1586,7 +1586,7 @@
 				if (inp->inp_vflag & INP_IPV6PROTO)
 					local_wild_mapped = inp;
 				else
-#endif /* INET6 */
+#endif
 					if (injail)
 						jail_wild = inp;
 					else
@@ -1601,7 +1601,7 @@
 #ifdef INET6
 		if (inp == NULL)
 			inp = local_wild_mapped;
-#endif /* defined(INET6) */
+#endif
 		if (inp != NULL)
 			goto found;
 	} /* if (lookupflags & INPLOOKUP_WILDCARD) */
@@ -1731,7 +1731,7 @@
 				if (inp->inp_vflag & INP_IPV6PROTO)
 					local_wild_mapped = inp;
 				else
-#endif /* INET6 */
+#endif
 					if (injail)
 						jail_wild = inp;
 					else
@@ -1747,7 +1747,7 @@
 #ifdef INET6
 		if (local_wild_mapped != NULL)
 			return (local_wild_mapped);
-#endif /* defined(INET6) */
+#endif
 	} /* if ((lookupflags & INPLOOKUP_WILDCARD) != 0) */
 
 	return (NULL);
@@ -1871,7 +1871,7 @@
 	if (inp->inp_vflag & INP_IPV6)
 		hashkey_faddr = inp->in6p_faddr.s6_addr32[3] /* XXX */;
 	else
-#endif /* INET6 */
+#endif
 	hashkey_faddr = inp->inp_faddr.s_addr;
 
 	pcbhash = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr,
@@ -1958,7 +1958,7 @@
 	if (inp->inp_vflag & INP_IPV6)
 		hashkey_faddr = inp->in6p_faddr.s6_addr32[3] /* XXX */;
 	else
-#endif /* INET6 */
+#endif
 	hashkey_faddr = inp->inp_faddr.s_addr;
 
 	head = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr,
@@ -2226,14 +2226,13 @@
 		/* IPv6. */
 		ip6_sprintf(laddr_str, &inc->inc6_laddr);
 		ip6_sprintf(faddr_str, &inc->inc6_faddr);
-	} else {
+	} else
 #endif
+	{
 		/* IPv4. */
 		inet_ntoa_r(inc->inc_laddr, laddr_str);
 		inet_ntoa_r(inc->inc_faddr, faddr_str);
-#ifdef INET6
 	}
-#endif
 	db_print_indent(indent);
 	db_printf("inc_laddr %s   inc_lport %u\n", laddr_str,
 	    ntohs(inc->inc_lport));
@@ -2446,4 +2445,4 @@
 
 	db_print_inpcb(inp, "inpcb", 0);
 }
-#endif
+#endif /* DDB */
diff -r 6ab479c649a8 -r e0562ffa123c head/sys/netinet/ip_divert.c
--- a/head/sys/netinet/ip_divert.c	Wed Feb 01 11:29:57 2012 +0200
+++ b/head/sys/netinet/ip_divert.c	Wed Feb 01 11:30:18 2012 +0200
@@ -28,16 +28,14 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/ip_divert.c 227309 2011-11-07 15:43:11Z ed $");
+__FBSDID("$FreeBSD: head/sys/netinet/ip_divert.c 230452 2012-01-22 10:41:58Z bz $");
 
-#if !defined(KLD_MODULE)
 #include "opt_inet.h"
+#include "opt_inet6.h"
 #include "opt_sctp.h"
 #ifndef INET
-#error "IPDIVERT requires INET."
+#error "IPDIVERT requires INET"
 #endif
-#endif
-#include "opt_inet6.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff -r 6ab479c649a8 -r e0562ffa123c head/sys/netinet/ip_gre.c
--- a/head/sys/netinet/ip_gre.c	Wed Feb 01 11:29:57 2012 +0200
+++ b/head/sys/netinet/ip_gre.c	Wed Feb 01 11:30:18 2012 +0200
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: head/sys/netinet/ip_gre.c 230452 2012-01-22 10:41:58Z bz $");
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
@@ -70,7 +70,7 @@
 #include <netinet/ip_gre.h>
 #include <machine/in_cksum.h>
 #else
-#error ip_gre input without IP?
+#error "ip_gre requires INET"
 #endif
 
 #ifdef NETATALK
diff -r 6ab479c649a8 -r e0562ffa123c head/sys/netinet/ip_ipsec.c
--- a/head/sys/netinet/ip_ipsec.c	Wed Feb 01 11:29:57 2012 +0200
+++ b/head/sys/netinet/ip_ipsec.c	Wed Feb 01 11:30:18 2012 +0200
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/ip_ipsec.c 222845 2011-06-08 03:02:11Z bz $");
+__FBSDID("$FreeBSD: head/sys/netinet/ip_ipsec.c 230442 2012-01-22 02:13:19Z bz $");
 
 #include "opt_ipsec.h"
 #include "opt_sctp.h"
@@ -92,7 +92,7 @@
 int
 ip_ipsec_filtertunnel(struct mbuf *m)
 {
-#if defined(IPSEC)
+#ifdef IPSEC
 
 	/*
 	 * Bypass packet filtering for packets previously handled by IPsec.
diff -r 6ab479c649a8 -r e0562ffa123c head/sys/netinet/ipfw/dn_sched_qfq.c
--- a/head/sys/netinet/ipfw/dn_sched_qfq.c	Wed Feb 01 11:29:57 2012 +0200
+++ b/head/sys/netinet/ipfw/dn_sched_qfq.c	Wed Feb 01 11:30:18 2012 +0200
@@ -25,7 +25,7 @@
  */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: head/sys/netinet/ipfw/dn_sched_qfq.c 230614 2012-01-27 13:26:25Z luigi $
  */
 
 #ifdef _KERNEL
@@ -608,7 +608,7 @@
 qfq_update_start(struct qfq_sched *q, struct qfq_class *cl)
 {
 	unsigned long mask;
-	uint32_t limit, roundedF;
+	uint64_t limit, roundedF;
 	int slot_shift = cl->grp->slot_shift;
 
 	roundedF = qfq_round_down(cl->F, slot_shift);
diff -r 6ab479c649a8 -r e0562ffa123c head/sys/netinet/ipfw/ip_fw2.c
--- a/head/sys/netinet/ipfw/ip_fw2.c	Wed Feb 01 11:29:57 2012 +0200
+++ b/head/sys/netinet/ipfw/ip_fw2.c	Wed Feb 01 11:30:18 2012 +0200
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/ipfw/ip_fw2.c 227085 2011-11-04 16:24:19Z bz $");
+__FBSDID("$FreeBSD: head/sys/netinet/ipfw/ip_fw2.c 230452 2012-01-22 10:41:58Z bz $");
 
 /*
  * The FreeBSD IP packet firewall, main file
@@ -34,7 +34,7 @@
 #include "opt_ipdivert.h"
 #include "opt_inet.h"
 #ifndef INET
-#error IPFIREWALL requires INET.
+#error "IPFIREWALL requires INET"
 #endif /* INET */
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
diff -r 6ab479c649a8 -r e0562ffa123c head/sys/netinet/sctp_input.c
--- a/head/sys/netinet/sctp_input.c	Wed Feb 01 11:29:57 2012 +0200
+++ b/head/sys/netinet/sctp_input.c	Wed Feb 01 11:30:18 2012 +0200
@@ -33,7 +33,7 @@
 /* $KAME: sctp_input.c,v 1.27 2005/03/06 16:04:17 itojun Exp $	 */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 229805 2012-01-08 09:56:24Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 230379 2012-01-20 13:26:11Z tuexen $");
 
 #include <netinet/sctp_os.h>
 #include <netinet/sctp_var.h>
@@ -1024,12 +1024,11 @@
 	sctp_send_shutdown_complete(stcb, net, 0);
 	/* notify upper layer protocol */
 	if (stcb->sctp_socket) {
-		sctp_ulp_notify(SCTP_NOTIFY_ASSOC_DOWN, stcb, 0, NULL, SCTP_SO_NOT_LOCKED);
 		if ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
 		    (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) {
-			/* Set the connected flag to disconnected */
 			stcb->sctp_socket->so_snd.sb_cc = 0;
 		}
+		sctp_ulp_notify(SCTP_NOTIFY_ASSOC_DOWN, stcb, 0, NULL, SCTP_SO_NOT_LOCKED);
 	}
 	SCTP_STAT_INCR_COUNTER32(sctps_shutdown);
 	/* free the TCB but first save off the ep */


More information about the Zrouter-src-freebsd mailing list