aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp/sm_make_chunk.c
diff options
context:
space:
mode:
authorVlad Yasevich <vladislav.yasevich@hp.com>2007-10-24 17:24:23 -0400
committerVlad Yasevich <vladislav.yasevich@hp.com>2007-11-07 11:39:27 -0500
commit88799fe5ec65fad1d5cb1d4dc5d8f78edb949f1c (patch)
treebcb6839aaeb0cdd7411ab7ac69a1273ed53eb1e2 /net/sctp/sm_make_chunk.c
parent0ed90fb0f668fd07f14ae2007a809e8b26cd27a6 (diff)
SCTP: Correctly disable ADD-IP when AUTH is not supported.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Diffstat (limited to 'net/sctp/sm_make_chunk.c')
-rw-r--r--net/sctp/sm_make_chunk.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index c60564dd169d..2ff3a3df049d 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -1847,7 +1847,7 @@ static void sctp_process_ext_param(struct sctp_association *asoc,
1847 break; 1847 break;
1848 case SCTP_CID_ASCONF: 1848 case SCTP_CID_ASCONF:
1849 case SCTP_CID_ASCONF_ACK: 1849 case SCTP_CID_ASCONF_ACK:
1850 asoc->peer.addip_capable = 1; 1850 asoc->peer.asconf_capable = 1;
1851 break; 1851 break;
1852 default: 1852 default:
1853 break; 1853 break;
@@ -2138,10 +2138,11 @@ int sctp_process_init(struct sctp_association *asoc, sctp_cid_t cid,
2138 /* If the peer claims support for ADD-IP without support 2138 /* If the peer claims support for ADD-IP without support
2139 * for AUTH, disable support for ADD-IP. 2139 * for AUTH, disable support for ADD-IP.
2140 */ 2140 */
2141 if (asoc->peer.addip_capable && !asoc->peer.auth_capable) { 2141 if (asoc->peer.asconf_capable && !asoc->peer.auth_capable) {
2142 asoc->peer.addip_disabled_mask |= (SCTP_PARAM_ADD_IP | 2142 asoc->peer.addip_disabled_mask |= (SCTP_PARAM_ADD_IP |
2143 SCTP_PARAM_DEL_IP | 2143 SCTP_PARAM_DEL_IP |
2144 SCTP_PARAM_SET_PRIMARY); 2144 SCTP_PARAM_SET_PRIMARY);
2145 asoc->peer.asconf_capable = 0;
2145 } 2146 }
2146 2147
2147 /* Walk list of transports, removing transports in the UNKNOWN state. */ 2148 /* Walk list of transports, removing transports in the UNKNOWN state. */