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

Fix it so we align with new socket API draft for

Browse Source 
state's in destination (i.e. ACTIVE/INACTIVE/UNCONFIRMED)

MFC after:	1 week
This commit is contained in:
Randall Stewart 2011-01-20 12:40:09 +00:00
parent c44797fc39
commit a97009a5cd
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=217635
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/netinet/sctp_constants.h
View File

@ -506,8 +506,7 @@ __FBSDID("$FreeBSD$");
#define SCTP_ADDR_UNCONFIRMED 0x200
#define SCTP_ADDR_REQ_PRIMARY 0x400
/* JRS 5/13/07 - Added potentially failed state for CMT PF */
#define SCTP_ADDR_PF 0x800
#define SCTP_REACHABLE_MASK 0x203
#define SCTP_ADDR_PF 0x800
/* bound address types (e.g. valid address types to allow) */
#define SCTP_BOUND_V6 0x01

21
sys/netinet/sctp_uio.h
View File

@ -233,31 +233,10 @@ struct sctp_paddr_change {
#define SCTP_ADDR_MADE_PRIM 0x0005
#define SCTP_ADDR_CONFIRMED 0x0006
/*
* CAUTION: these are user exposed SCTP addr reachability states must be
* compatible with SCTP_ADDR states in sctp_constants.h
*/
#ifdef SCTP_ACTIVE
#undef SCTP_ACTIVE
#endif
#define SCTP_ACTIVE 0x0001 /* SCTP_ADDR_REACHABLE */
#ifdef SCTP_INACTIVE
#undef SCTP_INACTIVE
#endif
#define SCTP_INACTIVE 0x0002 /* SCTP_ADDR_NOT_REACHABLE */
#ifdef SCTP_UNCONFIRMED
#undef SCTP_UNCONFIRMED
#endif
#define SCTP_UNCONFIRMED 0x0200 /* SCTP_ADDR_UNCONFIRMED */
#ifdef SCTP_NOHEARTBEAT
#undef SCTP_NOHEARTBEAT
#endif
#define SCTP_NOHEARTBEAT 0x0040 /* SCTP_ADDR_NOHB */
/* remote error events */
struct sctp_remote_error {
uint16_t sre_type;

22
sys/netinet/sctp_usrreq.c
View File

@ -2341,7 +2341,16 @@ sctp_getopt(struct socket *so, int optname, void *optval, size_t *optsize,
}
if ((stcb) && (net)) {
paddri->spinfo_state = net->dest_state & (SCTP_REACHABLE_MASK | SCTP_ADDR_NOHB);
if (net->dest_state & SCTP_ADDR_UNCONFIRMED) {
/* Its unconfirmed */
paddri->spinfo_state = SCTP_UNCONFIRMED;
} else if (net->dest_state & SCTP_ADDR_REACHABLE) {
/* The Active */
paddri->spinfo_state = SCTP_ACTIVE;
} else {
/* It's Inactive */
paddri->spinfo_state = SCTP_INACTIVE;
}
paddri->spinfo_cwnd = net->cwnd;
paddri->spinfo_srtt = ((net->lastsa >> 2) + net->lastsv) >> 1;
paddri->spinfo_rto = net->RTO;
@ -2409,7 +2418,16 @@ sctp_getopt(struct socket *so, int optname, void *optval, size_t *optsize,
* Again the user can get info from sctp_constants.h
* for what the state of the network is.
*/
sstat->sstat_primary.spinfo_state = net->dest_state & SCTP_REACHABLE_MASK;
if (net->dest_state & SCTP_ADDR_UNCONFIRMED) {
/* It's unconfirmed */
sstat->sstat_primary.spinfo_state = SCTP_UNCONFIRMED;
} else if (net->dest_state & SCTP_ADDR_REACHABLE) {
/* Its active */
sstat->sstat_primary.spinfo_state = SCTP_ACTIVE;
} else {
/* It's Inactive */
sstat->sstat_primary.spinfo_state = SCTP_INACTIVE;
}
sstat->sstat_primary.spinfo_cwnd = net->cwnd;
sstat->sstat_primary.spinfo_srtt = net->lastsa;
sstat->sstat_primary.spinfo_rto = net->RTO;