diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-29 04:36:32 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-29 04:36:32 +0000 |
| commit | 9f0d8cda2653d34e644d930dd739a09652629197 (patch) | |
| tree | a2829ae528d1245de9540efeae773d23ba9ff760 /funcs | |
| parent | 8ddd7b1fee7e702df35f13ab2834b967e01a846e (diff) | |
The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.
If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.
Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden
(in trunk).
All the places that previously tested for
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.
I tested this against the 4 common parking
scenarios:
1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.
2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.
3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.
4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.
No crash.
I also ran the scenarios above against valgrind, and accesses looked good.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@152535 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_channel.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/funcs/func_channel.c b/funcs/func_channel.c index a881872c4..a37ebc972 100644 --- a/funcs/func_channel.c +++ b/funcs/func_channel.c @@ -26,15 +26,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <sys/types.h> +#include <regex.h> #include "asterisk/module.h" #include "asterisk/channel.h" #include "asterisk/pbx.h" -#include "asterisk/logger.h" #include "asterisk/utils.h" #include "asterisk/app.h" #include "asterisk/indications.h" |