[svn-commits] objsys: branch 1.2 r325 - /branches/1.2/asterisk-ooh323c/ooh323c/src/ooh323.c

[svn-commits at lists.digium.com]

Author: objsys
Date: Thu Jan 18 17:06:36 2007
New Revision: 325

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=325
Log:
Tunneling has priority than control channel

Modified:
    branches/1.2/asterisk-ooh323c/ooh323c/src/ooh323.c

Modified: branches/1.2/asterisk-ooh323c/ooh323c/src/ooh323.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.2/asterisk-ooh323c/ooh323c/src/ooh323.c?view=diff&rev=325&r1=324&r2=325
==============================================================================
--- branches/1.2/asterisk-ooh323c/ooh323c/src/ooh323.c (original)
+++ branches/1.2/asterisk-ooh323c/ooh323c/src/ooh323.c Thu Jan 18 17:06:36 2007
@@ -528,7 +528,14 @@
    }
 
    /* Retrieve the H.245 control channel address from the connect msg */
-   if(callProceeding->m.h245AddressPresent)
+   if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+      q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&
+      callProceeding->m.h245AddressPresent) {
+      OOTRACEINFO3("Tunneling and h245address provided."
+                   "Using Tunneling for H.245 messages (%s, %s)\n", 
+                   call->callType, call->callToken);
+   }
+   else if(callProceeding->m.h245AddressPresent)
    {
       if (OO_TESTFLAG (call->flags, OO_M_TUNNELING))
       {
@@ -718,7 +725,14 @@
    }
 
    /* Retrieve the H.245 control channel address from the connect msg */
-   if(alerting->m.h245AddressPresent)
+   if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+      q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&
+      alerting->m.h245AddressPresent) {
+      OOTRACEINFO3("Tunneling and h245address provided."
+                   "Giving preference to Tunneling (%s, %s)\n", 
+                   call->callType, call->callToken);
+   }
+   else if(alerting->m.h245AddressPresent)
    {
       if (OO_TESTFLAG (call->flags, OO_M_TUNNELING))
       {
@@ -933,7 +947,14 @@
    }
 
    /* Retrieve the H.245 control channel address from the connect msg */
-   if(connect->m.h245AddressPresent)
+   if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+      q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&
+      connect->m.h245AddressPresent) {
+      OOTRACEINFO3("Tunneling and h245address provided."
+                   "Giving preference to Tunneling (%s, %s)\n", 
+                   call->callType, call->callToken);
+   }
+   else if(connect->m.h245AddressPresent)
    {
       if (OO_TESTFLAG (call->flags, OO_M_TUNNELING))
       {