r4777: added a smb_composite_sesssetup() async composite function. This
[gd/samba-autobuild/.git] / source4 / libcli / raw / clitree.c
index 0f56c0fe2e7fb50bdce6d99a5aa7693e24f46681..c6b3fa5ad9e951946f5f9b94dac46e4b9ee1230b 100644 (file)
@@ -1,7 +1,9 @@
 /* 
    Unix SMB/CIFS implementation.
+
    SMB client tree context management functions
-   Copyright (C) Andrew Tridgell 1994-1998
+
+   Copyright (C) Andrew Tridgell 1994-2005
    Copyright (C) James Myers 2003 <myersjj@samba.org>
    
    This program is free software; you can redistribute it and/or modify
@@ -21,6 +23,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/composite/composite.h"
 
 #define SETUP_REQUEST_TREE(cmd, wct, buflen) do { \
        req = smbcli_request_setup(tree, cmd, wct, buflen); \
@@ -34,12 +37,11 @@ struct smbcli_tree *smbcli_tree_init(struct smbcli_session *session)
 {
        struct smbcli_tree *tree;
 
-       tree = talloc_p(session, struct smbcli_tree);
+       tree = talloc_zero(session, struct smbcli_tree);
        if (!tree) {
                return NULL;
        }
 
-       ZERO_STRUCTP(tree);
        tree->session = talloc_reference(tree, session);
 
        return tree;
@@ -48,7 +50,8 @@ struct smbcli_tree *smbcli_tree_init(struct smbcli_session *session)
 /****************************************************************************
  Send a tconX (async send)
 ****************************************************************************/
-struct smbcli_request *smb_tree_connect_send(struct smbcli_tree *tree, union smb_tcon *parms)
+struct smbcli_request *smb_tree_connect_send(struct smbcli_tree *tree, 
+                                            union smb_tcon *parms)
 {
        struct smbcli_request *req = NULL;
 
@@ -83,7 +86,8 @@ struct smbcli_request *smb_tree_connect_send(struct smbcli_tree *tree, union smb
 /****************************************************************************
  Send a tconX (async recv)
 ****************************************************************************/
-NTSTATUS smb_tree_connect_recv(struct smbcli_request *req, TALLOC_CTX *mem_ctx, union smb_tcon *parms)
+NTSTATUS smb_tree_connect_recv(struct smbcli_request *req, TALLOC_CTX *mem_ctx, 
+                              union smb_tcon *parms)
 {
        uint8_t *p;
 
@@ -124,7 +128,8 @@ failed:
 /****************************************************************************
  Send a tconX (sync interface)
 ****************************************************************************/
-NTSTATUS smb_tree_connect(struct smbcli_tree *tree, TALLOC_CTX *mem_ctx, union smb_tcon *parms)
+NTSTATUS smb_tree_connect(struct smbcli_tree *tree, TALLOC_CTX *mem_ctx, 
+                         union smb_tcon *parms)
 {
        struct smbcli_request *req = smb_tree_connect_send(tree, parms);
        return smb_tree_connect_recv(req, mem_ctx, parms);
@@ -149,8 +154,7 @@ NTSTATUS smb_tree_disconnect(struct smbcli_tree *tree)
 
 
 /*
-  a convenient function to establish a smbcli_tree from scratch, using reasonable default
-  parameters
+  a convenient function to establish a smbcli_tree from scratch
 */
 NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
                                     struct smbcli_tree **ret_tree, 
@@ -160,130 +164,23 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
                                     const char *user, const char *domain, 
                                     const char *password)
 {
-       struct smbcli_socket *sock;
-       struct smbcli_transport *transport;
-       struct smbcli_session *session;
-       struct smbcli_tree *tree;
+       struct smb_composite_connect io;
        NTSTATUS status;
-       struct nmb_name calling;
-       struct nmb_name called;
-       union smb_sesssetup setup;
-       union smb_tcon tcon;
-       TALLOC_CTX *mem_ctx;
-       char *in_path = NULL;
-
-       *ret_tree = NULL;
-
-       sock = smbcli_sock_init(parent_ctx);
-       if (!sock) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       /* open a TCP socket to the server */
-       if (!smbcli_sock_connect_byname(sock, dest_host, port)) {
-               talloc_free(sock);
-               DEBUG(2,("Failed to establish socket connection - %s\n", strerror(errno)));
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-       transport = smbcli_transport_init(sock);
-       talloc_free(sock);
-       if (!transport) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       /* send a NBT session request, if applicable */
-       make_nmb_name(&calling, my_name, 0x0);
-       choose_called_name(&called,  dest_host, 0x20);
-
-       if (!smbcli_transport_connect(transport, &calling, &called)) {
-               talloc_free(transport);
-               return NT_STATUS_UNSUCCESSFUL;
-       }
-
-
-       /* negotiate protocol options with the server */
-       status = smb_raw_negotiate(transport);
-       if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(transport);
-               return status;
-       }
-
-       session = smbcli_session_init(transport);
-       talloc_free(transport);
-       if (!session) {
-               return NT_STATUS_NO_MEMORY;
-       }
 
-       /* prepare a session setup to establish a security context */
-       setup.generic.level = RAW_SESSSETUP_GENERIC;
-       setup.generic.in.sesskey = transport->negotiate.sesskey;
-       setup.generic.in.capabilities = transport->negotiate.capabilities;
-       if (!user || !user[0]) {
-               setup.generic.in.password = NULL;
-               setup.generic.in.user = "";
-               setup.generic.in.domain = "";
-       } else {
-               setup.generic.in.password = password;
-               setup.generic.in.user = user;
-               setup.generic.in.domain = domain;
-       }
-
-       mem_ctx = talloc_init("tcon");
-       if (!mem_ctx) {
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       status = smb_raw_session_setup(session, mem_ctx, &setup);
-       if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(session);
-               talloc_free(mem_ctx);
-               return status;
-       }
-
-       session->vuid = setup.generic.out.vuid;
-
-       tree = smbcli_tree_init(session);
-       talloc_free(session);
-       if (!tree) {
-               talloc_free(mem_ctx);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       /* connect to a share using a tree connect */
-       tcon.generic.level = RAW_TCON_TCONX;
-       tcon.tconx.in.flags = 0;
-       tcon.tconx.in.password = data_blob(NULL, 0);    
-       asprintf(&in_path, "\\\\%s\\%s", dest_host, service);
-       tcon.tconx.in.path = in_path;
-       if (!service_type) {
-               if (strequal(service, "IPC$"))
-                       service_type = "IPC";
-               else
-                       service_type = "?????";
-       }
-       tcon.tconx.in.device = service_type;
+       io.in.dest_host = dest_host;
+       io.in.port = port;
+       io.in.called_name = dest_host;
+       io.in.calling_name = my_name;
+       io.in.service = service;
+       io.in.service_type = service_type;
+       io.in.user = user;
+       io.in.domain = domain;
+       io.in.password = password;
        
-       status = smb_tree_connect(tree, mem_ctx, &tcon);
-
-       SAFE_FREE(in_path);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(tree);
-               talloc_free(mem_ctx);
-               return status;
+       status = smb_composite_connect(&io, parent_ctx);
+       if (NT_STATUS_IS_OK(status)) {
+               *ret_tree = io.out.tree;
        }
 
-       tree->tid = tcon.tconx.out.tid;
-       if (tcon.tconx.out.dev_type) {
-               tree->device = talloc_strdup(tree, tcon.tconx.out.dev_type);
-       }
-       if (tcon.tconx.out.fs_type) {
-               tree->fs_type = talloc_strdup(tree, tcon.tconx.out.fs_type);
-       }
-
-       talloc_free(mem_ctx);
-
-       *ret_tree = tree;
-       return NT_STATUS_OK;
+       return status;
 }