diff options
| author | tuexen <tuexen@FreeBSD.org> | 2016-01-16 14:46:27 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2016-01-16 14:46:27 +0000 |
| commit | d143500d09fde3db70f9e61f03b33b3a4d5e9715 (patch) | |
| tree | d51f2a128855a1b3bf9c3be7d5f15ae2714f1932 /sys/netinet | |
| parent | dd1d6c828098d7c48c98646ca83ccdda2afc8983 (diff) | |
| download | FreeBSD-src-d143500d09fde3db70f9e61f03b33b3a4d5e9715.zip FreeBSD-src-d143500d09fde3db70f9e61f03b33b3a4d5e9715.tar.gz | |
MFC r287294:
Use 5 times RTO.Max as the default for the shutdown guard timer
as required by RFC 4960. The sysctl variable can be used to
overwrite this.
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/sctp_constants.h | 4 | ||||
| -rw-r--r-- | sys/netinet/sctp_sysctl.h | 4 | ||||
| -rw-r--r-- | sys/netinet/sctputil.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/netinet/sctp_constants.h b/sys/netinet/sctp_constants.h index 135d46c..760c3b4 100644 --- a/sys/netinet/sctp_constants.h +++ b/sys/netinet/sctp_constants.h @@ -612,10 +612,6 @@ __FBSDID("$FreeBSD$"); /* 30 seconds + RTO (in ms) */ #define SCTP_HB_DEFAULT_MSEC 30000 -/* Max time I will wait for Shutdown to complete */ -#define SCTP_DEF_MAX_SHUTDOWN_SEC 180 - - /* * This is how long a secret lives, NOT how long a cookie lives how many * ticks the current secret will live. diff --git a/sys/netinet/sctp_sysctl.h b/sys/netinet/sctp_sysctl.h index 857bda1..8233343 100644 --- a/sys/netinet/sctp_sysctl.h +++ b/sys/netinet/sctp_sysctl.h @@ -291,10 +291,10 @@ struct sctp_sysctl { #define SCTPCTL_PMTU_RAISE_TIME_DEFAULT SCTP_DEF_PMTU_RAISE_SEC /* shutdown_guard_time: Default shutdown guard timer in seconds */ -#define SCTPCTL_SHUTDOWN_GUARD_TIME_DESC "Default shutdown guard timer in seconds" +#define SCTPCTL_SHUTDOWN_GUARD_TIME_DESC "Shutdown guard timer in seconds (0 means 5 times RTO.Max)" #define SCTPCTL_SHUTDOWN_GUARD_TIME_MIN 0 #define SCTPCTL_SHUTDOWN_GUARD_TIME_MAX 0xFFFFFFFF -#define SCTPCTL_SHUTDOWN_GUARD_TIME_DEFAULT SCTP_DEF_MAX_SHUTDOWN_SEC +#define SCTPCTL_SHUTDOWN_GUARD_TIME_DEFAULT 0 /* secret_lifetime: Default secret lifetime in seconds */ #define SCTPCTL_SECRET_LIFETIME_DESC "Default secret lifetime in seconds" diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 3030994..c31f557 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -2123,7 +2123,11 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, struct sctp_tcb *stcb, if (stcb == NULL) { return; } - to_ticks = inp->sctp_ep.sctp_timeoutticks[SCTP_TIMER_MAXSHUTDOWN]; + if (inp->sctp_ep.sctp_timeoutticks[SCTP_TIMER_MAXSHUTDOWN] == 0) { + to_ticks = 5 * MSEC_TO_TICKS(stcb->asoc.maxrto); + } else { + to_ticks = inp->sctp_ep.sctp_timeoutticks[SCTP_TIMER_MAXSHUTDOWN]; + } tmr = &stcb->asoc.shut_guard_timer; break; case SCTP_TIMER_TYPE_STRRESET: |
