1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00

s3:smbd: handle SMB2 in deadtime_fn() and avoid disconnecting non idle clients

metze
This commit is contained in:
Stefan Metzmacher 2010-03-31 04:54:41 +02:00
parent 74f36df4b3
commit 6f30b9a6ff

View File

@ -2349,9 +2349,21 @@ static bool keepalive_fn(const struct timeval *now, void *private_data)
static bool deadtime_fn(const struct timeval *now, void *private_data)
{
struct smbd_server_connection *sconn = smbd_server_conn;
if (sconn->allow_smb2) {
/* TODO: implement real idle check */
if (sconn->smb2.sessions.list) {
return true;
}
DEBUG( 2, ( "Closing idle SMB2 connection\n" ) );
messaging_send(smbd_messaging_context(), procid_self(),
MSG_SHUTDOWN, &data_blob_null);
return false;
}
if ((conn_num_open(sconn) == 0)
|| (conn_idle_all(sconn, now->tv_sec))) {
DEBUG( 2, ( "Closing idle connection\n" ) );
DEBUG( 2, ( "Closing idle SMB1 connection\n" ) );
messaging_send(smbd_messaging_context(), procid_self(),
MSG_SHUTDOWN, &data_blob_null);
return False;