sync w/ 1.6.1. compiled but not tested

kame · Apr 22, 2003 · 41857dc · 41857dc
1 parent acade00
commit 41857dc
Show file tree

Hide file tree

Showing 58 changed files with 1,751 additions and 3,358 deletions.
diff --git a/kame/sys/netinet/sctp_pcb.c b/kame/sys/netinet/sctp_pcb.c
@@ -1,4 +1,4 @@
-/*	$KAME: sctp_pcb.c,v 1.19 2003/04/21 06:26:10 itojun Exp $	*/
+/*	$KAME: sctp_pcb.c,v 1.20 2003/04/22 07:24:05 itojun Exp $	*/
 /*	Header: /home/sctpBsd/netinet/sctp_pcb.c,v 1.207 2002/04/04 16:53:46 randall Exp	*/
 
 /*
@@ -3790,43 +3790,45 @@ sctp_set_primary_addr(struct sctp_tcb *stcb, struct sockaddr *sa)
 int
 sctp_is_vtag_good(struct sctp_inpcb *m, u_int32_t tag, struct timeval *now)
 {
-    /*
-     * This function serves two purposes. It will see if a TAG can be
-     * re-used and return 1 for yes it is ok and 0 for don't use that
-     * tag.
-     * A secondary function it will do is purge out old tags that can
-     * be removed.
-     */
-    struct sctpvtaghead *chain;
-    struct sctp_tagblock *twait_block;
-
-    int i;
+	/*
+	 * This function serves two purposes. It will see if a TAG can be
+	 * re-used and return 1 for yes it is ok and 0 for don't use that
+	 * tag.
+	 * A secondary function it will do is purge out old tags that can
+	 * be removed.
+	 */
+	struct sctpvtaghead *chain;
+	struct sctp_tagblock *twait_block;
+
+	int i;
 #ifdef SCTP_VTAG_TIMEWAIT_PER_STACK
-    chain = &sctppcbinfo.vtag_timewait[(tag % SCTP_STACK_VTAG_HASH_SIZE)];
+	chain = &sctppcbinfo.vtag_timewait[(tag % SCTP_STACK_VTAG_HASH_SIZE)];
 #else
-    chain = &m->vtag_timewait[(tag % SCTP_STACK_VTAG_HASH_SIZE)];
-#endif
-    if (!LIST_EMPTY(chain)) {
-	/* Block(s) are present, lets see if we have this tag in the list */
-	LIST_FOREACH(twait_block, chain, sctp_nxt_tagblock) {
-	    for (i = 0; i < SCTP_NUMBER_IN_VTAG_BLOCK; i++) {
-		if (twait_block->vtag_block[i].v_tag == 0) {
-		    /* not used */
-		    continue;
-		} else if (twait_block->vtag_block[i].tv_sec_at_expire >
-			   now->tv_sec) {
-		    /* Audit expires this guy */
-		    twait_block->vtag_block[i].tv_sec_at_expire = 0;
-		    twait_block->vtag_block[i].v_tag = 0;
-		} else if (twait_block->vtag_block[i].v_tag == tag) {
-		    /* Bad tag, sorry :< */
-			return (0);
+	chain = &m->vtag_timewait[(tag % SCTP_STACK_VTAG_HASH_SIZE)];
+#endif
+	if (!LIST_EMPTY(chain)) {
+		/*
+		 * Block(s) are present, lets see if we have this tag in
+		 * the list
+		 */
+		LIST_FOREACH(twait_block, chain, sctp_nxt_tagblock) {
+			for (i = 0; i < SCTP_NUMBER_IN_VTAG_BLOCK; i++) {
+				if (twait_block->vtag_block[i].v_tag == 0) {
+					/* not used */
+					continue;
+				} else if (twait_block->vtag_block[i].tv_sec_at_expire > now->tv_sec) {
+					/* Audit expires this guy */
+					twait_block->vtag_block[i].tv_sec_at_expire = 0;
+					twait_block->vtag_block[i].v_tag = 0;
+				} else if (twait_block->vtag_block[i].v_tag == tag) {
+					/* Bad tag, sorry :< */
+					return (0);
+				}
+			}
 		}
-	    }
 	}
-    }
-    /* Not found, ok to use the tag */
-    return (1);
+	/* Not found, ok to use the tag */
+	return (1);
 }
 
 

diff --git a/netbsd/sys/arch/arm/arm32/bcopyinout.S b/netbsd/sys/arch/arm/arm32/bcopyinout.S
diff --git a/netbsd/sys/arch/i386/conf/GENERIC b/netbsd/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.491.4.2 2002/08/01 04:22:39 lukem Exp $
+# $NetBSD: GENERIC,v 1.491.4.4 2003/01/28 06:28:20 jmc Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.491.4.2 $"
+#ident 		"GENERIC-$Revision: 1.491.4.4 $"
 
 maxusers	32		# estimated number of users
 
@@ -161,6 +161,7 @@ options 	PPP_DEFLATE	# Deflate compression support for PPP
 options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
 options 	PFIL_HOOKS	# pfil(9) packet filter hooks
 options 	IPFILTER_LOG	# ipmon(8) log support
+#options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
 #options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
 
 # These options enable verbose messages for several subsystems.
@@ -604,6 +605,7 @@ ed*	at edc?
 
 # PCI network interfaces
 an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
+bge* 	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
 en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet