diff options
| author | rwatson <rwatson@FreeBSD.org> | 2007-09-07 09:19:22 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2007-09-07 09:19:22 +0000 |
| commit | e14f216203a782ebef55f9b3423abe5ea4c83eb2 (patch) | |
| tree | 710e9a8fadb8fa96b1269df0c62d76eb99d3b544 /sys/netinet/tcp_var.h | |
| parent | bf5d382aa7ca3d8b0a5b6e8c6b078c068d81071d (diff) | |
| download | FreeBSD-src-e14f216203a782ebef55f9b3423abe5ea4c83eb2.zip FreeBSD-src-e14f216203a782ebef55f9b3423abe5ea4c83eb2.tar.gz | |
Back out tcp_timer.c:1.93 and associated changes that reimplemented the many
TCP timers as a single timer, but retain the API changes necessary to
reintroduce this change. This will back out the source of at least two
reported problems: lock leaks in certain timer edge cases, and TCP timers
continuing to fire after a connection has closed (a bug previously fixed and
then reintroduced with the timer rewrite).
In a follow-up commit, some minor restylings and comment changes performed
after the TCP timer rewrite will be reapplied, and a further change to allow
the TCP timer rewrite to be added back without disturbing the ABI. The new
design is believed to be a good thing, but the outstanding issues are
leading to significant stability/correctness problems that are holding
up 7.0.
This patch was generated by silby, but is being committed by proxy due to
poor network connectivity for silby this week.
Approved by: re (kensmith)
Submitted by: silby
Tested by: rwatson, kris
Problems reported by: peter, kris, others
Diffstat (limited to 'sys/netinet/tcp_var.h')
| -rw-r--r-- | sys/netinet/tcp_var.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 5a471af..38114a3 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -96,7 +96,11 @@ struct tcpcb { int t_segqlen; /* segment reassembly queue length */ int t_dupacks; /* consecutive dup acks recd */ - struct tcp_timer *t_timers; /* retransmit timer */ + struct callout *tt_rexmt; /* retransmit timer */ + struct callout *tt_persist; /* retransmit persistence */ + struct callout *tt_keep; /* keepalive */ + struct callout *tt_2msl; /* 2*msl TIME_WAIT timer */ + struct callout *tt_delack; /* delayed ACK timer */ struct inpcb *t_inpcb; /* back pointer to internet pcb */ int t_state; /* state of this connection */ |
