Increase limit of unshared connections from 1023 to 4.2 billion.

(Related to issue #12677)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@117264 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2 files changed, 15 insertions, 12 deletions

diff --git a/CHANGES b/CHANGES
index 18236d62b..7c34507dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,13 @@ Dialplan Functions
    based on other parameters.  The default is still to search based on the
    forwarding station ID.  However, there are new options that allow you to search
    based on the message desk terminal ID, or the message desk number.
+ * TIMEOUT() has been modified to be accurate down to the millisecond.
+ * ENUM*() functions now include the following new options:
+     - 'u' returns the full URI and does not strip off the URI-scheme.
+	 - 's' triggers ISN specific rewriting
+	 - 'i' looks for branches into an Infrastructure ENUM tree
+	 - 'd' for a direct DNS lookup without any flipping of digits.
+ * TXCIDNAME() has a new zone-suffix parameter (which defaults to 'e164.arpa')
 
 Zaptel channel driver (chan_zap) Changes
 ----------------------------------------
@@ -106,21 +113,17 @@ DNS manager changes
   * Addresses managed by DNS manager now can check to see if there is a DNS
     SRV record for a given domain and will use that hostname/port if present.
 
-Dialplan function changes
--------------------------
- * TIMEOUT() has been modified to be accurate down to the millisecond.
- * ENUM*() functions now include the following new options:
-     - 'u' returns the full URI and does not strip off the URI-scheme.
-	 - 's' triggers ISN specific rewriting
-	 - 'i' looks for branches into an Infrastructure ENUM tree
-	 - 'd' for a direct DNS lookup without any flipping of digits.
- * TXCIDNAME() has a new zone-suffix parameter (which defaults to 'e164.arpa')
-
 AMI - The manager (TCP/TLS/HTTP)
 --------------------------------
   * The Status command now takes an optional list of variables to display
     along with channel status.
 
+ODBC Changes
+------------
+  * res_odbc no longer has a limit of 1023 total possible unshared connections,
+    as some people were running into this limit.  This limit has been increased
+    to 4.2 billion.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.4.X to Asterisk 1.6.0  -------------
 ------------------------------------------------------------------------------
diff --git a/res/res_odbc.c b/res/res_odbc.c
index 5e0ea4b54..b050c8cb9 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -59,10 +59,10 @@ struct odbc_class
 	char *sanitysql;
 	SQLHENV env;
 	unsigned int haspool:1;              /* Boolean - TDS databases need this */
-	unsigned int limit:10;               /* Gives a limit of 1023 maximum */
-	unsigned int count:10;               /* Running count of pooled connections */
 	unsigned int delme:1;                /* Purge the class */
 	unsigned int backslash_is_escape:1;  /* On this database, the backslash is a native escape sequence */
+	unsigned int limit;                  /* 1023 wasn't enough for some people */
+	unsigned int count;                  /* Running count of pooled connections */
 	unsigned int idlecheck;              /* Recheck the connection if it is idle for this long */
 	struct ao2_container *obj_container;
 };