libutil: moved the networking defines to util_net.h

[kai/samba-autobuild/.git] / source4 / libcli / smb_composite / connect.c

diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index 5f651f486519fca6392f6663d1d52e7539bf34b3..16f2af9b3df701af5a382abb2dd6eea3f1385a7d 100644 (file)
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -30,10 +30,10 @@
 #include "auth/credentials/credentials.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "param/param.h"
+#include "lib/util/util_net.h"
 
 /* the stages of this call */
-enum connect_stage {CONNECT_RESOLVE, 
-                   CONNECT_SOCKET, 
+enum connect_stage {CONNECT_SOCKET, 
                    CONNECT_SESSION_REQUEST,
                    CONNECT_NEGPROT,
                    CONNECT_SESSION_SETUP,
@@ -129,7 +129,7 @@ static NTSTATUS connect_session_setup_anon(struct composite_context *c,
        }
 
        state->req->async.fn = request_handler;
-       state->req->async.private = c;
+       state->req->async.private_data = c;
        state->stage = CONNECT_TCON;
 
        return NT_STATUS_OK;
@@ -215,7 +215,7 @@ static NTSTATUS connect_session_setup(struct composite_context *c,
        }
 
        state->req->async.fn = request_handler;
-       state->req->async.private = c;
+       state->req->async.private_data = c;
        state->stage = CONNECT_TCON;
 
        return NT_STATUS_OK;
@@ -229,15 +229,12 @@ static NTSTATUS connect_negprot(struct composite_context *c,
 {
        struct connect_state *state = talloc_get_type(c->private_data, struct connect_state);
        NTSTATUS status;
-       struct smbcli_session_options options;
-
-       lp_smbcli_session_options(global_loadparm, &options);
 
        status = smb_raw_negotiate_recv(state->req);
        NT_STATUS_NOT_OK_RETURN(status);
 
        /* next step is a session setup */
-       state->session = smbcli_session_init(state->transport, state, true, options);
+       state->session = smbcli_session_init(state->transport, state, true, io->in.session_options);
        NT_STATUS_HAVE_NO_MEMORY(state->session);
        
        /* setup for a tconx (or at least have the structure ready to
@@ -260,6 +257,7 @@ static NTSTATUS connect_negprot(struct composite_context *c,
        state->io_setup->in.capabilities = state->transport->negotiate.capabilities;
        state->io_setup->in.credentials  = io->in.credentials;
        state->io_setup->in.workgroup    = io->in.workgroup;
+       state->io_setup->in.gensec_settings = io->in.gensec_settings;
 
        state->creq = smb_composite_sesssetup_send(state->session, state->io_setup);
        NT_STATUS_HAVE_NO_MEMORY(state->creq);
@@ -287,7 +285,7 @@ static NTSTATUS connect_send_negprot(struct composite_context *c,
        NT_STATUS_HAVE_NO_MEMORY(state->req);
 
        state->req->async.fn = request_handler;
-       state->req->async.private = c;
+       state->req->async.private_data = c;
        state->stage = CONNECT_NEGPROT;
        
        return NT_STATUS_OK;
@@ -325,7 +323,7 @@ static NTSTATUS connect_socket(struct composite_context *c,
 
        /* the socket is up - we can initialise the smbcli transport layer */
        state->transport = smbcli_transport_init(state->sock, state, true, 
-                                                &io->in.options);
+                                                &io->in.options, io->in.iconv_convenience);
        NT_STATUS_HAVE_NO_MEMORY(state->transport);
 
        if (is_ipaddress(state->sock->hostname) &&
@@ -356,40 +354,13 @@ static NTSTATUS connect_socket(struct composite_context *c,
        NT_STATUS_HAVE_NO_MEMORY(state->req);
 
        state->req->async.fn = request_handler;
-       state->req->async.private = c;
+       state->req->async.private_data = c;
        state->stage = CONNECT_SESSION_REQUEST;
 
        return NT_STATUS_OK;
 }
 
 
-/*
-  called when name resolution is finished
-*/
-static NTSTATUS connect_resolve(struct composite_context *c, 
-                               struct smb_composite_connect *io)
-{
-       struct connect_state *state = talloc_get_type(c->private_data, struct connect_state);
-       NTSTATUS status;
-       const char *address;
-
-       status = resolve_name_recv(state->creq, state, &address);
-       NT_STATUS_NOT_OK_RETURN(status);
-
-       state->creq = smbcli_sock_connect_send(state, address, 
-                                              io->in.dest_ports,
-                                              io->in.dest_host, 
-                                              NULL, c->event_ctx);
-       NT_STATUS_HAVE_NO_MEMORY(state->creq);
-
-       state->stage = CONNECT_SOCKET;
-       state->creq->async.private_data = c;
-       state->creq->async.fn = composite_handler;
-
-       return NT_STATUS_OK;
-}
-
-
 /*
   handle and dispatch state transitions
 */
@@ -398,9 +369,6 @@ static void state_handler(struct composite_context *c)
        struct connect_state *state = talloc_get_type(c->private_data, struct connect_state);
 
        switch (state->stage) {
-       case CONNECT_RESOLVE:
-               c->status = connect_resolve(c, state->io);
-               break;
        case CONNECT_SOCKET:
                c->status = connect_socket(c, state->io);
                break;
@@ -419,6 +387,8 @@ static void state_handler(struct composite_context *c)
        case CONNECT_TCON:
                c->status = connect_tcon(c, state->io);
                break;
+       case CONNECT_DONE:
+               break;
        }
 
        if (state->stage == CONNECT_DONE) {
@@ -435,7 +405,7 @@ static void state_handler(struct composite_context *c)
 */
 static void request_handler(struct smbcli_request *req)
 {
-       struct composite_context *c = talloc_get_type(req->async.private, 
+       struct composite_context *c = talloc_get_type(req->async.private_data,
                                                     struct composite_context);
        state_handler(c);
 }
@@ -456,31 +426,35 @@ static void composite_handler(struct composite_context *creq)
 struct composite_context *smb_composite_connect_send(struct smb_composite_connect *io,
                                                     TALLOC_CTX *mem_ctx,
                                                     struct resolve_context *resolve_ctx,
-                                                    struct event_context *event_ctx)
+                                                    struct tevent_context *event_ctx)
 {
        struct composite_context *c;
        struct connect_state *state;
-       struct nbt_name name;
 
        c = talloc_zero(mem_ctx, struct composite_context);
        if (c == NULL) goto failed;
 
-       c->event_ctx = talloc_reference(c, event_ctx);
+       c->event_ctx = event_ctx;
        if (c->event_ctx == NULL) goto failed;
 
        state = talloc_zero(c, struct connect_state);
        if (state == NULL) goto failed;
 
+       if (io->in.gensec_settings == NULL) goto failed;
        state->io = io;
 
        c->state = COMPOSITE_STATE_IN_PROGRESS;
        c->private_data = state;
 
-       state->stage = CONNECT_RESOLVE;
-       make_nbt_name_server(&name, io->in.dest_host);
-       state->creq = resolve_name_send(resolve_ctx, &name, c->event_ctx);
-
+       state->creq = smbcli_sock_connect_send(state, 
+                                              NULL,
+                                              io->in.dest_ports,
+                                              io->in.dest_host, 
+                                              resolve_ctx, c->event_ctx, 
+                                              io->in.socket_options);
        if (state->creq == NULL) goto failed;
+
+       state->stage = CONNECT_SOCKET;
        state->creq->async.private_data = c;
        state->creq->async.fn = composite_handler;
 
@@ -513,7 +487,7 @@ NTSTATUS smb_composite_connect_recv(struct composite_context *c, TALLOC_CTX *mem
 */
 NTSTATUS smb_composite_connect(struct smb_composite_connect *io, TALLOC_CTX *mem_ctx,
                               struct resolve_context *resolve_ctx,
-                              struct event_context *ev)
+                              struct tevent_context *ev)
 {
        struct composite_context *c = smb_composite_connect_send(io, mem_ctx, resolve_ctx, ev);
        return smb_composite_connect_recv(c, mem_ctx);