Imported Upstream version 3.3.0.20041110

FAQ/README

@@ -2,11 +2,15 @@ In this directory you find the FAQ for isdn4linux.
 It contains answers for those questions that are frequently asked in the
 mailing list/news group for isdn4linux (and some more).
 
-The FAQ is now only available in English. Its source code is formatted in
-SGML, which can easily be converted by using:
-sgml2txt i4lfaq.sgml
+The FAQ is now maintained in English. A German version exists, but updates
+to the English version are only translated on a best effort basis.
+To see the latest information always use the English version.
+
+The source code of the FAQ is formatted in SGML, which can easily be
+converted by using:
+   sgml2txt i4lfaq.sgml
 or
-sgml2html i4lfaq.sgml
+   sgml2html i4lfaq.sgml
 
 To download converted versions, or see the latest version online,
 visit the homepage of the FAQ:
@@ -22,7 +26,7 @@ http://www.isdn4linux.de/faq/
 
 "_example" and "_howto" contain postings from the mailing list/news group that
 appeared helpful/interesting to me. They may be helpful to you, but be careful:
-THEY MAY BE OUTDATED BY NOW!
+THEY ARE ALMOST SURELY OUTDATED BY NOW!
 
 See the FAQ for more information about the author of the FAQ.
 

FAQ/i4lfaq.sgml

@@ -4,7 +4,7 @@
 
 <title>FAQ for isdn4linux
 <author>Matthias Hessler (<tt><htmlurl url="mailto:hessler@isdn4linux.de" name="hessler@isdn4linux.de"></tt>)
-<date>v2.0.88, 14. July 2004
+<date>v2.0.91, 31. October 2004
 <abstract>
 If you are reading this FAQ online, you may consider downloading the whole
 thing, and reading it offline (much cheaper). To download the latest
@@ -518,6 +518,8 @@ Here is a German website which has some nice installation instructions:
 <tt><url url="http://ixi.thepenguin.de"></tt> or
 <tt><url url="http://capi4linux.thepenguin.de"></tt> or
 <tt><url url="http://www.thepenguin.de"></tt>
+Please note that due to its binary nature, this driver will not work
+if your distribution is incompatible with it (e.g. based on 64 bit).
 </itemize>
 
 This interface follows the official CAPI 2.0 standard that was established
@@ -1082,6 +1084,16 @@ Yes, this works nicely. However, make sure to compile the kernel and all
 modules with option <tt/SMP/. If you run into problems when both CPUs try to
 handle the same IRQ, try to boot with <tt/noapic/.
 
+<sect1> hardware_64bit: Can I run isdn4linux on 64bit hardware with Linux?  
+<label id="hardware_64bit">
+<p>
+In principle yes, however your hardware choice is currently limited to
+active cards and external devices. Most desired are external devices using
+standard interfaces (network, USB) which do not require isdn4linux at all.
+The drivers for passive cards are currently not working under 64bit.
+Obviously you can also not make use of binary drivers, unless you find a
+binary compiled for 64bit.
+
 <sect1> hardware_alpha: Can I run isdn4linux on a DEC Alpha with Linux?  
 <label id="hardware_alpha">
 <p>
@@ -1174,7 +1186,7 @@ You may want to have a look at the German article in ct 9/2004 on how to use
 PBX4Linux.
 
 Another alternative for emulation of a PBX is Asterisk, to be found on:
-<tt><url url="www.asterisk.org"></tt>
+<tt><url url="http://www.asterisk.org"></tt>
 
 Also, it is possible to give up one B-channel in exchange for reading the
 complete D-channel protocol, which is great for isdnlog. The later can
@@ -1433,6 +1445,16 @@ hisaxctrl &lt;id&gt; 9 ISAR.BIN
 question <ref id="feature_fax" name="feature_fax"> for details).
 </itemize>
 
+<sect1> hardware_diva: What should I know about the Eicon Diva cards?  
+<label id="hardware_diva">
+<p>
+In general, a dedicated driver exists which supports the active Eicon
+Diva cards very well. The Pro series are not supported by isdn4linux
+since it is a semiactive card with a DSP as a B-channel controller.
+There is no code available in isdn4linux to dynamically load DSP
+programs into the card. However, check Eicon's website; maybe by now they
+provide pre-compiled driver for their cards not supported by isdn4linux.
+
 
 <!-- Trouble Hardware
 -->
@@ -2839,7 +2861,9 @@ this:
 <code>
 isdnctrl addphone &lt;device&gt; out P1&lt;your_out_number&gt;
 </code>
-Please note that then a dialout will fail when another device already uses
+This will indicate the preferred B channel in the outgoing SETUP message.
+Please note that some PBX may not like this.
+Obviously, a dialout will fail when another device already uses
 the second B channel.
 
 <sect1> dialout_dynip: On dynamic ip assignment, how do I find out which ip  
@@ -4591,6 +4615,17 @@ interfaces can be set to the same MSN, since several people can be
 connected to a MSN at the same time (as long as there are B channels free).
 However, not more than one getty can be assigned to a single ttyI* device. 
 
+<sect1> dialin_manycards: When using several ISDN cards, how can I react  
+upon on a call received via a specific ISDN card?  
+<label id="dialin_manycards">
+<p>
+You can use the EAZ mapping feature for this to map incoming MSN numbers
+to new internal MSN numbers, in the same way as described for question
+<ref id="dialout_manycards" name="dialout_manycards">. Usage of a card can be prevented by
+using the dash during the mapping. Please note that it is not possible to
+have any limitations based upon the B channel, since channel assignment
+is normally done by the exchange.
+
 <sect1> dialin_analogditalsamettyi: Can I configure a ttyI* device to  
 accept both digital and analog modem dialins?  
 <label id="dialin_analogditalsamettyi">

Makefile

@@ -1,11 +1,11 @@
-# $Id: Makefile,v 1.55 2003/07/28 19:50:13 keil Exp $
+# $Id: Makefile,v 1.56 2004/08/30 14:06:42 keil Exp $
 #
 # Toplevel Makefile for isdn4k-utils
 #
 
 .EXPORT_ALL_VARIABLES:
 
-export I4LVERSION = 3.3
+export I4LVERSION = 3.5
 
 all:	do-it-all
 

capi20/Makefile.am

@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libcapi20.la
 lib_LIBRARIES   = libcapi20dyn.a
 
 libcapi20_la_SOURCES = capi20.c capifunc.c convert.c
-libcapi20_la_LDFLAGS = -version-info 2:8:0
+libcapi20_la_LDFLAGS = -version-info 2:9:0
 libcapi20_la_CFLAGS = -fno-strict-aliasing
 
 libcapi20dyn_a_SOURCES = capidyn.c

capi20/capi20.c

@@ -1,7 +1,12 @@
 /*
- * $Id: capi20.c,v 1.22 2004/06/14 11:23:48 calle Exp $
+ * $Id: capi20.c,v 1.23 2004/10/06 15:24:42 calle Exp $
  * 
  * $Log: capi20.c,v $
+ * Revision 1.23  2004/10/06 15:24:42  calle
+ * - "SendingComplete"-Patch reverted => 2.0.8 was not binaer compartible
+ * - Bugfix: capi20_register() with MaxB3Connection == 0 results in a
+ *   core dump. Now at least one buffer is allocated.
+ *
  * Revision 1.22  2004/06/14 11:23:48  calle
  * Erweiterungen fuer ALERT_REQ.
  *
@@ -204,7 +209,7 @@ static struct applinfo *alloc_buffers(unsigned MaxB3Connection,
 		                      unsigned MaxSizeB3)
 {
    struct applinfo *ap;
-   unsigned nbufs = MaxB3Connection * (MaxB3Blks + 1);
+   unsigned nbufs = 1 + MaxB3Connection * (MaxB3Blks + 1);
    size_t recvbuffersize = 128 + MaxSizeB3;
    unsigned i;
    size_t size;

capi20/capifunc.c

@@ -1,7 +1,12 @@
 /*
- * $Id: capifunc.c,v 1.5 2004/06/14 11:23:48 calle Exp $
+ * $Id: capifunc.c,v 1.6 2004/10/06 15:24:43 calle Exp $
  *
  * $Log: capifunc.c,v $
+ * Revision 1.6  2004/10/06 15:24:43  calle
+ * - "SendingComplete"-Patch reverted => 2.0.8 was not binaer compartible
+ * - Bugfix: capi20_register() with MaxB3Connection == 0 results in a
+ *   core dump. Now at least one buffer is allocated.
+ *
  * Revision 1.5  2004/06/14 11:23:48  calle
  * Erweiterungen fuer ALERT_REQ.
  *
@@ -25,14 +30,12 @@ unsigned ALERT_REQ (_cmsg *cmsg, _cword ApplId, _cword Messagenumber,
                     _cstruct BChannelinformation,
                     _cstruct Keypadfacility,
                     _cstruct Useruserdata,
-                    _cstruct Facilitydataarray,
-		    _cstruct SendingComplete) {
+                    _cstruct Facilitydataarray) {
     capi_cmsg_header (cmsg,ApplId,0x01,0x80,Messagenumber,adr);
     cmsg->BChannelinformation = BChannelinformation;
     cmsg->Keypadfacility = Keypadfacility;
     cmsg->Useruserdata = Useruserdata;
     cmsg->Facilitydataarray = Facilitydataarray;
-    cmsg->SendingComplete = SendingComplete;
     return capi_put_cmsg (cmsg);
 }
 

capi20/capiutils.h

@@ -218,7 +218,6 @@ typedef struct {
 	_cword Reason_B3;
 	_cword Reject;
 	_cstruct Useruserdata;
-	_cstruct SendingComplete;
 	unsigned char *Data;
 
 	/* intern */
@@ -919,8 +918,7 @@ unsigned ALERT_REQ (_cmsg *cmsg, _cword ApplId, _cword Messagenumber
 		,_cstruct BChannelinformation
 		,_cstruct Keypadfacility
 		,_cstruct Useruserdata
-                ,_cstruct Facilitydataarray
-		,_cstruct SendingComplete);
+                ,_cstruct Facilitydataarra);
 unsigned CONNECT_REQ (_cmsg *cmsg, _cword ApplId, _cword Messagenumber
 		,_cdword adr
 		,_cword CIPValue
@@ -1099,15 +1097,13 @@ static inline void capi_fill_ALERT_REQ(_cmsg * cmsg, _cword ApplId, _cword Messa
 				       _cstruct BChannelinformation,
 				       _cstruct Keypadfacility,
 				       _cstruct Useruserdata,
-				       _cstruct Facilitydataarray,
-				       _cstruct SendingComplete)
+				       _cstruct Facilitydataarray)
 {
 	capi_cmsg_header(cmsg, ApplId, 0x01, 0x80, Messagenumber, adr);
 	cmsg->BChannelinformation = BChannelinformation;
 	cmsg->Keypadfacility = Keypadfacility;
 	cmsg->Useruserdata = Useruserdata;
 	cmsg->Facilitydataarray = Facilitydataarray;
-	cmsg->SendingComplete = SendingComplete;
 }
 
 static inline void capi_fill_CONNECT_REQ(_cmsg * cmsg, _cword ApplId, _cword Messagenumber,

capi20/convert.c

@@ -1,7 +1,12 @@
 /*
- * $Id: convert.c,v 1.12 2004/06/14 11:23:48 calle Exp $
+ * $Id: convert.c,v 1.13 2004/10/06 15:24:43 calle Exp $
  *
  * $Log: convert.c,v $
+ * Revision 1.13  2004/10/06 15:24:43  calle
+ * - "SendingComplete"-Patch reverted => 2.0.8 was not binaer compartible
+ * - Bugfix: capi20_register() with MaxB3Connection == 0 results in a
+ *   core dump. Now at least one buffer is allocated.
+ *
  * Revision 1.12  2004/06/14 11:23:48  calle
  * Erweiterungen fuer ALERT_REQ.
  *
@@ -336,12 +341,11 @@ static _cdef cdef[] = {
     /*2f*/{_CWORD,      offsetof(_cmsg, Reject)},
     /*30*/{_CSTRUCT,    offsetof(_cmsg, Useruserdata)},
     /*31*/{_CQWORD,     offsetof(_cmsg, Data64)},
-    /*32*/{_CSTRUCT,    offsetof(_cmsg, SendingComplete)},
 };
 
 static unsigned char *cpars[] = {
     /*00*/ 0,
-    /*01 ALERT_REQ*/            (unsigned char*)"\x03\x04\x0c\x28\x30\x1c\x32\x01\x01",
+    /*01 ALERT_REQ*/            (unsigned char*)"\x03\x04\x0c\x28\x30\x1c\x01\x01",
     /*02 CONNECT_REQ*/          (unsigned char*)"\x03\x14\x0e\x10\x0f\x11\x0d\x06\x08\x0a\x05\x07\x09\x01\x0b\x29\x23\x04\x0c\x28\x30\x1c\x01\x01",
     /*03*/ 0,
     /*04 DISCONNECT_REQ*/       (unsigned char*)"\x03\x04\x0c\x28\x30\x1c\x01\x01",

doc/Configure.help

@@ -397,6 +397,13 @@ CONFIG_ISDNLOG_REBOOTCMD
   Enter the full path of a shell-script which reboots Linux
   in case of a failure.
 
+Location of isdnlog documentation
+CONFIG_ISDNLOG_DOCDIR
+  Enter the directory for documentation of isdnlog,
+  usually something like /usr/share/doc/isdnlog.
+  Currently no files are installed to this directory, but it
+  appears as reference in sample config files.
+
 Old config directory
 CONFIG_ISDNLOG_OLDI4LCONFDIR
   Enter the directory of your old (pre 3.0) isdnlog config-stuff.
@@ -456,6 +463,16 @@ National support for cities
 CONFIG_ISDN_LOG_DEST_NL
   S. above text for German cities.
 
+National support for cities
+CONFIG_ISDN_LOG_DEST_BE
+  Belgian area codes.
+  S. above text for German cities.
+
+National support for cities
+CONFIG_ISDN_LOG_DEST_CN
+  Chinese area codes.
+  S. above text for German cities.
+
 Diversion services support
 CONFIG_DIVERTCTRL
   This program is needed to configure the supplementary diversion

eicon/divautil/linload.c

@@ -197,7 +197,7 @@ int DivaALoad (char *dsp_name,
 			case 6:
 				filename[strlen(filename)-1]='6';
 				break;
-			default:
+			default: ;
 		}
 	}
 

ipppd/Makefile.in

@@ -1,8 +1,9 @@
 #
 # ipppd makefile for Linux
-# $Id: Makefile.in,v 1.18 2004/02/12 10:50:20 keil Exp $
+# $Id: Makefile.in,v 1.19 2004/08/30 14:56:36 keil Exp $
 #
 
+HAVE_LIBSSL   := @HAVE_LIBSSL@
 HAVE_LIBDES   := @HAVE_LIBDES@
 HAVE_LIBCRYPT := @HAVE_LIBCRYPT@
 HAVE_SHADOW_H := @HAVE_SHADOW_H@
@@ -89,14 +90,22 @@ SOURCE = RELNOTES configure *.in $(PPPDSRCS) $(HEADERS) $(MANPAGES)
 
 MSG    = ''
 ifdef USE_MSCHAP
-	ifeq ($(HAVE_LIBDES),1)
+	ifeq ($(HAVE_LIBSSL),1)
 		PPPDSRCS += md4.c chap_ms.c
 		PPPDOBJS += md4.o chap_ms.o
 		HEADERS  += md4.h chap_ms.h
-		COPTS    += -DUSE_MSCHAP
-		LIBS     += -ldes
+		COPTS    += -DUSE_MSCHAP -DUSE_SSLDES
+		LIBS     += -lssl
 	else
-		MSG = '\n\nLibrary libdes not found, USE_MSCHAP disabled\n\n'
+		ifeq ($(HAVE_LIBDES),1)
+			PPPDSRCS += md4.c chap_ms.c
+			PPPDOBJS += md4.o chap_ms.o
+			HEADERS  += md4.h chap_ms.h
+			COPTS    += -DUSE_MSCHAP
+			LIBS     += -ldes
+		else
+			MSG = '\n\nLibrary libdes not found, USE_MSCHAP disabled\n\n'
+		endif
 	endif
 endif