diff options
author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-21 19:20:33 +0000 |
---|---|---|
committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-21 19:20:33 +0000 |
commit | d100588e74288412cb9948ffc18d3e47c509ffc8 (patch) | |
tree | 7020277526bbf11b519df62670cf2f259d621a75 /res | |
parent | 3564d9257727368bdc4d7eb258f575bcd466cec7 (diff) |
Merged revisions 89491 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r89491 | twilson | 2007-11-21 12:59:27 -0600 (Wed, 21 Nov 2007) | 4 lines
If a channel gets masqueraded in the middle of a park, don't play the
announcement to the masqueraded channel, and dial back to the original
channel on timeout.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89492 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/res_features.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/res/res_features.c b/res/res_features.c index 14550b80f..c773a643c 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -375,7 +375,7 @@ static enum ast_device_state metermaidstate(const char *data) } /* Park a call */ -int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeout, int *extout) +static int park_call_full(struct ast_channel *chan, struct ast_channel *peer, int timeout, int *extout, char *orig_chan_name) { struct parkeduser *pu, *cur; int i, x = -1, parking_range; @@ -440,8 +440,9 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou pu->parkingtime = (timeout > 0) ? timeout : parkingtime; if (extout) *extout = x; - - if (peer) + if (!ast_strlen_zero(orig_chan_name)) + ast_copy_string(pu->peername, orig_chan_name, sizeof(pu->peername)); + else if (peer) ast_copy_string(pu->peername, peer->name, sizeof(pu->peername)); /* Remember what had been dialed, so that if the parking @@ -485,7 +486,7 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou if (!con) /* Still no context? Bad */ ast_log(LOG_ERROR, "Parking context '%s' does not exist and unable to create\n", parking_con); /* Tell the peer channel the number of the parking space */ - if (peer && pu->parkingnum != -1) { /* Only say number if it's a number */ + if ((peer && pu->parkingnum != -1 && ast_strlen_zero(orig_chan_name)) || (strlen(orig_chan_name) == strlen(peer->name) && !strncasecmp(peer->name, orig_chan_name, strlen(peer->name)))) { /* Only say number if it's a number and the channel hasn't been masqueraded away */ /* Make sure we don't start saying digits to the channel being parked */ ast_set_flag(peer, AST_FLAG_MASQ_NOSTREAM); ast_say_digits(peer, pu->parkingnum, "", peer->language); @@ -506,6 +507,12 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou return 0; } +/*! \brief Park a call */ +int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeout, int *extout) +{ + return park_call_full(chan, peer, timeout, extout, NULL); +} + /* Park call via masquraded channel */ int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, int timeout, int *extout) { @@ -2222,6 +2229,10 @@ std: for (x=0; x<AST_MAX_FDS; x++) { /* mark fds for next round */ /*! \brief Park a call */ static int park_call_exec(struct ast_channel *chan, void *data) { + /* Cache the original channel name in case we get masqueraded in the middle + * of a park--it is still theoretically possible for a transfer to happen before + * we get here, but it is _really_ unlikely */ + char *orig_chan_name = ast_strdupa(chan->name); /* Data is unused at the moment but could contain a parking lot context eventually */ int res = 0; @@ -2241,7 +2252,7 @@ static int park_call_exec(struct ast_channel *chan, void *data) res = ast_safe_sleep(chan, 1000); /* Park the call */ if (!res) - res = ast_park_call(chan, chan, 0, NULL); + res = park_call_full(chan, chan, 0, NULL, orig_chan_name); ast_module_user_remove(u); |