Attachment 316 Details for Bug 716 – remove MAX_CONNECTIONS limit

[patch] remove MAX_CONNECTIONS limit

max_connect.diff (text/plain), 3.37 KB, created by James Peach on 2003-12-10 16:37:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Peach

Created: 2003-12-10 16:37:22 UTC

Size: 3.37 KB

patch

obsolete

>? samba/source/tdb/a.out
>Index: samba/source/lib/bitmap.c
>===================================================================
>RCS file: /cvsroot/samba/source/lib/bitmap.c,v
>retrieving revision 1.11.2.2
>diff -u -r1.11.2.2 bitmap.c
>--- samba/source/lib/bitmap.c	1 Feb 2003 07:25:53 -0000	1.11.2.2
>+++ samba/source/lib/bitmap.c	11 Dec 2003 00:31:33 -0000
>@@ -84,6 +84,20 @@
> }
> 
> /****************************************************************************
>+copy as much of the source bitmap as will fit in the destination bitmap.
>+****************************************************************************/
>+
>+int bitmap_copy(struct bitmap * const dst, const struct bitmap * const src)
>+{
>+        int count = MIN(dst->n, src->n);
>+
>+        SMB_ASSERT(dst->b != src->b);
>+	memcpy(dst->b, src->b, sizeof(dst->b[0])*(count+31)/32);
>+
>+        return count;
>+}
>+
>+/****************************************************************************
> set a bit in a bitmap
> ****************************************************************************/
> BOOL bitmap_set(struct bitmap *bm, unsigned i)
>Index: samba/source/smbd/conn.c
>===================================================================
>RCS file: /cvsroot/samba/source/smbd/conn.c,v
>retrieving revision 1.16.2.7
>diff -u -r1.16.2.7 conn.c
>--- samba/source/smbd/conn.c	11 May 2003 23:34:15 -0000	1.16.2.7
>+++ samba/source/smbd/conn.c	11 Dec 2003 00:31:34 -0000
>@@ -21,11 +21,11 @@
> 
> #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 @@
> ****************************************************************************/
> void conn_init(void)
> {
>-	bmap = bitmap_allocate(MAX_CONNECTIONS);
>+	bmap = bitmap_allocate(BITMAP_BLOCK_SZ);
> }
> 
> /****************************************************************************
>@@ -96,12 +96,35 @@
> 	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"));	       
>-		return NULL;
>+                /* Expand the connections bitmap. */
>+                int             oldsz = bmap->n;
>+                int             newsz = bmap->n + BITMAP_BLOCK_SZ;
>+                struct bitmap * nbmap;
>+
>+                if (newsz <= 0) {
>+                        /* 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);
>+
>+                bitmap_copy(nbmap, bmap);
>+                bitmap_free(bmap);
>+
>+                bmap = nbmap;
>+                find_offset = oldsz; /* Start next search in the new portion. */
>+
>+                goto find_again;
> 	}
> 
> 	if ((mem_ctx=talloc_init("connection_struct"))==NULL) {

Actions: View

Attachments on bug 716: 316