[svn-commits] mmichelson: branch group/issue8824 r164267 - in /team/group/issue8824: ./ app...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Dec 15 09:52:35 CST 2008
Author: mmichelson
Date: Mon Dec 15 09:52:35 2008
New Revision: 164267
URL: http://svn.digium.com/view/asterisk?view=rev&rev=164267
Log:
Resolve conflict and reset automerge
Modified:
team/group/issue8824/ (props changed)
team/group/issue8824/apps/app_fax.c
team/group/issue8824/apps/app_jack.c
team/group/issue8824/configure
team/group/issue8824/configure.ac
team/group/issue8824/include/asterisk/autoconfig.h.in
team/group/issue8824/main/channel.c
team/group/issue8824/main/features.c
team/group/issue8824/main/utils.c
Propchange: team/group/issue8824/
------------------------------------------------------------------------------
automerge = *
Propchange: team/group/issue8824/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/issue8824/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/issue8824/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec 15 09:52:35 2008
@@ -1,1 +1,1 @@
-/trunk:1-164172
+/trunk:1-164265
Modified: team/group/issue8824/apps/app_fax.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/apps/app_fax.c?view=diff&rev=164267&r1=164266&r2=164267
==============================================================================
--- team/group/issue8824/apps/app_fax.c (original)
+++ team/group/issue8824/apps/app_fax.c Mon Dec 15 09:52:35 2008
@@ -29,6 +29,9 @@
#include <tiffio.h>
#include <spandsp.h>
+#ifdef HAVE_SPANDSP_EXPOSE_H
+#include <spandsp/expose.h>
+#endif
#include <spandsp/version.h>
#include "asterisk/lock.h"
Modified: team/group/issue8824/apps/app_jack.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/apps/app_jack.c?view=diff&rev=164267&r1=164266&r2=164267
==============================================================================
--- team/group/issue8824/apps/app_jack.c (original)
+++ team/group/issue8824/apps/app_jack.c Mon Dec 15 09:52:35 2008
@@ -182,7 +182,7 @@
ast_str_append(&str, 0, ", %s", jack_status_to_str((1 << i)));
}
- ast_log(LOG_NOTICE, "%s: %s\n", prefix, str->str);
+ ast_log(LOG_NOTICE, "%s: %s\n", prefix, ast_str_buffer(str));
}
static int alloc_resampler(struct jack_data *jack_data, int input)
Modified: team/group/issue8824/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/configure.ac?view=diff&rev=164267&r1=164266&r2=164267
==============================================================================
--- team/group/issue8824/configure.ac (original)
+++ team/group/issue8824/configure.ac Mon Dec 15 09:52:35 2008
@@ -1412,6 +1412,10 @@
AST_EXT_LIB_CHECK([SPANDSP], [spandsp], [t38_terminal_init], [spandsp.h], [-ltiff])
fi
+if test "x${PBX_SPANDSP}" = "x1" ; then
+ AC_CHECK_HEADER([spandsp/expose.h], [AC_DEFINE_UNQUOTED([HAVE_SPANDSP_EXPOSE_H], 1, [Define to 1 if spandsp/expose.h is available.])], [], [#include <spandsp.h>])
+fi
+
AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_pollflags], [libss7.h])
if test "${USE_PWLIB}" != "no"; then
Modified: team/group/issue8824/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/include/asterisk/autoconfig.h.in?view=diff&rev=164267&r1=164266&r2=164267
==============================================================================
--- team/group/issue8824/include/asterisk/autoconfig.h.in (original)
+++ team/group/issue8824/include/asterisk/autoconfig.h.in Mon Dec 15 09:52:35 2008
@@ -778,6 +778,9 @@
/* Define this to indicate the ${SPANDSP_DESCRIP} library */
#undef HAVE_SPANDSP
+
+/* Define to 1 if spandsp/expose.h is available. */
+#undef HAVE_SPANDSP_EXPOSE_H
/* Define to indicate the ${SPANDSP_DESCRIP} library version */
#undef HAVE_SPANDSP_VERSION
Modified: team/group/issue8824/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/main/channel.c?view=diff&rev=164267&r1=164266&r2=164267
==============================================================================
--- team/group/issue8824/main/channel.c (original)
+++ team/group/issue8824/main/channel.c Mon Dec 15 09:52:35 2008
@@ -3289,12 +3289,52 @@
return ast_indicate_data(chan, condition, NULL, 0);
}
-int ast_indicate_data(struct ast_channel *chan, int condition, const void *data, size_t datalen)
-{
+static int attribute_const is_visible_indication(enum ast_control_frame_type condition)
+{
+ /* Don't include a default case here so that we get compiler warnings
+ * when a new type is added. */
+
+ switch (condition) {
+ case AST_CONTROL_PROGRESS:
+ case AST_CONTROL_PROCEEDING:
+ case AST_CONTROL_VIDUPDATE:
+ case AST_CONTROL_SRCUPDATE:
+ case AST_CONTROL_RADIO_KEY:
+ case AST_CONTROL_RADIO_UNKEY:
+ case AST_CONTROL_OPTION:
+ case AST_CONTROL_WINK:
+ case AST_CONTROL_FLASH:
+ case AST_CONTROL_OFFHOOK:
+ case AST_CONTROL_TAKEOFFHOOK:
+ case AST_CONTROL_ANSWER:
+ case AST_CONTROL_HANGUP:
+ case AST_CONTROL_T38:
+ return 0;
+
+ case AST_CONTROL_CONGESTION:
+ case AST_CONTROL_BUSY:
+ case AST_CONTROL_RINGING:
+ case AST_CONTROL_RING:
+ case AST_CONTROL_HOLD:
+ case AST_CONTROL_UNHOLD:
+ return 1;
+ }
+
+ return 0;
+}
+
+int ast_indicate_data(struct ast_channel *chan, int _condition,
+ const void *data, size_t datalen)
+{
+ /* By using an enum, we'll get compiler warnings for values not handled
+ * in switch statements. */
+ enum ast_control_frame_type condition = _condition;
+ const struct ind_tone_zone_sound *ts = NULL;
int res = -1;
ast_channel_lock(chan);
- /* Stop if we're a zombie or need a soft hangup */
+
+ /* Don't bother if the channel is about to go away, anyway. */
if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) {
ast_channel_unlock(chan);
return -1;
@@ -3329,58 +3369,76 @@
default:
break;
} /* end switch */
- if (chan->tech->indicate)
+
+ if (chan->tech->indicate) {
+ /* See if the channel driver can handle this condition. */
res = chan->tech->indicate(chan, condition, data, datalen);
+ }
+
ast_channel_unlock(chan);
- if (!chan->tech->indicate || res) {
- /*
- * Device does not support (that) indication, lets fake
- * it by doing our own tone generation. (PM2002)
- */
- if (condition < 0)
- ast_playtones_stop(chan);
- else {
- const struct ind_tone_zone_sound *ts = NULL;
- switch (condition) {
- case AST_CONTROL_RINGING:
- ts = ast_get_indication_tone(chan->zone, "ring");
- break;
- case AST_CONTROL_BUSY:
- ts = ast_get_indication_tone(chan->zone, "busy");
- break;
- case AST_CONTROL_CONGESTION:
- ts = ast_get_indication_tone(chan->zone, "congestion");
- break;
- }
- if (ts && ts->data[0]) {
- ast_debug(1, "Driver for channel '%s' does not support indication %d, emulating it\n", chan->name, condition);
- ast_playtones_start(chan,0,ts->data, 1);
- res = 0;
- chan->visible_indication = condition;
- } else if (condition == AST_CONTROL_PROGRESS) {
- /* ast_playtones_stop(chan); */
- } else if (condition == AST_CONTROL_PROCEEDING) {
- /* Do nothing, really */
- } else if (condition == AST_CONTROL_HOLD) {
- /* Do nothing.... */
- } else if (condition == AST_CONTROL_UNHOLD) {
- /* Do nothing.... */
- } else if (condition == AST_CONTROL_VIDUPDATE) {
- /* Do nothing.... */
- } else if (condition == AST_CONTROL_SRCUPDATE) {
- /* Do nothing... */
- } else if (condition == AST_CONTROL_CONNECTED_LINE) {
- /* Already handled above... */
- } else if (condition == AST_CONTROL_REDIRECTING) {
- /* Already handled above... */
- } else {
- /* not handled */
- ast_log(LOG_WARNING, "Unable to handle indication %d for '%s'\n", condition, chan->name);
- res = -1;
- }
- }
- } else
+
+ if (chan->tech->indicate && !res) {
+ /* The channel driver successfully handled this indication */
+ if (is_visible_indication(condition)) {
+ chan->visible_indication = condition;
+ }
+ return 0;
+ }
+
+ /* The channel driver does not support this indication, let's fake
+ * it by doing our own tone generation if applicable. */
+
+ if (condition < 0) {
+ /* Stop any tones that are playing */
+ ast_playtones_stop(chan);
+ return 0;
+ }
+
+ /* Handle conditions that we have tones for. */
+ switch (condition) {
+ case AST_CONTROL_RINGING:
+ ts = ast_get_indication_tone(chan->zone, "ring");
+ break;
+ case AST_CONTROL_BUSY:
+ ts = ast_get_indication_tone(chan->zone, "busy");
+ break;
+ case AST_CONTROL_CONGESTION:
+ ts = ast_get_indication_tone(chan->zone, "congestion");
+ break;
+ case AST_CONTROL_PROGRESS:
+ case AST_CONTROL_PROCEEDING:
+ case AST_CONTROL_VIDUPDATE:
+ case AST_CONTROL_SRCUPDATE:
+ case AST_CONTROL_RADIO_KEY:
+ case AST_CONTROL_RADIO_UNKEY:
+ case AST_CONTROL_OPTION:
+ case AST_CONTROL_WINK:
+ case AST_CONTROL_FLASH:
+ case AST_CONTROL_OFFHOOK:
+ case AST_CONTROL_TAKEOFFHOOK:
+ case AST_CONTROL_ANSWER:
+ case AST_CONTROL_HANGUP:
+ case AST_CONTROL_RING:
+ case AST_CONTROL_HOLD:
+ case AST_CONTROL_UNHOLD:
+ case AST_CONTROL_T38:
+ /* Nothing left to do for these. */
+ res = 0;
+ break;
+ }
+
+ if (ts && ts->data[0]) {
+ /* We have a tone to play, yay. */
+ ast_debug(1, "Driver for channel '%s' does not support indication %d, emulating it\n", chan->name, condition);
+ ast_playtones_start(chan, 0, ts->data, 1);
+ res = 0;
chan->visible_indication = condition;
+ }
+
+ if (res) {
+ /* not handled */
+ ast_log(LOG_WARNING, "Unable to handle indication %d for '%s'\n", condition, chan->name);
+ }
return res;
}
@@ -4521,7 +4579,7 @@
/* XXX What about blocking, softhangup, blocker, and lock and blockproc? XXX */
/* Application and data remain the same */
/* Clone exception becomes real one, as with fdno */
- ast_copy_flags(original, clonechan, AST_FLAG_EXCEPTION);
+ ast_copy_flags(original, clonechan, AST_FLAG_EXCEPTION | AST_FLAG_OUTGOING);
original->fdno = clonechan->fdno;
/* Schedule context remains the same */
/* Stream stuff stays the same */
@@ -4575,10 +4633,18 @@
ast_log(LOG_WARNING, "Channel type '%s' does not have a fixup routine (for %s)! Bad things may happen.\n",
original->tech->type, original->name);
- /* If an indication is currently playing maintain it on the channel that is taking the place of original */
- if (original->visible_indication)
+ /*
+ * If an indication is currently playing, maintain it on the channel
+ * that is taking the place of original
+ *
+ * This is needed because the masquerade is swapping out in the internals
+ * of this channel, and the new channel private data needs to be made
+ * aware of the current visible indication (RINGING, CONGESTION, etc.)
+ */
+ if (original->visible_indication) {
ast_indicate(original, original->visible_indication);
-
+ }
+
/* Now, at this point, the "clone" channel is totally F'd up. We mark it as
a zombie so nothing tries to touch it. If it's already been marked as a
zombie, then free it now (since it already is considered invalid). */
Modified: team/group/issue8824/main/features.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/main/features.c?view=diff&rev=164267&r1=164266&r2=164267
==============================================================================
--- team/group/issue8824/main/features.c (original)
+++ team/group/issue8824/main/features.c Mon Dec 15 09:52:35 2008
@@ -2237,8 +2237,16 @@
if (chan && peer) {
pbx_builtin_setvar_helper(chan, "BRIDGEPEER", peer->name);
pbx_builtin_setvar_helper(peer, "BRIDGEPEER", chan->name);
- } else if (chan)
+ } else if (chan) {
pbx_builtin_setvar_helper(chan, "BLINDTRANSFER", NULL);
+ }
+
+ /* This is an interesting case. One example is if a ringing channel gets redirected to
+ * an extension that picks up a parked call. This will make sure that the call taken
+ * out of parking gets told that the channel it just got bridged to is still ringing. */
+ if (chan->_state == AST_STATE_RINGING && peer->visible_indication != AST_CONTROL_RINGING) {
+ ast_indicate(peer, AST_CONTROL_RINGING);
+ }
if (monitor_ok) {
const char *monitor_exec;
Modified: team/group/issue8824/main/utils.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/main/utils.c?view=diff&rev=164267&r1=164266&r2=164267
==============================================================================
--- team/group/issue8824/main/utils.c (original)
+++ team/group/issue8824/main/utils.c Mon Dec 15 09:52:35 2008
@@ -820,7 +820,7 @@
it's acquired... */
if (lock_info->locks[i].lock_addr == this_lock_addr) {
append_lock_information(&str, lock_info, i);
- ast_log(LOG_NOTICE, "%s", str->str);
+ ast_log(LOG_NOTICE, "%s", ast_str_buffer(str));
break;
}
}
@@ -893,7 +893,7 @@
if (!str)
return CLI_FAILURE;
- ast_cli(a->fd, "%s", str->str);
+ ast_cli(a->fd, "%s", ast_str_buffer(str));
ast_free(str);
More information about the svn-commits
mailing list