Fix include paths to new location of libutil.

[kai/samba-autobuild/.git] / source4 / smb_server / tcon.c

diff --git a/source4/smb_server/tcon.c b/source4/smb_server/tcon.c
index 95e42d6537c9db366794c8d66d21666eb6f156f7..12131ea25978cbfbfa67785a960260d94a14a479 100644 (file)
--- a/source4/smb_server/tcon.c
+++ b/source4/smb_server/tcon.c
@@ -3,10 +3,11 @@
    Manage smbsrv_tcon structures
    Copyright (C) Andrew Tridgell 1998
    Copyright (C) Alexander Bokovoy 2002
+   Copyright (C) Stefan Metzmacher 2005-2006
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,16 +16,30 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "dlinklist.h"
+#include "../lib/util/dlinklist.h"
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
 #include "ntvfs/ntvfs.h"
 
+struct socket_address *smbsrv_get_my_addr(void *p, TALLOC_CTX *mem_ctx)
+{
+       struct smbsrv_connection *smb_conn = talloc_get_type(p,
+                                            struct smbsrv_connection);
+
+       return socket_get_my_addr(smb_conn->connection->socket, mem_ctx);
+}
+
+struct socket_address *smbsrv_get_peer_addr(void *p, TALLOC_CTX *mem_ctx)
+{
+       struct smbsrv_connection *smb_conn = talloc_get_type(p,
+                                            struct smbsrv_connection);
+
+       return socket_get_peer_addr(smb_conn->connection->socket, mem_ctx);
+}
 
 /****************************************************************************
 init the tcon structures
@@ -58,7 +73,8 @@ NTSTATUS smbsrv_smb2_init_tcons(struct smbsrv_session *smb_sess)
 /****************************************************************************
 find a tcon given a tid for SMB
 ****************************************************************************/
-static struct smbsrv_tcon *smbsrv_tcon_find(struct smbsrv_tcons_context *tcons_ctx, uint32_t tid)
+static struct smbsrv_tcon *smbsrv_tcon_find(struct smbsrv_tcons_context *tcons_ctx,
+                                           uint32_t tid, struct timeval request_time)
 {
        void *p;
        struct smbsrv_tcon *tcon;
@@ -71,31 +87,35 @@ static struct smbsrv_tcon *smbsrv_tcon_find(struct smbsrv_tcons_context *tcons_c
        if (!p) return NULL;
 
        tcon = talloc_get_type(p, struct smbsrv_tcon);
+       if (!tcon) return NULL;
+
+       tcon->statistics.last_request_time = request_time;
 
        return tcon;
 }
 
-struct smbsrv_tcon *smbsrv_smb_tcon_find(struct smbsrv_connection *smb_conn, uint32_t tid)
+struct smbsrv_tcon *smbsrv_smb_tcon_find(struct smbsrv_connection *smb_conn,
+                                        uint32_t tid, struct timeval request_time)
 {
-       return smbsrv_tcon_find(&smb_conn->smb_tcons, tid);
+       return smbsrv_tcon_find(&smb_conn->smb_tcons, tid, request_time);
 }
 
-struct smbsrv_tcon *smbsrv_smb2_tcon_find(struct smbsrv_session *smb_sess, uint32_t tid)
+struct smbsrv_tcon *smbsrv_smb2_tcon_find(struct smbsrv_session *smb_sess,
+                                         uint32_t tid, struct timeval request_time)
 {
        if (!smb_sess) return NULL;
-       return smbsrv_tcon_find(&smb_sess->smb2_tcons, tid);
+       return smbsrv_tcon_find(&smb_sess->smb2_tcons, tid, request_time);
 }
 
 /*
   destroy a connection structure
 */
-static int smbsrv_tcon_destructor(void *ptr)
+static int smbsrv_tcon_destructor(struct smbsrv_tcon *tcon)
 {
-       struct smbsrv_tcon *tcon = talloc_get_type(ptr, struct smbsrv_tcon);
        struct smbsrv_tcons_context *tcons_ctx;
        struct socket_address *client_addr;
 
-       client_addr = socket_get_peer_addr(tcon->smb_conn->connection->socket, ptr);
+       client_addr = socket_get_peer_addr(tcon->smb_conn->connection->socket, tcon);
        DEBUG(3,("%s closed connection to service %s\n",
                 client_addr ? client_addr->addr : "(unknown)",
                 tcon->share_name));
@@ -103,6 +123,7 @@ static int smbsrv_tcon_destructor(void *ptr)
        /* tell the ntvfs backend that we are disconnecting */
        if (tcon->ntvfs) {
                ntvfs_disconnect(tcon->ntvfs);
+               tcon->ntvfs = NULL;
        }
 
        if (tcon->smb2.session) {
@@ -125,15 +146,19 @@ static struct smbsrv_tcon *smbsrv_tcon_new(struct smbsrv_connection *smb_conn,
 {
        TALLOC_CTX *mem_ctx;
        struct smbsrv_tcons_context *tcons_ctx;
+       uint32_t handle_uint_max;
        struct smbsrv_tcon *tcon;
+       NTSTATUS status;
        int i;
 
        if (smb_sess) {
                mem_ctx = smb_sess;
                tcons_ctx = &smb_sess->smb2_tcons;
+               handle_uint_max = UINT32_MAX;
        } else {
                mem_ctx = smb_conn;
                tcons_ctx = &smb_conn->smb_tcons;
+               handle_uint_max = UINT16_MAX;
        }
 
        tcon = talloc_zero(mem_ctx, struct smbsrv_tcon);
@@ -143,6 +168,16 @@ static struct smbsrv_tcon *smbsrv_tcon_new(struct smbsrv_connection *smb_conn,
        tcon->share_name        = talloc_strdup(tcon, share_name);
        if (!tcon->share_name) goto failed;
 
+       /*
+        * the use -1 here, because we don't want to give away the wildcard
+        * fnum used in SMBflush
+        */
+       status = smbsrv_init_handles(tcon, handle_uint_max - 1);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(1,("ERROR! failed to init handles: %s\n", nt_errstr(status)));
+               goto failed;
+       }
+
        i = idr_get_new_random(tcons_ctx->idtree_tid, tcon, tcons_ctx->idtree_limit);
        if (i == -1) {
                DEBUG(1,("ERROR! Out of connection structures\n"));