diff options
| author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2007-03-23 11:32:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:28:01 -0700 |
| commit | 1ae4114dce35dd1d32ed847f60b599dbbdfd5829 (patch) | |
| tree | 5a2b558cec2074a3e25ea23b1ba68564dd59e87b | |
| parent | d49d91d79a8dc5e85108a5ae1c8eef23dec135c1 (diff) | |
| download | kernel-crypto-1ae4114dce35dd1d32ed847f60b599dbbdfd5829.tar.gz kernel-crypto-1ae4114dce35dd1d32ed847f60b599dbbdfd5829.tar.xz kernel-crypto-1ae4114dce35dd1d32ed847f60b599dbbdfd5829.zip | |
[SCTP]: Implement SCTP_ADDR_CONFIRMED state for ADDR_CHNAGE event
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/sctp/user.h | 1 | ||||
| -rw-r--r-- | net/sctp/associola.c | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h index 9a835271063..4ed752119bb 100644 --- a/include/net/sctp/user.h +++ b/include/net/sctp/user.h @@ -265,6 +265,7 @@ enum sctp_spc_state { SCTP_ADDR_REMOVED, SCTP_ADDR_ADDED, SCTP_ADDR_MADE_PRIM, + SCTP_ADDR_CONFIRMED, }; diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 78d2ddb5ca1..85af1cb70fe 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -714,8 +714,16 @@ void sctp_assoc_control_transport(struct sctp_association *asoc, /* Record the transition on the transport. */ switch (command) { case SCTP_TRANSPORT_UP: + /* If we are moving from UNCONFIRMED state due + * to heartbeat success, report the SCTP_ADDR_CONFIRMED + * state to the user, otherwise report SCTP_ADDR_AVAILABLE. + */ + if (SCTP_UNCONFIRMED == transport->state && + SCTP_HEARTBEAT_SUCCESS == error) + spc_state = SCTP_ADDR_CONFIRMED; + else + spc_state = SCTP_ADDR_AVAILABLE; transport->state = SCTP_ACTIVE; - spc_state = SCTP_ADDR_AVAILABLE; break; case SCTP_TRANSPORT_DOWN: |