Merge http://linux.bkbits.net/linux-2.5

into jgrimm.austin.ibm.com:/home/jgrimm/bk/test.merge.38

Merge http://linux.bkbits.net/linux-2.5
into jgrimm.austin.ibm.com:/home/jgrimm/bk/test.merge.38
dd18325f · Jon Grimm · 5dd6a6e5 · 372f525b · dd18325f · dd18325f
Commit dd18325f authored Sep 25, 2002 by Jon Grimm
24 changed files
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -112,6 +112,7 @@ typedef enum {
 	SCTP_EVENT_TIMEOUT_T2_SHUTDOWN,
 	SCTP_EVENT_TIMEOUT_T3_RTX,
 	SCTP_EVENT_TIMEOUT_T4_RTO,
+	SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD,
 	SCTP_EVENT_TIMEOUT_HEARTBEAT,
 	SCTP_EVENT_TIMEOUT_SACK,
 	SCTP_EVENT_TIMEOUT_AUTOCLOSE,

--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -114,7 +114,8 @@ extern sctp_protocol_t sctp_proto;
 extern struct sock *sctp_get_ctl_sock(void);
 extern int sctp_copy_local_addr_list(sctp_protocol_t *, sctp_bind_addr_t *,
 				     sctp_scope_t, int priority, int flags);
+extern sctp_pf_t *sctp_get_pf_specific(int family);
+extern void sctp_set_pf_specific(int family, sctp_pf_t *);
 /*
 * sctp_socket.c

--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -107,6 +107,9 @@ sctp_state_fn_t sctp_sf_timer_ignore;
 sctp_state_fn_t sctp_sf_do_9_1_abort;
 sctp_state_fn_t sctp_sf_cookie_wait_abort;
 sctp_state_fn_t sctp_sf_cookie_echoed_abort;
+sctp_state_fn_t sctp_sf_shutdown_pending_abort;
+sctp_state_fn_t sctp_sf_shutdown_sent_abort;
+sctp_state_fn_t sctp_sf_shutdown_ack_sent_abort;
 sctp_state_fn_t sctp_sf_do_5_1B_init;
 sctp_state_fn_t sctp_sf_do_5_1C_ack;
 sctp_state_fn_t sctp_sf_do_5_1D_ce;
@@ -119,6 +122,7 @@ sctp_state_fn_t sctp_sf_tabort_8_4_8;
 sctp_state_fn_t sctp_sf_operr_notify;
 sctp_state_fn_t sctp_sf_t1_timer_expire;
 sctp_state_fn_t sctp_sf_t2_timer_expire;
+sctp_state_fn_t sctp_sf_t5_timer_expire;
 sctp_state_fn_t sctp_sf_sendbeat_8_3;
 sctp_state_fn_t sctp_sf_beat_8_3;
 sctp_state_fn_t sctp_sf_backbeat_8_3;
@@ -134,6 +138,7 @@ sctp_state_fn_t sctp_sf_discard_chunk;
 sctp_state_fn_t sctp_sf_do_5_2_1_siminit;
 sctp_state_fn_t sctp_sf_do_5_2_2_dupinit;
 sctp_state_fn_t sctp_sf_do_5_2_4_dupcook;
+sctp_state_fn_t sctp_sf_unk_chunk;
 /* Prototypes for primitive event state functions.  */
 sctp_state_fn_t sctp_sf_do_prm_asoc;
@@ -144,6 +149,9 @@ sctp_state_fn_t sctp_sf_cookie_echoed_prm_shutdown;
 sctp_state_fn_t sctp_sf_do_9_1_prm_abort;
 sctp_state_fn_t sctp_sf_cookie_wait_prm_abort;
 sctp_state_fn_t sctp_sf_cookie_echoed_prm_abort;
+sctp_state_fn_t sctp_sf_shutdown_pending_prm_abort;
+sctp_state_fn_t sctp_sf_shutdown_sent_prm_abort;
+sctp_state_fn_t sctp_sf_shutdown_ack_sent_prm_abort;
 sctp_state_fn_t sctp_sf_error_closed;
 sctp_state_fn_t sctp_sf_error_shutdown;
 sctp_state_fn_t sctp_sf_ignore_primitive;

--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -255,6 +255,12 @@ typedef struct sctp_func {
 sctp_func_t *sctp_get_af_specific(const sockaddr_storage_t *address);
+/* Protocol family functions. */
+typedef struct sctp_pf {
+	void (*event_msgname)(sctp_ulpevent_t *, char *, int *);
+	void (*skb_msgname)(struct sk_buff *, char *, int *);
+} sctp_pf_t;
 /* SCTP Socket type: UDP or TCP style. */
 typedef enum {
 	SCTP_SOCKET_UDP = 0,
@@ -280,6 +286,7 @@ struct sctp_opt {
 	__u32 autoclose;
 	__u8 nodelay;
 	__u8 disable_fragments;
+	sctp_pf_t *pf;
 };
@@ -845,6 +852,7 @@ int sctp_outqueue_set_output_handlers(sctp_outqueue_t *,
                                      sctp_outqueue_ohandler_force_t force);
 void sctp_outqueue_restart(sctp_outqueue_t *);
 void sctp_retransmit(sctp_outqueue_t *, sctp_transport_t *, __u8);
+void sctp_retransmit_mark(sctp_outqueue_t *, sctp_transport_t *, __u8);
 /* These bind address data fields common between endpoints and associations */
@@ -1128,6 +1136,11 @@ struct SCTP_association {
 		 */
 		sctp_transport_t *primary_path;
+		/* Cache the primary path address here, when we
+		 * need a an address for msg_name. 
+		 */
+		sockaddr_storage_t primary_addr;
 		/* active_path
 		 *   The path that we are currently using to
 		 *   transmit new data and most control chunks.
@@ -1183,7 +1196,7 @@ struct SCTP_association {
 		int next_dup_tsn;
 		/* Do we need to sack the peer? */
-		int sack_needed;
+		uint8_t sack_needed;
 		/* These are capabilities which our peer advertised.  */
 		__u8	ecn_capable;     /* Can peer do ECN? */

--- a/net/sctp/adler32.c
+++ b/net/sctp/adler32.c
@@ -96,7 +96,7 @@ unsigned long update_adler32(unsigned long adler,
 		 * one subtract at the MOST, since buf[n]
 		 * is a max of 255.
 		 */
-		if(s1 >= BASE)
+		if (s1 >= BASE)
 			s1 -= BASE;
 		/* s2 = (s2 + s1) % BASE */

--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -66,7 +66,7 @@ static void sctp_assoc_bh_rcv(sctp_association_t *asoc);
 /* Allocate and initialize a new association */
 sctp_association_t *sctp_association_new(const sctp_endpoint_t *ep,
-					 const struct sock *sk, 
+					 const struct sock *sk,
 					 sctp_scope_t scope, int priority)
 {
 	sctp_association_t *asoc;
@@ -91,7 +91,7 @@ sctp_association_t *sctp_association_new(const sctp_endpoint_t *ep,
 /* Intialize a new association from provided memory. */
 sctp_association_t *sctp_association_init(sctp_association_t *asoc,
-					  const sctp_endpoint_t *ep, 
+					  const sctp_endpoint_t *ep,
 					  const struct sock *sk,
 					  sctp_scope_t scope, 
 					  int priority)
@@ -109,19 +109,19 @@ sctp_association_t *sctp_association_init(sctp_association_t *asoc,
 	asoc->ep = (sctp_endpoint_t *)ep;
 	sctp_endpoint_hold(asoc->ep);
-	/* Hold the sock. */
+	/* Hold the sock.  */
 	asoc->base.sk = (struct sock *)sk;
 	sock_hold(asoc->base.sk);
-	/* Initialize the common base substructure. */
+	/* Initialize the common base substructure.  */
 	asoc->base.type = SCTP_EP_TYPE_ASSOCIATION;
-	/* Initialize the object handling fields. */
+	/* Initialize the object handling fields.  */
 	atomic_set(&asoc->base.refcnt, 1);
 	asoc->base.dead = 0;
 	asoc->base.malloced = 0;
-	/* Initialize the bind addr area. */
+	/* Initialize the bind addr area.  */
 	sctp_bind_addr_init(&asoc->base.bind_addr, ep->base.bind_addr.port);
 	asoc->base.addr_lock = RW_LOCK_UNLOCKED;
@@ -135,7 +135,7 @@ sctp_association_t *sctp_association_init(sctp_association_t *asoc,
 	asoc->pmtu = 0;
 	asoc->frag_point = 0;
-	/* Initialize the default association max_retrans and RTO values. */
+	/* Initialize the default association max_retrans and RTO values.  */
 	asoc->max_retrans = ep->proto->max_retrans_association;
 	asoc->rto_initial = ep->proto->rto_initial;
 	asoc->rto_max = ep->proto->rto_max;
@@ -288,7 +288,6 @@ sctp_association_t *sctp_association_init(sctp_association_t *asoc,
 	return NULL;
 }
 /* Free this association if possible.  There may still be users, so
 * the actual deallocation may be delayed.
 */
@@ -330,6 +329,11 @@ void sctp_association_free(sctp_association_t *asoc)
 			sctp_association_put(asoc);
 	}
+	/* Free peer's cached cookie. */
+	if (asoc->peer.cookie) {
+		kfree(asoc->peer.cookie);
+	}
 	/* Release the transport structures. */
 	list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) {
 		transport = list_entry(pos, sctp_transport_t, transports);
@@ -342,7 +346,6 @@ void sctp_association_free(sctp_association_t *asoc)
 	sctp_association_put(asoc);
 }
 /* Cleanup and free up an association. */
 static void sctp_association_destroy(sctp_association_t *asoc)
 {
@@ -383,12 +386,11 @@ sctp_transport_t *sctp_assoc_add_peer(sctp_association_t *asoc,
 	};
 	/* Set the port if it has not been set yet.  */
-        if (0 == asoc->peer.port) {
+	if (0 == asoc->peer.port) {
-                asoc->peer.port = *port;
+		asoc->peer.port = *port;
-        }
+	}
-	SCTP_ASSERT(*port == asoc->peer.port, ":Invalid port\n",
+	SCTP_ASSERT(*port == asoc->peer.port, ":Invalid port\n", return NULL);
-		    return NULL);
 	/* Check to see if this is a duplicate. */
 	peer = sctp_assoc_lookup_paddr(asoc, addr);
@@ -461,11 +463,21 @@ sctp_transport_t *sctp_assoc_add_peer(sctp_association_t *asoc,
 	sp = sctp_sk(asoc->base.sk);
 	peer->hb_interval = sp->paddrparam.spp_hbinterval * HZ;
-        /* Attach the remote transport to our asoc.  */
+	/* Attach the remote transport to our asoc.  */
 	list_add_tail(&peer->transports, &asoc->peer.transport_addr_list);
 	/* If we do not yet have a primary path, set one.  */
-        if (NULL == asoc->peer.primary_path) {
+	if (NULL == asoc->peer.primary_path) {
+		asoc->peer.primary_path = peer;
+		/* Set a default msg_name for events. */
+		memcpy(&asoc->peer.primary_addr, &peer->ipaddr,
+		       sizeof(sockaddr_storage_t));
+		asoc->peer.active_path = peer;
+		asoc->peer.retran_path = peer;
+	}
+	/* If we do not yet have a primary path, set one.  */
+	if (NULL == asoc->peer.primary_path) {
 		asoc->peer.primary_path = peer;
 		asoc->peer.active_path = peer;
 		asoc->peer.retran_path = peer;
@@ -617,7 +629,7 @@ __u32 __sctp_association_get_next_tsn(sctp_association_t *asoc)
 	asoc->next_tsn++;
 	asoc->unack_data++;
-        return retval;
+	return retval;
 }
 /* Allocate 'num' TSNs by incrementing the association's TSN by num. */
@@ -739,7 +751,7 @@ int sctp_cmp_addr_exact(const sockaddr_storage_t *ss1,
 * Note:  We are sly and return a shared, prealloced chunk.
 */
 sctp_chunk_t *sctp_get_ecne_prepend(sctp_association_t *asoc)
-{ 
+{
 	sctp_chunk_t *chunk;
 	int need_ecne;
 	__u32 lowest_tsn;
@@ -892,7 +904,7 @@ static void sctp_assoc_bh_rcv(sctp_association_t *asoc)
 		/* Check to see if the association is freed in response to 
 		 * the incoming chunk.  If so, get out of the while loop.
-		 */ 
+		 */
 		if (!sctp_id2assoc(sk, associd))
 			goto out;
@@ -967,7 +979,7 @@ void sctp_assoc_update(sctp_association_t *asoc, sctp_association_t *new)
 		 * and peer's streams.
 		 */
 		for (i = 0; i < SCTP_MAX_STREAM; i++) {
-			asoc->ssn[i]      = 0;
+			asoc->ssn[i] = 0;
 			asoc->ulpq.ssn[i] = 0;
 		}
 	} else {

--- a/net/sctp/bind_addr.c
+++ b/net/sctp/bind_addr.c
 /* SCTP kernel reference Implementation
- * Copyright (c) Cisco 1999,2000 
+ * Copyright (c) Cisco 1999,2000
- * Copyright (c) Motorola 1999,2000,2001 
+ * Copyright (c) Motorola 1999,2000,2001
 * Copyright (c) International Business Machines Corp., 2001
 * Copyright (c) La Monte H.P. Yarroll 2001
 *
 * This file is part of the SCTP kernel reference implementation.
- * 
+ *
- * A collection class to handle the storage of transport addresses. 
+ * A collection class to handle the storage of transport addresses.
- * 
+ *
- * The SCTP reference implementation is free software; 
+ * The SCTP reference implementation is free software;
- * you can redistribute it and/or modify it under the terms of 
+ * you can redistribute it and/or modify it under the terms of
 * the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
- * 
+ *
- * The SCTP reference implementation is distributed in the hope that it 
+ * The SCTP reference implementation is distributed in the hope that it
 * will be useful, but WITHOUT ANY WARRANTY; without even the implied
 *                 ************************
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with GNU CC; see the file COPYING.  If not, write to
 * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.  
+ * Boston, MA 02111-1307, USA.
- * 
+ *
 * Please send any bug reports or fixes you make to the
 * email address(es):
 *    lksctp developers <lksctp-developers@lists.sourceforge.net>
- * 
+ *
 * Or submit a bug report through the following website:
 *    http://www.sf.net/projects/lksctp
 *
- * Written or modified by: 
+ * Written or modified by:
 *    La Monte H.P. Yarroll <piggy@acm.org>
 *    Karl Knutson          <karl@athena.chicago.il.us>
 *    Jon Grimm             <jgrimm@us.ibm.com>
 *    Daisy Chang           <daisyc@us.ibm.com>
- * 
+ *
 * Any bugs reported given to us we will try to fix... any fixes shared will
 * be incorporated into the next SCTP release.
 */
@@ -83,7 +83,7 @@ int sctp_bind_addr_copy(sctp_bind_addr_t *dest, const sctp_bind_addr_t *src,
 out:
 	if (error)
 		sctp_bind_addr_clean(dest);
 	return error;
 }
@@ -356,7 +356,7 @@ int sctp_in_scope(const sockaddr_storage_t *addr, sctp_scope_t scope)
 	case AF_INET:
 		/* According to the SCTP IPv4 address scoping document -
 		 * <draft-stewart-tsvwg-sctp-ipv4-00.txt>, the scope has
-		 * a heirarchy of 5 levels: 
+		 * a heirarchy of 5 levels:
 		 * Level 0 - unusable SCTP addresses
 		 * Level 1 - loopback address
 		 * Level 2 - link-local addresses

--- a/net/sctp/command.c
+++ b/net/sctp/command.c
 /* SCTP kernel reference Implementation Copyright (C) 1999-2001
 * Cisco, Motorola, and IBM
 * Copyright 2001 La Monte H.P. Yarroll
- * 
+ *
 * This file is part of the SCTP kernel reference Implementation
- * 
+ *
 * These functions manipulate sctp command sequences.
- * 
+ *
- * The SCTP reference implementation is free software; 
+ * The SCTP reference implementation is free software;
- * you can redistribute it and/or modify it under the terms of 
+ * you can redistribute it and/or modify it under the terms of
 * the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
- * 
+ *
- * The SCTP reference implementation is distributed in the hope that it 
+ * The SCTP reference implementation is distributed in the hope that it
 * will be useful, but WITHOUT ANY WARRANTY; without even the implied
 *                 ************************
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with GNU CC; see the file COPYING.  If not, write to
 * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.  
+ * Boston, MA 02111-1307, USA.
- * 
+ *
 * Please send any bug reports or fixes you make to the
 * email address(es):
 *    lksctp developers <lksctp-developers@lists.sourceforge.net>
- * 
+ *
 * Or submit a bug report through the following website:
 *    http://www.sf.net/projects/lksctp
 *
- * Written or modified by: 
+ * Written or modified by:
 *    La Monte H.P. Yarroll <piggy@acm.org>
 *    Karl Knutson <karl@athena.chicago.il.us>
- * 
+ *
 * Any bugs reported given to us we will try to fix... any fixes shared will
 * be incorporated into the next SCTP release.
 */

--- a/net/sctp/debug.c
+++ b/net/sctp/debug.c
@@ -198,6 +198,7 @@ static const char *sctp_timer_tbl[] = {
 	"TIMEOUT_T2_SHUTDOWN",
 	"TIMEOUT_T3_RTX",
 	"TIMEOUT_T4_RTO",
+	"TIMEOUT_T5_SHUTDOWN_GUARD",
 	"TIMEOUT_HEARTBEAT",
 	"TIMEOUT_SACK",
 	"TIMEOUT_AUTOCLOSE",

--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -5,46 +5,46 @@
 * Copyright (c) 2001 Intel Corp.
 * Copyright (c) 2001 Nokia, Inc.
 * Copyright (c) 2001 La Monte H.P. Yarroll
- * 
+ *
 * This file is part of the SCTP kernel reference Implementation
- * 
+ *
- * This abstraction represents an SCTP endpoint.   
+ * This abstraction represents an SCTP endpoint.
 *
 * This file is part of the implementation of the add-IP extension,
 * based on <draft-ietf-tsvwg-addip-sctp-02.txt> June 29, 2001,
 * for the SCTP kernel reference Implementation.
- * 
+ *
- * The SCTP reference implementation is free software; 
+ * The SCTP reference implementation is free software;
- * you can redistribute it and/or modify it under the terms of 
+ * you can redistribute it and/or modify it under the terms of
 * the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
- * 
+ *
- * The SCTP reference implementation is distributed in the hope that it 
+ * The SCTP reference implementation is distributed in the hope that it
 * will be useful, but WITHOUT ANY WARRANTY; without even the implied
 *                 ************************
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with GNU CC; see the file COPYING.  If not, write to
 * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.  
+ * Boston, MA 02111-1307, USA.
- * 
+ *
 * Please send any bug reports or fixes you make to the
 * email address(es):
 *    lksctp developers <lksctp-developers@lists.sourceforge.net>
- * 
+ *
 * Or submit a bug report through the following website:
 *    http://www.sf.net/projects/lksctp
 *
- * Written or modified by: 
+ * Written or modified by:
 *    La Monte H.P. Yarroll <piggy@acm.org>
 *    Karl Knutson <karl@athena.chicago.il.us>
 *    Jon Grimm <jgrimm@austin.ibm.com>
 *    Daisy Chang <daisyc@us.ibm.com>
 *    Dajiang Zhang <dajiang.zhang@nokia.com>
- * 
+ *
 * Any bugs reported given to us we will try to fix... any fixes shared will
 * be incorporated into the next SCTP release.
 */
@@ -92,15 +92,16 @@ sctp_endpoint_t *sctp_endpoint_new(sctp_protocol_t *proto,
 sctp_endpoint_t *sctp_endpoint_init(sctp_endpoint_t *ep, sctp_protocol_t *proto,
 				    struct sock *sk, int priority)
 {
+	sctp_opt_t *sp = sctp_sk(sk);
 	memset(ep, 0, sizeof(sctp_endpoint_t));
 	/* Initialize the base structure. */
 	/* What type of endpoint are we?  */
 	ep->base.type = SCTP_EP_TYPE_SOCKET;
-        /* Initialize the basic object fields. */
+	/* Initialize the basic object fields. */
 	atomic_set(&ep->base.refcnt, 1);
-	ep->base.dead     = 0;
+	ep->base.dead = 0;
 	ep->base.malloced = 1;
 	/* Create an input queue.  */
@@ -129,22 +130,30 @@ sctp_endpoint_t *sctp_endpoint_init(sctp_endpoint_t *ep, sctp_protocol_t *proto,
 	/* Set up the base timeout information.  */
 	ep->timeouts[SCTP_EVENT_TIMEOUT_NONE] = 0;
-	ep->timeouts[SCTP_EVENT_TIMEOUT_T1_COOKIE]
+	ep->timeouts[SCTP_EVENT_TIMEOUT_T1_COOKIE] = 
-		= SCTP_DEFAULT_TIMEOUT_T1_COOKIE;
+		SCTP_DEFAULT_TIMEOUT_T1_COOKIE;
-	ep->timeouts[SCTP_EVENT_TIMEOUT_T1_INIT]
+	ep->timeouts[SCTP_EVENT_TIMEOUT_T1_INIT] = 
-		= SCTP_DEFAULT_TIMEOUT_T1_INIT;
+		SCTP_DEFAULT_TIMEOUT_T1_INIT;
-	ep->timeouts[SCTP_EVENT_TIMEOUT_T2_SHUTDOWN]
+	ep->timeouts[SCTP_EVENT_TIMEOUT_T2_SHUTDOWN] = 
-		= sctp_sk(sk)->rtoinfo.srto_initial;
+		sp->rtoinfo.srto_initial;
 	ep->timeouts[SCTP_EVENT_TIMEOUT_T3_RTX] = 0;
 	ep->timeouts[SCTP_EVENT_TIMEOUT_T4_RTO] = 0;
-	ep->timeouts[SCTP_EVENT_TIMEOUT_HEARTBEAT]
-		= SCTP_DEFAULT_TIMEOUT_HEARTBEAT;
+	/* sctpimpguide-05 Section 2.12.2
-	ep->timeouts[SCTP_EVENT_TIMEOUT_SACK]
+	 * If the 'T5-shutdown-guard' timer is used, it SHOULD be set to the
-		= SCTP_DEFAULT_TIMEOUT_SACK;
+	 * recommended value of 5 times 'RTO.Max'.
-	ep->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE]
+	 */
-		= sctp_sk(sk)->autoclose * HZ;
+        ep->timeouts[SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD]
-	ep->timeouts[SCTP_EVENT_TIMEOUT_PMTU_RAISE]
+		= 5 * sp->rtoinfo.srto_max;
-		= SCTP_DEFAULT_TIMEOUT_PMTU_RAISE;
+	ep->timeouts[SCTP_EVENT_TIMEOUT_HEARTBEAT] = 
+		SCTP_DEFAULT_TIMEOUT_HEARTBEAT;
+	ep->timeouts[SCTP_EVENT_TIMEOUT_SACK] = 
+		SCTP_DEFAULT_TIMEOUT_SACK;
+	ep->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] = 
+		sp->autoclose * HZ;
+	ep->timeouts[SCTP_EVENT_TIMEOUT_PMTU_RAISE] = 
+		SCTP_DEFAULT_TIMEOUT_PMTU_RAISE;
 	/* Set up the default send/receive buffer space.  */
@@ -251,9 +260,10 @@ sctp_endpoint_t *sctp_endpoint_is_match(sctp_endpoint_t *ep,
 * We do a linear search of the associations for this endpoint.
 * We return the matching transport address too.
 */
-sctp_association_t *__sctp_endpoint_lookup_assoc(const sctp_endpoint_t *endpoint,
+sctp_association_t *__sctp_endpoint_lookup_assoc(
-						 const sockaddr_storage_t *paddr,
+	const sctp_endpoint_t *endpoint,
-						 sctp_transport_t **transport)
+	const sockaddr_storage_t *paddr,
+	sctp_transport_t **transport)
 {
 	int rport;
 	sctp_association_t *asoc;
@@ -310,7 +320,7 @@ static void sctp_endpoint_bh_rcv(sctp_endpoint_t *ep)
 	asoc = NULL;
 	inqueue = &ep->base.inqueue;
-	sk      = ep->base.sk;
+	sk = ep->base.sk;
 	while (NULL != (chunk = sctp_pop_inqueue(inqueue))) {
 		subtype.chunk = chunk->chunk_hdr->type;
@@ -343,15 +353,15 @@ static void sctp_endpoint_bh_rcv(sctp_endpoint_t *ep)
 		/* FIX ME We really would rather NOT have to use
 		 * GFP_ATOMIC.
 		 */
-                error = sctp_do_sm(SCTP_EVENT_T_CHUNK, subtype, state,
+		error = sctp_do_sm(SCTP_EVENT_T_CHUNK, subtype, state,
                                   ep, asoc, chunk, GFP_ATOMIC);
 		if (error != 0)
 			goto err_out;
-		/* Check to see if the endpoint is freed in response to 
+		/* Check to see if the endpoint is freed in response to
 		 * the incoming chunk. If so, get out of the while loop.
-		 */ 
+		 */
 		if (!sctp_sk(sk)->ep)
 			goto out;
 	}
@@ -360,10 +370,5 @@ static void sctp_endpoint_bh_rcv(sctp_endpoint_t *ep)
 	/* Is this the right way to pass errors up to the ULP?  */
 	if (error)
 		ep->base.sk->err = -error;
 out:
 }
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -5,43 +5,43 @@
 * Copyright (c) 2001 Intel Corp.
 * Copyright (c) 2001 Nokia, Inc.
 * Copyright (c) 2001 La Monte H.P. Yarroll
- * 
+ *
 * This file is part of the SCTP kernel reference Implementation
- * 
+ *
- * These functions handle all input from the IP layer into SCTP. 
+ * These functions handle all input from the IP layer into SCTP.
- * 
+ *
- * The SCTP reference implementation is free software; 
+ * The SCTP reference implementation is free software;
- * you can redistribute it and/or modify it under the terms of 
+ * you can redistribute it and/or modify it under the terms of
 * the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
- * 
+ *
- * The SCTP reference implementation is distributed in the hope that it 
+ * The SCTP reference implementation is distributed in the hope that it
 * will be useful, but WITHOUT ANY WARRANTY; without even the implied
 *                 ************************
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with GNU CC; see the file COPYING.  If not, write to
 * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.  
+ * Boston, MA 02111-1307, USA.
- * 
+ *
 * Please send any bug reports or fixes you make to the
 * email address(es):
 *    lksctp developers <lksctp-developers@lists.sourceforge.net>
- * 
+ *
 * Or submit a bug report through the following website:
 *    http://www.sf.net/projects/lksctp
 *
- * Written or modified by: 
+ * Written or modified by:
 *    La Monte H.P. Yarroll <piggy@acm.org>
 *    Karl Knutson <karl@athena.chicago.il.us>
 *    Xingang Guo <xingang.guo@intel.com>
 *    Jon Grimm <jgrimm@us.ibm.com>
 *    Hui Huang <hui.huang@nokia.com>
 *    Daisy Chang <daisyc@us.ibm.com>
- * 
+ *
 * Any bugs reported given to us we will try to fix... any fixes shared will
 * be incorporated into the next SCTP release.
 */
@@ -57,7 +57,7 @@
 #include <net/sctp/sm.h>
 /* Forward declarations for internal helpers. */
-static int sctp_rcv_ootb(struct sk_buff *); 
+static int sctp_rcv_ootb(struct sk_buff *);
 sctp_association_t *__sctp_rcv_lookup(struct sk_buff *skb,
 				      const sockaddr_storage_t *laddr,
 				      const sockaddr_storage_t *paddr,
@@ -639,7 +639,7 @@ static sctp_association_t *__sctp_rcv_initack_lookup(struct sk_buff *skb,
 /* Lookup an association for an inbound skb. */
 sctp_association_t *__sctp_rcv_lookup(struct sk_buff *skb,
 				      const sockaddr_storage_t *paddr,
-				      const sockaddr_storage_t *laddr, 
+				      const sockaddr_storage_t *laddr,
 				      sctp_transport_t **transportp)
 {
 	sctp_association_t *asoc;

--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -2,36 +2,36 @@
 * Copyright (c) 2001 Nokia, Inc.
 * Copyright (c) 2001 La Monte H.P. Yarroll
 * Copyright (c) 2002 International Business Machines, Corp.
- * 
+ *
 * This file is part of the SCTP kernel reference Implementation
- * 
+ *
 * SCTP over IPv6.
- * 
+ *
- * The SCTP reference implementation is free software; 
+ * The SCTP reference implementation is free software;
- * you can redistribute it and/or modify it under the terms of 
+ * you can redistribute it and/or modify it under the terms of
 * the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
- * 
+ *
- * The SCTP reference implementation is distributed in the hope that it 
+ * The SCTP reference implementation is distributed in the hope that it
 * will be useful, but WITHOUT ANY WARRANTY; without even the implied
 *                 ************************
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with GNU CC; see the file COPYING.  If not, write to
 * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.  
+ * Boston, MA 02111-1307, USA.
- * 
+ *
 * Please send any bug reports or fixes you make to the
 * email address(es):
 *    lksctp developers <lksctp-developers@lists.sourceforge.net>
- * 
+ *
 * Or submit a bug report through the following website:
 *    http://www.sf.net/projects/lksctp
 *
- * Written or modified by: 
+ * Written or modified by:
 *    Le Yanqun             <yanqun.le@nokia.com>
 *    Hui Huang		    <hui.huang@nokia.com>
 *    La Monte H.P. Yarroll <piggy@acm.org>
@@ -40,7 +40,7 @@
 *
 * Based on:
 *      linux/net/ipv6/tcp_ipv6.c
- * 
+ *
 * Any bugs reported given to us we will try to fix... any fixes shared will
 * be incorporated into the next SCTP release.
 */
@@ -145,7 +145,7 @@ static inline int sctp_v6_xmit(struct sk_buff *skb)
 			      IPV6_ADDR_LOOPBACK)) {
 				ipv6_addr_copy(&saddr, &np->daddr);
 			}
-		}			
+		}
 		fl.fl6_src = &saddr;
 	} else {
 		fl.fl6_src = &np->saddr;
@@ -177,7 +177,7 @@ int sctp_v6_get_dst_mtu(const sockaddr_storage_t *address)
 	if (dst) {
 		dst_mtu = dst->pmtu;
 		SCTP_DEBUG_PRINTK("sctp_v6_get_dst_mtu: "
-				  "ip6_route_output: dev:%s pmtu:%d\n", 
+				  "ip6_route_output: dev:%s pmtu:%d\n",
 				  dst->dev->name, dst_mtu);
 		dst_release(dst);
 	} else {
@@ -189,11 +189,85 @@ int sctp_v6_get_dst_mtu(const sockaddr_storage_t *address)
 	return dst_mtu;
 }
+/* Initialize a PF_INET6 socket msg_name. */
+static void sctp_inet6_msgname(char *msgname, int *addr_len)
+{
+	struct sockaddr_in6 *sin6;
+	sin6 = (struct sockaddr_in6 *)msgname;
+	sin6->sin6_family = AF_INET6;
+	sin6->sin6_flowinfo = 0;
+	sin6->sin6_scope_id = 0;
+	*addr_len = sizeof(struct sockaddr_in6);
+}
+/* Initialize a PF_INET msgname from a ulpevent. */
+static void sctp_inet6_event_msgname(sctp_ulpevent_t *event, char *msgname, int *addrlen)
+{
+	struct sockaddr_in6 *sin6, *sin6from;
+	if (msgname) {
+		sockaddr_storage_t *addr;
+		sctp_inet6_msgname(msgname, addrlen);
+		sin6 = (struct sockaddr_in6 *)msgname;
+		sin6->sin6_port = htons(event->asoc->peer.port);
+		addr = &event->asoc->peer.primary_addr;
+		/* Note: If we go to a common v6 format, this code
+		 * will change.
+		 */
+		/* Map ipv4 address into v4-mapped-on-v6 address.  */
+		if (AF_INET == addr->sa.sa_family) {
+			/* FIXME: Easy, but there was no way to test this
+			 * yet.
+			 */
+			return;
+		}
+		sin6from = &event->asoc->peer.primary_addr.v6;
+		ipv6_addr_copy(&sin6->sin6_addr, &sin6from->sin6_addr);
+	}
+}
+/* Initialize a msg_name from an inbound skb. */
+static void sctp_inet6_skb_msgname(struct sk_buff *skb, char *msgname,
+				   int *addr_len)
+{
+	struct sctphdr *sh;
+	struct sockaddr_in6 *sin6;
+	if (msgname) {
+		sctp_inet6_msgname(msgname, addr_len);
+		sin6 = (struct sockaddr_in6 *)msgname;
+		sh = (struct sctphdr *)skb->h.raw;
+		sin6->sin6_port = sh->source;
+		/* FIXME: Map ipv4 address into v4-mapped-on-v6 address. */
+		if (__constant_htons(ETH_P_IP) == skb->protocol) {
+			/* FIXME: Easy, but there was no way to test this
+			 * yet.
+			 */
+			return;
+		}
+		/* Otherwise, just copy the v6 address. */
+		ipv6_addr_copy(&sin6->sin6_addr, &skb->nh.ipv6h->saddr);
+		if (ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL) {
+			struct inet6_skb_parm *opt =
+				(struct inet6_skb_parm *) skb->cb;
+			sin6->sin6_scope_id = opt->iif;
+		}
+	}
+}
 static struct proto_ops inet6_seqpacket_ops = {
 	.family     = PF_INET6,
 	.release    = inet6_release,
 	.bind       = inet6_bind,
-	.connect    = inet_dgram_connect,   
+	.connect    = inet_dgram_connect,
 	.socketpair = sock_no_socketpair,
 	.accept     = inet_accept,
 	.getname    = inet6_getname,
@@ -238,15 +312,22 @@ static sctp_func_t sctp_ipv6_specific = {
 	.sa_family       = AF_INET6,
 };
+static sctp_pf_t sctp_pf_inet6_specific = {
+	.event_msgname = sctp_inet6_event_msgname,
+	.skb_msgname   = sctp_inet6_skb_msgname,
+};
 /* Initialize IPv6 support and register with inet6 stack.  */
 int sctp_v6_init(void)
 {
 	/* Add SCTPv6 to inetsw6 linked list. */
 	inet6_register_protosw(&sctpv6_protosw);
 	/* Register inet6 protocol. */
 	inet6_add_protocol(&sctpv6_protocol);
+	/* Register the SCTP specfic PF_INET6 functions. */
+	sctp_set_pf_specific(PF_INET6, &sctp_pf_inet6_specific);
 	/* Fill in address family info.  */
 	INIT_LIST_HEAD(&sctp_ipv6_specific.list);
 	list_add_tail(&sctp_ipv6_specific.list, &sctp_proto.address_families);

--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -2,41 +2,41 @@
 * Copyright (c) 1999-2000 Cisco, Inc.
 * Copyright (c) 1999-2001 Motorola, Inc.
 * Copyright (c) 2001 International Business Machines, Corp.
- * 
+ *
 * This file is part of the SCTP kernel reference Implementation
- * 
+ *
 * These functions handle output processing.
- *  
+ *
- * The SCTP reference implementation is free software; 
+ * The SCTP reference implementation is free software;
- * you can redistribute it and/or modify it under the terms of 
+ * you can redistribute it and/or modify it under the terms of
 * the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
- * 
+ *
- * The SCTP reference implementation is distributed in the hope that it 
+ * The SCTP reference implementation is distributed in the hope that it
 * will be useful, but WITHOUT ANY WARRANTY; without even the implied
 *                 ************************
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with GNU CC; see the file COPYING.  If not, write to
 * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.  
+ * Boston, MA 02111-1307, USA.
- * 
+ *
 * Please send any bug reports or fixes you make to the
 * email address(es):
 *    lksctp developers <lksctp-developers@lists.sourceforge.net>
- * 
+ *
 * Or submit a bug report through the following website:
 *    http://www.sf.net/projects/lksctp
 *
- * Written or modified by: 
+ * Written or modified by:
 *    La Monte H.P. Yarroll <piggy@acm.org>
 *    Karl Knutson          <karl@athena.chicago.il.us>
 *    Jon Grimm             <jgrimm@austin.ibm.com>
 *    Sridhar Samudrala     <sri@us.ibm.com>
- * 
+ *
 * Any bugs reported given to us we will try to fix... any fixes shared will
 * be incorporated into the next SCTP release.
 */
@@ -48,7 +48,7 @@
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/init.h>
-#include <net/inet_ecn.h> 
+#include <net/inet_ecn.h>
 #include <net/icmp.h>
 #ifndef TEST_FRAME
@@ -113,7 +113,7 @@ void sctp_packet_free(sctp_packet_t *packet)
 {
 	sctp_chunk_t *chunk;
-        while (NULL !=
+        while (NULL != 
 	       (chunk = (sctp_chunk_t *)skb_dequeue(&packet->chunks))) {
 		sctp_free_chunk(chunk);
 	}
@@ -129,7 +129,8 @@ void sctp_packet_free(sctp_packet_t *packet)
 * as it can fit in the packet, but any more data that does not fit in this
 * packet can be sent only after receiving the COOKIE_ACK.
 */
-sctp_xmit_t sctp_packet_transmit_chunk(sctp_packet_t *packet, sctp_chunk_t *chunk)
+sctp_xmit_t sctp_packet_transmit_chunk(sctp_packet_t *packet,
+				       sctp_chunk_t *chunk)
 {
 	sctp_xmit_t retval;
 	int error = 0;
@@ -181,8 +182,8 @@ sctp_xmit_t sctp_packet_append_chunk(sctp_packet_t *packet, sctp_chunk_t *chunk)
 		/* Both control chunks and data chunks with TSNs are
 		 * non-fragmentable.
 		 */
-		int fragmentable = sctp_chunk_is_data(chunk) 
+		int fragmentable = sctp_chunk_is_data(chunk) && 
-			&& (!chunk->has_tsn);
+			(!chunk->has_tsn);
 		if (packet_empty) {
 			if (fragmentable) {
 				retval = SCTP_XMIT_MUST_FRAG;
@@ -221,10 +222,8 @@ sctp_xmit_t sctp_packet_append_chunk(sctp_packet_t *packet, sctp_chunk_t *chunk)
 	}
 	/* It is OK to send this chunk.  */
-	skb_queue_tail(&packet->chunks,
+	skb_queue_tail(&packet->chunks, (struct sk_buff *)chunk);
-		       (struct sk_buff *)chunk);
 	packet->size += chunk_len;
 finish:
 	return retval;
 }
@@ -305,7 +304,7 @@ int sctp_packet_transmit(sctp_packet_t *packet)
 			 */
 			if ((1 == chunk->num_times_sent) &&
 			    (!transport->rto_pending)) {
-				chunk->rtt_in_progress = 1;	
+				chunk->rtt_in_progress = 1;
 				transport->rto_pending = 1;
 			}
 			packet_has_data = 1;
@@ -337,9 +336,9 @@ int sctp_packet_transmit(sctp_packet_t *packet)
 	}
 	/* Build the SCTP header.  */
-	sh = (struct sctphdr *) skb_push(nskb, sizeof(struct sctphdr));
+	sh = (struct sctphdr *)skb_push(nskb, sizeof(struct sctphdr));
-	sh->source		= htons(packet->source_port);
+	sh->source = htons(packet->source_port);
-	sh->dest		= htons(packet->destination_port);
+	sh->dest   = htons(packet->destination_port);
 	/* From 6.8 Adler-32 Checksum Calculation:
 	 * After the packet is constructed (containing the SCTP common
@@ -349,8 +348,8 @@ int sctp_packet_transmit(sctp_packet_t *packet)
 	 * 1) Fill in the proper Verification Tag in the SCTP common
 	 *    header and initialize the checksum field to 0's.
 	 */
-	sh->vtag	= htonl(packet->vtag);
+	sh->vtag     = htonl(packet->vtag);
-	sh->checksum	= 0;
+	sh->checksum = 0;
 	/* 2) Calculate the Adler-32 checksum of the whole packet,
 	 *    including the SCTP common header and all the
@@ -467,7 +466,8 @@ static void sctp_packet_reset(sctp_packet_t *packet)
 }
 /* This private function handles the specifics of appending DATA chunks.  */
-static sctp_xmit_t sctp_packet_append_data(sctp_packet_t *packet, sctp_chunk_t *chunk)
+static sctp_xmit_t sctp_packet_append_data(sctp_packet_t *packet, 
+					   sctp_chunk_t *chunk)
 {
 	sctp_xmit_t retval = SCTP_XMIT_OK;
 	size_t datasize, rwnd, inflight;
@@ -502,12 +502,13 @@ static sctp_xmit_t sctp_packet_append_data(sctp_packet_t *packet, sctp_chunk_t *
 		}
 	}
-	/* sctpimpguide-05 2.14.2 D) When the time comes for the sender to
+	/* sctpimpguide-05 2.14.2
+	 * D) When the time comes for the sender to
 	 * transmit new DATA chunks, the protocol parameter Max.Burst MUST
 	 * first be applied to limit how many new DATA chunks may be sent.
 	 * The limit is applied by adjusting cwnd as follows:
-	 * 	if((flightsize + Max.Burst*MTU) < cwnd)
+	 * 	if ((flightsize + Max.Burst * MTU) < cwnd)
-	 *		cwnd = flightsize + Max.Burst*MTU
+	 *		cwnd = flightsize + Max.Burst * MTU
 	 */
 	max_burst_bytes = transport->asoc->max_burst * transport->asoc->pmtu;
 	if ((transport->flight_size + max_burst_bytes) < transport->cwnd) {
@@ -516,11 +517,11 @@ static sctp_xmit_t sctp_packet_append_data(sctp_packet_t *packet, sctp_chunk_t *
 				  "transport: %p, cwnd: %d, "
 				  "ssthresh: %d, flight_size: %d, "
 				  "pba: %d\n",
-				   __FUNCTION__, transport,
+				  __FUNCTION__, transport,
-				   transport->cwnd,
+				  transport->cwnd,
-				   transport->ssthresh,
+				  transport->ssthresh,
-				   transport->flight_size,
+				  transport->flight_size,
-				   transport->partial_bytes_acked);
+				  transport->partial_bytes_acked);
 	}
 	/* RFC 2960 6.1  Transmission of DATA Chunks
@@ -552,7 +553,3 @@ static sctp_xmit_t sctp_packet_append_data(sctp_packet_t *packet, sctp_chunk_t *
 finish:
 	return retval;
 }
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
--- a/net/sctp/primitive.c
+++ b/net/sctp/primitive.c
 /* SCTP kernel reference Implementation
 * Copyright (c) 1999-2000 Cisco, Inc.
 * Copyright (c) 1999-2001 Motorola, Inc.
- * 
+ *
 * This file is part of the SCTP kernel reference Implementation
- * 
+ *
 * These functions implement the SCTP primitive functions from Section 10.
- * 
+ *
 * Note that the descriptions from the specification are USER level
 * functions--this file is the functions which populate the struct proto
 * for SCTP which is the BOTTOM of the sockets interface.
- * 
+ *
- * The SCTP reference implementation is free software; 
+ * The SCTP reference implementation is free software;
- * you can redistribute it and/or modify it under the terms of 
+ * you can redistribute it and/or modify it under the terms of
 * the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
- * 
+ *
- * The SCTP reference implementation is distributed in the hope that it 
+ * The SCTP reference implementation is distributed in the hope that it
 * will be useful, but WITHOUT ANY WARRANTY; without even the implied
 *                 ************************
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with GNU CC; see the file COPYING.  If not, write to
 * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.  
+ * Boston, MA 02111-1307, USA.
- * 
+ *
 * Please send any bug reports or fixes you make to the
 * email address(es):
 *    lksctp developers <lksctp-developers@lists.sourceforge.net>
- * 
+ *
 * Or submit a bug report through the following website:
 *    http://www.sf.net/projects/lksctp
 *
- * Written or modified by: 
+ * Written or modified by:
 *    La Monte H.P. Yarroll <piggy@acm.org>
 *    Narasimha Budihal     <narasimha@refcode.org>
 *    Karl Knutson          <karl@athena.chicago.il.us>
- * 
+ *
 * Any bugs reported given to us we will try to fix... any fixes shared will
 * be incorporated into the next SCTP release.
 */

--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -66,6 +66,9 @@ struct proc_dir_entry	*proc_net_sctp;
 */
 static struct socket *sctp_ctl_socket;
+static sctp_pf_t *sctp_pf_inet6_specific;
+static sctp_pf_t *sctp_pf_inet_specific;
 extern struct net_proto_family inet_family_ops;
 /* Return the address of the control sock. */
@@ -91,7 +94,7 @@ void sctp_proc_init(void)
 void sctp_proc_exit(void)
 {
 	if (proc_net_sctp) {
-		proc_net_sctp= NULL;
+		proc_net_sctp = NULL;
 		remove_proc_entry("net/sctp", 0);
 	}
 }
@@ -135,7 +138,8 @@ static inline void sctp_v4_get_local_addr_list(sctp_protocol_t *proto,
 * the protocol structure.
 * FIXME: Make this an address family function.
 */
-static inline void sctp_v6_get_local_addr_list(sctp_protocol_t *proto, struct net_device *dev)
+static inline void sctp_v6_get_local_addr_list(sctp_protocol_t *proto, 
+					       struct net_device *dev)
 {
 #ifdef SCTP_V6_SUPPORT
 	/* FIXME: The testframe doesn't support this function. */
@@ -227,8 +231,8 @@ int sctp_copy_local_addr_list(sctp_protocol_t *proto, sctp_bind_addr_t *bp,
 	long flags __attribute__ ((unused));
 	sctp_spin_lock_irqsave(&proto->local_addr_lock, flags);
- 	list_for_each(pos, &proto->local_addr_list) {
+	list_for_each(pos, &proto->local_addr_list) {
- 		addr = list_entry(pos, struct sockaddr_storage_list, list);
+		addr = list_entry(pos, struct sockaddr_storage_list, list);
 		if (sctp_in_scope(&addr->a, scope)) {
 			/* Now that the address is in scope, check to see if
 			 * the address type is really supported by the local
@@ -239,8 +243,7 @@ int sctp_copy_local_addr_list(sctp_protocol_t *proto, sctp_bind_addr_t *bp,
 			    (((AF_INET6 == addr->a.sa.sa_family) &&
 			      (copy_flags & SCTP_ADDR6_ALLOWED) &&
 			      (copy_flags & SCTP_ADDR6_PEERSUPP)))) {
-				error = sctp_add_bind_addr(bp,
+				error = sctp_add_bind_addr(bp, &addr->a,
-							   &addr->a,
 							   priority);
 				if (error)
 					goto end_copy;
@@ -286,7 +289,8 @@ int sctp_v4_get_dst_mtu(const sockaddr_storage_t *address)
 /* Event handler for inet device events.
 * Basically, whenever there is an event, we re-build our local address list.
 */
-static int sctp_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)
+static int sctp_netdev_event(struct notifier_block *this, unsigned long event,
+			     void *ptr)
 {
 	long flags __attribute__ ((unused));
@@ -312,8 +316,8 @@ int sctp_ctl_sock_init(void)
 	err = sock_create(family, SOCK_SEQPACKET, IPPROTO_SCTP,
 			  &sctp_ctl_socket);
 	if (err < 0) {
-		printk(KERN_ERR 
+		printk(KERN_ERR
-			"SCTP: Failed to create the SCTP control socket.\n");
+		       "SCTP: Failed to create the SCTP control socket.\n");
 		return err;
 	}
 	sctp_ctl_socket->sk->allocation = GFP_ATOMIC;
@@ -347,6 +351,52 @@ sctp_func_t *sctp_get_af_specific(const sockaddr_storage_t *address)
 	return retval;
 }
+/* Common code to initialize a AF_INET msg_name. */
+static void sctp_inet_msgname(char *msgname, int *addr_len)
+{
+	struct sockaddr_in *sin;
+	sin = (struct sockaddr_in *)msgname;
+	*addr_len = sizeof(struct sockaddr_in);
+	sin->sin_family = AF_INET;
+	memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
+}
+/* Copy the primary address of the peer primary address as the msg_name. */
+static void sctp_inet_event_msgname(sctp_ulpevent_t *event, char *msgname, int *addr_len)
+{
+	struct sockaddr_in *sin, *sinfrom;
+	if (msgname) {
+		sctp_inet_msgname(msgname, addr_len);
+		sin = (struct sockaddr_in *)msgname;
+		sinfrom = &event->asoc->peer.primary_addr.v4;
+		sin->sin_port = htons(event->asoc->peer.port);
+		sin->sin_addr.s_addr = sinfrom->sin_addr.s_addr;
+	}
+} 
+/* Initialize and copy out a msgname from an inbound skb. */
+static void sctp_inet_skb_msgname(struct sk_buff *skb, char *msgname, int *addr_len)
+{
+	struct sctphdr *sh; 
+	struct sockaddr_in *sin;
+	if (msgname) {
+		sctp_inet_msgname(msgname, addr_len);
+		sin = (struct sockaddr_in *)msgname;
+		sh = (struct sctphdr *)skb->h.raw;
+		sin->sin_port = sh->source;
+		sin->sin_addr.s_addr = skb->nh.iph->saddr;
+	}
+} 
+static sctp_pf_t sctp_pf_inet = {
+	.event_msgname = sctp_inet_event_msgname,
+	.skb_msgname = sctp_inet_skb_msgname,
+};
 /* Registration for netdev events.  */
 struct notifier_block sctp_netdev_notifier = {
 	.notifier_call = sctp_netdev_event,
@@ -403,6 +453,34 @@ sctp_func_t sctp_ipv4_specific = {
 	.sa_family      = AF_INET,
 };
+sctp_pf_t *sctp_get_pf_specific(int family) {
+	switch (family) {
+	case PF_INET:
+		return sctp_pf_inet_specific;
+	case PF_INET6:
+		return sctp_pf_inet6_specific;
+	default:
+		return NULL;
+	}
+}
+/* Set the PF specific function table.  */
+void sctp_set_pf_specific(int family, sctp_pf_t *pf)
+{
+	switch (family) {
+	case PF_INET:
+		sctp_pf_inet_specific = pf;
+		break;
+	case PF_INET6:
+		sctp_pf_inet6_specific = pf;
+		break;
+	default:
+		BUG();
+		break;
+	}
+}
 /* Initialize the universe into something sensible.  */
 int sctp_init(void)
 {
@@ -421,9 +499,11 @@ int sctp_init(void)
 	/* Initialize object count debugging.  */
 	sctp_dbg_objcnt_init();
+	/* Initialize the SCTP specific PF functions. */
+	sctp_set_pf_specific(PF_INET, &sctp_pf_inet);
 	/*
-         * 14. Suggested SCTP Protocol Parameter Values
+	 * 14. Suggested SCTP Protocol Parameter Values
-         */
+	 */
 	/* The following protocol parameters are RECOMMENDED:  */
 	/* RTO.Initial              - 3  seconds */
 	sctp_proto.rto_initial		= SCTP_RTO_INITIAL;
@@ -468,7 +548,7 @@ int sctp_init(void)
 	sctp_proto.assoc_hashbucket = (sctp_hashbucket_t *)
 		kmalloc(4096 * sizeof(sctp_hashbucket_t), GFP_KERNEL);
 	if (!sctp_proto.assoc_hashbucket) {
-		printk (KERN_ERR "SCTP: Failed association hash alloc.\n");
+		printk(KERN_ERR "SCTP: Failed association hash alloc.\n");
 		status = -ENOMEM;
 		goto err_ahash_alloc;
 	}
@@ -482,7 +562,7 @@ int sctp_init(void)
 	sctp_proto.ep_hashbucket = (sctp_hashbucket_t *)
 		kmalloc(64 * sizeof(sctp_hashbucket_t), GFP_KERNEL);
 	if (!sctp_proto.ep_hashbucket) {
-		printk (KERN_ERR "SCTP: Failed endpoint_hash alloc.\n");
+		printk(KERN_ERR "SCTP: Failed endpoint_hash alloc.\n");
 		status = -ENOMEM;
 		goto err_ehash_alloc;
 	}
@@ -497,7 +577,7 @@ int sctp_init(void)
 	sctp_proto.port_hashtable = (sctp_bind_hashbucket_t *)
 		kmalloc(4096 * sizeof(sctp_bind_hashbucket_t), GFP_KERNEL);
 	if (!sctp_proto.port_hashtable) {
-		printk (KERN_ERR "SCTP: Failed bind hash alloc.");
+		printk(KERN_ERR "SCTP: Failed bind hash alloc.");
 		status = -ENOMEM;
 		goto err_bhash_alloc;
 	}

--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -9,36 +9,36 @@
 * This file includes part of the implementation of the add-IP extension,
 * based on <draft-ietf-tsvwg-addip-sctp-02.txt> June 29, 2001,
 * for the SCTP kernel reference Implementation.
- * 
+ *
 * These functions work with the state functions in sctp_sm_statefuns.c
 * to implement the state operations.  These functions implement the
 * steps which require modifying existing data structures.
- * 
+ *
- * The SCTP reference implementation is free software; 
+ * The SCTP reference implementation is free software;
- * you can redistribute it and/or modify it under the terms of 
+ * you can redistribute it and/or modify it under the terms of
 * the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
- * 
+ *
- * The SCTP reference implementation is distributed in the hope that it 
+ * The SCTP reference implementation is distributed in the hope that it
 * will be useful, but WITHOUT ANY WARRANTY; without even the implied
 *                 ************************
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with GNU CC; see the file COPYING.  If not, write to
 * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.  
+ * Boston, MA 02111-1307, USA.
- * 
+ *
 * Please send any bug reports or fixes you make to the
 * email address(es):
 *    lksctp developers <lksctp-developers@lists.sourceforge.net>
- * 
+ *
 * Or submit a bug report through the following website:
 *    http://www.sf.net/projects/lksctp
 *
- * Written or modified by: 
+ * Written or modified by:
 *    La Monte H.P. Yarroll <piggy@acm.org>
 *    Karl Knutson          <karl@athena.chicago.il.us>
 *    C. Robin              <chris@hundredacre.ac.uk>
@@ -73,7 +73,7 @@
 * support any address type.
 */
 static const sctp_supported_addrs_param_t sat_param = {
-	{           
+	{
 		SCTP_PARAM_SUPPORTED_ADDRESS_TYPES,
 		__constant_htons(SCTP_SAT_LEN),
 	},
@@ -204,7 +204,7 @@ sctp_chunk_t *sctp_make_init(const sctp_association_t *asoc,
 	 * PLEASE DO NOT FIXME [This version does not support Host Name.]
 	 */
-	retval = sctp_make_chunk(asoc, SCTP_CID_INIT, 0, chunksize); 
+	retval = sctp_make_chunk(asoc, SCTP_CID_INIT, 0, chunksize);
 	if (!retval)
 		goto nodata;
@@ -1204,7 +1204,7 @@ sctp_association_t *sctp_make_temp_asoc(const sctp_endpoint_t *ep,
 	case 6:
 		asoc->c.peer_addr.v6.sin6_family     = AF_INET6;
-		asoc->c.peer_addr.v6.sin6_port 
+		asoc->c.peer_addr.v6.sin6_port
 			= ntohs(chunk->sctp_hdr->source);
 		asoc->c.peer_addr.v6.sin6_flowinfo = 0; /* BUG BUG BUG */
 		asoc->c.peer_addr.v6.sin6_addr = chunk->skb->nh.ipv6h->saddr;
@@ -1245,7 +1245,7 @@ sctp_cookie_param_t *sctp_pack_cookie(const sctp_endpoint_t *ep,
 	 * functions simpler to write.
 	 */
 	if (bodysize % SCTP_COOKIE_MULTIPLE)
-		bodysize += SCTP_COOKIE_MULTIPLE 
+		bodysize += SCTP_COOKIE_MULTIPLE
 			- (bodysize % SCTP_COOKIE_MULTIPLE);
 	*cookie_len = headersize + bodysize;
@@ -1418,6 +1418,7 @@ void sctp_process_init(sctp_association_t *asoc, sctp_cid_t cid,
 	__u8 *end;
 	sctp_transport_t *transport;
 	struct list_head *pos, *temp;
+	char *cookie;
 	/* We must include the address that the INIT packet came from.
 	 * This is the only address that matters for an INIT packet.
@@ -1437,7 +1438,7 @@ void sctp_process_init(sctp_association_t *asoc, sctp_cid_t cid,
 	for (param.v = peer_init->init_hdr.params;
 	     param.v < end;
 	     param.v += WORD_ROUND(ntohs(param.p->length))) {
-		if (!sctp_process_param(asoc, param, peer_addr, cid, 
+		if (!sctp_process_param(asoc, param, peer_addr, cid,
 					priority))
                        goto clean_up;
 	}
@@ -1461,7 +1462,7 @@ void sctp_process_init(sctp_association_t *asoc, sctp_cid_t cid,
 	 */
 	if (asoc->c.sinit_num_ostreams  >
 	    ntohs(peer_init->init_hdr.num_inbound_streams)) {
-		asoc->c.sinit_num_ostreams = 
+		asoc->c.sinit_num_ostreams =
 			ntohs(peer_init->init_hdr.num_inbound_streams);
 	}
@@ -1471,6 +1472,15 @@ void sctp_process_init(sctp_association_t *asoc, sctp_cid_t cid,
 	/* Peer Rwnd   : Current calculated value of the peer's rwnd.  */
 	asoc->peer.rwnd = asoc->peer.i.a_rwnd;
+	/* Copy cookie in case we need to resend COOKIE-ECHO. */
+	cookie = asoc->peer.cookie;
+	if (cookie) {
+		asoc->peer.cookie = kmalloc(asoc->peer.cookie_len, priority);
+		if (!asoc->peer.cookie)
+			goto clean_up;
+		memcpy(asoc->peer.cookie, cookie, asoc->peer.cookie_len);
+	}
 	/* RFC 2960 7.2.1 The initial value of ssthresh MAY be arbitrarily
 	 * high (for example, implementations MAY use the size of the receiver
 	 * advertised window).
@@ -1560,7 +1570,7 @@ int sctp_process_param(sctp_association_t *asoc, sctpParam_t param,
 		break;
 	case SCTP_PARAM_HOST_NAME_ADDRESS:
-		SCTP_DEBUG_PRINTK("unimplmented SCTP_HOST_NAME_ADDRESS\n");
+		SCTP_DEBUG_PRINTK("unimplemented SCTP_HOST_NAME_ADDRESS\n");
 		break;
 	case SCTP_PARAM_SUPPORTED_ADDRESS_TYPES:
@@ -1595,13 +1605,12 @@ int sctp_process_param(sctp_association_t *asoc, sctpParam_t param,
 	case SCTP_PARAM_STATE_COOKIE:
 		asoc->peer.cookie_len =
-			ntohs(param.p->length) -
+			ntohs(param.p->length) - sizeof(sctp_paramhdr_t);
-			sizeof(sctp_paramhdr_t);
 		asoc->peer.cookie = param.cookie->body;
 		break;
 	case SCTP_PARAM_HEATBEAT_INFO:
-		SCTP_DEBUG_PRINTK("unimplmented "
+		SCTP_DEBUG_PRINTK("unimplemented "
 				  "SCTP_PARAM_HEATBEAT_INFO\n");
 		break;

--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
-/* SCTP kernel reference Implementation 
+/* SCTP kernel reference Implementation
 * Copyright (c) 1999 Cisco, Inc.
 * Copyright (c) 1999-2001 Motorola, Inc.
 * Copyright (c) 2001-2002 International Business Machines Corp.
- * 
+ *
 * This file is part of the SCTP kernel reference Implementation
- * 
+ *
 * These functions work with the state functions in sctp_sm_statefuns.c
 * to implement that state operations.  These functions implement the
 * steps which require modifying existing data structures.
- * 
+ *
- * The SCTP reference implementation is free software; 
+ * The SCTP reference implementation is free software;
- * you can redistribute it and/or modify it under the terms of 
+ * you can redistribute it and/or modify it under the terms of
 * the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
- * 
+ *
- * The SCTP reference implementation is distributed in the hope that it 
+ * The SCTP reference implementation is distributed in the hope that it
 * will be useful, but WITHOUT ANY WARRANTY; without even the implied
 *                 ************************
 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU General Public License
 * along with GNU CC; see the file COPYING.  If not, write to
 * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.  
+ * Boston, MA 02111-1307, USA.
- * 
+ *
 * Please send any bug reports or fixes you make to the
 * email address(es):
 *    lksctp developers <lksctp-developers@lists.sourceforge.net>
- * 
+ *
 * Or submit a bug report through the following website:
 *    http://www.sf.net/projects/lksctp
 *
- * Written or modified by: 
+ * Written or modified by:
 *    La Monte H.P. Yarroll <piggy@acm.org>
 *    Karl Knutson          <karl@athena.chicago.il.us>
 *    Jon Grimm             <jgrimm@austin.ibm.com>
@@ -119,7 +119,7 @@ int sctp_do_sm(sctp_event_t event_type, sctp_subtype_t subtype,
 	       int priority)
 {
 	sctp_cmd_seq_t commands;
-	sctp_sm_table_entry_t *state_fn;        
+	sctp_sm_table_entry_t *state_fn;
 	sctp_disposition_t status;
 	int error = 0;
 	typedef const char *(printfn_t)(sctp_subtype_t);
@@ -253,6 +253,7 @@ int sctp_cmd_interpreter(sctp_event_t event_type, sctp_subtype_t subtype,
 	sctp_chunk_t *new_obj;
 	sctp_chunk_t *chunk;
 	sctp_packet_t *packet;
+	struct list_head *pos;
 	struct timer_list *timer;
 	unsigned long timeout;
 	sctp_transport_t *t;
@@ -336,9 +337,8 @@ int sctp_cmd_interpreter(sctp_event_t event_type, sctp_subtype_t subtype,
 		case SCTP_CMD_PEER_INIT:
 			/* Process a unified INIT from the peer.  */
-			sctp_cmd_process_init(commands,
+			sctp_cmd_process_init(commands, asoc, chunk,
-					      asoc, chunk, command->obj.ptr,
+					      command->obj.ptr, priority);
-					      priority);
 			break;
 		case SCTP_CMD_GEN_COOKIE_ECHO:
@@ -462,6 +462,7 @@ int sctp_cmd_interpreter(sctp_event_t event_type, sctp_subtype_t subtype,
 			break;
 		case SCTP_CMD_INIT_RESTART:
 			/* Do the needed accounting and updates
 			 * associated with restarting an initialization
 			 * timer.
@@ -474,6 +475,15 @@ int sctp_cmd_interpreter(sctp_event_t event_type, sctp_subtype_t subtype,
 					asoc->max_init_timeo;
 			}
+			/* If we've sent any data bundled with
+			 * COOKIE-ECHO we need to resend.
+			 */
+			list_for_each(pos, &asoc->peer.transport_addr_list) {
+				t = list_entry(pos, sctp_transport_t,
+					       transports);
+				sctp_retransmit_mark(&asoc->outqueue, t, 0);
+			}
 			sctp_add_cmd_sf(commands,
 					SCTP_CMD_TIMER_RESTART,
 					SCTP_TO(command->obj.to));
@@ -602,7 +612,7 @@ static sctp_chunk_t *sctp_do_ecn_ecne_work(sctp_association_t *asoc,
 {
 	sctp_chunk_t *repl;
 	sctp_transport_t *transport;
 	/* Our previously transmitted packet ran into some congestion
 	 * so we should take action by reducing cwnd and ssthresh
 	 * and then ACK our peer that we we've done so by
@@ -716,7 +726,7 @@ int sctp_gen_sack(sctp_association_t *asoc, int force, sctp_cmd_seq_t *commands)
 		error = sctp_push_outqueue(&asoc->outqueue, sack);
 		/* Stop the SACK timer.  */
-		sctp_add_cmd_sf(commands, SCTP_CMD_TIMER_STOP, 
+		sctp_add_cmd_sf(commands, SCTP_CMD_TIMER_STOP,
 				SCTP_TO(SCTP_EVENT_TIMEOUT_SACK));
 	}
@@ -785,7 +795,7 @@ void sctp_generate_t3_rtx_event(unsigned long peer)
 		if (!mod_timer(&transport->T3_rtx_timer, jiffies + (HZ/20)))
 			sctp_transport_hold(transport);
 		goto out_unlock;
-	} 
+	}
 	/* Is this transport really dead and just waiting around for
 	 * the timer to let go of the reference?
@@ -867,6 +877,14 @@ void sctp_generate_t2_shutdown_event(unsigned long data)
 	sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_T2_SHUTDOWN);
 }
+void sctp_generate_t5_shutdown_guard_event(unsigned long data)
+{
+        sctp_association_t *asoc = (sctp_association_t *)data;
+        sctp_generate_timeout_event(asoc,
+				    SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD);
+} /* sctp_generate_t5_shutdown_guard_event() */
 void sctp_generate_autoclose_event(unsigned long data)
 {
 	sctp_association_t *asoc = (sctp_association_t *) data;
@@ -890,7 +908,7 @@ void sctp_generate_heartbeat_event(unsigned long data)
 		if (!mod_timer(&transport->hb_timer, jiffies + (HZ/20)))
 			sctp_transport_hold(transport);
 		goto out_unlock;
-	} 
+	}
 	/* Is this structure just waiting around for us to actually
 	 * get destroyed?
@@ -932,6 +950,7 @@ sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
 	sctp_generate_t2_shutdown_event,
 	NULL,
 	NULL,
+	sctp_generate_t5_shutdown_guard_event,
 	sctp_generate_heartbeat_event,
 	sctp_generate_sack_event,
 	sctp_generate_autoclose_event,
@@ -1023,6 +1042,9 @@ static void sctp_cmd_assoc_failed(sctp_cmd_seq_t *commands,
 		sctp_add_cmd_sf(commands, SCTP_CMD_EVENT_ULP,
 				SCTP_ULPEVENT(event));
+	sctp_add_cmd_sf(commands, SCTP_CMD_NEW_STATE,
+			SCTP_STATE(SCTP_STATE_CLOSED));
 	/* FIXME:  We need to handle data that could not be sent or was not
 	 * acked, if the user has enabled SEND_FAILED notifications.
 	 */

--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
--- a/net/sctp/sm_statetable.c
+++ b/net/sctp/sm_statetable.c
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
--- a/net/sctp/ulpevent.c
+++ b/net/sctp/ulpevent.c
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c