[asterisk-addons-commits] objsys: branch 1.2 r269 - in /branches/1.2/asterisk-ooh323c: ooh323c/src/ src/

asterisk-addons-commits at lists.digium.com asterisk-addons-commits at lists.digium.com
Fri Aug 4 11:15:01 MST 2006


Author: objsys
Date: Fri Aug  4 13:15:00 2006
New Revision: 269

URL: http://svn.digium.com/view/asterisk-addons?rev=269&view=rev
Log:
Fix for uint flag values, causing wrong behaviour of ooh323c

Modified:
    branches/1.2/asterisk-ooh323c/ooh323c/src/ooCalls.h
    branches/1.2/asterisk-ooh323c/ooh323c/src/ooasn1.h
    branches/1.2/asterisk-ooh323c/ooh323c/src/ooq931.c
    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=269&r1=268&r2=269&view=diff
==============================================================================
--- branches/1.2/asterisk-ooh323c/ooh323c/src/ooCalls.h (original)
+++ branches/1.2/asterisk-ooh323c/ooh323c/src/ooCalls.h Fri Aug  4 13:15:00 2006
@@ -41,18 +41,18 @@
 */
 
 
-
-#define OO_M_ENDPOINTCREATED    0x00010000
-#define OO_M_ENDSESSION_BUILT   0x00800000
-#define OO_M_RELEASE_BUILT      0x00400000
-#define OO_M_GKROUTED           0x00200000
-#define OO_M_AUTOANSWER         0x00100000
-#define OO_M_TUNNELING	        0x08000000
-#define OO_M_FASTSTARTANSWERED  0x04000000
-#define OO_M_MEDIAWAITFORCONN   0x03000000 
-#define OO_M_FASTSTART	        0x02000000 
-#define OO_M_DISABLEGK          0x01000000
-#define OO_M_MANUALRINGBACK     0x10000000
+#define OO_M_ENDSESSION_BUILT   ASN1UINTCNT(0x00800000)
+#define OO_M_RELEASE_BUILT      ASN1UINTCNT(0x00400000)
+#define OO_M_FASTSTARTANSWERED  ASN1UINTCNT(0x04000000)
+
+#define OO_M_ENDPOINTCREATED    ASN1UINTCNT(0x00010000)
+#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_FASTSTART	        ASN1UINTCNT(0x02000000)
+#define OO_M_DISABLEGK          ASN1UINTCNT(0x01000000)
+#define OO_M_MANUALRINGBACK     ASN1UINTCNT(0x10000000)
 
 
 /** 

Modified: branches/1.2/asterisk-ooh323c/ooh323c/src/ooasn1.h
URL: http://svn.digium.com/view/asterisk-addons/branches/1.2/asterisk-ooh323c/ooh323c/src/ooasn1.h?rev=269&r1=268&r2=269&view=diff
==============================================================================
--- branches/1.2/asterisk-ooh323c/ooh323c/src/ooasn1.h (original)
+++ branches/1.2/asterisk-ooh323c/ooh323c/src/ooasn1.h Fri Aug  4 13:15:00 2006
@@ -32,41 +32,6 @@
  * @defgroup cruntime C Runtime Common Functions 
  * @{
  */
-/* Tagging Value and Mask Constants */
-
-/* tag class value constants */
-
-#define TV_UNIV         0       /* universal                    */
-#define TV_APPL         1       /* application-wide             */
-#define TV_CTXT         2       /* context-specific             */
-#define TV_PRIV         3       /* private-use                  */
-
-/* tag form value constants */
-
-#define TV_PRIM         0       /* primitive                    */
-#define TV_CONS         1       /* constructor                  */
-
-/* tag mask values - these can be logically or'd together to    */
-/* form tags compatible with the ASNTAG structure..             */
-
-#define TM_UNIV         0x00000000  /* universal class          */
-#define TM_APPL         0x40000000  /* application-wide class   */
-#define TM_CTXT         0x80000000  /* context-specific class   */
-#define TM_PRIV         0xC0000000  /* private-use class        */
-
-#define TM_PRIM         0x00000000  /* primitive form           */
-#define TM_CONS         0x20000000  /* constructor form         */
-#define TM_IDCODE       0x1FFFFFFF  /* ID code mask             */
-
-#define ASN_K_BADTAG    0xFFFFFFFF  /* invalid tag code         */
-#define ASN_K_NOTAG     0xFFFFFFFF  /* no tag input parameter   */
-
-#define TM_CLASS        0xC0    /* class mask                   */
-#define TM_FORM         0x20    /* form mask                    */
-#define TM_CLASS_FORM   0xE0    /* class/form mask              */
-#define TM_B_IDCODE     0x1F    /* id code mask (byte)          */
-
-#define MINMSGLEN       8       /* minimum message length               */
 
 /* Error Code Constants */
 
@@ -258,6 +223,8 @@
 #define ASN1INT_MAX     ((ASN1INT)2147483647L)
 #define ASN1INT_MIN     ((ASN1INT)(-ASN1INT_MAX-1))
 
+#define ASN1UINTCNT(val) val##u
+
 
 #ifndef ASN1INT64
 

Modified: branches/1.2/asterisk-ooh323c/ooh323c/src/ooq931.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.2/asterisk-ooh323c/ooh323c/src/ooq931.c?rev=269&r1=268&r2=269&view=diff
==============================================================================
--- branches/1.2/asterisk-ooh323c/ooh323c/src/ooq931.c (original)
+++ branches/1.2/asterisk-ooh323c/ooh323c/src/ooq931.c Fri Aug  4 13:15:00 2006
@@ -720,6 +720,15 @@
       i += pq931Msg->causeIE->length;
    } 
       
+   /*Add progress indicator IE 
+   if(pq931Msg->messageType == Q931AlertingMsg || pq931Msg->messageType == Q931CallProceedingMsg)
+   {
+      msgbuf[i++] = Q931ProgressIndicatorIE;
+      msgbuf[i++] = 2; //Length is 2 octet
+      msgbuf[i++] = 0x80; //PI=8
+      msgbuf[i++] = 0x88;
+  }*/
+
    /*Add display ie. */
    if(!ooUtilsIsStrEmpty(call->ourCallerId))
    {

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=269&r1=268&r2=269&view=diff
==============================================================================
--- branches/1.2/asterisk-ooh323c/src/chan_h323.c (original)
+++ branches/1.2/asterisk-ooh323c/src/chan_h323.c Fri Aug  4 13:15:00 2006
@@ -2190,12 +2190,19 @@
 
    ast_cli(fd, "\nObjective Open H.323 Channel Driver's Config:\n");
    sprintf(value, "%s:%d", gIP, gPort);
-   ast_cli(fd, "%-15s%s\n", "IP:Port: ", value);
-   ast_cli(fd, "%-15s%s\n", "FastStart", gFastStart?"yes":"no");
-   ast_cli(fd, "%-15s%s\n", "Tunneling", gTunneling?"yes":"no");
-   ast_cli(fd, "%-15s%s\n", "CallerId", gCallerID);
-   ast_cli(fd, "%-15s%s\n", "MediaWaitForConnect", 
+   ast_cli(fd, "%-20s%s\n", "IP:Port: ", value);
+   ast_cli(fd, "%-20s%s\n", "FastStart", gFastStart?"yes":"no");
+   ast_cli(fd, "%-20s%s\n", "Tunneling", gTunneling?"yes":"no");
+   ast_cli(fd, "%-20s%s\n", "CallerId", gCallerID);
+   ast_cli(fd, "%-20s%s\n", "MediaWaitForConnect", 
       gMediaWaitForConnect?"yes":"no");
+
+#if (0)
+   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");
+#endif
 
    if(gRasGkMode == RasNoGatekeeper)
       sprintf(value, "%s", "No Gatekeeper");
@@ -2204,16 +2211,16 @@
    else
       sprintf(value, "%s", gGatekeeper);
 
-   ast_cli(fd,  "%-15s%s\n", "Gatekeeper:", value);
-
-   ast_cli(fd,  "%-15s%s\n", "H.323 LogFile:", gLogFile);   
-
-   ast_cli(fd,  "%-15s%s\n", "Context:", gContext);
+   ast_cli(fd,  "%-20s%s\n", "Gatekeeper:", value);
+
+   ast_cli(fd,  "%-20s%s\n", "H.323 LogFile:", gLogFile);   
+
+   ast_cli(fd,  "%-20s%s\n", "Context:", gContext);
    
-   ast_cli(fd,  "%-15s%s\n", "Capability:", 
+   ast_cli(fd,  "%-20s%s\n", "Capability:", 
            ast_getformatname_multiple(value,512,gCapability));
 
-   ast_cli(fd, "%-15s", "DTMF Mode: ");
+   ast_cli(fd, "%-20s", "DTMF Mode: ");
    if(gDTMFMode & H323_DTMF_RFC2833)
       ast_cli(fd, "%s\n", "rfc2833");
    else if (gDTMFMode & H323_DTMF_Q931)
@@ -2225,14 +2232,14 @@
    else
       ast_cli(fd, "%s\n", "unknown");
 
-   ast_cli(fd, "%-15s%s\n", "AccountCode: ", gAccountcode);
-
-   ast_cli(fd, "%-15s%s\n", "AMA flags: ", ast_cdr_flags2str(gAMAFLAGS));
+   ast_cli(fd, "%-20s%s\n", "AccountCode: ", gAccountcode);
+
+   ast_cli(fd, "%-20s%s\n", "AMA flags: ", ast_cdr_flags2str(gAMAFLAGS));
 
    pAlias = gAliasList;
    if(pAlias)
    {
-     ast_cli(fd, "%-15s\n", "Aliases: ");
+     ast_cli(fd, "%-20s\n", "Aliases: ");
    }
    while(pAlias)
    {



More information about the asterisk-addons-commits mailing list