[svn-commits] may: trunk r341869 - in /trunk: ./ addons/chan_ooh323.c

[SVN commits to the Digium repositories]

Author: may
Date: Sat Oct 22 07:03:23 2011
New Revision: 341869

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

................
  r341313 | may | 2011-10-19 03:33:49 +0400 (Wed, 19 Oct 2011) | 10 lines
  
  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:
    trunk/   (props changed)
    trunk/addons/chan_ooh323.c

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

Modified: trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/chan_ooh323.c?view=diff&rev=341869&r1=341868&r2=341869
==============================================================================
--- trunk/addons/chan_ooh323.c (original)
+++ trunk/addons/chan_ooh323.c Sat Oct 22 07:03:23 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);