[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r321525 - in /team/irroot/dist...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jun 1 00:18:21 CDT 2011
Author: irroot
Date: Wed Jun 1 00:18:15 2011
New Revision: 321525
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321525
Log:
check f->datalen instead of f->samples to detect null frames. For MODEM frames, samples will be 0
Modified:
team/irroot/distrotech-customers-1.8/ (props changed)
team/irroot/distrotech-customers-1.8/apps/app_directed_pickup.c
team/irroot/distrotech-customers-1.8/cel/cel_odbc.c (props changed)
team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql (props changed)
team/irroot/distrotech-customers-1.8/main/channel.c
team/irroot/distrotech-customers-1.8/res/res_fax_spandsp.c
Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 00:18:15 2011
@@ -1,5 +1,5 @@
/be/branches/C.3:256426
/team/irroot/distrotech-customers-1.8:319067
-/team/irroot/distrotech-customers-trunk:320619,320821-320822
-/team/irroot/t38gateway-1.8:318979-319017,319357
+/team/irroot/distrotech-customers-trunk:320619,320821-320822,321099
+/team/irroot/t38gateway-1.8:318979-319017,319357,321514
/team/irroot/t38gateway-trunk:318977-319016,319067,319071,320879
Modified: team/irroot/distrotech-customers-1.8/apps/app_directed_pickup.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/apps/app_directed_pickup.c?view=diff&rev=321525&r1=321524&r2=321525
==============================================================================
--- team/irroot/distrotech-customers-1.8/apps/app_directed_pickup.c (original)
+++ team/irroot/distrotech-customers-1.8/apps/app_directed_pickup.c Wed Jun 1 00:18:15 2011
@@ -103,7 +103,8 @@
if (!chan->pbx && !chan->masq &&
!ast_test_flag(chan, AST_FLAG_ZOMBIE) &&
(chan->_state == AST_STATE_RINGING ||
- chan->_state == AST_STATE_RING)) {
+ chan->_state == AST_STATE_RING ||
+ chan->_state == AST_STATE_DOWN)) {
return 1;
}
return 0;
Propchange: team/irroot/distrotech-customers-1.8/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 00:18:15 2011
@@ -1,5 +1,5 @@
/be/branches/C.3/cel/cel_adaptive_odbc.c:256426
/team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319067
-/team/irroot/distrotech-customers-trunk/cel/cel_odbc.c:320619,320821-320822
-/team/irroot/t38gateway-1.8/cel/cel_odbc.c:318979-319017,319357
+/team/irroot/distrotech-customers-trunk/cel/cel_odbc.c:320619,320821-320822,321099
+/team/irroot/t38gateway-1.8/cel/cel_odbc.c:318979-319017,319357,321514
/team/irroot/t38gateway-trunk/cel/cel_odbc.c:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 00:18:15 2011
@@ -1,5 +1,5 @@
/be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
/team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319067
-/team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample:320619,320821-320822
-/team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample:318979-319017,319357
+/team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample:320619,320821-320822,321099
+/team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample:318979-319017,319357,321514
/team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 00:18:15 2011
@@ -1,4 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql:319067
-/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/iaxfriends.sql:320619,320821-320822
-/team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql:318979-319017,319357
+/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/iaxfriends.sql:320619,320821-320822,321099
+/team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql:318979-319017,319357,321514
/team/irroot/t38gateway-trunk/contrib/realtime/mysql/iaxfriends.sql:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 00:18:15 2011
@@ -1,4 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql:319067
-/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/meetme.sql:320619,320821-320822
-/team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql:318979-319017,319357
+/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/meetme.sql:320619,320821-320822,321099
+/team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql:318979-319017,319357,321514
/team/irroot/t38gateway-trunk/contrib/realtime/mysql/meetme.sql:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 00:18:15 2011
@@ -1,4 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql:319067
-/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/sipfriends.sql:320619,320821-320822
-/team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql:318979-319017,319357
+/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/sipfriends.sql:320619,320821-320822,321099
+/team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql:318979-319017,319357,321514
/team/irroot/t38gateway-trunk/contrib/realtime/mysql/sipfriends.sql:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 00:18:15 2011
@@ -1,4 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql:319067
-/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/voicemail.sql:320619,320821-320822
-/team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql:318979-319017,319357
+/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/voicemail.sql:320619,320821-320822,321099
+/team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql:318979-319017,319357,321514
/team/irroot/t38gateway-trunk/contrib/realtime/mysql/voicemail.sql:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 1 00:18:15 2011
@@ -1,4 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql:319067
-/team/irroot/distrotech-customers-trunk/contrib/realtime/postgresql/realtime.sql:320619,320821-320822
-/team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql:318979-319017,319357
+/team/irroot/distrotech-customers-trunk/contrib/realtime/postgresql/realtime.sql:320619,320821-320822,321099
+/team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql:318979-319017,319357,321514
/team/irroot/t38gateway-trunk/contrib/realtime/postgresql/realtime.sql:318977-319016,319067,319071,320879
Modified: team/irroot/distrotech-customers-1.8/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/main/channel.c?view=diff&rev=321525&r1=321524&r2=321525
==============================================================================
--- team/irroot/distrotech-customers-1.8/main/channel.c (original)
+++ team/irroot/distrotech-customers-1.8/main/channel.c Wed Jun 1 00:18:15 2011
@@ -7138,7 +7138,8 @@
long time_left_ms=0;
char caller_warning = 0;
char callee_warning = 0;
- const char *bridge_macro,*bridge_macro_args;
+ const char *bridge_macro;
+ const char *bridge_macro_args;
*fo = NULL;
@@ -7212,15 +7213,15 @@
ast_indicate(c0, AST_CONTROL_SRCUPDATE);
ast_indicate(c1, AST_CONTROL_SRCUPDATE);
- bridge_macro=pbx_builtin_getvar_helper(c0, "PICKUP_BRIDGE_MACRO");
+ bridge_macro = pbx_builtin_getvar_helper(c0, "PICKUP_BRIDGE_MACRO");
if (!ast_strlen_zero(bridge_macro)) {
- bridge_macro_args=pbx_builtin_getvar_helper(c0, "PICKUP_BRIDGE_MACRO_ARGS");
- ast_app_run_macro(NULL, c1, bridge_macro, bridge_macro_args);
- }
- bridge_macro=pbx_builtin_getvar_helper(c1, "PICKUP_BRIDGE_MACRO");
+ bridge_macro_args = pbx_builtin_getvar_helper(c0, "PICKUP_BRIDGE_MACRO_ARGS");
+ ast_app_run_macro(c0, c1, bridge_macro, bridge_macro_args);
+ }
+ bridge_macro = pbx_builtin_getvar_helper(c1, "PICKUP_BRIDGE_MACRO");
if (!ast_strlen_zero(bridge_macro)) {
- bridge_macro_args=pbx_builtin_getvar_helper(c1, "PICKUP_BRIDGE_MACRO_ARGS");
- ast_app_run_macro(NULL, c0, bridge_macro, bridge_macro_args);
+ bridge_macro_args = pbx_builtin_getvar_helper(c1, "PICKUP_BRIDGE_MACRO_ARGS");
+ ast_app_run_macro(c1, c0, bridge_macro, bridge_macro_args);
}
for (/* ever */;;) {
Modified: team/irroot/distrotech-customers-1.8/res/res_fax_spandsp.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/res/res_fax_spandsp.c?view=diff&rev=321525&r1=321524&r2=321525
==============================================================================
--- team/irroot/distrotech-customers-1.8/res/res_fax_spandsp.c (original)
+++ team/irroot/distrotech-customers-1.8/res/res_fax_spandsp.c Wed Jun 1 00:18:15 2011
@@ -718,7 +718,7 @@
struct spandsp_pvt *p = s->tech_pvt;
/*invalid frame*/
- if (!f->data.ptr || !f->samples) {
+ if (!f->data.ptr || !f->datalen) {
return 0;
}
More information about the asterisk-commits
mailing list