libcli/smb: remove unused split of read_fd and write_fd

The tevent epoll backend supports separate read and write tevent_fd structure
on a single fd, so there's no need for a dup() anymore.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11316

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index b38792e87be4b2bc388d0e6deea932f152561c5e..63bcee9f600c2c4c9e4dcc635fe574bd8d4233d6 100644 (file)
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -44,8 +44,7 @@ struct smbXcli_session;
 struct smbXcli_tcon;
 
 struct smbXcli_conn {
-       int read_fd;
-       int write_fd;
+       int sock_fd;
        struct sockaddr_storage local_ss;
        struct sockaddr_storage remote_ss;
        const char *remote_name;
@@ -328,18 +327,13 @@ struct smbXcli_conn *smbXcli_conn_create(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
-       conn->read_fd = fd;
-       conn->write_fd = dup(fd);
-       if (conn->write_fd == -1) {
-               goto error;
-       }
+       conn->sock_fd = fd;
 
        conn->remote_name = talloc_strdup(conn, remote_name);
        if (conn->remote_name == NULL) {
                goto error;
        }
 
-
        ss = (void *)&conn->local_ss;
        sa = (struct sockaddr *)ss;
        sa_length = sizeof(conn->local_ss);
@@ -428,9 +422,6 @@ struct smbXcli_conn *smbXcli_conn_create(TALLOC_CTX *mem_ctx,
        return conn;
 
  error:
-       if (conn->write_fd != -1) {
-               close(conn->write_fd);
-       }
        TALLOC_FREE(conn);
        return NULL;
 }
@@ -441,7 +432,7 @@ bool smbXcli_conn_is_connected(struct smbXcli_conn *conn)
                return false;
        }
 
-       if (conn->read_fd == -1) {
+       if (conn->sock_fd == -1) {
                return false;
        }
 
@@ -468,7 +459,7 @@ bool smbXcli_conn_use_unicode(struct smbXcli_conn *conn)
 
 void smbXcli_conn_set_sockopt(struct smbXcli_conn *conn, const char *options)
 {
-       set_socket_options(conn->read_fd, options);
+       set_socket_options(conn->sock_fd, options);
 }
 
 const struct sockaddr_storage *smbXcli_conn_local_sockaddr(struct smbXcli_conn *conn)
@@ -554,7 +545,7 @@ struct tevent_req *smbXcli_conn_samba_suicide_send(TALLOC_CTX *mem_ctx,
        state->iov.iov_base = state->buf;
        state->iov.iov_len = sizeof(state->buf);
 
-       subreq = writev_send(state, ev, conn->outgoing, conn->write_fd,
+       subreq = writev_send(state, ev, conn->outgoing, conn->sock_fd,
                             false, &state->iov, 1);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
@@ -986,7 +977,7 @@ static bool smbXcli_conn_receive_next(struct smbXcli_conn *conn)
         */
        conn->read_smb_req = read_smb_send(conn->pending,
                                           state->ev,
-                                          conn->read_fd);
+                                          conn->sock_fd);
        if (conn->read_smb_req == NULL) {
                return false;
        }
@@ -997,13 +988,11 @@ static bool smbXcli_conn_receive_next(struct smbXcli_conn *conn)
 void smbXcli_conn_disconnect(struct smbXcli_conn *conn, NTSTATUS status)
 {
        struct smbXcli_session *session;
-       int read_fd = conn->read_fd;
-       int write_fd = conn->write_fd;
+       int sock_fd = conn->sock_fd;
 
        tevent_queue_stop(conn->outgoing);
 
-       conn->read_fd = -1;
-       conn->write_fd = -1;
+       conn->sock_fd = -1;
 
        session = conn->sessions;
        if (talloc_array_length(conn->pending) == 0) {
@@ -1085,11 +1074,8 @@ void smbXcli_conn_disconnect(struct smbXcli_conn *conn, NTSTATUS status)
                TALLOC_FREE(chain);
        }
 
-       if (read_fd != -1) {
-               close(read_fd);
-       }
-       if (write_fd != -1) {
-               close(write_fd);
+       if (sock_fd != -1) {
+               close(sock_fd);
        }
 }
 
@@ -1571,7 +1557,7 @@ static NTSTATUS smb1cli_req_writev_submit(struct tevent_req *req,
        tevent_req_set_cancel_fn(req, smbXcli_req_cancel);
 
        subreq = writev_send(state, state->ev, state->conn->outgoing,
-                            state->conn->write_fd, false, iov, iov_count);
+                            state->conn->sock_fd, false, iov, iov_count);
        if (subreq == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -3166,7 +3152,7 @@ skip_credits:
        }
 
        subreq = writev_send(state, state->ev, state->conn->outgoing,
-                            state->conn->write_fd, false, iov, num_iov);
+                            state->conn->sock_fd, false, iov, num_iov);
        if (subreq == NULL) {
                return NT_STATUS_NO_MEMORY;
        }