diff options
| author | Jeremy Allison <jra@samba.org> | 1999-01-06 23:32:13 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1999-01-06 23:32:13 +0000 |
| commit | f85f08419cd267f6d20c3ea6d072ddef49ca82c0 (patch) | |
| tree | 1ec39803fed75b24e9bde4d5b6106d143ba16e4a /source/include | |
| parent | 11c5fbaba4636700bb657f9d59883082be0ac625 (diff) | |
| download | samba-f85f08419cd267f6d20c3ea6d072ddef49ca82c0.tar.gz samba-f85f08419cd267f6d20c3ea6d072ddef49ca82c0.tar.xz samba-f85f08419cd267f6d20c3ea6d072ddef49ca82c0.zip | |
Fixed the blocking locks and change notify code that got broken in
beta5. The problem was that I had increased the select timeout so much
that the client was sending echo requests as a sort of keepalive.
As smbd only did timeout processing on select timeout then not
much timeout processing was being done :-).
I've fixed this by moving the timeout code to a function and
calling it every time we get an SMBecho request (we must have
been idle at that point).
Jeremy.
Diffstat (limited to 'source/include')
| -rw-r--r-- | source/include/local.h | 2 | ||||
| -rw-r--r-- | source/include/proto.h | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/source/include/local.h b/source/include/local.h index 6aef7f0b8dd..cdff63aa8e5 100644 --- a/source/include/local.h +++ b/source/include/local.h @@ -126,7 +126,7 @@ /* the following control timings of various actions. Don't change them unless you know what you are doing. These are all in seconds */ #define DEFAULT_SMBD_TIMEOUT (60*60*24*7) -#define SMBD_RELOAD_CHECK (120) +#define SMBD_RELOAD_CHECK (180) #define IDLE_CLOSED_TIMEOUT (60) #define DPTR_IDLE_TIMEOUT (120) #define SMBD_SELECT_LOOP (60) diff --git a/source/include/proto.h b/source/include/proto.h index 72baf1c77ec..1f4f522ac77 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -2412,6 +2412,10 @@ int reply_negprot(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize); +/*The following definitions come from smbd/noquotas.c */ + +BOOL disk_quotas(char *path,SMB_BIG_UINT *bsize,SMB_BIG_UINT *dfree,SMB_BIG_UINT *dsize); + /*The following definitions come from smbd/nttrans.c */ void fail_next_srvsvc_open(void); @@ -2506,15 +2510,6 @@ void construct_reply_common(char *inbuf,char *outbuf); int chain_reply(char *inbuf,char *outbuf,int size,int bufsize); void smbd_process(void); -/*The following definitions come from smbd/quotas.c */ - -BOOL disk_quotas(char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize); -BOOL disk_quotas(char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize); -BOOL disk_quotas(char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize); -BOOL disk_quotas(char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize); -BOOL disk_quotas(char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize); -BOOL disk_quotas(char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize); - /*The following definitions come from smbd/reply.c */ int reply_special(char *inbuf,char *outbuf); |