diff options
| author | Scott Lovenberg <scott.lovenberg@gmail.com> | 2012-12-04 09:15:38 -0500 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-12-06 03:25:58 +0100 |
| commit | bd18d996e2dc3e6b984d20196e9825b8b3f4dea3 (patch) | |
| tree | 8d4dffa1bbc607240fd9180692e6038e273c3810 | |
| parent | 4eb53da3fe139b8d89ab98cc1df211267669a612 (diff) | |
| download | samba-bd18d996e2dc3e6b984d20196e9825b8b3f4dea3.tar.gz samba-bd18d996e2dc3e6b984d20196e9825b8b3f4dea3.tar.bz2 samba-bd18d996e2dc3e6b984d20196e9825b8b3f4dea3.zip | |
Clean up client timeout definitions [rev. 2]
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
| -rw-r--r-- | source3/client/client.c | 4 | ||||
| -rw-r--r-- | source3/client/clitar.c | 3 | ||||
| -rw-r--r-- | source3/include/client.h | 3 | ||||
| -rw-r--r-- | source3/libsmb/clientgen.c | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 0e2e07bd71..6aed9d3891 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -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) diff --git a/source3/client/clitar.c b/source3/client/clitar.c index d3525719f5..7bbd6ad975 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -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; diff --git a/source3/include/client.h b/source3/include/client.h index f6aaceaea6..52e2212c06 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -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 */ diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 6bc8d0ce70..98ea7113a2 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -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 |