[svn-commits] may: branch may/ooh323_ipv6_direct_rtp r346467 - /team/may/ooh323_ipv6_direct...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Nov 30 09:47:45 CST 2011
Author: may
Date: Wed Nov 30 09:47:41 2011
New Revision: 346467
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=346467
Log:
change all ast_verbose to ast_verb in ooh323 according to rv1599
Modified:
team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c
team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.c
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=346467&r1=346466&r2=346467
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c Wed Nov 30 09:47:41 2011
@@ -4118,14 +4118,14 @@
{
struct ooh323_pvt *p = chan->tech_pvt;
if (gH323Debug) {
- ast_verbose("+++ ooh323 get_codec, %s\n", chan->name);
+ ast_verb(0, "+++ ooh323 get_codec, %s\n", chan->name);
}
ast_format_cap_append(result, ast_format_cap_is_empty(chan->nativeformats) ?
(ast_format_cap_is_empty(p->cap) ? NULL : p->cap) : chan->nativeformats);
if (gH323Debug) {
- ast_verbose("--- ooh323 get_codec, %s\n", chan->name);
+ ast_verb(0, "--- ooh323 get_codec, %s\n", chan->name);
}
}
@@ -4138,7 +4138,7 @@
struct ast_sockaddr tmp;
if (gH323Debug) {
- ast_verbose("+++ ooh323 get_rtp_peer \n");
+ ast_verb(0, "+++ ooh323 get_rtp_peer \n");
}
if (!(p = (struct ooh323_pvt *) chan->tech_pvt))
@@ -4164,11 +4164,11 @@
ast_rtp_instance_get_remote_address(*rtp, &tmp);
if (gH323Debug) {
- ast_verbose("ooh323_get_rtp_peer %s -> %s:%d, %d\n", chan->name, ast_sockaddr_stringify_addr(&tmp),
+ ast_verb(0, "ooh323_get_rtp_peer %s -> %s:%d, %d\n", chan->name, ast_sockaddr_stringify_addr(&tmp),
ast_sockaddr_port(&tmp), res);
}
if (gH323Debug) {
- ast_verbose("--- ooh323 get_rtp_peer, res = %d\n", (int) res);
+ ast_verb(0, "--- ooh323 get_rtp_peer, res = %d\n", (int) res);
}
return res;
@@ -4279,7 +4279,7 @@
if (!callToken) {
if (gH323Debug)
- ast_verbose(" set_rtp_peer - No callToken\n");
+ ast_verb(0, " set_rtp_peer - No callToken\n");
ast_mutex_unlock(&p->lock);
return -1;
}
@@ -4289,12 +4289,12 @@
ast_rtp_instance_get_local_address(rtp, &tmp); */
if (changed) {
if (!ast_sockaddr_isnull(&p->redirip)) {
- ast_verbose("ooh323_set_rtp_peer %s -> %s:%d\n", chan->name, ast_sockaddr_stringify_addr(&p->redirip),
+ ast_verb(0, "ooh323_set_rtp_peer %s -> %s:%d\n", chan->name, ast_sockaddr_stringify_addr(&p->redirip),
ast_sockaddr_port(&p->redirip));
ooUpdateLogChannels(callToken, ast_sockaddr_stringify_addr(&p->redirip),
ast_sockaddr_port(&p->redirip));
} else {
- ast_verbose("ooh323_set_rtp_peer return back to local\n");
+ ast_verb(0, "ooh323_set_rtp_peer return back to local\n");
ooUpdateLogChannels(callToken, "0.0.0.0" , 0);
}
}
@@ -4445,11 +4445,11 @@
struct ast_sockaddr tmp;
if (gH323Debug)
- ast_verbose("--- setup_rtp_remote %s:%d\n", remoteIp, remotePort);
+ ast_verb(0, "--- setup_rtp_remote %s:%d\n", remoteIp, remotePort);
if (!remoteIp || !remoteIp[0] || !remotePort) {
if (gH323Debug) {
- ast_verbose("+++ setup_rtp_remote no data\n");
+ ast_verb(0, "+++ setup_rtp_remote no data\n");
}
return;
}
@@ -4471,7 +4471,7 @@
ast_mutex_unlock(&p->lock);
if(gH323Debug)
- ast_verbose("+++ setup_rtp_remote\n");
+ ast_verb(0, "+++ setup_rtp_remote\n");
return;
}
Modified: team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.c?view=diff&rev=346467&r1=346466&r2=346467
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.c Wed Nov 30 09:47:41 2011
@@ -231,14 +231,14 @@
int ret = 0, x;
struct ast_format tmpfmt;
if(gH323Debug)
- ast_verbose("\tAdding capabilities to H323 endpoint\n");
+ ast_verb(0, "\tAdding capabilities to H323 endpoint\n");
for(x=0; ast_codec_pref_index(prefs, x, &tmpfmt); x++)
{
if(tmpfmt.id == AST_FORMAT_ULAW)
{
if(gH323Debug)
- ast_verbose("\tAdding g711 ulaw capability to H323 endpoint\n");
+ ast_verb(0, "\tAdding g711 ulaw capability to H323 endpoint\n");
ret= ooH323EpAddG711Capability(OO_G711ULAW64K, gtxframes, grxframes,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
@@ -248,7 +248,7 @@
if(tmpfmt.id == AST_FORMAT_ALAW)
{
if(gH323Debug)
- ast_verbose("\tAdding g711 alaw capability to H323 endpoint\n");
+ ast_verb(0, "\tAdding g711 alaw capability to H323 endpoint\n");
ret= ooH323EpAddG711Capability(OO_G711ALAW64K, gtxframes, grxframes,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
@@ -259,7 +259,7 @@
if(tmpfmt.id == AST_FORMAT_G729A)
{
if(gH323Debug)
- ast_verbose("\tAdding g729A capability to H323 endpoint\n");
+ ast_verb(0, "\tAdding g729A capability to H323 endpoint\n");
ret = ooH323EpAddG729Capability(OO_G729A, 2, 24,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
@@ -267,14 +267,14 @@
&ooh323c_stop_transmit_channel);
if(gH323Debug)
- ast_verbose("\tAdding g729 capability to H323 endpoint\n");
+ ast_verb(0, "\tAdding g729 capability to H323 endpoint\n");
ret |= ooH323EpAddG729Capability(OO_G729, 2, 24,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
&ooh323c_stop_receive_channel,
&ooh323c_stop_transmit_channel);
if(gH323Debug)
- ast_verbose("\tAdding g729b capability to H323 endpoint\n");
+ ast_verb(0, "\tAdding g729b capability to H323 endpoint\n");
ret |= ooH323EpAddG729Capability(OO_G729B, 2, 24,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
@@ -285,7 +285,7 @@
if(tmpfmt.id == AST_FORMAT_G723_1)
{
if(gH323Debug)
- ast_verbose("\tAdding g7231 capability to H323 endpoint\n");
+ ast_verb(0, "\tAdding g7231 capability to H323 endpoint\n");
ret = ooH323EpAddG7231Capability(OO_G7231, 1, 1, FALSE,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
@@ -297,7 +297,7 @@
if(tmpfmt.id == AST_FORMAT_G726)
{
if(gH323Debug)
- ast_verbose("\tAdding g726 capability to H323 endpoint\n");
+ ast_verb(0, "\tAdding g726 capability to H323 endpoint\n");
ret = ooH323EpAddG726Capability(OO_G726, gtxframes, grxframes, FALSE,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
@@ -309,7 +309,7 @@
if(tmpfmt.id == AST_FORMAT_G726_AAL2)
{
if(gH323Debug)
- ast_verbose("\tAdding g726aal2 capability to H323 endpoint\n");
+ ast_verb(0, "\tAdding g726aal2 capability to H323 endpoint\n");
ret = ooH323EpAddG726Capability(OO_G726AAL2, gtxframes, grxframes, FALSE,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
@@ -321,7 +321,7 @@
if(tmpfmt.id == AST_FORMAT_H263)
{
if(gH323Debug)
- ast_verbose("\tAdding h263 capability to H323 endpoint\n");
+ ast_verb(0, "\tAdding h263 capability to H323 endpoint\n");
ret = ooH323EpAddH263VideoCapability(OO_H263VIDEO, 1, 0, 0, 0, 0, 320*1024,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
@@ -333,7 +333,7 @@
if(tmpfmt.id == AST_FORMAT_GSM)
{
if(gH323Debug)
- ast_verbose("\tAdding gsm capability to H323 endpoint\n");
+ ast_verb(0, "\tAdding gsm capability to H323 endpoint\n");
ret = ooH323EpAddGSMCapability(OO_GSMFULLRATE, 4, FALSE, FALSE,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
@@ -346,7 +346,7 @@
if(tmpfmt.id == AST_FORMAT_AMRNB)
{
if(gH323Debug)
- ast_verbose("\tAdding amr nb capability to H323 endpoint\n");
+ ast_verb(0, "\tAdding amr nb capability to H323 endpoint\n");
ret = ooH323EpAddAMRNBCapability(OO_AMRNB, 4, 4, FALSE,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
@@ -360,7 +360,7 @@
if(tmpfmt.id == AST_FORMAT_SPEEX)
{
if(gH323Debug)
- ast_verbose("\tAdding speex capability to H323 endpoint\n");
+ ast_verb(0, "\tAdding speex capability to H323 endpoint\n");
ret = ooH323EpAddSpeexCapability(OO_SPEEX, 4, 4, FALSE,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
@@ -391,7 +391,7 @@
int ret = 0, x, txframes;
struct ast_format tmpfmt;
if(gH323Debug)
- ast_verbose("\tAdding capabilities to call(%s, %s)\n", call->callType,
+ ast_verb(0, "\tAdding capabilities to call(%s, %s)\n", call->callType,
call->callToken);
if(dtmf & H323_DTMF_CISCO || 1)
ret |= ooCallEnableDTMFCISCO(call,dtmfcodec);
@@ -415,7 +415,7 @@
if(tmpfmt.id == AST_FORMAT_ULAW)
{
if(gH323Debug)
- ast_verbose("\tAdding g711 ulaw capability to call(%s, %s)\n",
+ ast_verb(0, "\tAdding g711 ulaw capability to call(%s, %s)\n",
call->callType, call->callToken);
txframes = prefs->framing[x];
ret= ooCallAddG711Capability(call, OO_G711ULAW64K, txframes,
@@ -428,7 +428,7 @@
if(tmpfmt.id == AST_FORMAT_ALAW)
{
if(gH323Debug)
- ast_verbose("\tAdding g711 alaw capability to call(%s, %s)\n",
+ ast_verb(0, "\tAdding g711 alaw capability to call(%s, %s)\n",
call->callType, call->callToken);
txframes = prefs->framing[x];
ret= ooCallAddG711Capability(call, OO_G711ALAW64K, txframes,
@@ -442,7 +442,7 @@
if(tmpfmt.id == AST_FORMAT_G726)
{
if(gH323Debug)
- ast_verbose("\tAdding g726 capability to call (%s, %s)\n",
+ ast_verb(0, "\tAdding g726 capability to call (%s, %s)\n",
call->callType, call->callToken);
txframes = prefs->framing[x];
ret = ooCallAddG726Capability(call, OO_G726, txframes, grxframes, FALSE,
@@ -456,7 +456,7 @@
if(tmpfmt.id == AST_FORMAT_G726_AAL2)
{
if(gH323Debug)
- ast_verbose("\tAdding g726aal2 capability to call (%s, %s)\n",
+ ast_verb(0, "\tAdding g726aal2 capability to call (%s, %s)\n",
call->callType, call->callToken);
txframes = prefs->framing[x];
ret = ooCallAddG726Capability(call, OO_G726AAL2, txframes, grxframes, FALSE,
@@ -472,7 +472,7 @@
txframes = (prefs->framing[x])/10;
if(gH323Debug)
- ast_verbose("\tAdding g729A capability to call(%s, %s)\n",
+ ast_verb(0, "\tAdding g729A capability to call(%s, %s)\n",
call->callType, call->callToken);
ret= ooCallAddG729Capability(call, OO_G729A, txframes, txframes,
OORXANDTX, &ooh323c_start_receive_channel,
@@ -482,7 +482,7 @@
if (g729onlyA)
continue;
if(gH323Debug)
- ast_verbose("\tAdding g729 capability to call(%s, %s)\n",
+ ast_verb(0, "\tAdding g729 capability to call(%s, %s)\n",
call->callType, call->callToken);
ret|= ooCallAddG729Capability(call, OO_G729, txframes, txframes,
OORXANDTX, &ooh323c_start_receive_channel,
@@ -490,7 +490,7 @@
&ooh323c_stop_receive_channel,
&ooh323c_stop_transmit_channel);
if(gH323Debug)
- ast_verbose("\tAdding g729B capability to call(%s, %s)\n",
+ ast_verb(0, "\tAdding g729B capability to call(%s, %s)\n",
call->callType, call->callToken);
ret|= ooCallAddG729Capability(call, OO_G729B, txframes, txframes,
OORXANDTX, &ooh323c_start_receive_channel,
@@ -503,7 +503,7 @@
if(tmpfmt.id == AST_FORMAT_G723_1)
{
if(gH323Debug)
- ast_verbose("\tAdding g7231 capability to call (%s, %s)\n",
+ ast_verb(0, "\tAdding g7231 capability to call (%s, %s)\n",
call->callType, call->callToken);
ret = ooCallAddG7231Capability(call, OO_G7231, 1, 1, FALSE,
OORXANDTX, &ooh323c_start_receive_channel,
@@ -516,7 +516,7 @@
if(tmpfmt.id == AST_FORMAT_H263)
{
if(gH323Debug)
- ast_verbose("\tAdding h263 capability to call (%s, %s)\n",
+ ast_verb(0, "\tAdding h263 capability to call (%s, %s)\n",
call->callType, call->callToken);
ret = ooCallAddH263VideoCapability(call, OO_H263VIDEO, 1, 0, 0, 0, 0, 320*1024,
OORXANDTX, &ooh323c_start_receive_channel,
@@ -529,7 +529,7 @@
if(tmpfmt.id == AST_FORMAT_GSM)
{
if(gH323Debug)
- ast_verbose("\tAdding gsm capability to call(%s, %s)\n",
+ ast_verb(0, "\tAdding gsm capability to call(%s, %s)\n",
call->callType, call->callToken);
ret = ooCallAddGSMCapability(call, OO_GSMFULLRATE, 4, FALSE, FALSE,
OORXANDTX, &ooh323c_start_receive_channel,
@@ -542,7 +542,7 @@
if(tmpfmt.id == AST_FORMAT_AMRNB)
{
if(gH323Debug)
- ast_verbose("\tAdding AMR capability to call(%s, %s)\n",
+ ast_verb(0, "\tAdding AMR capability to call(%s, %s)\n",
call->callType, call->callToken);
ret = ooCallAddAMRNBCapability(call, OO_AMRNB, 4, 4, FALSE,
OORXANDTX, &ooh323c_start_receive_channel,
@@ -555,7 +555,7 @@
if(tmpfmt.id == AST_FORMAT_SPEEX)
{
if(gH323Debug)
- ast_verbose("\tAdding Speex capability to call(%s, %s)\n",
+ ast_verb(0, "\tAdding Speex capability to call(%s, %s)\n",
call->callType, call->callToken);
ret = ooCallAddSpeexCapability(call, OO_SPEEX, 4, 4, FALSE,
OORXANDTX, &ooh323c_start_receive_channel,
More information about the svn-commits
mailing list