summaryrefslogtreecommitdiff
path: root/source3/smbd/process.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-10-19 11:11:56 -0700
committerJeremy Allison <jra@samba.org>2010-10-19 15:13:17 -0700
commite7d0f478ee529500461f80f2fd51987c9255d345 (patch)
tree84b120159293ec5c4d3fa51464312157d6c6fb28 /source3/smbd/process.c
parentd7f4bea39455c5d0a9b36cfa731d10c96a1c1405 (diff)
downloadsamba-e7d0f478ee529500461f80f2fd51987c9255d345.tar.gz
samba-e7d0f478ee529500461f80f2fd51987c9255d345.tar.bz2
samba-e7d0f478ee529500461f80f2fd51987c9255d345.zip
Add deadtime detection for SMB2. Correctly update lastused timestamp across all active tcons. Should fix dfree cache not updating bug.
Diffstat (limited to 'source3/smbd/process.c')
-rw-r--r--source3/smbd/process.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index ff2b8fc67d..f2aa23e3e0 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2467,21 +2467,9 @@ static bool deadtime_fn(const struct timeval *now, void *private_data)
struct smbd_server_connection *sconn =
(struct smbd_server_connection *)private_data;
- if (sconn->using_smb2) {
- /* TODO: implement real idle check */
- if (sconn->smb2.sessions.list) {
- return true;
- }
- DEBUG( 2, ( "Closing idle SMB2 connection\n" ) );
- messaging_send(sconn->msg_ctx,
- messaging_server_id(sconn->msg_ctx),
- MSG_SHUTDOWN, &data_blob_null);
- return false;
- }
-
if ((conn_num_open(sconn) == 0)
|| (conn_idle_all(sconn, now->tv_sec))) {
- DEBUG( 2, ( "Closing idle SMB1 connection\n" ) );
+ DEBUG( 2, ( "Closing idle connection\n" ) );
messaging_send(sconn->msg_ctx,
messaging_server_id(sconn->msg_ctx),
MSG_SHUTDOWN, &data_blob_null);