d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the exporting of SCTP association states to userland. Without this,

Browse Source 
associations in SHUTDOWN-PENDING were never reported correctly.

MFC after:	3 weeks
This commit is contained in:
Michael Tuexen 2015-08-29 09:14:32 +00:00
parent c1eb13c74c
commit e92c2a8d6a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=287282
5 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/netinet/sctp_constants.h
View File

@ -458,7 +458,7 @@ __FBSDID("$FreeBSD$");
/*
* SCTP states for internal state machine XXX (should match "user" values)
* SCTP states for internal state machine
*/
#define SCTP_STATE_EMPTY 0x0000
#define SCTP_STATE_INUSE 0x0001

2
sys/netinet/sctp_sysctl.c
View File

@ -453,7 +453,7 @@ sctp_sysctl_handle_assoclist(SYSCTL_HANDLER_ARGS)
if (stcb->asoc.primary_destination != NULL)
xstcb.primary_addr = stcb->asoc.primary_destination->ro._l_addr;
xstcb.heartbeat_interval = stcb->asoc.heart_beat_delay;
xstcb.state = SCTP_GET_STATE(&stcb->asoc); /* FIXME */
xstcb.state = (uint32_t) sctp_map_assoc_state(stcb->asoc.state);
/* 7.0 does not support these */
xstcb.assoc_id = sctp_get_associd(stcb);
xstcb.peers_rwnd = stcb->asoc.peers_rwnd;

7
sys/netinet/sctp_usrreq.c
View File

@ -2668,12 +2668,7 @@ sctp_getopt(struct socket *so, int optname, void *optval, size_t *optsize,
error = EINVAL;
break;
}
/*
* I think passing the state is fine since
* sctp_constants.h will be available to the user
* land.
*/
sstat->sstat_state = stcb->asoc.state;
sstat->sstat_state = sctp_map_assoc_state(stcb->asoc.state);
sstat->sstat_assoc_id = sctp_get_associd(stcb);
sstat->sstat_rwnd = stcb->asoc.peers_rwnd;
sstat->sstat_unackdata = stcb->asoc.sent_queue_cnt;

43
sys/netinet/sctputil.c
View File

@ -893,6 +893,49 @@ sctp_select_a_tag(struct sctp_inpcb *inp, uint16_t lport, uint16_t rport, int ch
return (x);
}
int32_t
sctp_map_assoc_state(int kernel_state)
{
int32_t user_state;
if (kernel_state & SCTP_STATE_WAS_ABORTED) {
user_state = SCTP_CLOSED;
} else if (kernel_state & SCTP_STATE_SHUTDOWN_PENDING) {
user_state = SCTP_SHUTDOWN_PENDING;
} else {
switch (kernel_state & SCTP_STATE_MASK) {
case SCTP_STATE_EMPTY:
user_state = SCTP_CLOSED;
break;
case SCTP_STATE_INUSE:
user_state = SCTP_CLOSED;
break;
case SCTP_STATE_COOKIE_WAIT:
user_state = SCTP_COOKIE_WAIT;
break;
case SCTP_STATE_COOKIE_ECHOED:
user_state = SCTP_COOKIE_ECHOED;
break;
case SCTP_STATE_OPEN:
user_state = SCTP_ESTABLISHED;
break;
case SCTP_STATE_SHUTDOWN_SENT:
user_state = SCTP_SHUTDOWN_SENT;
break;
case SCTP_STATE_SHUTDOWN_RECEIVED:
user_state = SCTP_SHUTDOWN_RECEIVED;
break;
case SCTP_STATE_SHUTDOWN_ACK_SENT:
user_state = SCTP_SHUTDOWN_ACK_SENT;
break;
default:
user_state = SCTP_CLOSED;
break;
}
}
return (user_state);
}
int
sctp_init_asoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
uint32_t override_tag, uint32_t vrf_id)

3
sys/netinet/sctputil.h
View File

@ -67,6 +67,9 @@ void
/*
* Function prototypes
*/
int32_t
sctp_map_assoc_state(int);
uint32_t
sctp_get_ifa_hash_val(struct sockaddr *addr);