kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only send 180 ringing once, fix CTRL+D in main code

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-05-22 14:24:06 +00:00
parent bc75095a9a
commit 921ffb5dd7
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
asterisk.c
View File

@@ -1373,12 +1373,15 @@ int main(int argc, char *argv[])
ast_cli_register(&astexit); ast_cli_register(&astexit);
consolethread = pthread_self(); consolethread = pthread_self();
while ( (buf = (char *)el_gets(el, &num) ) != NULL && num != 0) { for (;;) {
buf = (char *)el_gets(el, &num);
if (buf) {
if (buf[strlen(buf)-1] == '\n')
buf[strlen(buf)-1] = '\0';
if (buf[strlen(buf)-1] == '\n') consolehandler((char *)buf);
buf[strlen(buf)-1] = '\0'; } else
ast_cli(STDOUT_FILENO, "\nUse EXIT or QUIT to exist, or STOP NOW to shutdown Asterisk\n");
consolehandler((char *)buf);
} }
} else { } else {

4
channels/chan_sip.c
View File

@@ -179,6 +179,7 @@ static struct sip_pvt {
int expiry; /* How long we take to expire */ int expiry; /* How long we take to expire */
int branch; /* One random number */ int branch; /* One random number */
int canreinvite; /* Do we support reinvite */ int canreinvite; /* Do we support reinvite */
int ringing; /* Have sent 180 ringing */
int progress; /* Have sent 183 message progress */ int progress; /* Have sent 183 message progress */
int tag; /* Another random number */ int tag; /* Another random number */
int nat; /* Whether to try to support NAT */ int nat; /* Whether to try to support NAT */
@@ -1011,8 +1012,9 @@ static int sip_indicate(struct ast_channel *ast, int condition)
switch(condition) { switch(condition) {
case AST_CONTROL_RINGING: case AST_CONTROL_RINGING:
if (ast->_state == AST_STATE_RING) { if (ast->_state == AST_STATE_RING) {
if (!p->progress) { if (!p->progress && !p->ringing) {
transmit_response(p, "180 Ringing", &p->initreq); transmit_response(p, "180 Ringing", &p->initreq);
p->ringing = 1;
break; break;
} else { } else {
/* Oops, we've sent progress tones. Let Asterisk do it instead */ /* Oops, we've sent progress tones. Let Asterisk do it instead */