aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2002-01-13 18:51:27 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2002-01-13 18:51:27 +0000
commit523a0bda29f526b876a769fa0a389f8e12f2245c (patch)
tree6fd02493d44e48745b47e5aac27496e51758a646
parent67a3b0017a28e1c2d73e1f236cf7ccced0110b0f (diff)
Version 0.1.11 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@406 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xchannels/chan_oss.c10
-rwxr-xr-xinclude/asterisk/adsi.h2
2 files changed, 9 insertions, 3 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 3959cda13..297c578c1 100755
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -476,8 +476,14 @@ static int oss_hangup(struct ast_channel *c)
needhangup = 0;
needanswer = 0;
if (hookstate) {
- res = 2;
- write(sndcmd[1], &res, sizeof(res));
+ if (autoanswer) {
+ /* Assume auto-hangup too */
+ hookstate = 0;
+ } else {
+ /* Make congestion noise */
+ res = 2;
+ write(sndcmd[1], &res, sizeof(res));
+ }
}
return 0;
}
diff --git a/include/asterisk/adsi.h b/include/asterisk/adsi.h
index a3d538d9e..5438e48d0 100755
--- a/include/asterisk/adsi.h
+++ b/include/asterisk/adsi.h
@@ -77,7 +77,7 @@
#define ADSI_SWITCH_TO_DATA2 0x92 /* Switch CPE to data mode */
#define ADSI_SWITCH_TO_VOICE2 0x93 /* Switch CPE to voice mode */
#define ADSI_DISP_CALL_BUF 0x94 /* Display specified call buffer */
-#define ADSI_CLEAR_CALL_BUF 0x95 /* Clear specified call buffer */
+#define ADSI_CLEAR_CALL_B 0x95 /* Clear specified call buffer */
#ifdef __ADSI_CPE
/* These messages are reserved for the ADSI CPE only */