diff --git a/Makefile b/Makefile index f48dec10..b7144b47 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ -# $Id: Makefile,v 1.36 1999/07/12 10:35:25 keil Exp $ +# $Id: Makefile,v 1.37 1999/10/15 15:43:26 keil Exp $ # # Toplevel Makefile for isdn4k-utils # .EXPORT_ALL_VARIABLES: -export I4LVERSION = 3.1beta1 +export I4LVERSION = 3.1beta5 all: do-it-all diff --git a/doc/Configure.help b/doc/Configure.help index 34a4605a..d55c9863 100644 --- a/doc/Configure.help +++ b/doc/Configure.help @@ -326,6 +326,12 @@ VBOX_TCL There are different versions of tcl available.. tcl8.0 is the current one. +Use a callid in SUSPEND +VBOX_SUSPEND_ID + If suspending ("park") a call it is possible to assign a id to the + suspended call (value is 1). Some ISDN phones don't allow to resume + calls with an id. + PPP daemon for syncPPP support CONFIG_IPPPD Enabling this, builds a special PPP daemon called ipppd which diff --git a/vbox/.Config.in b/vbox/.Config.in index 94f0dfcc..78e74b55 100644 --- a/vbox/.Config.in +++ b/vbox/.Config.in @@ -6,4 +6,5 @@ string 'PID directory' VBOX_PIDDIR string 'Lock directory' VBOX_LOCKDIR string 'Documentation directory' VBOX_DOCDIR string 'Version of Tcl library to use' VBOX_TCL +bool 'Use a callid in SUSPEND' VBOX_SUSPEND_ID endmenu diff --git a/vbox/Makefile.in b/vbox/Makefile.in index 09500153..81cddef1 100644 --- a/vbox/Makefile.in +++ b/vbox/Makefile.in @@ -1,5 +1,5 @@ # -# $Id: Makefile.in,v 1.20 1998/11/23 09:17:59 fritz Exp $ +# $Id: Makefile.in,v 1.21 1999/10/15 15:43:27 keil Exp $ #----------------------------------------------------------------------------# # Things you can change to personalize the Makefile for your own site. Some # @@ -108,6 +108,11 @@ VBOX_PIDFILEDIR = $(PIDFILEDIR) VBOX_LCKFILEDIR = $(LCKFILEDIR) VBOX_SPOOLDIR = $(SPOOLDIR) +ifeq ($(VBOX_SUSPEND_ID),y) + VBOX_SUSPEND_DEF := -DVBOX_SUSPEND_VALUE=1 +endif + + #----------------------------------------------------------------------------# # Export variables needed by the other utilities... # #----------------------------------------------------------------------------# @@ -131,6 +136,7 @@ export VBOX_PIDFILEDIR export VBOX_LCKFILEDIR export VBOX_SPOOLDIR export VBOX_SYSCONFDIR +export VBOX_SUSPEND_DEF #----------------------------------------------------------------------------# # # diff --git a/vbox/src/Makefile.in b/vbox/src/Makefile.in index 3ae458ee..38b31334 100644 --- a/vbox/src/Makefile.in +++ b/vbox/src/Makefile.in @@ -1,5 +1,5 @@ # -# $Id: Makefile.in,v 1.10 1997/10/22 20:47:03 fritz Exp $ +# $Id: Makefile.in,v 1.11 1999/10/15 15:43:27 keil Exp $ #----------------------------------------------------------------------------# # The information below is modified by the configure script when Makefile is # @@ -41,7 +41,7 @@ script.o: $(HEADERS) script.c $(CC) $(CFLAGS) -DBINDIR='"$(VBOX_BINDIR)"' -c script.c voice.o: $(HEADERS) voice.c - $(CC) $(CFLAGS) -c voice.c + $(CC) $(CFLAGS) $(VBOX_SUSPEND_DEF) -c voice.c streamio.o: $(HEADERS) streamio.c $(CC) $(CFLAGS) -c streamio.c diff --git a/vbox/src/voice.c b/vbox/src/voice.c index 4eebea9c..ed6f680a 100644 --- a/vbox/src/voice.c +++ b/vbox/src/voice.c @@ -1,5 +1,5 @@ /* -** $Id: voice.c,v 1.12 1998/03/26 13:10:39 keil Exp $ +** $Id: voice.c,v 1.13 1999/10/15 15:43:27 keil Exp $ ** ** Copyright (C) 1996, 1997 Michael 'Ghandi' Herold */ @@ -321,7 +321,12 @@ int voice_put_message(char *message) printstring(line_o, "%c%c", DLE, ETX); modem_raw_write(line_o, strlen(line_o)); if (modem_command("", "VCON")>0) { - if (modem_command("AT+S1", "OK") <= 0) { +#ifdef VBOX_SUSPEND_VALUE + printstring(line_o, "AT+S%d", VBOX_SUSPEND_VALUE); +#else + printstring(line_o, "AT+S"); +#endif + if (modem_command(line_o, "OK") <= 0) { log(L_WARN, "Can't suspend call\n"); } else { log(L_INFO, "Call suspended\n"); @@ -533,7 +538,12 @@ int voice_get_message(char *name, char *timestr, int save) modem_raw_write(line_o, strlen(line_o)); modem_wait_sequence(line_i); if (modem_command("", "VCON")>0) { - if (modem_command("AT+S1", "OK") <= 0) { +#ifdef VBOX_SUSPEND_VALUE + printstring(line_o, "AT+S%d", VBOX_SUSPEND_VALUE); +#else + printstring(line_o, "AT+S"); +#endif + if (modem_command(line_o, "OK") <= 0) { log(L_WARN, "Can't suspend call\n"); } else { log(L_INFO, "Call suspended\n");