sctp: add some missing peer_capables in sctp info dump
Subsystems (3)
Xin Long
maintainercover sctp: add some missing peer_capables in sctp info dump
The 1st patch removes the unused and obsolete hostname_address from sctp_association peer and also the bit from sctp_info peer_capables, and then reuses its bit for reconf_capable and use the higher available bit for intl_capable in the 2nd patch.
Xin Long (2):
sctp: delete the obsolete code for the host name address param
sctp: add intl_capable and reconf_capable in ss peer_capable
include/net/sctp/structs.h | 1 - net/sctp/sm_make_chunk.c | 10 +--------- net/sctp/socket.c | 5 +++-- 3 files changed, 4 insertions(+), 12 deletions(-)
Signature · 1 line
2.39.1
Xin Long
maintainerPATCH 1/2 sctp: delete the obsolete code for the host name address param
In the latest RFC9260, the Host Name Address param has been deprecated. For INIT chunk:
Note 3: An INIT chunk MUST NOT contain the Host Name Address parameter. The receiver of an INIT chunk containing a Host Name Address parameter MUST send an ABORT chunk and MAY include an "Unresolvable Address" error cause.
For Supported Address Types:
The value indicating the Host Name Address parameter MUST NOT be used when sending this parameter and MUST be ignored when receiving this parameter.
Currently Linux SCTP doesn't really support Host Name Address param, but only saves some flag and print debug info, which actually won't even be triggered due to the verification in sctp_verify_param(). This patch is to delete those dead code.
--- include/net/sctp/structs.h | 1 - net/sctp/sm_make_chunk.c | 10 +--------- net/sctp/socket.c | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-)
include/net/sctp/structs.h +0 -1
@@ -1711,7 +1711,6 @@ struct sctp_association { __u16 ecn_capable:1, /* Can peer do ECN? */ ipv4_address:1, /* Peer understands IPv4 addresses? */ ipv6_address:1, /* Peer understands IPv6 addresses? */ - hostname_address:1, /* Peer understands DNS addresses? */ asconf_capable:1, /* Does peer support ADDIP? */ prsctp_capable:1, /* Can peer do PR-SCTP? */ reconf_capable:1, /* Can peer do RE-CONFIG? */
net/sctp/sm_make_chunk.c +1 -9
@@ -2207,7 +2207,7 @@ static enum sctp_ierror sctp_verify_param(struct net *net,break ;case SCTP_PARAM_HOST_NAME_ADDRESS : -/* Tell the peer, we won't support this param. */ +/* This param has been Deprecated, send ABORT. */ sctp_process_hn_param (asoc, param, chunk, err_chunk); retval =SCTP_IERROR_ABORT ;break ;
@@ -2589,10 +2589,6 @@ static int sctp_process_param(struct sctp_association *asoc, asoc->cookie_life =ktime_add_ms (asoc->cookie_life, stale);break ; -case SCTP_PARAM_HOST_NAME_ADDRESS : -pr_debug ("%s: unimplemented SCTP_HOST_NAME_ADDRESS\n" , __func__); -break ; -case SCTP_PARAM_SUPPORTED_ADDRESS_TYPES :/* Turn off the default values first so we'll know which * ones are really set by the peer.
@@ -2624,10 +2620,6 @@ static int sctp_process_param(struct sctp_association *asoc, asoc->peer.ipv6_address =1 ;break ; -case SCTP_PARAM_HOST_NAME_ADDRESS : - asoc->peer.hostname_address =1 ; -break ; -default :/* Just ignore anything else. */ break ; }
net/sctp/socket.c +1 -1
@@ -5195,7 +5195,7 @@ int sctp_get_sctp_info(struct sock *sk, struct sctp_association *asoc, mask = asoc->peer.ecn_capable <<1 ; mask = (mask | asoc->peer.ipv4_address) <<1 ; mask = (mask | asoc->peer.ipv6_address) <<1 ; - mask = (mask | asoc->peer.hostname_address) <<1 ; + mask = mask <<1 ; mask = (mask | asoc->peer.asconf_capable) <<1 ; mask = (mask | asoc->peer.prsctp_capable) <<1 ; mask = (mask | asoc->peer.auth_capable);
Signature · 1 line
2.39.1
Xin Long
maintainerPATCH 2/2 sctp: add intl_capable and reconf_capable in ss peer_capable
In reply to Xin LongThere are two new peer capables have been added since sctp_diag was introduced into SCTP. When dumping the peer capables, these two new peer capables should also be included. To not break the old capables, reconf_capable takes the old hostname_address bit, and intl_capable uses the higher available bit in sctpi_peer_capable.
--- net/sctp/socket.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/sctp/socket.c +3 -2
@@ -5192,10 +5192,11 @@ int sctp_get_sctp_info(struct sock *sk, struct sctp_association *asoc, info->sctpi_peer_rwnd = asoc->peer.rwnd; info->sctpi_peer_tag = asoc->c.peer_vtag; - mask = asoc->peer.ecn_capable <<1 ; + mask = asoc->peer.intl_capable <<1 ; + mask = (mask | asoc->peer.ecn_capable) <<1 ; mask = (mask | asoc->peer.ipv4_address) <<1 ; mask = (mask | asoc->peer.ipv6_address) <<1 ; - mask = mask <<1 ; + mask = (mask | asoc->peer.reconf_capable) <<1 ; mask = (mask | asoc->peer.asconf_capable) <<1 ; mask = (mask | asoc->peer.prsctp_capable) <<1 ; mask = (mask | asoc->peer.auth_capable);
Signature · 1 line
2.39.1
This series was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 10 lines · On Fri, 14 Apr 2023 17:21:14 -0400 you wrote:
The 1st patch removes the unused and obsolete
hostname_addressfromsctp_associationpeer and also the bit fromsctp_infopeer_capables, and then reuses its bit forreconf_capableand use the higher available bit forintl_capablein the 2nd patch.Xin Long (2):
sctp: delete the obsolete code for the host name address param
sctp: addintl_capableandreconf_capablein sspeer_capable[...]
Here is the summary with links:
- [net-next,1/2] sctp: delete the obsolete code for the host name address param
https://git.kernel.org/netdev/net-next/c/bd4b28189469 - [net-next,2/2] sctp: add intl_capable and reconf_capable in ss peer_capable https://git.kernel.org/netdev/net-next/c/ab4f1e28c941
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html