kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

limit fixes in SIP

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1798 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-11-26 19:24:57 +00:00
parent d6d3585c03
commit 6a7ddeb222
1 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
channels/chan_sip.c
View File

@@ -876,12 +876,14 @@ static int sip_call(struct ast_channel *ast, char *dest, int timeout)
p->outgoing = 1; p->outgoing = 1;
ast_log(LOG_DEBUG, "Outgoing Call for %s\n", p->username); ast_log(LOG_DEBUG, "Outgoing Call for %s\n", p->username);
res = find_user(p,INC_OUT_USE); res = find_user(p,INC_OUT_USE);
p->restrictcid = ast->restrictcid; if ( res != -1 ) {
p->jointcapability = p->capability; p->restrictcid = ast->restrictcid;
transmit_invite(p, "INVITE", 1, NULL, NULL, vxml_url,distinctive_ring, 1); p->jointcapability = p->capability;
if (p->maxtime) { transmit_invite(p, "INVITE", 1, NULL, NULL, vxml_url,distinctive_ring, 1);
/* Initialize auto-congest time */ if (p->maxtime) {
p->initid = ast_sched_add(sched, p->maxtime * 2, auto_congest, p); /* Initialize auto-congest time */
p->initid = ast_sched_add(sched, p->maxtime * 2, auto_congest, p);
}
} }
return res; return res;
} }
@@ -974,6 +976,8 @@ static int find_user(struct sip_pvt *fup, int event)
return 0; return 0;
} }
switch(event) { switch(event) {
/* incoming and outgoing affects the inUse counter */
case DEC_OUT_USE:
case DEC_IN_USE: case DEC_IN_USE:
if ( u->inUse > 0 ) { if ( u->inUse > 0 ) {
u->inUse--; u->inUse--;
@@ -982,16 +986,22 @@ static int find_user(struct sip_pvt *fup, int event)
} }
break; break;
case INC_IN_USE: case INC_IN_USE:
case INC_OUT_USE:
if (u->incominglimit > 0 ) { if (u->incominglimit > 0 ) {
if (u->inUse >= u->incominglimit) { 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_log(LOG_ERROR, "Call from user '%s' rejected due to usage limit of %d\n", u->name, u->incominglimit);
ast_mutex_unlock(&userl.lock); ast_mutex_unlock(&userl.lock);
/* inc inUse as well */
if ( event == INC_OUT_USE ) {
u->inUse++;
}
return -1; return -1;
} }
} }
u->inUse++; u->inUse++;
ast_log(LOG_DEBUG, "Call from user '%s' is %d out of %d\n", u->name, u->inUse, u->incominglimit); ast_log(LOG_DEBUG, "Call from user '%s' is %d out of %d\n", u->name, u->inUse, u->incominglimit);
break; break;
/* we don't use these anymore
case DEC_OUT_USE: case DEC_OUT_USE:
if ( u->outUse > 0 ) { if ( u->outUse > 0 ) {
u->outUse--; u->outUse--;
@@ -1009,6 +1019,7 @@ static int find_user(struct sip_pvt *fup, int event)
} }
u->outUse++; u->outUse++;
break; break;
*/
default: default:
ast_log(LOG_ERROR, "find_user(%s,%d) called with no event!\n",u->name,event); ast_log(LOG_ERROR, "find_user(%s,%d) called with no event!\n",u->name,event);
} }
@@ -1101,6 +1112,13 @@ static int sip_hangup(struct ast_channel *ast)
INVITE, but do set an autodestruct just in case. */ INVITE, but do set an autodestruct just in case. */
needdestroy = 0; needdestroy = 0;
sip_scheddestroy(p, 15000); 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 { } else {
char *res; char *res;
if (ast->hangupcause && ((res = hangup_cause2sip(ast->hangupcause)))) { if (ast->hangupcause && ((res = hangup_cause2sip(ast->hangupcause)))) {
@@ -4816,6 +4834,15 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_
if (p->owner) if (p->owner)
ast_queue_control(p->owner, AST_CONTROL_BUSY, 0); ast_queue_control(p->owner, AST_CONTROL_BUSY, 0);
break; 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 486: /* Busy here */
case 600: /* Busy everywhere */ case 600: /* Busy everywhere */
if (p->owner) if (p->owner)