diff options
| author | jch <jch@FreeBSD.org> | 2015-05-15 12:07:43 +0000 |
|---|---|---|
| committer | jch <jch@FreeBSD.org> | 2015-05-15 12:07:43 +0000 |
| commit | c3c407f451b0e0fd1caedfd880ff942cf71ee717 (patch) | |
| tree | ec0e7710dd181f9434b00092ee1882b819b34772 /sys/netinet/tcp_var.h | |
| parent | 6e83eeac7b6fd0d90d7402cd2656d5766e20d33f (diff) | |
| download | FreeBSD-src-c3c407f451b0e0fd1caedfd880ff942cf71ee717.zip FreeBSD-src-c3c407f451b0e0fd1caedfd880ff942cf71ee717.tar.gz | |
MFC: r280904, r280990, r281599
r280904:
Use appropriate timeout_t* instead of void* in tcp_timer_activate()
Suggested by: imp
Differential Revision: https://reviews.freebsd.org/D2154
Reviewed by: imp, jhb
Approved by: jhb
r280990:
Provide better debugging information in tcp_timer_activate() and
tcp_timer_active()
Differential Revision: https://reviews.freebsd.org/D2179
Suggested by: bz
Reviewed by: jhb
Approved by: jhb
r281599:
Fix an old and well-documented use-after-free race condition in
TCP timers:
- Add a reference from tcpcb to its inpcb
- Defer tcpcb deletion until TCP timers have finished
Differential Revision: https://reviews.freebsd.org/D2079
Submitted by: jch, Marc De La Gueronniere <mdelagueronniere@verisign.com>
Reviewed by: imp, rrs, adrian, jhb, bz
Approved by: jhb
Sponsored by: Verisign, Inc.
Diffstat (limited to 'sys/netinet/tcp_var.h')
| -rw-r--r-- | sys/netinet/tcp_var.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 1919146..61f01c6 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -718,8 +718,9 @@ void tcp_slowtimo(void); struct tcptemp * tcpip_maketemplate(struct inpcb *); void tcpip_fillheaders(struct inpcb *, void *, void *); -void tcp_timer_activate(struct tcpcb *, int, u_int); -int tcp_timer_active(struct tcpcb *, int); +void tcp_timer_activate(struct tcpcb *, uint32_t, u_int); +int tcp_timer_active(struct tcpcb *, uint32_t); +void tcp_timer_stop(struct tcpcb *, uint32_t); void tcp_trace(short, short, struct tcpcb *, void *, struct tcphdr *, int); /* * All tcp_hc_* functions are IPv4 and IPv6 (via in_conninfo) |
