Do proper error handling if the socket is closed
authorVolker Lendecke <vl@sernet.de>
Fri, 5 Sep 2008 09:48:36 +0000 (11:48 +0200)
committerVolker Lendecke <vl@samba.org>
Fri, 5 Sep 2008 10:10:08 +0000 (12:10 +0200)
This is a step in fixing bug 5707.

Thanks to Igor Galić <i.galic@brainsware.org> for reporting!

Volker

source/libsmb/async_smb.c

index 58bba2bfc703d130686442bdaf1980ed5a0a794a..934626456de59db90a7017c88e0e7998074ef1c8 100644 (file)
@@ -319,6 +319,7 @@ static void cli_state_handler(struct event_context *event_ctx,
 {
        struct cli_state *cli = (struct cli_state *)p;
        struct cli_request *req;
+       NTSTATUS status;
 
        DEBUG(11, ("cli_state_handler called with flags %d\n", flags));
 
@@ -331,11 +332,13 @@ static void cli_state_handler(struct event_context *event_ctx,
                if (res == -1) {
                        DEBUG(10, ("ioctl(FIONREAD) failed: %s\n",
                                   strerror(errno)));
+                       status = map_nt_error_from_unix(errno);
                        goto sock_error;
                }
 
                if (available == 0) {
                        /* EOF */
+                       status = NT_STATUS_END_OF_FILE;
                        goto sock_error;
                }
 
@@ -344,6 +347,7 @@ static void cli_state_handler(struct event_context *event_ctx,
 
                if (new_size < old_size) {
                        /* wrap */
+                       status = NT_STATUS_UNEXPECTED_IO_ERROR;
                        goto sock_error;
                }
 
@@ -351,6 +355,7 @@ static void cli_state_handler(struct event_context *event_ctx,
                                           new_size);
                if (tmp == NULL) {
                        /* nomem */
+                       status = NT_STATUS_NO_MEMORY;
                        goto sock_error;
                }
                cli->evt_inbuf = tmp;
@@ -358,6 +363,7 @@ static void cli_state_handler(struct event_context *event_ctx,
                res = recv(cli->fd, cli->evt_inbuf + old_size, available, 0);
                if (res == -1) {
                        DEBUG(10, ("recv failed: %s\n", strerror(errno)));
+                       status = map_nt_error_from_unix(errno);
                        goto sock_error;
                }
 
@@ -402,6 +408,7 @@ static void cli_state_handler(struct event_context *event_ctx,
                            to_send - req->sent, 0);
 
                if (sent < 0) {
+                       status = map_nt_error_from_unix(errno);
                        goto sock_error;
                }
 
@@ -415,8 +422,7 @@ static void cli_state_handler(struct event_context *event_ctx,
 
  sock_error:
        for (req = cli->outstanding_requests; req; req = req->next) {
-               req->async->state = ASYNC_REQ_ERROR;
-               req->async->status = map_nt_error_from_unix(errno);
+               async_req_error(req->async, status);
        }
        TALLOC_FREE(cli->fd_event);
        close(cli->fd);