[asterisk-addons-commits] objsys: branch 1.4 r352 - in /branches/1.4: ./ asterisk-ooh323c/ asterisk-ooh...

[asterisk-addons-commits at lists.digium.com]

Author: objsys
Date: Fri Mar 23 14:46:24 2007
New Revision: 352

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=352
Log:
Merged revisions 346,350-351 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.2

........
r346 | objsys | 2007-03-05 17:41:12 -0500 (Mon, 05 Mar 2007) | 1 line

keepalive Regstration Message for ep value
........
r350 | objsys | 2007-03-16 15:05:56 -0500 (Fri, 16 Mar 2007) | 1 line

possible fix for g.729 codec comparision
........
r351 | objsys | 2007-03-23 14:39:20 -0500 (Fri, 23 Mar 2007) | 1 line

g.729A codec comparision fixed
........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/asterisk-ooh323c/ChangeLog
    branches/1.4/asterisk-ooh323c/ooh323c/src/ooCapability.c
    branches/1.4/asterisk-ooh323c/ooh323c/src/ooGkClient.c
    branches/1.4/asterisk-ooh323c/ooh323c/src/ooLogChan.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Fri Mar 23 14:46:24 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-183,209,211,257-258,264,268-273,305-328,332-336,339-344
+/branches/1.2:1-183,209,211,257-258,264,268-273,305-328,332-336,339-344,346-351

Modified: branches/1.4/asterisk-ooh323c/ChangeLog
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/ChangeLog?view=diff&rev=352&r1=351&r2=352
==============================================================================
--- branches/1.4/asterisk-ooh323c/ChangeLog (original)
+++ branches/1.4/asterisk-ooh323c/ChangeLog Fri Mar 23 14:46:24 2007
@@ -1,3 +1,7 @@
+svn
+* Fixed g.729A codec comparision problem
+
+
 Release 0.6
 * Includes ooh323c stack 0.8.3 version API
 * Added fast start response in ALERTING message for early audio. 

Modified: branches/1.4/asterisk-ooh323c/ooh323c/src/ooCapability.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/ooh323c/src/ooCapability.c?view=diff&rev=352&r1=351&r2=352
==============================================================================
--- branches/1.4/asterisk-ooh323c/ooh323c/src/ooCapability.c (original)
+++ branches/1.4/asterisk-ooh323c/ooh323c/src/ooCapability.c Fri Mar 23 14:46:24 2007
@@ -932,7 +932,7 @@
       noofframes = audioCap->u.g729;
       break;
    case T_H245AudioCapability_g729AnnexA:
-      cap = OO_G729;
+      cap = OO_G729A;
       noofframes = audioCap->u.g729AnnexA;
       break;   
    case T_H245AudioCapability_g7231:
@@ -943,7 +943,7 @@
       return FALSE;
    }
 
-   OOTRACEDBGC3("Comparing codecs: channel's=%d, requested=%d\n", 
+   OOTRACEDBGC3("Comparing codecs: current=%d, requested=%d\n", 
       epCap->cap, cap);
    if(cap != epCap->cap) { return FALSE; }
 

Modified: branches/1.4/asterisk-ooh323c/ooh323c/src/ooGkClient.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/ooh323c/src/ooGkClient.c?view=diff&rev=352&r1=351&r2=352
==============================================================================
--- branches/1.4/asterisk-ooh323c/ooh323c/src/ooGkClient.c (original)
+++ branches/1.4/asterisk-ooh323c/ooh323c/src/ooGkClient.c Fri Mar 23 14:46:24 2007
@@ -981,6 +981,37 @@
    pRegReq->discoveryComplete= pGkClient->discoveryComplete;
    pRegReq->m.keepAlivePresent=TRUE;
    pRegReq->keepAlive= keepAlive;
+
+   /*
+    * Cisco Gatekeeper re-registration fix.  Thanks to Mike Tubby (mike at tubby.org) 28feb2007
+    * Without this patch initial registration works, but re-registration fails!
+    *
+    * For light-weight re-registration, keepalive is set true
+    * GK needs rasAddress, keepAlive, endpointIdentifier, gatekeeperIdentifier,
+    * tokens, and timeToLive
+    * GK will ignore all other params if KeepAlive is set.
+    *
+    */
+   if(keepAlive) {
+      /* KeepAlive, re-registration message...
+         allocate storage for endpoint-identifier, and populate it from what the
+         GK told us from the previous RCF. Only allocate on the first pass thru here */
+      pRegReq->endpointIdentifier.data = 
+           (ASN116BITCHAR*)memAlloc(pctxt, pGkClient->gkId.nchars*sizeof(ASN116BITCHAR));
+      if (pRegReq->endpointIdentifier.data) {
+         pRegReq->endpointIdentifier.nchars = pGkClient->endpointId.nchars;
+         pRegReq->m.endpointIdentifierPresent = TRUE;
+         memcpy(pRegReq->endpointIdentifier.data, pGkClient->endpointId.data, pGkClient->endpointId.nchars*sizeof(ASN116BITCHAR));
+         OOTRACEINFO1("Sending RRQ for re-registration (with EndpointID)\n");
+      }
+      else {
+         OOTRACEERR1("Error: Failed to allocate memory for EndpointIdentifier in RRQ \n");
+         memReset(pctxt);
+         pGkClient->state = GkClientFailed;
+         return OO_FAILED;
+      }
+   }
+
    pRegReq->m.timeToLivePresent = TRUE;
    pRegReq->timeToLive = pGkClient->regTimeout;
 

Modified: branches/1.4/asterisk-ooh323c/ooh323c/src/ooLogChan.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/asterisk-ooh323c/ooh323c/src/ooLogChan.c?view=diff&rev=352&r1=351&r2=352
==============================================================================
--- branches/1.4/asterisk-ooh323c/ooh323c/src/ooLogChan.c (original)
+++ branches/1.4/asterisk-ooh323c/ooh323c/src/ooLogChan.c Fri Mar 23 14:46:24 2007
@@ -192,7 +192,7 @@
          if(!strcmp(pChannel->dir, dir))
          {
             OOTRACEDBGC3("ooFindLogicalChannel, comparing channel: %d:%s\n",
-                          pChannel->sessionID, pChannel->dir);
+                          pChannel->channelNo, pChannel->dir);
             if(!strcmp(dir, "receive"))
             {
                if(ooCapabilityCheckCompatibility(call, pChannel->chanCap,