[Asterisk-cvs] asterisk/channels chan_sip.c,1.253,1.254

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv26170/channels

Modified Files:
	chan_sip.c 
Log Message:
limit fixes in SIP


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- chan_sip.c	26 Nov 2003 18:56:00 -0000	1.253
+++ chan_sip.c	26 Nov 2003 19:24:57 -0000	1.254
@@ -876,12 +876,14 @@
 	p->outgoing = 1;
 	ast_log(LOG_DEBUG, "Outgoing Call for %s\n", p->username);
 	res = find_user(p,INC_OUT_USE);
-	p->restrictcid = ast->restrictcid;
-	p->jointcapability = p->capability;
-	transmit_invite(p, "INVITE", 1, NULL, NULL, vxml_url,distinctive_ring, 1);
-	if (p->maxtime) {
-		/* Initialize auto-congest time */
-		p->initid = ast_sched_add(sched, p->maxtime * 2, auto_congest, p);
+	if ( res != -1 ) {
+		p->restrictcid = ast->restrictcid;
+		p->jointcapability = p->capability;
+		transmit_invite(p, "INVITE", 1, NULL, NULL, vxml_url,distinctive_ring, 1);
+		if (p->maxtime) {
+			/* Initialize auto-congest time */
+			p->initid = ast_sched_add(sched, p->maxtime * 2, auto_congest, p);
+		}
 	}
 	return res;
 }
@@ -974,6 +976,8 @@
 		return 0;
 	}
 	switch(event) {
+		/* incoming and outgoing affects the inUse counter */
+		case DEC_OUT_USE:
 		case DEC_IN_USE:
 			if ( u->inUse > 0 ) {
 				u->inUse--;
@@ -982,16 +986,22 @@
 			}
 			break;
 		case INC_IN_USE:
+		case INC_OUT_USE:
 			if (u->incominglimit > 0 ) {
 				if (u->inUse >= u->incominglimit) {
 					ast_log(LOG_ERROR, "Call from user '%s' rejected due to usage limit of %d\n", u->name, u->incominglimit);
 					ast_mutex_unlock(&userl.lock);
+					/* inc inUse as well */
+					if ( event == INC_OUT_USE ) {
+						u->inUse++;
+					}
 					return -1; 
 				}
 			}
 			u->inUse++;
 			ast_log(LOG_DEBUG, "Call from user '%s' is %d out of %d\n", u->name, u->inUse, u->incominglimit);
 			break;
+		/* we don't use these anymore
 		case DEC_OUT_USE:
 			if ( u->outUse > 0 ) {
 				u->outUse--;
@@ -1009,6 +1019,7 @@
 			}
 			u->outUse++;
 			break;
+		*/
 		default:
 			ast_log(LOG_ERROR, "find_user(%s,%d) called with no event!\n",u->name,event);
 	}
@@ -1101,6 +1112,13 @@
 				   INVITE, but do set an autodestruct just in case. */
 				needdestroy = 0;
 				sip_scheddestroy(p, 15000);
+				/* channel still up - reverse dec of inUse counter */
+				if ( p->outgoing ) {
+					find_user(p, INC_OUT_USE);
+				}
+				else {
+					find_user(p, INC_IN_USE);
+				}
 			} else {
 				char *res;
 				if (ast->hangupcause && ((res = hangup_cause2sip(ast->hangupcause)))) {
@@ -4815,6 +4833,15 @@
 					parse_moved_contact(p, req);
 					if (p->owner)
 						ast_queue_control(p->owner, AST_CONTROL_BUSY, 0);
+					break;
+				case 487:
+					/* channel now destroyed - dec the inUse counter */
+					if ( p->outgoing ) {
+						find_user(p, DEC_OUT_USE);
+					}
+					else {
+						find_user(p, DEC_IN_USE);
+					}
 					break;
 				case 486: /* Busy here */
 				case 600: /* Busy everywhere */