diff options
| author | tuexen <tuexen@FreeBSD.org> | 2011-12-10 10:52:54 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2011-12-10 10:52:54 +0000 |
| commit | e98fa27d6f0e51141702230a51b0a8a031a98a9a (patch) | |
| tree | 123d0bf73a2c156684e93120ccefa3855c080c68 /sys/netinet | |
| parent | 38b99982d5e48f07d1a8c9b486f101a3ea76fa11 (diff) | |
| download | FreeBSD-src-e98fa27d6f0e51141702230a51b0a8a031a98a9a.zip FreeBSD-src-e98fa27d6f0e51141702230a51b0a8a031a98a9a.tar.gz | |
Fix a bug reported by Irene Ruengeler which resulted in not sending
out HEARTBEATs when requested by the user. The HEARTBEATs were only
queued, but not actually sent out.
MFC after: 2 months.
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/sctp_constants.h | 2 | ||||
| -rw-r--r-- | sys/netinet/sctp_usrreq.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sys/netinet/sctp_constants.h b/sys/netinet/sctp_constants.h index 5b74056..96b679c 100644 --- a/sys/netinet/sctp_constants.h +++ b/sys/netinet/sctp_constants.h @@ -391,6 +391,8 @@ __FBSDID("$FreeBSD$"); #define SCTP_OUTPUT_FROM_COOKIE_ACK 14 #define SCTP_OUTPUT_FROM_DRAIN 15 #define SCTP_OUTPUT_FROM_CLOSING 16 +#define SCTP_OUTPUT_FROM_SOCKOPT 17 + /* SCTP chunk types are moved sctp.h for application (NAT, FW) use */ /* align to 32-bit sizes */ diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index c638e9c..a0a9f52 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -4727,6 +4727,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize, if (paddrp->spp_flags & SPP_HB_DEMAND) { /* on demand HB */ sctp_send_hb(stcb, net, SCTP_SO_LOCKED); + sctp_chunk_output(inp, stcb, SCTP_OUTPUT_FROM_SOCKOPT, SCTP_SO_LOCKED); sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, inp, stcb, net); } if ((paddrp->spp_flags & SPP_PMTUD_DISABLE) && (paddrp->spp_pathmtu >= SCTP_SMALLEST_PMTU)) { |
