sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r17020: pass the real error to the failing requests

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2006-07-13 17:37:45 +00:00 committed by Gerald (Jerry) Carter
parent 8d4fd35b10
commit 49b96ac44a
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/libcli/raw/clitransport.c
View File

@ -52,7 +52,7 @@ static void smbcli_transport_event_handler(struct event_context *ev,
*/
static int transport_destructor(struct smbcli_transport *transport)
{
smbcli_transport_dead(transport);
smbcli_transport_dead(transport, NT_STATUS_LOCAL_DISCONNECT);
return 0;
}
@ -63,7 +63,7 @@ static int transport_destructor(struct smbcli_transport *transport)
static void smbcli_transport_error(void *private, NTSTATUS status)
{
struct smbcli_transport *transport = talloc_get_type(private, struct smbcli_transport);
smbcli_transport_dead(transport);
smbcli_transport_dead(transport, status);
}
static NTSTATUS smbcli_transport_finish_recv(void *private, DATA_BLOB blob);
@ -130,15 +130,19 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
/*
mark the transport as dead
*/
void smbcli_transport_dead(struct smbcli_transport *transport)
void smbcli_transport_dead(struct smbcli_transport *transport, NTSTATUS status)
{
smbcli_sock_dead(transport->socket);
if (NT_STATUS_EQUAL(NT_STATUS_UNSUCCESSFUL, status)) {
status = NT_STATUS_UNEXPECTED_NETWORK_ERROR;
}
/* kill all pending receives */
while (transport->pending_recv) {
struct smbcli_request *req = transport->pending_recv;
req->state = SMBCLI_REQUEST_ERROR;
req->status = NT_STATUS_NET_WRITE_FAULT;
req->status = status;
DLIST_REMOVE(transport->pending_recv, req);
if (req->async.fn) {
req->async.fn(req);

12
source/libcli/smb2/transport.c
View File

@ -53,7 +53,7 @@ static void smb2_transport_event_handler(struct event_context *ev,
*/
static int transport_destructor(struct smb2_transport *transport)
{
smb2_transport_dead(transport);
smb2_transport_dead(transport, NT_STATUS_LOCAL_DISCONNECT);
return 0;
}
@ -65,7 +65,7 @@ static void smb2_transport_error(void *private, NTSTATUS status)
{
struct smb2_transport *transport = talloc_get_type(private,
struct smb2_transport);
smb2_transport_dead(transport);
smb2_transport_dead(transport, status);
}
static NTSTATUS smb2_transport_finish_recv(void *private, DATA_BLOB blob);
@ -120,15 +120,19 @@ struct smb2_transport *smb2_transport_init(struct smbcli_socket *sock,
/*
mark the transport as dead
*/
void smb2_transport_dead(struct smb2_transport *transport)
void smb2_transport_dead(struct smb2_transport *transport, NTSTATUS status)
{
smbcli_sock_dead(transport->socket);
if (NT_STATUS_EQUAL(NT_STATUS_UNSUCCESSFUL, status)) {
status = NT_STATUS_UNEXPECTED_NETWORK_ERROR;
}
/* kill all pending receives */
while (transport->pending_recv) {
struct smb2_request *req = transport->pending_recv;
req->state = SMB2_REQUEST_ERROR;
req->status = NT_STATUS_NET_WRITE_FAULT;
req->status = status;
DLIST_REMOVE(transport->pending_recv, req);
if (req->async.fn) {
req->async.fn(req);

2
source/torture/basic/delete.c
View File

@ -1592,7 +1592,7 @@ static BOOL deltest21(struct smbcli_state **ppcli1, struct smbcli_state **ppcli2
correct &= check_delete_on_close(cli1, fnum1, fname, True, __location__);
/* Now yank the rug from under cli1. */
smbcli_transport_dead(cli1->transport);
smbcli_transport_dead(cli1->transport, NT_STATUS_LOCAL_DISCONNECT);
fnum1 = -1;

4
source/torture/raw/notify.c
View File

@ -842,7 +842,7 @@ done:
static void tcp_dis_handler(struct smbcli_transport *t, void *p)
{
struct smbcli_state *cli = p;
smbcli_transport_dead(cli->transport);
smbcli_transport_dead(cli->transport, NT_STATUS_LOCAL_DISCONNECT);
cli->transport = NULL;
cli->tree = NULL;
}
@ -898,7 +898,7 @@ static BOOL test_notify_tcp_dis(TALLOC_CTX *mem_ctx)
smbcli_transport_idle_handler(cli->transport, tcp_dis_handler, 250, cli);
status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
CHECK_STATUS(status, NT_STATUS_NET_WRITE_FAULT);
CHECK_STATUS(status, NT_STATUS_LOCAL_DISCONNECT);
done:
torture_close_connection(cli);