s3:libsmb: abstract the incoming dispatch function via a function pointer

[idra/samba.git] / source3 / libsmb / async_smb.c

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index b3de5af50b0d253b6b3702427d45e5af920c9a9a..b07eee9e10e2b594456497850a7df61b730c80a9 100644 (file)
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -228,6 +228,9 @@ bool cli_smb_req_set_pending(struct tevent_req *req)
 }
 
 static void cli_smb_received(struct tevent_req *subreq);
 }
 
 static void cli_smb_received(struct tevent_req *subreq);

+static NTSTATUS cli_state_dispatch_smb1(struct cli_state *cli,
+                                       TALLOC_CTX *frame,
+                                       uint8_t *inbuf);

 
 static bool cli_state_receive_next(struct cli_state *cli)
 {
 
 static bool cli_state_receive_next(struct cli_state *cli)
 {


@@ -246,6 +249,8 @@ static bool cli_state_receive_next(struct cli_state *cli)
        req = cli->conn.pending[0];
        state = tevent_req_data(req, struct cli_smb_state);
 
        req = cli->conn.pending[0];
        state = tevent_req_data(req, struct cli_smb_state);
 

+       cli->conn.dispatch_incoming = cli_state_dispatch_smb1;
+

        /*
         * We're the first ones, add the read_smb request that waits for the
         * answer from the server
        /*
         * We're the first ones, add the read_smb request that waits for the
         * answer from the server


@@ -579,10 +584,6 @@ static void cli_smb_sent(struct tevent_req *subreq)
        }
 }
 
        }
 }
 

-static NTSTATUS cli_state_dispatch_smb1(struct cli_state *cli,
-                                       TALLOC_CTX *frame,
-                                       uint8_t *inbuf);
-

 static void cli_smb_received(struct tevent_req *subreq)
 {
        struct cli_state *cli = tevent_req_callback_data(
 static void cli_smb_received(struct tevent_req *subreq)
 {
        struct cli_state *cli = tevent_req_callback_data(


@@ -612,7 +613,7 @@ static void cli_smb_received(struct tevent_req *subreq)
                return;
        }
 
                return;
        }
 

-       status = cli_state_dispatch_smb1(cli, frame, inbuf);
+       status = cli->conn.dispatch_incoming(cli, frame, inbuf);

        TALLOC_FREE(frame);
        if (NT_STATUS_IS_OK(status)) {
                /*
        TALLOC_FREE(frame);
        if (NT_STATUS_IS_OK(status)) {
                /*