sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

at the interop Isaac (at least I _think_ it was Isaac) said that if a

Browse Source 
MS client doesn't respond to a oplock break request then we might try
resending the request.

This morning Sues Win95 machine had this problem (thus forcing me to
do something about it!). When starting winword her box refused to
answer an oplock break request. I have added code to resend the oplock
break request up to 3 times at 10 second intervals before killing the
socket.

of course, as soon as I did this her box started to behave again so I
haven't been able to tell if this fix actually works, but it can't be
worse than dropping the socket immediately.
This commit is contained in:
Andrew Tridgell 0001-01-01 00:00:00 +00:00
parent 39db385a0c
commit a1c4d8351b
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/include/local.h
View File

@ -184,6 +184,10 @@
#define OPLOCK_BREAK_TIMEOUT 30
/* how many times do we try to resend the oplock break request - useful
for buggy MS clients */
#define OPLOCK_BREAK_RESENDS 3
/* Timout (in seconds) to add to the oplock break timeout
to wait for the smbd to smbd message to return. */

15
source/smbd/oplock.c
View File

@ -545,6 +545,7 @@ static BOOL oplock_break(SMB_DEV_T dev, SMB_INO_T inode, struct timeval *tval)
connection_struct *saved_conn;
int saved_vuid;
pstring saved_dir;
int break_counter = OPLOCK_BREAK_RESENDS;
if( DEBUGLVL( 3 ) )
{
@ -671,8 +672,20 @@ static BOOL oplock_break(SMB_DEV_T dev, SMB_INO_T inode, struct timeval *tval)
while(OPEN_FSP(fsp) && fsp->granted_oplock)
{
if(receive_smb(Client,inbuf,OPLOCK_BREAK_TIMEOUT * 1000) == False)
if(receive_smb(Client,inbuf,
(OPLOCK_BREAK_TIMEOUT/OPLOCK_BREAK_RESENDS) * 1000) == False)
{
/* Isaac suggestd that if a MS client doesn't respond to a
oplock break request then we might try resending
it. Certainly it's no worse than just dropping the
socket! */
if (smb_read_error == READ_TIMEOUT && break_counter--) {
DEBUG(2, ( "oplock_break resend\n" ) );
send_smb(Client, outbuf);
continue;
}
/*
* Die if we got an error.
*/