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

MFC of 202520

Browse Source 
This aligns us to the socket api of the stream
reset with proper naming.. and a define for backward
compatibility.
This commit is contained in:
Randall Stewart 2010-04-17 03:47:04 +00:00
parent 394ddd21a6
commit d50db6bd56
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/8/; revision=206727
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/netinet/sctp_uio.h
View File

@ -45,6 +45,9 @@ __FBSDID("$FreeBSD$");
typedef uint32_t sctp_assoc_t;
/* Compatibility to previous define's */
#define sctp_stream_reset_events sctp_stream_reset_event
/* On/Off setup for subscription to events */
struct sctp_event_subscribe {
uint8_t sctp_data_io_event;
@ -57,7 +60,7 @@ struct sctp_event_subscribe {
uint8_t sctp_adaptation_layer_event;
uint8_t sctp_authentication_event;
uint8_t sctp_sender_dry_event;
uint8_t sctp_stream_reset_events;
uint8_t sctp_stream_reset_event;
};
/* ancillary data types */
@ -402,19 +405,19 @@ union sctp_notification {
};
/* notification types */
#define SCTP_ASSOC_CHANGE 0x0001
#define SCTP_PEER_ADDR_CHANGE 0x0002
#define SCTP_REMOTE_ERROR 0x0003
#define SCTP_SEND_FAILED 0x0004
#define SCTP_SHUTDOWN_EVENT 0x0005
#define SCTP_ADAPTATION_INDICATION 0x0006
#define SCTP_ASSOC_CHANGE 0x0001
#define SCTP_PEER_ADDR_CHANGE 0x0002
#define SCTP_REMOTE_ERROR 0x0003
#define SCTP_SEND_FAILED 0x0004
#define SCTP_SHUTDOWN_EVENT 0x0005
#define SCTP_ADAPTATION_INDICATION 0x0006
/* same as above */
#define SCTP_ADAPTION_INDICATION 0x0006
#define SCTP_PARTIAL_DELIVERY_EVENT 0x0007
#define SCTP_AUTHENTICATION_EVENT 0x0008
#define SCTP_STREAM_RESET_EVENT 0x0009
#define SCTP_SENDER_DRY_EVENT 0x000a
#define SCTP_ADAPTION_INDICATION 0x0006
#define SCTP_PARTIAL_DELIVERY_EVENT 0x0007
#define SCTP_AUTHENTICATION_EVENT 0x0008
#define SCTP_STREAM_RESET_EVENT 0x0009
#define SCTP_SENDER_DRY_EVENT 0x000a
#define SCTP__NOTIFICATIONS_STOPPED_EVENT 0x000b /* we dont send this */
/*
* socket option structs
*/

4
sys/netinet/sctp_usrreq.c
View File

@ -2008,7 +2008,7 @@ sctp_getopt(struct socket *so, int optname, void *optval, size_t *optsize,
events->sctp_sender_dry_event = 1;
if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_STREAM_RESETEVNT))
events->sctp_stream_reset_events = 1;
events->sctp_stream_reset_event = 1;
SCTP_INP_RUNLOCK(inp);
*optsize = sizeof(struct sctp_event_subscribe);
}
@ -3650,7 +3650,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
sctp_feature_off(inp, SCTP_PCB_FLAGS_DRYEVNT);
}
if (events->sctp_stream_reset_events) {
if (events->sctp_stream_reset_event) {
sctp_feature_on(inp, SCTP_PCB_FLAGS_STREAM_RESETEVNT);
} else {
sctp_feature_off(inp, SCTP_PCB_FLAGS_STREAM_RESETEVNT);