1
0
mirror of https://github.com/samba-team/samba.git synced 2025-11-16 20:23:50 +03:00

some more work on the byte range locking

note the ugly global_smbpid - I hope that won't bethere for long, I
just didn't want to do two lots of major surgery at the one time.
Using global_smbpid avoids the big change of getting rid of our
inbuf/outbuf interface to reply routines. I'll do that once the
locking stuff passes all tests.
This commit is contained in:
Andrew Tridgell
-
parent 23bb936e1f
commit f8bebf91ab
3 changed files with 31 additions and 22 deletions

View File

@@ -25,7 +25,7 @@ extern int DEBUGLEVEL;
struct timeval smb_last_time;
char *InBuffer = NULL;
static char *InBuffer = NULL;
char *OutBuffer = NULL;
char *last_inbuf = NULL;
@@ -420,6 +420,7 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize
sizeof(smb_messages) / sizeof(struct smb_message_struct);
int match;
extern int Client;
extern int global_smbpid;
if (pid == (pid_t)-1)
pid = getpid();
@@ -438,6 +439,10 @@ static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize
if (smb_messages[match].code == type)
break;
/* yuck! this is an interim measure before we get rid of our
current inbuf/outbuf system */
global_smbpid = SVAL(inbuf,smb_pid);
if (match == num_smb_messages)
{
DEBUG(0,("Unknown message type %d!\n",type));
@@ -841,7 +846,7 @@ void check_reload(int t)
}
/****************************************************************************
Process any timeout housekeeping. Return False if the caler should exit.
Process any timeout housekeeping. Return False if the caller should exit.
****************************************************************************/
static BOOL timeout_processing(int deadtime, int *select_timeout, time_t *last_timeout_processing_time)