kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 376867,376871 via svnmerge from

Browse Source 
file:///srv/subversion/repos/asterisk/trunk

................
  r376867 | rmudgett | 2012-11-29 16:34:24 -0600 (Thu, 29 Nov 2012) | 13 lines
  
  Fix compile error.
  
  (issue ASTERISK-20724)
  ........
  
  Merged revisions 376864 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 376865 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........
  
  Merged revisions 376866 from http://svn.asterisk.org/svn/asterisk/branches/11
................
  r376871 | rmudgett | 2012-11-29 17:01:16 -0600 (Thu, 29 Nov 2012) | 13 lines
  
  chan_local: Fix local_pvt ref leak in local_devicestate().
  
  Regression introduced by ASTERISK-20390 fix.
  ........
  
  Merged revisions 376868 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 376869 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........
  
  Merged revisions 376870 from http://svn.asterisk.org/svn/asterisk/branches/11
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376878 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2012-11-29 23:19:44 +00:00
parent f052e88b49
commit b2df2488b6
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
channels/chan_local.c
View File

@@ -311,15 +311,20 @@ static int local_devicestate(const char *data)
res = AST_DEVICE_NOT_INUSE; res = AST_DEVICE_NOT_INUSE;
it = ao2_iterator_init(locals, 0); it = ao2_iterator_init(locals, 0);
while ((lp = ao2_iterator_next(&it)) && (res == AST_DEVICE_NOT_INUSE)) { for (; (lp = ao2_iterator_next(&it)); ao2_ref(lp, -1)) {
if (!strcmp(exten, lp->exten) && !strcmp(context, lp->context) && lp->owner) { int is_inuse;
ao2_lock(lp);
if (ast_test_flag(lp, LOCAL_LAUNCHED_PBX)) { ao2_lock(lp);
res = AST_DEVICE_INUSE; is_inuse = !strcmp(exten, lp->exten)
} && !strcmp(context, lp->context)
ao2_unlock(lp); && lp->owner
&& ast_test_flag(lp, LOCAL_LAUNCHED_PBX);
ao2_unlock(lp);
if (is_inuse) {
res = AST_DEVICE_INUSE;
ao2_ref(lp, -1);
break;
} }
ao2_ref(lp, -1);
} }
ao2_iterator_destroy(&it); ao2_iterator_destroy(&it);

2
channels/chan_sip.c
View File

@@ -17897,7 +17897,7 @@ static void check_via(struct sip_pvt *p, struct sip_request *req)
if (ast_sockaddr_resolve_first(&tmp, c, 0)) { if (ast_sockaddr_resolve_first(&tmp, c, 0)) {
ast_log(LOG_WARNING, "Could not resolve socket address for '%s'\n", c); ast_log(LOG_WARNING, "Could not resolve socket address for '%s'\n", c);
port = STANDARD_SIP_PORT; port = STANDARD_SIP_PORT;
} else if (!(port = ast_sockaddr_port(&tmp)) { } else if (!(port = ast_sockaddr_port(&tmp))) {
port = STANDARD_SIP_PORT; port = STANDARD_SIP_PORT;
ast_sockaddr_set_port(&tmp, port); ast_sockaddr_set_port(&tmp, port);
} }