From 2ac0ed4fc437dd23589640f2e48f6dc38ee3c172 Mon Sep 17 00:00:00 2001 From: Super User Date: Sun, 27 Jul 2008 10:35:55 +0200 Subject: fixed problem with "Answer" after extension matches. some cleanups in the makefile. modified: Makefile modified: chan_lcr.c --- Makefile | 12 ------------ chan_lcr.c | 6 +++--- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index bb902a0..78e3ead 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,6 @@ all: $(CHAN_LCR) $(LCR) $(LCRADMIN) $(GEN) $(GENW) $(GENRC) $(GENEXT) @sh -c 'grep -n sprintf *.c* --exclude chan_lcr.c --exclude bchannel.c --exclude callerid.c ; if test $$''? = 0 ; then echo "dont use sprintf, use makro instead." ; exit -1 ; fi' @sh -c 'grep -n snprintf *.c* --exclude chan_lcr.c --exclude bchannel.c --exclude callerid.c ; if test $$''? = 0 ; then echo "dont use snprintf, use makro instead." ; exit -1 ; fi' @echo "All LCR binaries done" - @sync @exit main.o: main.c *.h Makefile @@ -260,7 +259,6 @@ $(GENEXT): options.ooo extension.o genext.o install: make - -killall -9 -w -q lcr # the following error must be ignored cp $(LCR) $(INSTALL_BIN) cp $(LCRADMIN) $(INSTALL_BIN) ifdef WITH-ASTERISK @@ -304,7 +302,6 @@ endif @if test -a $(INSTALL_DATA)/tones_efi ; then \ echo "NOTE: special efi tones already exists, not overwritten." ; else \ cp -a tones_efi $(INSTALL_DATA) ; fi - sync clean: touch * @@ -319,18 +316,9 @@ tar: cd .. && tar --exclude=.git -cvzf lcr_`date +%Y%m%d`.tar.gz lcr start: $(LCR) - sync - -killall -9 -w -q lcr # the following error must be ignored - $(LCR) start - -s: $(LCR) - sync - -killall -9 -w -q lcr # the following error must be ignored $(LCR) start fork: $(LCR) - sync - -killall -9 -w -q lcr # the following error must be ignored $(LCR) fork snapshot: clean diff --git a/chan_lcr.c b/chan_lcr.c index 5a5b6f9..e09004c 100644 --- a/chan_lcr.c +++ b/chan_lcr.c @@ -746,10 +746,10 @@ static void lcr_start_pbx(struct chan_call *call, struct ast_channel *ast, int c } call->pbx_started = 1; // if (call->state == CHAN_LCR_STATE_IN_DIALING) -// ast_setstate(ast, AST_STATE_DIALING); + ast_setstate(ast, AST_STATE_RINGING); // else -// ast_setstate(ast, AST_STATE_OFFHOOK); - return; +// ast_setstate(ast, AST_STATE_RINGING); +// return; } /* -- cgit v1.2.3-55-g7522