[svn-commits] may: branch 10 r341313 - in /branches/10: ./ addons/chan_ooh323.c

[SVN commits to the Digium repositories]

Author: may
Date: Tue Oct 18 18:33:49 2011
New Revision: 341313

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=341313
Log:
Merged revisions 341312 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r341312 | may | 2011-10-19 03:20:53 +0400 (Wed, 19 Oct 2011) | 3 lines
  
  fix issue on channel numbering (calls could have same channel number
  on heavy loaded system)
........

Modified:
    branches/10/   (props changed)
    branches/10/addons/chan_ooh323.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/addons/chan_ooh323.c?view=diff&rev=341313&r1=341312&r2=341313
==============================================================================
--- branches/10/addons/chan_ooh323.c (original)
+++ branches/10/addons/chan_ooh323.c Tue Oct 18 18:33:49 2011
@@ -367,10 +367,10 @@
 	ast_format_clear(&tmpfmt);
 	/* Don't hold a h323 pvt lock while we allocate a channel */
 	ast_mutex_unlock(&i->lock);
+   	ast_mutex_lock(&ooh323c_cn_lock);
    	ch = ast_channel_alloc(1, state, i->callerid_num, i->callerid_name, 
 				i->accountcode, i->exten, i->context, linkedid, i->amaflags,
 				"OOH323/%s-%ld", host, callnumber);
-   	ast_mutex_lock(&ooh323c_cn_lock);
    	callnumber++;
    	ast_mutex_unlock(&ooh323c_cn_lock);