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

It is possible for a TCP callout to be removed from the timing wheel,

Browse Source 
but have a network interrupt arrive and deactivate the timeout before
the callout routine runs.  Check for this case in the callout routine;
it should only run if the callout is active and not on the wheel.
This commit is contained in:
jlemon 2000-09-16 00:53:53 +00:00
parent 8de35c289b
commit a7f2d521f4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/netinet/tcp_timer.c
View File

@ -169,7 +169,7 @@ tcp_timer_delack(xtp)
int s;
s = splnet();
if (callout_pending(tp->tt_delack)) {
if (callout_pending(tp->tt_delack) || !callout_active(tp->tt_delack)) {
splx(s);
return;
}
@ -193,7 +193,7 @@ tcp_timer_2msl(xtp)
ostate = tp->t_state;
#endif
s = splnet();
if (callout_pending(tp->tt_2msl)) {
if (callout_pending(tp->tt_2msl) || !callout_active(tp->tt_2msl)) {
splx(s);
return;
}
@ -231,7 +231,7 @@ tcp_timer_keep(xtp)
ostate = tp->t_state;
#endif
s = splnet();
if (callout_pending(tp->tt_keep)) {
if (callout_pending(tp->tt_keep) || !callout_active(tp->tt_keep)) {
splx(s);
return;
}
@ -310,7 +310,7 @@ tcp_timer_persist(xtp)
ostate = tp->t_state;
#endif
s = splnet();
if (callout_pending(tp->tt_persist)) {
if (callout_pending(tp->tt_persist) || !callout_active(tp->tt_persist)){
splx(s);
return;
}
@ -361,7 +361,7 @@ tcp_timer_rexmt(xtp)
ostate = tp->t_state;
#endif
s = splnet();
if (callout_pending(tp->tt_rexmt)) {
if (callout_pending(tp->tt_rexmt) || !callout_active(tp->tt_rexmt)) {
splx(s);
return;
}