From: Automerge script <automerge@asterisk.org>
Date: Fri, 6 Oct 2006 17:02:27 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.13-netsec~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dfd31906254d5af7aca1f339c3cd9c06d78c41c;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@44594 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/file.c b/file.c
index 1e65abc6f6..1067f7ff35 100644
--- a/file.c
+++ b/file.c
@@ -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: