r21064: The core of this patch is
[samba.git] / source3 / smbd / conn.c
index c771f1254b8123e228377d219c1dfbe441a60a56..44888b777f2e536b6d3014f7434a261f76d7d4df 100644 (file)
 
 #include "includes.h"
 
-/* set these to define the limits of the server. NOTE These are on a
-   per-client basis. Thus any one machine can't connect to more than
-   MAX_CONNECTIONS services, but any number of machines may connect at
  one time. */
-#define MAX_CONNECTIONS 128
+/* The connections bitmap is expanded in increments of BITMAP_BLOCK_SZ. The
+ * maximum size of the bitmap is the largest positive integer, but you will hit
+ * the "max connections" limit, looong before that.
+ */
+#define BITMAP_BLOCK_SZ 128
 
 static connection_struct *Connections;
 
@@ -38,7 +38,7 @@ init the conn structures
 ****************************************************************************/
 void conn_init(void)
 {
-       bmap = bitmap_allocate(MAX_CONNECTIONS);
+       bmap = bitmap_allocate(BITMAP_BLOCK_SZ);
 }
 
 /****************************************************************************
@@ -57,7 +57,7 @@ BOOL conn_snum_used(int snum)
 {
        connection_struct *conn;
        for (conn=Connections;conn;conn=conn->next) {
-               if (conn->service == snum) {
+               if (conn->params->service == snum) {
                        return(True);
                }
        }
@@ -68,7 +68,7 @@ BOOL conn_snum_used(int snum)
 /****************************************************************************
 find a conn given a cnum
 ****************************************************************************/
-connection_struct *conn_find(int cnum)
+connection_struct *conn_find(unsigned cnum)
 {
        int count=0;
        connection_struct *conn;
@@ -93,20 +93,66 @@ thinking the server is still available.
 ****************************************************************************/
 connection_struct *conn_new(void)
 {
+       TALLOC_CTX *mem_ctx;
        connection_struct *conn;
        int i;
+        int find_offset = 1;
 
-       i = bitmap_find(bmap, 1);
+find_again:
+       i = bitmap_find(bmap, find_offset);
        
        if (i == -1) {
-               DEBUG(1,("ERROR! Out of connection structures\n"));            
+                /* Expand the connections bitmap. */
+                int             oldsz = bmap->n;
+                int             newsz = bmap->n + BITMAP_BLOCK_SZ;
+                struct bitmap * nbmap;
+
+                if (newsz <= oldsz) {
+                        /* Integer wrap. */
+                       DEBUG(0,("ERROR! Out of connection structures\n"));
+                        return NULL;
+                }
+
+               DEBUG(4,("resizing connections bitmap from %d to %d\n",
+                        oldsz, newsz));
+
+                nbmap = bitmap_allocate(newsz);
+               if (!nbmap) {
+                       DEBUG(0,("ERROR! malloc fail.\n"));
+                       return NULL;
+               }
+
+                bitmap_copy(nbmap, bmap);
+                bitmap_free(bmap);
+
+                bmap = nbmap;
+                find_offset = oldsz; /* Start next search in the new portion. */
+
+                goto find_again;
+       }
+
+       /* The bitmap position is used below as the connection number
+        * conn->cnum). This ends up as the TID field in the SMB header,
+        * which is limited to 16 bits (we skip 0xffff which is the
+        * NULL TID).
+        */
+       if (i > 65534) {
+               DEBUG(0, ("Maximum connection limit reached\n"));
                return NULL;
        }
 
-       conn = (connection_struct *)malloc(sizeof(*conn));
-       if (!conn) return NULL;
+       if ((mem_ctx=talloc_init("connection_struct"))==NULL) {
+               DEBUG(0,("talloc_init(connection_struct) failed!\n"));
+               return NULL;
+       }
 
-       ZERO_STRUCTP(conn);
+       if (!(conn=TALLOC_ZERO_P(mem_ctx, connection_struct)) ||
+           !(conn->params = TALLOC_P(mem_ctx, struct share_params))) {
+               DEBUG(0,("talloc_zero() failed!\n"));
+               TALLOC_FREE(mem_ctx);
+               return NULL;
+       }
+       conn->mem_ctx = mem_ctx;
        conn->cnum = i;
 
        bitmap_set(bmap, i);
@@ -124,13 +170,15 @@ connection_struct *conn_new(void)
 }
 
 /****************************************************************************
-close all conn structures
+ Close all conn structures.
 ****************************************************************************/
+
 void conn_close_all(void)
 {
        connection_struct *conn, *next;
        for (conn=Connections;conn;conn=next) {
                next=conn->next;
+               set_current_service(conn, 0, True);
                close_cnum(conn, conn->vuid);
        }
 }
@@ -147,13 +195,21 @@ BOOL conn_idle_all(time_t t, int deadtime)
 
        for (conn=Connections;conn;conn=next) {
                next=conn->next;
+
+               /* Update if connection wasn't idle. */
+               if (conn->lastused != conn->lastused_count) {
+                       conn->lastused = t;
+                       conn->lastused_count = t;
+               }
+
                /* close dirptrs on connections that are idle */
-               if ((t-conn->lastused) > DPTR_IDLE_TIMEOUT)
+               if ((t-conn->lastused) > DPTR_IDLE_TIMEOUT) {
                        dptr_idlecnum(conn);
+               }
 
-               if (conn->num_files_open > 0 || 
-                   (t-conn->lastused)<deadtime)
+               if (conn->num_files_open > 0 || (t-conn->lastused)<deadtime) {
                        allidle = False;
+               }
        }
 
        /*
@@ -169,12 +225,13 @@ BOOL conn_idle_all(time_t t, int deadtime)
 }
 
 /****************************************************************************
-clear a vuid out of the validity cache, and as the 'owner' of a connection.
+ Clear a vuid out of the validity cache, and as the 'owner' of a connection.
 ****************************************************************************/
+
 void conn_clear_vuid_cache(uint16 vuid)
 {
        connection_struct *conn;
-       int i;
+       unsigned int i;
 
        for (conn=Connections;conn;conn=conn->next) {
                if (conn->vuid == vuid) {
@@ -182,76 +239,85 @@ void conn_clear_vuid_cache(uint16 vuid)
                }
 
                for (i=0;i<conn->vuid_cache.entries && i< VUID_CACHE_SIZE;i++) {
-                       if (conn->vuid_cache.list[i] == vuid) {
-                               conn->vuid_cache.list[i] = UID_FIELD_INVALID;
+                       if (conn->vuid_cache.array[i].vuid == vuid) {
+                               struct vuid_cache_entry *ent = &conn->vuid_cache.array[i];
+                               ent->vuid = UID_FIELD_INVALID;
+                               ent->read_only = False;
+                               ent->admin_user = False;
                        }
                }
        }
 }
 
 /****************************************************************************
- Free a conn structure.
+ Free a conn structure - internal part.
 ****************************************************************************/
 
-void conn_free(connection_struct *conn)
+void conn_free_internal(connection_struct *conn)
 {
-       smb_vfs_handle_struct *handle, *thandle;
-       void (*done_fptr)(connection_struct *the_conn);
+       vfs_handle_struct *handle = NULL, *thandle = NULL;
+       TALLOC_CTX *mem_ctx = NULL;
+       struct trans_state *state = NULL;
 
        /* Free vfs_connection_struct */
-       handle = conn->vfs_private;
+       handle = conn->vfs_handles;
        while(handle) {
-               /* Close dlopen() handle */
-               done_fptr = (void (*)(connection_struct *))sys_dlsym(handle->handle, "vfs_done");
-               if (done_fptr == NULL) {
-                       DEBUG(3, ("No vfs_done() symbol found in module with handle %p, ignoring\n", handle->handle));
-               } else {
-                       done_fptr(conn);
-               }
-               sys_dlclose(handle->handle);
-               DLIST_REMOVE(conn->vfs_private, handle);
+               DLIST_REMOVE(conn->vfs_handles, handle);
                thandle = handle->next;
-               SAFE_FREE(handle);
+               if (handle->free_data)
+                       handle->free_data(&handle->data);
                handle = thandle;
        }
 
-       DLIST_REMOVE(Connections, conn);
-
-       if (conn->ngroups && conn->groups) {
-               SAFE_FREE(conn->groups);
-               conn->ngroups = 0;
+       /* Free any pending transactions stored on this conn. */
+       for (state = conn->pending_trans; state; state = state->next) {
+               /* state->setup is a talloc child of state. */
+               SAFE_FREE(state->param);
+               SAFE_FREE(state->data);
        }
 
        free_namearray(conn->veto_list);
        free_namearray(conn->hide_list);
        free_namearray(conn->veto_oplock_list);
+       free_namearray(conn->aio_write_behind_list);
        
        string_free(&conn->user);
        string_free(&conn->dirpath);
        string_free(&conn->connectpath);
        string_free(&conn->origpath);
 
-       bitmap_clear(bmap, conn->cnum);
-       num_open--;
-
+       mem_ctx = conn->mem_ctx;
        ZERO_STRUCTP(conn);
-       SAFE_FREE(conn);
+       talloc_destroy(mem_ctx);
 }
 
+/****************************************************************************
+ Free a conn structure.
+****************************************************************************/
+
+void conn_free(connection_struct *conn)
+{
+       DLIST_REMOVE(Connections, conn);
+
+       bitmap_clear(bmap, conn->cnum);
+       num_open--;
 
+       conn_free_internal(conn);
+}
 /****************************************************************************
 receive a smbcontrol message to forcibly unmount a share
 the message contains just a share name and all instances of that
 share are unmounted
 the special sharename '*' forces unmount of all shares
 ****************************************************************************/
-void msg_force_tdis(int msg_type, pid_t pid, void *buf, size_t len)
+void msg_force_tdis(int msg_type, struct process_id pid, void *buf, size_t len,
+                   void *private_data)
 {
        connection_struct *conn, *next;
        fstring sharename;
 
-       fstrcpy(sharename, buf);
+       fstrcpy(sharename, (const char *)buf);
 
        if (strcmp(sharename, "*") == 0) {
                DEBUG(1,("Forcing close of all shares\n"));
@@ -261,7 +327,7 @@ void msg_force_tdis(int msg_type, pid_t pid, void *buf, size_t len)
 
        for (conn=Connections;conn;conn=next) {
                next=conn->next;
-               if (strequal(lp_servicename(conn->service), sharename)) {
+               if (strequal(lp_servicename(SNUM(conn)), sharename)) {
                        DEBUG(1,("Forcing close of share %s cnum=%d\n",
                                 sharename, conn->cnum));
                        close_cnum(conn, (uint16)-1);