s3:libsmb: move cli->smb1.mid to cli->conn.smb1.mid

metze

diff --git a/source3/include/client.h b/source3/include/client.h
index 43b154192559dfbf3a62a46d72311910a59b7dcc..77e124004647bd7036396e1dc61d4e255e8a83ea 100644 (file)
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -137,11 +137,12 @@ struct cli_state {
                        } server;
 
                        uint32_t capabilities;
+
+                       uint16_t mid;
                } smb1;
        } conn;
 
        struct {
-               uint16_t mid;
                uint16_t pid;
                uint16_t vc_num;
                uint16_t tid;

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index e55d5bd3656c476d28672254c3f5da758c109522..cb4e63035b490220bafbd01b2baeba425fbd2e18 100644 (file)
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -106,7 +106,7 @@ static uint16_t cli_alloc_mid(struct cli_state *cli)
        while (true) {
                int i;
 
-               result = cli->smb1.mid++;
+               result = cli->conn.smb1.mid++;
                if ((result == 0) || (result == 0xffff)) {
                        continue;
                }

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 78211583d6de0d7bd1c05282e73e939f89b91631..720a118559da44e1164f4e693171a6b31cf50d38 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -304,6 +304,8 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
 
        cli->conn.smb1.capabilities = cli->conn.smb1.client.capabilities;
 
+       cli->conn.smb1.mid = 1;
+
        cli->conn.outgoing = tevent_queue_create(cli, "cli_outgoing");
        if (cli->conn.outgoing == NULL) {
                goto error;
@@ -339,7 +341,6 @@ struct cli_state *cli_state_create(TALLOC_CTX *mem_ctx,
                goto error;
        }
 
-       cli->smb1.mid = 1;
        cli->smb1.pid = (uint16_t)sys_getpid();
        cli->smb1.vc_num = cli->smb1.pid;
        cli->smb1.tid = UINT16_MAX;