[asterisk-commits] irroot: branch irroot/t38gateway-1.8 r321673 - in /team/irroot/t38gateway-1.8...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Jun 3 04:38:15 CDT 2011
Author: irroot
Date: Fri Jun 3 04:38:11 2011
New Revision: 321673
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321673
Log:
resolve / enable automerge
Modified:
team/irroot/t38gateway-1.8/ (props changed)
team/irroot/t38gateway-1.8/addons/chan_ooh323.c
team/irroot/t38gateway-1.8/addons/ooh323c/src/oochannels.c
team/irroot/t38gateway-1.8/addons/ooh323c/src/ooh245.c
team/irroot/t38gateway-1.8/cel/cel_odbc.c (props changed)
team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample (props changed)
team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql (props changed)
team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql (props changed)
team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql (props changed)
team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql (props changed)
team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql (props changed)
team/irroot/t38gateway-1.8/include/asterisk/acl.h
team/irroot/t38gateway-1.8/include/asterisk/dnsmgr.h
team/irroot/t38gateway-1.8/main/cdr.c
team/irroot/t38gateway-1.8/sounds/Makefile (props changed)
Propchange: team/irroot/t38gateway-1.8/
------------------------------------------------------------------------------
automerge = *
Propchange: team/irroot/t38gateway-1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 04:38:11 2011
@@ -1,3 +1,4 @@
/be/branches/C.3:256426
+/branches/1.8:321461-321547
/team/irroot/distrotech-customers-1.8:319062-319063
/team/irroot/t38gateway-trunk:318977-319016,319067,319070-319071,320879
Modified: team/irroot/t38gateway-1.8/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/t38gateway-1.8/addons/chan_ooh323.c?view=diff&rev=321673&r1=321672&r2=321673
==============================================================================
--- team/irroot/t38gateway-1.8/addons/chan_ooh323.c (original)
+++ team/irroot/t38gateway-1.8/addons/chan_ooh323.c Fri Jun 3 04:38:11 2011
@@ -1128,6 +1128,7 @@
static int ooh323_answer(struct ast_channel *ast)
{
struct ooh323_pvt *p = ast->tech_pvt;
+ char *callToken = (char *)NULL;
if (gH323Debug)
ast_verbose("--- ooh323_answer\n");
@@ -1135,8 +1136,18 @@
if (p) {
ast_mutex_lock(&p->lock);
+ callToken = (p->callToken ? strdup(p->callToken) : NULL);
if (ast->_state != AST_STATE_UP) {
ast_channel_lock(ast);
+ if (!p->alertsent) {
+ if (gH323Debug) {
+ ast_debug(1, "Sending forced ringback for %s, res = %d\n",
+ callToken, ooManualRingback(callToken));
+ } else {
+ ooManualRingback(callToken);
+ }
+ p->alertsent = 1;
+ }
ast_setstate(ast, AST_STATE_UP);
if (option_debug)
ast_debug(1, "ooh323_answer(%s)\n", ast->name);
@@ -1301,6 +1312,7 @@
} else {
ooManualRingback(callToken);
}
+ p->alertsent = 1;
}
}
break;
Modified: team/irroot/t38gateway-1.8/addons/ooh323c/src/oochannels.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/t38gateway-1.8/addons/ooh323c/src/oochannels.c?view=diff&rev=321673&r1=321672&r2=321673
==============================================================================
--- team/irroot/t38gateway-1.8/addons/ooh323c/src/oochannels.c (original)
+++ team/irroot/t38gateway-1.8/addons/ooh323c/src/oochannels.c Fri Jun 3 04:38:11 2011
@@ -671,10 +671,11 @@
if (0 != call->pH245Channel && 0 != call->pH245Channel->sock)
{
- if(call->pH245Channel->outQueue.count>0)
- {
- if(ooPDWrite(pfds, nfds, call->pH245Channel->sock))
- ooSendMsg(call, OOH245MSG);
+ if(ooPDWrite(pfds, nfds, call->pH245Channel->sock)) {
+ while (call->pH245Channel->outQueue.count>0) {
+ if (ooSendMsg(call, OOH245MSG) != OO_OK)
+ break;
+ }
}
}
else if(call->h245listener)
@@ -691,20 +692,23 @@
{
if(ooPDWrite(pfds, nfds, call->pH225Channel->sock))
{
- if(call->pH225Channel->outQueue.count>0)
+ while (call->pH225Channel->outQueue.count>0)
{
OOTRACEDBGC3("Sending H225 message (%s, %s)\n",
call->callType, call->callToken);
- ooSendMsg(call, OOQ931MSG);
+ if (ooSendMsg(call, OOQ931MSG) != OO_OK)
+ break;
}
if(call->pH245Channel &&
call->pH245Channel->outQueue.count>0 &&
- OO_TESTFLAG (call->flags, OO_M_TUNNELING))
- {
+ OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
+ while (call->pH245Channel->outQueue.count>0) {
OOTRACEDBGC3("H245 message needs to be tunneled. "
"(%s, %s)\n", call->callType,
call->callToken);
- ooSendMsg(call, OOH245MSG);
+ if (ooSendMsg(call, OOH245MSG) != OO_OK)
+ break;
+ }
}
}
}
@@ -1319,7 +1323,7 @@
{
OOTRACEDBGA3("Warning:Call marked for cleanup. Can not send message."
"(%s, %s)\n", call->callType, call->callToken);
- return OO_OK;
+ return OO_FAILED;
}
if(type == OOQ931MSG)
Modified: team/irroot/t38gateway-1.8/addons/ooh323c/src/ooh245.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/t38gateway-1.8/addons/ooh323c/src/ooh245.c?view=diff&rev=321673&r1=321672&r2=321673
==============================================================================
--- team/irroot/t38gateway-1.8/addons/ooh323c/src/ooh245.c (original)
+++ team/irroot/t38gateway-1.8/addons/ooh323c/src/ooh245.c Fri Jun 3 04:38:11 2011
@@ -2074,6 +2074,8 @@
ooClearAllLogicalChannels(call);
}
ooSendEndSessionCommand(call);
+ if (call->callState < OO_CALL_CLEAR)
+ call->callState = OO_CALL_CLEAR;
}
Propchange: team/irroot/t38gateway-1.8/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 04:38:11 2011
@@ -1,4 +1,5 @@
/be/branches/C.3/cel/cel_adaptive_odbc.c:256426
+/branches/1.8/cel/cel_odbc.c:321461-321547
/team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319062-319063,321553
/team/irroot/distrotech-customers-trunk/cel/cel_odbc.c:321552
/team/irroot/t38gateway-trunk/cel/cel_odbc.c:318977-319016,319067,319070-319071,320879-321512,321514-321541
Propchange: team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 04:38:11 2011
@@ -1,4 +1,5 @@
/be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
+/branches/1.8/configs/cel_odbc.conf.sample:321461-321547
/team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319062-319063,321553
/team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample:321552
/team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318977-319016,319067,319070-319071,320879-321512,321514-321541
Propchange: team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 04:38:11 2011
@@ -1,3 +1,4 @@
+/branches/1.8/contrib/realtime/mysql/iaxfriends.sql:321461-321547
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql:319062-319063,321553
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/iaxfriends.sql:321552
/team/irroot/t38gateway-trunk/contrib/realtime/mysql/iaxfriends.sql:318977-319016,319067,319070-319071,320879
Propchange: team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 04:38:11 2011
@@ -1,3 +1,4 @@
+/branches/1.8/contrib/realtime/mysql/meetme.sql:321461-321547
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql:319062-319063,321553
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/meetme.sql:321552
/team/irroot/t38gateway-trunk/contrib/realtime/mysql/meetme.sql:318977-319016,319067,319070-319071,320879
Propchange: team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 04:38:11 2011
@@ -1,3 +1,4 @@
+/branches/1.8/contrib/realtime/mysql/sipfriends.sql:321461-321547
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql:319062-319063,321553
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/sipfriends.sql:321552
/team/irroot/t38gateway-trunk/contrib/realtime/mysql/sipfriends.sql:318977-319016,319067,319070-319071,320879
Propchange: team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 04:38:11 2011
@@ -1,3 +1,4 @@
+/branches/1.8/contrib/realtime/mysql/voicemail.sql:321461-321547
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql:319062-319063,321553
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/voicemail.sql:321552
/team/irroot/t38gateway-trunk/contrib/realtime/mysql/voicemail.sql:318977-319016,319067,319070-319071,320879
Propchange: team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 04:38:11 2011
@@ -1,3 +1,4 @@
+/branches/1.8/contrib/realtime/postgresql/realtime.sql:321461-321547
/team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql:319062-319063,321553
/team/irroot/distrotech-customers-trunk/contrib/realtime/postgresql/realtime.sql:321552
/team/irroot/t38gateway-trunk/contrib/realtime/postgresql/realtime.sql:318977-319016,319067,319070-319071,320879
Modified: team/irroot/t38gateway-1.8/include/asterisk/acl.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/t38gateway-1.8/include/asterisk/acl.h?view=diff&rev=321673&r1=321672&r2=321673
==============================================================================
--- team/irroot/t38gateway-1.8/include/asterisk/acl.h (original)
+++ team/irroot/t38gateway-1.8/include/asterisk/acl.h Fri Jun 3 04:38:11 2011
@@ -143,7 +143,7 @@
* then this function acts exactly like a call to ast_get_ip.
*
* \param addr The IP address found. The address family is used as an input parameter to
- * filter the returned adresses. if it is 0, both IPv4 and IPv6 addresses
+ * filter the returned addresses. if it is 0, both IPv4 and IPv6 addresses
* can be returned.
*
* \param value The hostname to look up
Modified: team/irroot/t38gateway-1.8/include/asterisk/dnsmgr.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/t38gateway-1.8/include/asterisk/dnsmgr.h?view=diff&rev=321673&r1=321672&r2=321673
==============================================================================
--- team/irroot/t38gateway-1.8/include/asterisk/dnsmgr.h (original)
+++ team/irroot/t38gateway-1.8/include/asterisk/dnsmgr.h Fri Jun 3 04:38:11 2011
@@ -68,11 +68,13 @@
* \brief Allocate and initialize a DNS manager entry
*
* \param name the hostname
- * \param result where to store the IP address as the DNS manager refreshes it. The address family
- * is used as an input parameter to filter the returned adresses. if it is 0, both IPv4 * and IPv6 addresses can be returned.
+ * \param result where to store the IP address as the DNS manager refreshes it.
+ * The address family is used as an input parameter to filter the returned addresses.
+ * If it is 0, both IPv4 and IPv6 addresses can be returned.
* \param dnsmgr Where to store the allocate DNS manager entry
* \param service
*
+ * \note
* This function allocates a new DNS manager entry object, and fills it with
* the provided hostname and IP address. This function _does_ force an initial
* lookup, so it may block for some period of time.
Modified: team/irroot/t38gateway-1.8/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/t38gateway-1.8/main/cdr.c?view=diff&rev=321673&r1=321672&r2=321673
==============================================================================
--- team/irroot/t38gateway-1.8/main/cdr.c (original)
+++ team/irroot/t38gateway-1.8/main/cdr.c Fri Jun 3 04:38:11 2011
@@ -111,14 +111,16 @@
AST_MUTEX_DEFINE_STATIC(cdr_pending_lock);
static ast_cond_t cdr_pending_cond;
-int check_cdr_enabled()
+int check_cdr_enabled(void)
{
return enabled;
}
-/*! Register a CDR driver. Each registered CDR driver generates a CDR
- \return 0 on success, -1 on failure
-*/
+/*!
+ * \brief Register a CDR driver. Each registered CDR driver generates a CDR
+ * \retval 0 on success.
+ * \retval -1 on error
+ */
int ast_cdr_register(const char *name, const char *desc, ast_cdrbe be)
{
struct ast_cdr_beitem *i = NULL;
Propchange: team/irroot/t38gateway-1.8/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 3 04:38:11 2011
@@ -1,4 +1,5 @@
/be/branches/C.3/sounds/Makefile:256426
+/branches/1.8/sounds/Makefile:321461-321547
/team/irroot/distrotech-customers-1.8/sounds/Makefile:319062-319063,321553
/team/irroot/distrotech-customers-trunk/sounds/Makefile:321552
/team/irroot/t38gateway-trunk/sounds/Makefile:318977-319016,319067,319070-319071,320879-321512,321514-321541
More information about the asterisk-commits
mailing list