diff options
| author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2008-09-18 16:27:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-18 16:27:38 -0700 |
| commit | 0ef46e285c062cbe35d60c0adbff96f530d31c86 (patch) | |
| tree | c2fc631d5760f097bab6b5173166c872639580ff /net/sctp/sm_make_chunk.c | |
| parent | a3028b8ed1e1e9930bfa70ce4555fb7f9fad3dcc (diff) | |
| download | blackbird-op-linux-0ef46e285c062cbe35d60c0adbff96f530d31c86.tar.gz blackbird-op-linux-0ef46e285c062cbe35d60c0adbff96f530d31c86.zip | |
sctp: do not enable peer features if we can't do them.
Do not enable peer features like addip and auth, if they
are administratively disabled localy. If the peer resports
that he supports something that we don't, neither end can
use it so enabling it is pointless. This solves a problem
when talking to a peer that has auth and addip enabled while
we do not. Found by Andrei Pelinescu-Onciul <andrei@iptel.org>.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sm_make_chunk.c')
| -rw-r--r-- | net/sctp/sm_make_chunk.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index e8ca4e54981f..fe94f42fa068 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -1886,11 +1886,13 @@ static void sctp_process_ext_param(struct sctp_association *asoc, /* if the peer reports AUTH, assume that he * supports AUTH. */ - asoc->peer.auth_capable = 1; + if (sctp_auth_enable) + asoc->peer.auth_capable = 1; break; case SCTP_CID_ASCONF: case SCTP_CID_ASCONF_ACK: - asoc->peer.asconf_capable = 1; + if (sctp_addip_enable) + asoc->peer.asconf_capable = 1; break; default: break; @@ -2460,6 +2462,9 @@ do_addr_param: break; case SCTP_PARAM_SET_PRIMARY: + if (!sctp_addip_enable) + goto fall_through; + addr_param = param.v + sizeof(sctp_addip_param_t); af = sctp_get_af_specific(param_type2af(param.p->type)); |
