s3:libsmb: move cli_state->outgoing to cli_state->conn.outgoing

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Fri Jul 22 09:53:59 CEST 2011 on sn-devel-104

diff --git a/source3/include/client.h b/source3/include/client.h
index 72bb25a2d7ecba96d4cccce3d973c73a81b82cbe..26b8fcb4056751486b315b965bedef4d0d46089b 100644 (file)
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -124,9 +124,8 @@ struct cli_state {
        /* Where (if anywhere) this is mounted under DFS. */
        char *dfs_mountpoint;
 
-       struct tevent_queue *outgoing;
-
        struct {
+               struct tevent_queue *outgoing;
                struct tevent_req **pending;
        } conn;
 

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 402abb2c333c5edf11f7cd3538c1685d8d594bca..462a6dc4a46c48dcf02d943e3ed494b698cef657 100644 (file)
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -430,7 +430,7 @@ static NTSTATUS cli_smb_req_iov_send(struct tevent_req *req,
                iov[0].iov_len = talloc_get_size(buf);
                iov_count = 1;
        }
-       subreq = writev_send(state, state->ev, state->cli->outgoing,
+       subreq = writev_send(state, state->ev, state->cli->conn.outgoing,
                             state->cli->fd, false, iov, iov_count);
        if (subreq == NULL) {
                return NT_STATUS_NO_MEMORY;
@@ -954,7 +954,7 @@ NTSTATUS cli_smb_chain_send(struct tevent_req **reqs, int num_reqs)
 
 bool cli_has_async_calls(struct cli_state *cli)
 {
-       return ((tevent_queue_length(cli->outgoing) != 0)
+       return ((tevent_queue_length(cli->conn.outgoing) != 0)
                || (talloc_array_length(cli->conn.pending) != 0));
 }
 

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index b84b1812e824a03f6c3d4c993b3e3da3c8a45e23..c394197ad9ea5e2fbed551707276fdfff58d44c7 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -233,8 +233,8 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
                goto error;
        }
 
-       cli->outgoing = tevent_queue_create(cli, "cli_outgoing");
-       if (cli->outgoing == NULL) {
+       cli->conn.outgoing = tevent_queue_create(cli, "cli_outgoing");
+       if (cli->conn.outgoing == NULL) {
                goto error;
        }
        cli->conn.pending = NULL;

diff --git a/source3/libsmb/smb2cli_base.c b/source3/libsmb/smb2cli_base.c
index 037127ea07bea0cd3662e929c66ed351df945170..a1ecfb4e38928b56a53b7548f6e2ae97b41f7059 100644 (file)
--- a/source3/libsmb/smb2cli_base.c
+++ b/source3/libsmb/smb2cli_base.c
@@ -293,7 +293,7 @@ NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
        iov[0].iov_base = state->nbt;
        iov[0].iov_len  = sizeof(state->nbt);
 
-       subreq = writev_send(state, state->ev, state->cli->outgoing,
+       subreq = writev_send(state, state->ev, state->cli->conn.outgoing,
                             state->cli->fd, false, iov, num_iov);
        if (subreq == NULL) {
                return NT_STATUS_NO_MEMORY;