[asterisk-commits] may: trunk r239037 - /trunk/addons/ooh323c/src/

[SVN commits to the Asterisk project]

Author: may
Date: Sun Jan 10 11:53:59 2010
New Revision: 239037

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=239037
Log:
add docallbacks flag in q931decode function because
when we decode received q931 packet we must do callbacks and
when we print sended q931 packet we must not. 

Modified:
    trunk/addons/ooh323c/src/oochannels.c
    trunk/addons/ooh323c/src/ooq931.c
    trunk/addons/ooh323c/src/ooq931.h

Modified: trunk/addons/ooh323c/src/oochannels.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/oochannels.c?view=diff&rev=239037&r1=239036&r2=239037
==============================================================================
--- trunk/addons/ooh323c/src/oochannels.c (original)
+++ trunk/addons/ooh323c/src/oochannels.c Sun Jan 10 11:53:59 2010
@@ -1114,7 +1114,7 @@
 
    initializePrintHandler(&printHandler, "Received H.2250 Message");
    setEventHandler (pctxt, &printHandler);
-   ret = ooQ931Decode (call, pmsg, len, message);
+   ret = ooQ931Decode (call, pmsg, len, message, 1);
    if(ret != OO_OK) {
       OOTRACEERR3("Error:Failed to decode received H.2250 message. (%s, %s)\n",
                    call->callType, call->callToken);

Modified: trunk/addons/ooh323c/src/ooq931.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooq931.c?view=diff&rev=239037&r1=239036&r2=239037
==============================================================================
--- trunk/addons/ooh323c/src/ooq931.c (original)
+++ trunk/addons/ooh323c/src/ooq931.c Sun Jan 10 11:53:59 2010
@@ -47,7 +47,7 @@
 };
 
 EXTERN int ooQ931Decode 
-   (OOH323CallData *call, Q931Message* msg, int length, ASN1OCTET *data) 
+   (OOH323CallData *call, Q931Message* msg, int length, ASN1OCTET *data, int docallbacks)
 {
    int offset, x;
    int rv = ASN_OK;
@@ -173,7 +173,7 @@
          OOTRACEDBGB1("   Keypad IE = {\n");
          OOTRACEDBGB2("      %s\n", ie->data);
          OOTRACEDBGB1("   }\n");
-         if(gH323ep.h323Callbacks.onReceivedDTMF)
+         if(docallbacks && gH323ep.h323Callbacks.onReceivedDTMF)
          {
             gH323ep.h323Callbacks.onReceivedDTMF(call, (char *)ie->data);
          }
@@ -626,7 +626,7 @@
 
    setPERBuffer (pctxt, msgbuf, msglen, TRUE);
 
-   ret = ooQ931Decode (call, &q931Msg, msglen, msgbuf);
+   ret = ooQ931Decode (call, &q931Msg, msglen, msgbuf, 0);
    if(ret != OO_OK)
    {
       OOTRACEERR3("Error:Failed decoding Q931 message. (%s, %s)\n", 

Modified: trunk/addons/ooh323c/src/ooq931.h
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooq931.h?view=diff&rev=239037&r1=239036&r2=239037
==============================================================================
--- trunk/addons/ooh323c/src/ooq931.h (original)
+++ trunk/addons/ooh323c/src/ooq931.h Sun Jan 10 11:53:59 2010
@@ -335,7 +335,7 @@
  * @return         Completion status - 0 on success, -1 on failure
  */
 EXTERN int ooQ931Decode 
-(struct OOH323CallData *call, Q931Message* msg, int length, ASN1OCTET *data);
+(struct OOH323CallData *call, Q931Message* msg, int length, ASN1OCTET *data, int docallbacks);
 
 /**
  * This function is used to decode the UUIE of the message from the list of