[svn-commits] tilghman: branch 1.6.0 r608 - in /branches/1.6.0: ./ channels/chan_ooh323.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed May 28 17:32:06 2008
New Revision: 608

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=608
Log:
Merged revisions 607 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/trunk

................
r607 | tilghman | 2008-05-28 17:31:22 -0500 (Wed, 28 May 2008) | 15 lines

Merged revisions 606 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.4

........
r606 | tilghman | 2008-05-28 17:29:27 -0500 (Wed, 28 May 2008) | 7 lines

Change channel name to use the section name, rather than CallerID name (which
can contain strange characters).
(closes issue #12743)
 Reported by: softins
 Patches: 
       ooh323-1.4-diff.txt uploaded by softins (license 197)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_ooh323.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Wed May 28 17:32:06 2008
@@ -1,1 +1,1 @@
-/trunk:540-559,575,579,583,586,588,590,592,594,603
+/trunk:540-559,575,579,583,586,588,590,592,594,603,607

Modified: branches/1.6.0/channels/chan_ooh323.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.6.0/channels/chan_ooh323.c?view=diff&rev=608&r1=607&r2=608
==============================================================================
--- branches/1.6.0/channels/chan_ooh323.c (original)
+++ branches/1.6.0/channels/chan_ooh323.c Wed May 28 17:32:06 2008
@@ -250,7 +250,7 @@
    struct ast_channel *ch = NULL;
    int fmt;
    if(gH323Debug)
-      ast_debug(1, "---   ooh323_new - %s\n", host);
+      ast_verbose("---   ooh323_new - %s\n", host);
 
 
    /* Don't hold a h323 pvt lock while we allocate a channel */
@@ -352,7 +352,7 @@
    if(ch)   ast_channel_unlock(ch);
 
    if(gH323Debug)
-      ast_debug(1, "+++   h323_new\n");
+      ast_verbose("+++   h323_new\n");
 
    return ch;
 }
@@ -364,7 +364,7 @@
    struct ooh323_pvt *pvt = NULL;
    struct in_addr ipAddr;
    if(gH323Debug)
-      ast_debug(1, "---   ooh323_alloc\n");
+      ast_verbose("---   ooh323_alloc\n");
 
    pvt = (struct ooh323_pvt*) malloc(sizeof(struct ooh323_pvt));
    if(!pvt)
@@ -447,7 +447,7 @@
   ast_mutex_unlock(&iflock);
 
   if(gH323Debug)
-    ast_debug(1, "+++   ooh323_alloc\n");
+    ast_verbose("+++   ooh323_alloc\n");
 
   return pvt;
 }
@@ -1340,11 +1340,11 @@
    
    if(p->callerid_name)
    {
-      p->username = strdup(p->callerid_name);
-      user = find_user(p->username, call->remoteIP);
+      user = find_user(p->callerid_name, call->remoteIP);
       if(user)
       {
          ast_mutex_lock(&user->lock);
+         p->username = strdup(user->name);
          strncpy(p->context, user->context, sizeof(p->context)-1);
          strncpy(p->accountcode, user->accountcode, sizeof(p->accountcode)-1);
          p->amaflags = user->amaflags;
@@ -1414,8 +1414,7 @@
 
       if(!ast_strlen_zero(p->caller_dialedDigits)){
          if(gH323Debug) {
-            ast_debug(1, "Setting dialed digits %s\n", 
-               p->caller_dialedDigits);
+            ast_verbose("Setting dialed digits %s\n", p->caller_dialedDigits);
          }
          ooCallAddAliasDialedDigits(call, p->caller_dialedDigits);
       }