[svn-commits] may: branch may/ooh323_ipv6_direct_rtp r369609 - in /team/may/ooh323_ipv6_dir...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Jul 4 14:33:25 CDT 2012
Author: may
Date: Wed Jul 4 14:33:21 2012
New Revision: 369609
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369609
Log:
changes according latest comment on review board
(document options in CHANGES, use ast_free/malloc, remove meaningless
check)
Modified:
team/may/ooh323_ipv6_direct_rtp/ (props changed)
team/may/ooh323_ipv6_direct_rtp/CHANGES
team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c
team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooCmdChannel.c
team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooStackCmds.c
team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooh245.c
Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 4 14:33:21 2012
@@ -1,2 +1,2 @@
/team/mmichelson/private/phones-trunk:358764-361321
-/trunk:331201-331202,346391,354429,356042,357272,360190,362888,362919-362920,368181-368569,368588-369527
+/trunk:331201-331202,346391,354429,356042,357272,360190,362888,362919-362920,368181-368569,368588-369527,369602-369603
Modified: team/may/ooh323_ipv6_direct_rtp/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/CHANGES?view=diff&rev=369609&r1=369608&r2=369609
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/CHANGES (original)
+++ team/may/ooh323_ipv6_direct_rtp/CHANGES Wed Jul 4 14:33:21 2012
@@ -288,6 +288,11 @@
* IPv6 addresses are now supported when using FastAGI (agi://). Hostnames
are resolved and each address is attempted in turn until one succeeds or
all fail.
+
+chan_ooh323
+-----------
+ * Direct media functionality has been added.
+ Options in config are: directmedia (directrtp) and directrtpsetup (earlydirect)
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.8 to Asterisk 10 -------------------
Modified: team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c?view=diff&rev=369609&r1=369608&r2=369609
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c Wed Jul 4 14:33:21 2012
@@ -1252,7 +1252,6 @@
return -1;
}
- /* 20110107 if we are redirected then we don't must generate any inband data */
if (!ast_sockaddr_isnull(&p->redirip)) {
res = 0;
}
Modified: team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooCmdChannel.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooCmdChannel.c?view=diff&rev=369609&r1=369608&r2=369609
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooCmdChannel.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooCmdChannel.c Wed Jul 4 14:33:21 2012
@@ -423,13 +423,13 @@
}
}
if (cmd.param1) {
- free(cmd.param1);
+ ast_free(cmd.param1);
}
if (cmd.param2) {
- free(cmd.param2);
+ ast_free(cmd.param2);
}
if (cmd.param3) {
- free(cmd.param3);
+ ast_free(cmd.param3);
}
}
Modified: team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooStackCmds.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooStackCmds.c?view=diff&rev=369609&r1=369608&r2=369609
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooStackCmds.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooStackCmds.c Wed Jul 4 14:33:21 2012
@@ -571,18 +571,18 @@
memset(&cmd, 0, sizeof(OOStackCommand));
cmd.type = OO_CMD_UPDLC;
- cmd.param1 = (void*) malloc(strlen(callToken) + 1);
- cmd.param2 = (void*) malloc(strlen(localIP) + 1);
- cmd.param3 = (void*) malloc(sizeof(int) + 1);
+ cmd.param1 = ast_malloc(strlen(callToken) + 1);
+ cmd.param2 = ast_malloc(strlen(localIP) + 1);
+ cmd.param3 = ast_malloc(sizeof(int) + 1);
if (!cmd.param1 || !cmd.param2 || !cmd.param3) {
if (cmd.param1) {
- free(cmd.param1); /* Release memory */
+ ast_free(cmd.param1); /* Release memory */
}
if (cmd.param2) {
- free(cmd.param2);
+ ast_free(cmd.param2);
}
if (cmd.param3) {
- free(cmd.param3);
+ ast_free(cmd.param3);
}
return OO_STKCMD_MEMERR;
}
@@ -594,15 +594,15 @@
cmd.plen3 = sizeof(int) + 1;
if (ooWriteCallStackCommand(call, &cmd) != OO_OK) {
- free(cmd.param1);
- free(cmd.param2);
- free(cmd.param3);
- return OO_STKCMD_WRITEERR;
- }
-
- free(cmd.param1);
- free(cmd.param2);
- free(cmd.param3);
+ ast_free(cmd.param1);
+ ast_free(cmd.param2);
+ ast_free(cmd.param3);
+ return OO_STKCMD_WRITEERR;
+ }
+
+ ast_free(cmd.param1);
+ ast_free(cmd.param2);
+ ast_free(cmd.param3);
return OO_STKCMD_SUCCESS;
}
Modified: team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooh245.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooh245.c?view=diff&rev=369609&r1=369608&r2=369609
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooh245.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooh245.c Wed Jul 4 14:33:21 2012
@@ -839,11 +839,6 @@
pctxt = call->msgctxt;
ph245msg->msgType = OOTerminalCapabilitySet;
memset(request, 0, sizeof(H245RequestMessage));
- if (request == NULL) {
- OOTRACEERR3("ERROR: No memory allocated for request message (%s, %s)\n",
- call->callType, call->callToken);
- return OO_FAILED;
- }
request->t = T_H245RequestMessage_terminalCapabilitySet;
request->u.terminalCapabilitySet = (H245TerminalCapabilitySet*)
More information about the svn-commits
mailing list