diff options
| author | Jeremy Allison <jra@samba.org> | 2002-10-01 01:33:05 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-10-01 01:33:05 +0000 |
| commit | 68259be9d555257042e91e343324eb91f12a7185 (patch) | |
| tree | a27b8ecbc9813c23dbef8bde4b296a0f74a42615 | |
| parent | 5de642fc6c476f7631b8caaebd1eda5c4d50df57 (diff) | |
| download | samba-68259be9d555257042e91e343324eb91f12a7185.tar.gz samba-68259be9d555257042e91e343324eb91f12a7185.tar.bz2 samba-68259be9d555257042e91e343324eb91f12a7185.zip | |
Added error string for server timeout on client call.
Jeremy.
(This used to be commit abeebf33c132c4975ac5dadde57c22176ddc9fda)
| -rw-r--r-- | source3/include/client.h | 1 | ||||
| -rw-r--r-- | source3/libsmb/clientgen.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/clierror.c | 8 |
3 files changed, 11 insertions, 0 deletions
diff --git a/source3/include/client.h b/source3/include/client.h index 1e8d1c3d29..7a8889edc5 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -70,6 +70,7 @@ typedef struct smb_sign_info { struct cli_state { int port; int fd; + int smb_read_error; /* Copy of last read error. */ uint16 cnum; uint16 pid; uint16 mid; diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 793dd19644..fff81545b1 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -69,6 +69,7 @@ static BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout) BOOL cli_receive_smb(struct cli_state *cli) { + extern int smb_read_error; BOOL ret; /* fd == -1 causes segfaults -- Tom (tom@ninja.nl) */ @@ -100,6 +101,7 @@ BOOL cli_receive_smb(struct cli_state *cli) if (!ret) { close(cli->fd); cli->fd = -1; + cli->smb_read_erorr = smb_read_error; } return ret; diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c index e1507c6048..fb88b66786 100644 --- a/source3/libsmb/clierror.c +++ b/source3/libsmb/clierror.c @@ -85,6 +85,14 @@ char *cli_errstr(struct cli_state *cli) return cli_error_message; } + /* Was it server timeout ? */ + if (cli->fd == -1 && cli->timeout > 0 && cli->smb_read_error == READ_TIMEOUT) { + slprintf(cli_error_message, sizeof(cli_error_message) - 1, + "Call timed out: server did not respond after %d milliseconds", + cli->timeout); + return cli_error_message; + } + /* Case #1: RAP error */ if (cli->rap_error) { for (i = 0; rap_errmap[i].message != NULL; i++) { |