[asterisk-commits] may: branch may/ooh323_ipv6 r294124 - in /team/may/ooh323_ipv6/addons: ./ ooh...

[SVN commits to the Asterisk project]

Author: may
Date: Sun Nov  7 16:25:23 2010
New Revision: 294124

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294124
Log:
few error fixes
ehnancement of user h245tunneling parm proccessing

Tested in both ipv4/v6 modes with and without tunneling/faststart
Codes is ready for review

Modified:
    team/may/ooh323_ipv6/addons/chan_ooh323.c
    team/may/ooh323_ipv6/addons/ooh323c/src/ooh245.c
    team/may/ooh323_ipv6/addons/ooh323c/src/ooh323.c
    team/may/ooh323_ipv6/addons/ooh323c/src/ooq931.c

Modified: team/may/ooh323_ipv6/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/addons/chan_ooh323.c?view=diff&rev=294124&r1=294123&r2=294124
==============================================================================
--- team/may/ooh323_ipv6/addons/chan_ooh323.c (original)
+++ team/may/ooh323_ipv6/addons/chan_ooh323.c Sun Nov  7 16:25:23 2010
@@ -1758,9 +1758,11 @@
          		OO_SETFLAG(call->flags, OO_M_FASTSTART);
 		else
 			OO_CLRFLAG(call->flags, OO_M_FASTSTART);
-		if (p->h245tunneling)
-			OO_SETFLAG(call->flags, OO_M_TUNNELING);
-		else
+		/* if we disable h245tun for this user then we clear flag */
+		/* in any other case we don't must touch this */
+		/* ie if we receive setup without h245tun but enabled
+		   we can't enable it per call */
+		if (!p->h245tunneling)
 			OO_CLRFLAG(call->flags, OO_M_TUNNELING);
 
 		if (user->rtpmask && user->rtpmaskstr[0]) {

Modified: team/may/ooh323_ipv6/addons/ooh323c/src/ooh245.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/addons/ooh323c/src/ooh245.c?view=diff&rev=294124&r1=294123&r2=294124
==============================================================================
--- team/may/ooh323_ipv6/addons/ooh323c/src/ooh245.c (original)
+++ team/may/ooh323_ipv6/addons/ooh323c/src/ooh245.c Sun Nov  7 16:25:23 2010
@@ -3801,7 +3801,7 @@
 
 	inet_pton(AF_INET6, pLogicalChannel->localIP, iP6Address->network.data);
    	iP6Address->network.numocts = 16;
-   	iPAddress->tsapIdentifier = pLogicalChannel->localRtcpPort;
+   	iP6Address->tsapIdentifier = pLogicalChannel->localRtcpPort;
    } else {
    	unicastAddrs->t = T_H245UnicastAddress_iPAddress;
    	unicastAddrs->u.iPAddress = (H245UnicastAddress_iPAddress*)

Modified: team/may/ooh323_ipv6/addons/ooh323c/src/ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/addons/ooh323c/src/ooh323.c?view=diff&rev=294124&r1=294123&r2=294124
==============================================================================
--- team/may/ooh323_ipv6/addons/ooh323c/src/ooh323.c (original)
+++ team/may/ooh323_ipv6/addons/ooh323c/src/ooh323.c Sun Nov  7 16:25:23 2010
@@ -214,7 +214,7 @@
       if(ret != OO_OK)
       {
          OOTRACEERR3("Error: Unknown H245 address type in received "
-                     "CallProceeding message (%s, %s)", call->callType, 
+                     "Facility message (%s, %s)", call->callType, 
                      call->callToken);
          /* Mark call for clearing */
          if(call->callState < OO_CALL_CLEAR)
@@ -2546,7 +2546,7 @@
 int ooH323GetIpPortFromH225TransportAddress(struct OOH323CallData *call, 
    H225TransportAddress *h225Address, char *ip, int *port)
 {
-   if (call->versionIP) {
+   if (call->versionIP == 6) {
     if(h225Address->t != T_H225TransportAddress_ip6Address)
     {
       OOTRACEERR3("Error: Unknown H225 address type. (%s, %s)", call->callType,

Modified: team/may/ooh323_ipv6/addons/ooh323c/src/ooq931.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/addons/ooh323c/src/ooq931.c?view=diff&rev=294124&r1=294123&r2=294124
==============================================================================
--- team/may/ooh323_ipv6/addons/ooh323c/src/ooq931.c (original)
+++ team/may/ooh323_ipv6/addons/ooh323c/src/ooq931.c Sun Nov  7 16:25:23 2010
@@ -3617,13 +3617,15 @@
    }
 
    if (!ast_parse_arg(dest, PARSE_ADDR, &tmpaddr)) {
-      if(strlen(dest)+1>len)
+      if(strlen(dest)+7>len)
       {
          OOTRACEERR1("Error:Insufficient buffer space for parsed ip - "
                      "ooParseDestination\n");
          return OO_FAILED;
       }
-      strcpy(parsedIP, dest);     
+      strcpy(parsedIP, ast_sockaddr_stringify_addr(&tmpaddr));
+      strcat(parsedIP, ":");
+      strcat(parsedIP, ast_sockaddr_stringify_port(&tmpaddr));
       return OO_OK;
    }