diff options
| author | Jeremy Allison <jra@samba.org> | 2006-04-15 04:07:10 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:16:22 -0500 |
| commit | 010c725b36feb1a234dce9f40b95ae5869058698 (patch) | |
| tree | 48ab1b420d3ca0e47677c9f88001506c3b61b16b /source3/smbd/conn.c | |
| parent | a2e2032d080804b4555df8938e53b395e3fe0b7b (diff) | |
| download | samba-010c725b36feb1a234dce9f40b95ae5869058698.tar.gz samba-010c725b36feb1a234dce9f40b95ae5869058698.tar.bz2 samba-010c725b36feb1a234dce9f40b95ae5869058698.zip | |
r15088: Remove all time() and gettimeofday() calls out of the mainline
packet processing code. Only do these when needed (ie. in the
idle timeout code). We drop an unneccessary global here too.
Jeremy.
(This used to be commit 8272a5ab0605fcf95527143c4f909aa1008e5b94)
Diffstat (limited to 'source3/smbd/conn.c')
| -rw-r--r-- | source3/smbd/conn.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c index b41467f02c..5aa8901d59 100644 --- a/source3/smbd/conn.c +++ b/source3/smbd/conn.c @@ -154,8 +154,9 @@ find_again: } /**************************************************************************** -close all conn structures + Close all conn structures. ****************************************************************************/ + void conn_close_all(void) { connection_struct *conn, *next; @@ -178,13 +179,20 @@ BOOL conn_idle_all(time_t t, int deadtime) for (conn=Connections;conn;conn=next) { next=conn->next; + + /* Update if connection wasn't idle. */ + if (conn->lastused != conn->lastused_count) { + conn->lastused = t; + } + /* close dirptrs on connections that are idle */ - if ((t-conn->lastused) > DPTR_IDLE_TIMEOUT) + if ((t-conn->lastused) > DPTR_IDLE_TIMEOUT) { dptr_idlecnum(conn); + } - if (conn->num_files_open > 0 || - (t-conn->lastused)<deadtime) + if (conn->num_files_open > 0 || (t-conn->lastused)<deadtime) { allidle = False; + } } /* |