diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-06 17:02:27 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-06 17:02:27 +0000 |
| commit | ac8e39fc4961e4919371646c02a80fc7c7e4c308 (patch) | |
| tree | cdafe759509405687ed1a8a0e0e514d7ce303a49 /file.c | |
| parent | fc3b073e5bcd89a0c6c9330943a1b2f45b34f798 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44594 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1029,6 +1029,7 @@ int ast_waitstream(struct ast_channel *c, const char *breakon) switch(fr->subclass) { case AST_CONTROL_HANGUP: case AST_CONTROL_BUSY: + case AST_CONTROL_CONGESTION: ast_frfree(fr); return -1; case AST_CONTROL_RINGING: @@ -1097,6 +1098,8 @@ int ast_waitstream_fr(struct ast_channel *c, const char *breakon, const char *fo case AST_FRAME_CONTROL: switch(fr->subclass) { case AST_CONTROL_HANGUP: + case AST_CONTROL_BUSY: + case AST_CONTROL_CONGESTION: ast_frfree(fr); return -1; case AST_CONTROL_RINGING: @@ -1166,6 +1169,8 @@ int ast_waitstream_full(struct ast_channel *c, const char *breakon, int audiofd, case AST_FRAME_CONTROL: switch(fr->subclass) { case AST_CONTROL_HANGUP: + case AST_CONTROL_BUSY: + case AST_CONTROL_CONGESTION: ast_frfree(fr); return -1; case AST_CONTROL_RINGING: @@ -1231,6 +1236,8 @@ int ast_waitstream_exten(struct ast_channel *c, const char *context) case AST_FRAME_CONTROL: switch(fr->subclass) { case AST_CONTROL_HANGUP: + case AST_CONTROL_BUSY: + case AST_CONTROL_CONGESTION: ast_frfree(fr); return -1; case AST_CONTROL_RINGING: |