[svn-commits] objsys: branch 1.2 r270 - in /branches/1.2/asterisk-ooh323c: ooh323c/src/ src/

[svn-commits at lists.digium.com]

Author: objsys
Date: Fri Aug  4 17:01:39 2006
New Revision: 270

URL: http://svn.digium.com/view/asterisk-addons?rev=270&view=rev
Log:
Fix for reload problem of faststart, tunneling, mediawaitforconnect flags

Modified:
    branches/1.2/asterisk-ooh323c/ooh323c/src/ooCalls.h
    branches/1.2/asterisk-ooh323c/ooh323c/src/ootypes.h
    branches/1.2/asterisk-ooh323c/src/chan_h323.c

Modified: branches/1.2/asterisk-ooh323c/ooh323c/src/ooCalls.h
URL: http://svn.digium.com/view/asterisk-addons/branches/1.2/asterisk-ooh323c/ooh323c/src/ooCalls.h?rev=270&r1=269&r2=270&view=diff
==============================================================================
--- branches/1.2/asterisk-ooh323c/ooh323c/src/ooCalls.h (original)
+++ branches/1.2/asterisk-ooh323c/ooh323c/src/ooCalls.h Fri Aug  4 17:01:39 2006
@@ -49,7 +49,7 @@
 #define OO_M_GKROUTED           ASN1UINTCNT(0x00200000)
 #define OO_M_AUTOANSWER         ASN1UINTCNT(0x00100000)
 #define OO_M_TUNNELING	        ASN1UINTCNT(0x08000000)
-#define OO_M_MEDIAWAITFORCONN   ASN1UINTCNT(0x03000000)
+#define OO_M_MEDIAWAITFORCONN   ASN1UINTCNT(0x20000000)
 #define OO_M_FASTSTART	        ASN1UINTCNT(0x02000000)
 #define OO_M_DISABLEGK          ASN1UINTCNT(0x01000000)
 #define OO_M_MANUALRINGBACK     ASN1UINTCNT(0x10000000)

Modified: branches/1.2/asterisk-ooh323c/ooh323c/src/ootypes.h
URL: http://svn.digium.com/view/asterisk-addons/branches/1.2/asterisk-ooh323c/ooh323c/src/ootypes.h?rev=270&r1=269&r2=270&view=diff
==============================================================================
--- branches/1.2/asterisk-ooh323c/ooh323c/src/ootypes.h (original)
+++ branches/1.2/asterisk-ooh323c/ooh323c/src/ootypes.h Fri Aug  4 17:01:39 2006
@@ -216,13 +216,13 @@
  * Flag macros - these operate on bit mask flags using mask values
  */
 /** This macro sets a flag within a bit mask */
-#define OO_SETFLAG(flags,mask) (flags |= mask)
+#define OO_SETFLAG(flags,mask) (flags |= (ASN1UINT)mask)
 
 /** This macro clears a flag within a bit mask */
-#define OO_CLRFLAG(flags,mask) (flags &= ~mask)
+#define OO_CLRFLAG(flags,mask) (flags &= ~(ASN1UINT)mask)
 
 /** This macro tests a flag with a bit mask */
-#define OO_TESTFLAG(flags,mask) ((flags & mask) != 0)
+#define OO_TESTFLAG(flags,mask) (((ASN1UINT)flags & (ASN1UINT)mask) != 0)
 
 
 

Modified: branches/1.2/asterisk-ooh323c/src/chan_h323.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.2/asterisk-ooh323c/src/chan_h323.c?rev=270&r1=269&r2=270&view=diff
==============================================================================
--- branches/1.2/asterisk-ooh323c/src/chan_h323.c (original)
+++ branches/1.2/asterisk-ooh323c/src/chan_h323.c Fri Aug  4 17:01:39 2006
@@ -1792,12 +1792,24 @@
       } 
       else if (!strcasecmp(v->name, "faststart")) {
          gFastStart = ast_true(v->value);
+         if(gFastStart)
+            ooH323EpEnableFastStart();
+         else
+            ooH323EpDisableFastStart();
       } 
       else if (!strcasecmp(v->name, "mediawaitforconnect")) {
          gMediaWaitForConnect = ast_true(v->value);
+         if(gMediaWaitForConnect)
+            ooH323EpEnableMediaWaitForConnect();
+         else 
+            ooH323EpDisableMediaWaitForConnect();
       } 
       else if (!strcasecmp(v->name, "h245tunneling")) {
          gTunneling = ast_true(v->value);
+         if(gTunneling)
+            ooH323EpEnableH245Tunneling();
+         else
+            ooH323EpDisableH245Tunneling();
       }
       else if (!strcasecmp(v->name, "h323id")) {
          pNewAlias = malloc(sizeof(struct ooAliases));
@@ -2198,10 +2210,13 @@
       gMediaWaitForConnect?"yes":"no");
 
 #if (0)
+   extern OOH323EndPoint gH323ep;
+   ast_cli(fd, "%-20s%s\n", "FASTSTART", 
+      (OO_TESTFLAG(gH323ep.flags, OO_M_FASTSTART) != 0) ? "yes" : "no");
+   ast_cli(fd, "%-20s%s\n", "TUNNELING", 
+      (OO_TESTFLAG(gH323ep.flags, OO_M_TUNNELING) != 0) ? "yes" : "no");
    ast_cli(fd, "%-20s%s\n", "MEDIAWAITFORCONN",
-      (gH323ep.flags & OO_M_MEDIAWAITFORCONN) != 0) ? "yes" : "no");
-   ast_cli(fd, "%-20s%s\n", "FASTSTART", 
-      (gH323ep.flags & OO_M_FASTSTART) != 0) ? "yes" : "no");
+      (OO_TESTFLAG(gH323ep.flags, OO_M_MEDIAWAITFORCONN) != 0) ? "yes" : "no");
 #endif
 
    if(gRasGkMode == RasNoGatekeeper)