kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 23:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify previous patch

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47202 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2006-11-04 19:20:30 +00:00
parent d900b47ccf
commit fe5440b7c8
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
channels/chan_sip.c
View File

@@ -3043,23 +3043,11 @@ static int update_call_counter(struct sip_pvt *fup, int event)
ast_copy_string(name, fup->username, sizeof(name));
/* Check the list of users only for incoming calls */
if (!outgoing) {
if (global_limitonpeers == FALSE && (u = find_user(name, 1))) {
if (global_limitonpeers == FALSE && !outgoing && (u = find_user(name, 1))) {
inuse = &u->inUse;
call_limit = &u->call_limit;
inringing = NULL;
} else {
/* If limitonpeers is on, we only apply the limits to the
peer part of the type=friend. This is mainly to
help the queue system */
p = find_peer(name, NULL, 1); /* Check the peer */
if (p != NULL) {
inuse = &p->inUse;
call_limit = &p->call_limit;
inringing = &p->inRinging;
}
}
} else if ( (p = find_peer(fup->peername, NULL, 1) ) ) { /* Try to find peer */
} else if ( (p = find_peer(ast_strlen_zero(fup->peername) ? name : fup->peername, NULL, 1) ) ) { /* Try to find peer */
inuse = &p->inUse;
call_limit = &p->call_limit;
inringing = &p->inRinging;