sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

Clean up client timeout definitions [rev. 2]

Browse Source 
The definitions for default client timeout values have been moved to client.h.  When initializing a client struct we use this value instead of the old hardcoded value.  The timeout value remains 20 seconds.

Signed-off-by: Scott Lovenberg <scott.lovenberg@gmail.com>
Reviewed by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Dec  6 03:25:58 CET 2012 on sn-devel-104
This commit is contained in:
Scott Lovenberg 2012-12-04 09:15:38 -05:00 committed by Jeremy Allison
parent 4eb53da3fe
commit bd18d996e2
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/client/client.c
View File

@ -65,10 +65,6 @@ static int cmd_help(void);
#define CREATE_ACCESS_READ READ_CONTROL_ACCESS
/* 30 second timeout on most commands */
#define CLIENT_TIMEOUT (30*1000)
#define SHORT_TIMEOUT (5*1000)
/* value for unused fid field in trans2 secondary request */
#define FID_UNUSED (0xFFFF)

3
source3/client/clitar.c
View File

@ -73,9 +73,6 @@ extern struct cli_state *cli;
static uint16 attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
#ifndef CLIENT_TIMEOUT
#define CLIENT_TIMEOUT (30*1000)
#endif
static char *tarbuf, *buffer_p;
static int tp, ntarf, tbufsiz;

3
source3/include/client.h
View File

@ -24,6 +24,9 @@
#define CLI_BUFFER_SIZE (0xFFFF)
/* default client timeout to 20 seconds on most commands */
#define CLIENT_TIMEOUT (20 * 1000)
/*
* These definitions depend on smb.h
*/

3
source3/libsmb/clientgen.c
View File

@ -26,6 +26,7 @@
#include "async_smb.h"
#include "../libcli/smb/smbXcli_base.h"
#include "../librpc/ndr/libndr.h"
#include "../include/client.h"
/*******************************************************************
Setup the word count and byte count for a client smb message.
@ -175,7 +176,7 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
}
cli->raw_status = NT_STATUS_INTERNAL_ERROR;
cli->map_dos_errors = true; /* remove this */
cli->timeout = 20000; /* Timeout is in milliseconds. */
cli->timeout = CLIENT_TIMEOUT;
cli->case_sensitive = false;
/* Set the CLI_FORCE_DOSERR environment variable to test