[asterisk-commits] may: branch may/ooh323_ipv6_direct_rtp r307715 - in /team/may/ooh323_ipv6_dir...

[SVN commits to the Asterisk project]

Author: may
Date: Sun Feb 13 04:53:24 2011
New Revision: 307715

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307715
Log:
Merged revisions 307714 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/may/ooh323_ipv6

................
  r307714 | may | 2011-02-13 13:52:04 +0300 (Sun, 13 Feb 2011) | 10 lines
  
  Merged revisions 307713 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/trunk
  
  ........
    r307713 | may | 2011-02-13 13:50:22 +0300 (Sun, 13 Feb 2011) | 3 lines
    
    lc not found - it's warning,  not error,
    change malloc to ast_calloc again
  ........
................

Modified:
    team/may/ooh323_ipv6_direct_rtp/   (props changed)
    team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooCmdChannel.c
    team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooLogChan.c

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-custom (original)
+++ svnmerge-custom Sun Feb 13 04:53:24 2011
@@ -1,1 +1,1 @@
-/team/may/ooh323_ipv6:1-307678
+/team/may/ooh323_ipv6:1-307714

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Feb 13 04:53:24 2011
@@ -1,1 +1,1 @@
-/trunk:1-307677
+/trunk:1-307713

Modified: team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooCmdChannel.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooCmdChannel.c?view=diff&rev=307715&r1=307714&r2=307715
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooCmdChannel.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooCmdChannel.c Sun Feb 13 04:53:24 2011
@@ -56,7 +56,7 @@
 
     OOTRACEINFO2("INFO: create cmd connect for call: %lx\n", call);
 
-   call->CmdChanLock = malloc(sizeof(ast_mutex_t));
+   call->CmdChanLock = ast_calloc(1, sizeof(ast_mutex_t));
    ast_mutex_init(call->CmdChanLock);
 
 

Modified: team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooLogChan.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooLogChan.c?view=diff&rev=307715&r1=307714&r2=307715
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooLogChan.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooLogChan.c Sun Feb 13 04:53:24 2011
@@ -125,7 +125,7 @@
    OOLogicalChannel *pLogicalChannel=NULL;
    if(!call->logicalChans)
    {
-      OOTRACEERR3("ERROR: No Open LogicalChannels - Failed "
+      OOTRACEWARN3("ERROR: No Open LogicalChannels - Failed "
                   "FindLogicalChannelByChannelNo (%s, %s\n", call->callType,
                    call->callToken);
       return NULL;