From 75b6ca7f79905fbf2a8fc8f3fc7adde6345eb29b Mon Sep 17 00:00:00 2001
From: Matthias Urlichs <urlichs@noris.de>
Date: Wed, 11 Dec 1996 14:18:33 +0100
Subject: [PATCH] isdn-44

---
 Make.config               |  16 +++---
 Make.rules                |   8 +--
 alaw/alaw.c               |   6 +--
 buffer/buffer.c           |   6 +--
 cards/arnet/arnet.c       |   7 +--
 cards/capi/bintec.c       |   6 +--
 cards/dumb/shell.c        |   3 +-
 compat/compat.h           |   2 +-
 config/Makefile           |   3 +-
 config/files.list         |   2 +
 config/subst.c            |   4 +-
 fakecept/fakecept.c       |   6 +--
 fakeh/fakeh.c             |   6 +--
 include/Makefile          |   2 +-
 include/config.h          |   4 +-
 include/dump.h            |   2 +-
 include/isdn_12.h         |   4 ++
 include/isdn_2.h          |   5 ++
 include/isdn_23.h         |   4 ++
 include/isdn_3.h          |   5 ++
 include/isdn_34.h         |   5 ++
 include/kernel.h          |  17 +++++++
 include/port_m.h          |   3 +-
 include/primitives.h      |   5 ++
 include/q_data.h          |   3 +-
 include/smallq.h          |   2 +-
 include/streamlib.h       |   5 +-
 include/streams.h         |   3 +-
 include/sys/callout.h     |   2 +
 include/timeout.h         |   4 +-
 ip_mon/ip_mon.c           |  21 ++++----
 ip_mon/tools/monitor.c    |   4 +-
 isdn_2/isdn_2.c           |  19 ++++---
 isdn_3/capi.c             |   5 +-
 isdn_3/fixed.c            |   4 +-
 isdn_3/isdn_3.c           |   6 +--
 isdn_3/phone.c            |   3 +-
 isdn_3/prot_1TR6_0.c      |   3 +-
 isdn_3/prot_1TR6_1.c      |   3 +-
 isdn_3/prot_1TR6_common.h |   2 +-
 isdn_3/prot_ETS.c         |   4 +-
 isdn_3/tei.c              |   4 +-
 isdn_4/Makefile           |   2 +-
 isdn_4/cf.c               |   2 +
 isdn_4/master.c           |  14 +++--
 isdn_4/master.h           |   2 +-
 ksupport/count.c          |   5 +-
 ksupport/log.c            |   9 ++--
 ksupport/logh.c           |   6 ++-
 ksupport/proto.c          |   8 +--
 ksupport/qinfo.c          |   7 +--
 ksupport/smallq.c         |   3 --
 ksupport/streamlib.c      | 104 ++++++++++++++++++++++++++++++++------
 ksupport/x75lib.c         |   2 +-
 pr_on/pr_on.c             |   6 +--
 rate/rate.c               |   6 +--
 reconnect/reconnect.c     |   6 +--
 str_if/str_if.h           |   3 +-
 str_if/str_in.c           |   5 +-
 str_if/str_linux.c        |  11 ++--
 str_if/tools/slipto.c     |   4 +-
 streams/stream.h          |   3 +-
 strslip/strslip.c         |   6 +--
 support/malloc.o          | Bin 12252 -> 0 bytes
 support/sioctl.c          |   2 +-
 support/streams.c         |   5 +-
 t70/t70.c                 |   6 +--
 timer/timer.c             |   6 +--
 tools/Makefile            |  32 +++++++-----
 tools/d_insmod            |   3 +-
 tools/insmod              |   3 +-
 tools/isdn.conf           |  10 ----
 tools/rc.isdn             |  83 +++++++++++++++++++++---------
 v110/v110.c               |   6 +--
 van_j/compress.h          |   5 +-
 van_j/van_j.c             |   6 +--
 x75/x75.c                 |   6 +--
 77 files changed, 338 insertions(+), 277 deletions(-)
 delete mode 100644 support/malloc.o

diff --git a/Make.config b/Make.config
index d079584..15facab 100644
--- a/Make.config
+++ b/Make.config
@@ -4,14 +4,14 @@
 SHELL = /bin/sh
 
 ##  =()<CARDS	= @<CARDS>@>()=
-CARDS	= teles 
+CARDS	= teles bintec 
 ##  =()<PROTOCOLS	= @<PROTOCOLS>@>()=
-PROTOCOLS	= phone tei
+PROTOCOLS	= phone tei capi fixed
 ##  =()<SUBPROTOCOLS	= @<SUBPROTOCOLS>@>()=
-SUBPROTOCOLS	= euro
+SUBPROTOCOLS	= euro german
 
 ##  =()<KERNELSRC	:= @<KERNELSRC>@>()=
-KERNELSRC	:= /usr/src/kernel/linux-work
+KERNELSRC	:= /usr/src/kernel/linux-pci
 
 ifeq ($(wildcard $(KERNELSRC)/.config),$(KERNELSRC)/.config)
 include $(KERNELSRC)/.config
@@ -21,21 +21,21 @@ ifdef KERNEL
 ##  =()<CC	= @<CC>@>()=
 CC	= gcc
 ##  =()<CFLAGS  = @<CFLAGS>@ >()=
-CFLAGS  = -g -O -Wall -DKERNEL -D__KERNEL__ -DMODULE 
+CFLAGS  = -g -O2 -fomit-frame-pointer -Wall -DKERNEL -D__KERNEL__ -DMODULE 
 
 else
 
 ##  =()<CC	= @<HOSTCC>@>()=
 CC	= gcc
 ##  =()<CFLAGS  = @<HOSTCFLAGS>@ >()=
-CFLAGS  = -g -Wall 
+CFLAGS  = -g -O2 -Wall 
 ##  =()<LIBS	= @<LIBS>@>()=
-LIBS	= -lbsd
+LIBS	= -lbsd-compat
 endif
 
 
 ##  =()<DESTDIR	= @<DESTDIR>@>()=
-DESTDIR	= /usr/local/isdn
+DESTDIR	= /usr/lib/isdn
 ##  =()<LD	= @<LD>@>()=
 LD	= ld
 ##  =()<LDFLAGS	= @<LDFLAGS>@>()=
diff --git a/Make.rules b/Make.rules
index e410703..6b59f9d 100644
--- a/Make.rules
+++ b/Make.rules
@@ -229,10 +229,6 @@ endif
 depend::
 	rm -f .depend
 
-ifneq ($(strip $(PSOURCES)),)
-depend::     Makefile $(PSOURCES) $(HEADERS)
-	$(CC) -M $(CFLAGS) $(INCLUDES) $(EXTRA_CFLAGS) $(PSOURCES) >> .depend
-endif
 
 ifneq ($(strip $(SOURCES)),)
 ifneq ($(strip $(REALSOURCE)),)
@@ -253,3 +249,7 @@ endif
 endif
 endif
 
+ifneq ($(strip $(PSOURCES)),)
+depend::     Makefile $(PSOURCES) $(HEADERS)
+	$(CC) -M $(CFLAGS) $(INCLUDES) $(EXTRA_CFLAGS) $(PSOURCES) >> .depend
+endif
diff --git a/alaw/alaw.c b/alaw/alaw.c
index 93fdcd0..00e4fe2 100644
--- a/alaw/alaw.c
+++ b/alaw/alaw.c
@@ -9,16 +9,12 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 /* #include <sys/user.h> */
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "alaw.h"
 #include "isdn_proto.h"
diff --git a/buffer/buffer.c b/buffer/buffer.c
index 13e937c..f91aeb9 100644
--- a/buffer/buffer.c
+++ b/buffer/buffer.c
@@ -4,18 +4,14 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "buffer.h"
 #include "isdn_proto.h"
diff --git a/cards/arnet/arnet.c b/cards/arnet/arnet.c
index c047849..0529440 100644
--- a/cards/arnet/arnet.c
+++ b/cards/arnet/arnet.c
@@ -9,21 +9,18 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 /* #ifdef DONT_ADDERROR */
 #include "f_user.h"
 /* #endif */
-#include <sys/errno.h>
-#include <sys/file.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include "streamlib.h"
-#include <sys/termios.h>
+#include <linux/termios.h>
 #include "loader.h"
 
 #include <linux/delay.h>
diff --git a/cards/capi/bintec.c b/cards/capi/bintec.c
index c1edab9..937903a 100644
--- a/cards/capi/bintec.c
+++ b/cards/capi/bintec.c
@@ -28,11 +28,9 @@
 #include "isdn_limits.h"
 #include "stream.h"
 #include "streamlib.h"
-#include <sys/errno.h>
-#include <sys/sysmacros.h>
-#include <stddef.h>
-#include "loader.h"
 #include "kernel.h"
+#include "loader.h"
+#include <stddef.h>
 
 #ifdef linux
 #include <asm/byteorder.h> /* htons and friends */
diff --git a/cards/dumb/shell.c b/cards/dumb/shell.c
index 3bfac93..82008a9 100644
--- a/cards/dumb/shell.c
+++ b/cards/dumb/shell.c
@@ -18,11 +18,10 @@
 #include "isdn_proto.h"
 #include "stream.h"
 #include "streamlib.h"
-#include <sys/errno.h>
+#include "kernel.h"
 #ifdef SCO
 #include <sys/immu.h>
 #endif
-#include <sys/sysmacros.h>
 #include <stddef.h>
 #include "loader.h"
 
diff --git a/compat/compat.h b/compat/compat.h
index a0533e8..621b4f5 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -2,7 +2,7 @@
 #define _LINUX_SYSCOMPAT_H_
 
 #include "config.h"
-#include <linux/types.h>
+#include "kernel.h"
 
 #ifdef DO_DEBUGGING
 #define CONFIG_DEBUG_STREAMS
diff --git a/config/Makefile b/config/Makefile
index 3c29e56..116ee1e 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -42,8 +42,7 @@ config.data:		subst config.dist
 	cp config.dist config.new
 	./subst $(SED) -f subst.tmp config.new
 	-@rm -f subst.tmp
-	@echo "Check config.new, then rename it to config.data, and re-make!"
-	@false
+	mv config.new config.data
 
 subst:		subst.c subst.sh
 	-make c || make sh || rm -f subst
diff --git a/config/files.list b/config/files.list
index d54b6c7..a1a8988 100644
--- a/config/files.list
+++ b/config/files.list
@@ -4,4 +4,6 @@
 ../include/f_strings.h
 ../include/f_termio.h
 ../include/msgtype.h
+../tools/rc.isdn
+../tools/rc.isdnmon
 ../Make.config
diff --git a/config/subst.c b/config/subst.c
index 670d8b8..fe8af0e 100644
--- a/config/subst.c
+++ b/config/subst.c
@@ -1,6 +1,6 @@
 /* This is from INN. */
 
-/*  $Revision: 1.10 $
+/*  $Revision: 1.1.1.1 $
 **
 **  A C version of Henry Spencer's "subst" script.
 */
@@ -51,8 +51,6 @@ extern char	*strcpy();
 static char *
 xstrerror()
 {
-    extern int	sys_nerr;
-    extern char	*sys_errlist[];
     extern int	errno;
     static char	buff[30];
 
diff --git a/fakecept/fakecept.c b/fakecept/fakecept.c
index 115fb14..55d8606 100644
--- a/fakecept/fakecept.c
+++ b/fakecept/fakecept.c
@@ -4,18 +4,14 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "fakecept.h"
 #include "isdn_proto.h"
diff --git a/fakeh/fakeh.c b/fakeh/fakeh.c
index c462f08..21ff30a 100644
--- a/fakeh/fakeh.c
+++ b/fakeh/fakeh.c
@@ -6,19 +6,15 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
 #include "f_ip.h"
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "fakeh.h"
 #include "isdn_proto.h"
diff --git a/include/Makefile b/include/Makefile
index 929c70a..b8eb3ea 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -18,7 +18,7 @@ $(KERNELSRC)/include/linux/autoconf.h $(KERNELSRC)/include/linux/version.h:
 	@exit 1
 
 install::
-	-mkdir -p /lib/modules/$(shell ../tools/getversion)/isdn
+	-mkdir -p $${MODDIR:-/lib/modules}/$(shell ../tools/getversion)/isdn
 	-mkdir -p $(DESTDIR)/bin-$(shell ../tools/getversion) 
 	cp /dev/null /lib/modules/modules.isdn.all
 
diff --git a/include/config.h b/include/config.h
index 2dc3663..2ca9925 100644
--- a/include/config.h
+++ b/include/config.h
@@ -82,9 +82,9 @@ extern int writev(int fd, struct iovec *vp, int vpcount);
 #define ROUTE_PATH "/sbin/route"
 
 /* =()<#define LOCKNAME "@<LOCKNAME>@">()= */
-#define LOCKNAME "/var/lock/uucp/LCK..%s"
+#define LOCKNAME "/var/lock/LCK..%s"
 
 /* =()<#define ROOTUSER "@<ROOT>@">()= */
-#define ROOTUSER "isdnmaster"
+#define ROOTUSER "smurf"
 
 #endif							/* _CONFIG_H */
diff --git a/include/dump.h b/include/dump.h
index f3d0f6f..7f19279 100644
--- a/include/dump.h
+++ b/include/dump.h
@@ -1,7 +1,7 @@
 #ifndef _DUMP_H_
 #define _DUMP_H_
 
-#include <sys/types.h>
+#include "kernel.h"
 #include "isdn_23.h"
 
 #ifdef DEBUG
diff --git a/include/isdn_12.h b/include/isdn_12.h
index d6b85f8..ea80314 100644
--- a/include/isdn_12.h
+++ b/include/isdn_12.h
@@ -1,7 +1,11 @@
 #ifndef _ISDN_12
 #define _ISDN_12
 
+#ifdef __KERNEL__
+#include <linux/types.h>
+#else
 #include <sys/types.h>
+#endif
 #include "streams.h"
 
 /*
diff --git a/include/isdn_2.h b/include/isdn_2.h
index d5396f4..9d0cf59 100644
--- a/include/isdn_2.h
+++ b/include/isdn_2.h
@@ -2,8 +2,13 @@
 #define _ISDN_2
 
 #include "config.h"
+#ifdef __KERNEL__
+#include <linux/types.h>
+#include <linux/param.h>
+#else
 #include <sys/types.h>
 #include <sys/param.h>
+#endif
 #include "x75lib.h"
 #include "smallq.h"
 #include "isdn_limits.h"
diff --git a/include/isdn_23.h b/include/isdn_23.h
index f192417..cef4e95 100644
--- a/include/isdn_23.h
+++ b/include/isdn_23.h
@@ -1,7 +1,11 @@
 #ifndef _ISDN_23
 #define _ISDN_23
 
+#ifdef __KERNEL__
+#include <linux/types.h>
+#else
 #include <sys/types.h>
+#endif
 #include "config.h"
 
 /**
diff --git a/include/isdn_3.h b/include/isdn_3.h
index b716dd9..75ae439 100644
--- a/include/isdn_3.h
+++ b/include/isdn_3.h
@@ -1,8 +1,13 @@
 #ifndef _ISDN_3
 #define _ISDN_3
 
+#ifdef __KERNEL__
+#include <linux/types.h>
+#include <linux/param.h>
+#else
 #include <sys/types.h>
 #include <sys/param.h>
+#endif
 #include "streams.h"
 #include "isdn_limits.h"
 #include "config.h"
diff --git a/include/isdn_34.h b/include/isdn_34.h
index 8a14b84..03d7a7d 100644
--- a/include/isdn_34.h
+++ b/include/isdn_34.h
@@ -1,8 +1,13 @@
 #ifndef _ISDN_34
 #define _ISDN_34
 
+#ifdef __KERNEL__
+#include <linux/types.h>
+#include <linux/ioctl.h>
+#else
 #include <sys/types.h>
 #include <sys/ioctl.h>
+#endif
 #include "config.h"
 
 extern int log_34;
diff --git a/include/kernel.h b/include/kernel.h
index 319bade..3f073f6 100644
--- a/include/kernel.h
+++ b/include/kernel.h
@@ -7,7 +7,13 @@
 #ifndef KERNEL
 #include <malloc.h>
 #include <stdio.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/file.h>
 #include <sys/param.h>
+#include <sys/sysmacros.h>
+#include <sys/errno.h>
+#include <sys/uio.h>
 
 extern int spl6 (void);
 extern int spl1 (void);
@@ -45,6 +51,12 @@ extern void panic(const char *x, ...);
 #endif
 #include <linux/kernel.h>
 #include <linux/version.h>
+#include <linux/types.h>
+#include <linux/time.h>
+#include <linux/param.h>
+#include <linux/errno.h>
+#include <linux/uio.h>
+
 char *loghdr(char level);
 #undef KERN_EMERG
 #undef KERN_ALERT
@@ -64,4 +76,9 @@ char *loghdr(char level);
 #define	KERN_DEBUG	loghdr(7)
 
 #endif
+
+#ifndef minor
+#define minor(a) ((a)&0xFF)
+#endif
+
 #endif
diff --git a/include/port_m.h b/include/port_m.h
index f2de01f..4f1fddb 100644
--- a/include/port_m.h
+++ b/include/port_m.h
@@ -1,8 +1,7 @@
 #ifndef _PORT_M
 #define _PORT_M
 
-#include <sys/types.h>
-#include <sys/param.h>
+#include "kernel.h"
 #include "isdn_limits.h"
 #include "smallq.h"
 #include "msgtype.h"
diff --git a/include/primitives.h b/include/primitives.h
index aa49a99..ebe060b 100644
--- a/include/primitives.h
+++ b/include/primitives.h
@@ -7,8 +7,13 @@
 #include "kernel.h"
 
 #include "msgtype.h"
+#ifdef __KERNEL__
+#include <linux/types.h>
+#include <linux/param.h>
+#else
 #include <sys/types.h>
 #include <sys/param.h>
+#endif
 #ifdef linux
 #include <linux/major.h>
 #ifdef KERNEL
diff --git a/include/q_data.h b/include/q_data.h
index f2a42fa..a48d995 100644
--- a/include/q_data.h
+++ b/include/q_data.h
@@ -1,8 +1,7 @@
 #ifndef _Q_DATA
 #define _Q_DATA
 
-#include <sys/types.h>
-#include <sys/param.h>
+#include "kernel.h"
 
 /**
  ** This module handles the data structure of additional information elements,
diff --git a/include/smallq.h b/include/smallq.h
index 15a0528..3d9e8d5 100644
--- a/include/smallq.h
+++ b/include/smallq.h
@@ -1,7 +1,7 @@
 #ifndef __SMALLQ__
 #define __SMALLQ__
 
-#include <sys/types.h>
+#include "kernel.h"
 #include "streams.h"
 #include "config.h"
 
diff --git a/include/streamlib.h b/include/streamlib.h
index eb95b7e..5cc5fc2 100644
--- a/include/streamlib.h
+++ b/include/streamlib.h
@@ -13,11 +13,8 @@
  * key-parameter-argument list for a nested command.
  */
 
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "stropts.h"
 
 #include "streams.h"
diff --git a/include/streams.h b/include/streams.h
index f0a46a9..c8f02b2 100644
--- a/include/streams.h
+++ b/include/streams.h
@@ -1,8 +1,7 @@
 #ifndef __STREAMS_H
 #define __STREAMS_H
 
-#include <sys/types.h>
-#include <sys/uio.h>
+#include "kernel.h"
 
 #if !(defined(__sys_stream_h) || defined(_SYS_STREAM_H) || defined(_LINUX_STREAM_H))
 
diff --git a/include/sys/callout.h b/include/sys/callout.h
index 70797d5..d92cbab 100644
--- a/include/sys/callout.h
+++ b/include/sys/callout.h
@@ -1,7 +1,9 @@
 #if !defined(__sys_callout_h)
 #define __sys_callout_h
 
+#ifndef __KERNEL__
 #include <sys/types.h>
+#endif
 
 struct	callout {
 	int	c_time;		/* incremental time */
diff --git a/include/timeout.h b/include/timeout.h
index 67290af..20f3a04 100644
--- a/include/timeout.h
+++ b/include/timeout.h
@@ -1,9 +1,7 @@
 #ifndef __TIMEOUT
 #define __TIMEOUT
 
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/callout.h>
+#include "kernel.h"
 
 extern struct timeval callout_time;
 
diff --git a/ip_mon/ip_mon.c b/ip_mon/ip_mon.c
index 66e5578..ee9e14c 100644
--- a/ip_mon/ip_mon.c
+++ b/ip_mon/ip_mon.c
@@ -6,18 +6,14 @@
 #include "f_module.h"
 #include "primitives.h"
 #include "f_ip.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
-#include <sys/errno.h>
 #include "ip_mon.h"
 #include "streamlib.h"
 #include "isdn_proto.h"
@@ -244,10 +240,14 @@ ip_mon_timer (struct _ip_mon *ipmon)
 {
 	long s;
 
-	if (ipmon->timer == 0)
+	if (!ipmon->hastimer)
 		return;
 	if (ip_mon.qptr == NULL) {
-		ipmon->timer = 0;
+		ipmon->hastimer = 0;
+		return;
+	}
+	if (!ipmon->timer) {
+		ipmon->hastimer = 0;
 		return;
 	}
 
@@ -268,7 +268,6 @@ ip_mon_open (queue_t * q, dev_t dev, int flag, int sflag ERR_DECL)
 {
 	struct _ip_mon *ipmon;
 	static int nr = 1;
-	int do_timeout = 1;
 
 	dev = minor (dev);
 	if (sflag == MODOPEN) {
@@ -283,7 +282,6 @@ ip_mon_open (queue_t * q, dev_t dev, int flag, int sflag ERR_DECL)
 		ERR_RETURN(-ENXIO);
 	} else {
 		ipmon = &ip_mon;
-		do_timeout = (ip_mon.qptr == NULL);
 	}
 	memset(ipmon,0,sizeof (*ipmon));
 	if (ipmon != &ip_mon)
@@ -292,9 +290,9 @@ ip_mon_open (queue_t * q, dev_t dev, int flag, int sflag ERR_DECL)
 	q->q_ptr = (char *) ipmon;
 	ipmon->qptr = q;
 
-	ipmon->timer = 10;
+	ipmon->timer = dev ? 10 : 0;
 	ipmon->each = 1;
-	if(do_timeout) {
+	if(ipmon->timer) {
 		ipmon->hastimer = 1;
 #ifdef NEW_TIMEOUT
 		ipmon->timeout =
@@ -485,6 +483,7 @@ ip_mon_close (queue_t * q, int dummy)
 	flushq (WR (q), FLUSHALL);
 	printf ("IP_MON driver %d closed.\n", ipmon->nr);
 	if (ipmon->hastimer) {
+		ipmon->hastimer = 0;
 #ifdef NEW_TIMEOUT
 		untimeout (ipmon->timeout);
 #else
diff --git a/ip_mon/tools/monitor.c b/ip_mon/tools/monitor.c
index a098ac2..8f86dbb 100644
--- a/ip_mon/tools/monitor.c
+++ b/ip_mon/tools/monitor.c
@@ -6,9 +6,11 @@
 #include <errno.h>
 #include "f_strings.h"
 #include <syslog.h>
+#if __GNU_LIBRARY__ - 0 < 6
 #include <netinet/in_systm.h>
-#include <netinet/in.h>
 #include <netinet/ip.h>
+#endif
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <stdio.h>
diff --git a/isdn_2/isdn_2.c b/isdn_2/isdn_2.c
index 6f60e39..966de49 100644
--- a/isdn_2/isdn_2.c
+++ b/isdn_2/isdn_2.c
@@ -17,23 +17,22 @@
 #include "kernel.h"
 #include "primitives.h"
 #include "isdn_2.h"
-#include <sys/time.h>
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 /* #ifdef DONT_ADDERROR */
 #include "f_user.h"
 /* #endif */
-#include <sys/errno.h>
 #ifndef __linux__
 #include <sys/reg.h>
 #include <sys/var.h>
 #endif
-#include <sys/file.h>
+#if 0
+#include <sys/termios.h>
 #include <fcntl.h>
 #include <stddef.h>
+#endif
 #include "streamlib.h"
 #include "isdn_23.h"
 #include "isdn_12.h"
@@ -43,7 +42,6 @@
 #include "sapi.h"
 #include "isdn_limits.h"
 #include "isdn_proto.h"
-#include <sys/termios.h>
 
 ushort_t hdrseq = 1;
 
@@ -1425,7 +1423,8 @@ do_chprot (isdn2_card ctl, short channel, mblk_t * proto, int flags)
 	int err = 0;
 
 	if (isdn2_debug & 0x4)
-		printf ("%sdo_chprot %d %d 0%o\n",KERN_DEBUG, ctl ? ctl->nr : -1, channel, flags);
+		printf ("%sdo_chprot %d %d 0%o: %p %d %p\n",KERN_DEBUG, ctl ? ctl->nr : -1, channel, flags,
+			ctl, channel, isdn_chan.qptr);
 	if (ctl == NULL || (channel == 0 && isdn_chan.qptr == NULL))
 		return -ENXIO;
 	if(flags & CHP_TOCARD) {
@@ -1479,8 +1478,12 @@ do_chprot (isdn2_card ctl, short channel, mblk_t * proto, int flags)
 			if(canput(isdn_chan.qptr->q_next)) {
 				putnext (isdn_chan.qptr, mb);
 				err = 0;
-			} else 
+			} else {
+				if(isdn2_debug & 0x4)
+					 printf("%sdo_chprot: MasterUpqueue full\n",KERN_DEBUG);
+				freeb(mb);
 				err = -ENXIO;
+			}
 		} else 
 			err = -EAGAIN;
 		return err;
@@ -2603,6 +2606,8 @@ isdn2_wsrv (queue_t *q)
 									ismodlist = (id == PROTO_MODLIST);
 									minor = hdr.hdr_protocmd.minor;
 
+									if (isdn2_debug & 0x10)
+										printk("%sMinorSet %d -> %d %d\n",KERN_DEBUG,minor,(isdnchan[minor]&&isdnchan[minor]->card)?isdnchan[minor]->card->nr:-1,isdnchan[minor]?isdnchan[minor]->channel:-1);
 									if ((minor != 0) && (isdnchan[minor] != NULL) && (isdnchan[minor]->card != NULL)) {
 										/* This is a temporary kludge */
 										hdr.hdr_protocmd.card = isdnchan[minor]->card->nr;
diff --git a/isdn_3/capi.c b/isdn_3/capi.c
index 73b95b5..08f4bbf 100644
--- a/isdn_3/capi.c
+++ b/isdn_3/capi.c
@@ -8,8 +8,7 @@
 #include "q_data.h"
 #include "isdn_23.h"
 #include "isdn3_phone.h"
-#include <sys/errno.h>
-#include <sys/param.h>
+#include "kernel.h"
 #include "prot_1TR6_0.h"
 #include "prot_1TR6_1.h"
 #include "prot_ETS.h"
@@ -19,7 +18,9 @@
 #include "isdn_12.h"
 #include "asm/byteorder.h"
 #include "sapi.h"
+#ifndef __KERNEL__
 #include <ctype.h>
+#endif
 
 #define PPP_IP_VANJ CHAR2('i','v')
 #define PPP_IP      CHAR2('i','n')
diff --git a/isdn_3/fixed.c b/isdn_3/fixed.c
index 6f25a35..a0f4e85 100644
--- a/isdn_3/fixed.c
+++ b/isdn_3/fixed.c
@@ -6,9 +6,7 @@
 #include "isdn_proto.h"
 #include "lap.h"
 #include "dump.h"
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/param.h>
+#include "kernel.h"
 #include "sapi.h"
 
 #define ST_up 01
diff --git a/isdn_3/isdn_3.c b/isdn_3/isdn_3.c
index abdb96e..027b265 100644
--- a/isdn_3/isdn_3.c
+++ b/isdn_3/isdn_3.c
@@ -4,18 +4,14 @@
  **/
 
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "kernel.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "isdn_23.h"
 #include "isdn_3.h"
diff --git a/isdn_3/phone.c b/isdn_3/phone.c
index 84bfa78..0878189 100644
--- a/isdn_3/phone.c
+++ b/isdn_3/phone.c
@@ -8,8 +8,7 @@
 #include "q_data.h"
 #include "isdn_23.h"
 #include "isdn3_phone.h"
-#include <sys/errno.h>
-#include <sys/param.h>
+#include "kernel.h"
 #include "prot_1TR6_0.h"
 #include "prot_1TR6_1.h"
 #include "prot_ETS.h"
diff --git a/isdn_3/prot_1TR6_0.c b/isdn_3/prot_1TR6_0.c
index 5b3d167..c04c544 100644
--- a/isdn_3/prot_1TR6_0.c
+++ b/isdn_3/prot_1TR6_0.c
@@ -5,8 +5,7 @@
 #include "q_data.h"
 #include "isdn_23.h"
 #include "isdn3_phone.h"
-#include <sys/errno.h>
-#include <sys/param.h>
+#include "kernel.h"
 #include "prot_1TR6_0.h"
 #include "prot_1TR6_common.h"
 #include "sapi.h"
diff --git a/isdn_3/prot_1TR6_1.c b/isdn_3/prot_1TR6_1.c
index 383964a..de1bd8c 100644
--- a/isdn_3/prot_1TR6_1.c
+++ b/isdn_3/prot_1TR6_1.c
@@ -6,8 +6,7 @@
 #include "isdn_23.h"
 #include "isdn3_phone.h"
 #include "isdn_34.h"
-#include <sys/errno.h>
-#include <sys/param.h>
+#include "kernel.h"
 #include "prot_1TR6_1.h"
 #include "prot_1TR6_common.h"
 #include "sapi.h"
diff --git a/isdn_3/prot_1TR6_common.h b/isdn_3/prot_1TR6_common.h
index 050e97b..6c3d0fa 100644
--- a/isdn_3/prot_1TR6_common.h
+++ b/isdn_3/prot_1TR6_common.h
@@ -1,6 +1,6 @@
 #ifndef _1TR6_COMMON
 #define _1TR6_COMMON
-#include <sys/types.h>
+#include "kernel.h"
 #include "streams.h"
 #include "phone_1TR6.h"
 #include "q_data.h"
diff --git a/isdn_3/prot_ETS.c b/isdn_3/prot_ETS.c
index 2521de7..f7bef40 100644
--- a/isdn_3/prot_ETS.c
+++ b/isdn_3/prot_ETS.c
@@ -6,9 +6,7 @@
 #include "isdn_23.h"
 #include "isdn3_phone.h"
 #include "isdn_34.h"
-#include <sys/errno.h>
-#include <sys/param.h>
-#include <sys/types.h>
+#include "kernel.h"
 #include "q_data.h"
 #include "phone_ETSI.h"
 #include "sapi.h"
diff --git a/isdn_3/tei.c b/isdn_3/tei.c
index 645ebc5..3a678bd 100644
--- a/isdn_3/tei.c
+++ b/isdn_3/tei.c
@@ -5,9 +5,7 @@
 #include "isdn_34.h"
 #include "lap.h"
 #include "dump.h"
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/param.h>
+#include "kernel.h"
 #include <sys/utsname.h>
 #include "sapi.h"
 
diff --git a/isdn_4/Makefile b/isdn_4/Makefile
index c6c1d7b..76903e4 100644
--- a/isdn_4/Makefile
+++ b/isdn_4/Makefile
@@ -1,7 +1,7 @@
 PROGRAM = master
 EXTRA_LIBS=../isdn_3.a ../support.a
 EXTRA_CFLAGS=$(addsuffix _,$(addprefix -D_,$(PROTOCOLS) $(SUBPROTOCOLS)))
-EXTRA_LDFLAGS=-static
+#EXTRA_LDFLAGS=-static
 
 TOPDIR=..
 include $(TOPDIR)/Make.rules
diff --git a/isdn_4/cf.c b/isdn_4/cf.c
index 3eadec9..dfe714c 100644
--- a/isdn_4/cf.c
+++ b/isdn_4/cf.c
@@ -140,6 +140,8 @@ read_file (FILE * ffile, char *errf)
 		char *li = (char *) (c + 1);
 
 		switch (CHAR2 (li[0], li[1])) {
+		case CHAR2 ('M', 'O'):
+			continue;
 		case CHAR2 ('P', ' '):
 		case CHAR2 ('P', '_'):
 		case CHAR2 ('P', '\t'):
diff --git a/isdn_4/master.c b/isdn_4/master.c
index 9064296..a517e2c 100644
--- a/isdn_4/master.c
+++ b/isdn_4/master.c
@@ -8,6 +8,12 @@
 
 #define MASTER_MAIN
 #include "master.h"
+#include <sys/mman.h>
+
+#if __GNU_LIBRARY__ - 0 == 6 /* NOCH notwendig, fehlt in glibc */
+#include <syscall.h>
+_syscall1(int,mlockall,int,what);
+#endif
 
 int
 main (int argc, char *argv[])
@@ -19,11 +25,9 @@ main (int argc, char *argv[])
 	int pushlog = 0;
 	int debug = 0;
 	int x;
+	
+	mlockall(MCL_CURRENT | MCL_FUTURE);
 
-#ifdef linux
-	reboot(0xfee1dead,0x17392634,1);		/* Magic to make me nonswappable */
-	/* TODO: 1.3.xx kernel / libc: use appropriate system call */
-#endif
 #ifdef DO_DEBUG_MALLOC
 	mcheck(NULL);
 	mmtrace();
@@ -233,6 +237,8 @@ main (int argc, char *argv[])
 		xquit ("Open Dev", devnam);
 	if (ioctl (fd_mon, I_SRDOPT, RMSGN) < 0) /* Message mode */
 		xquit ("SetStrOpt", "");
+	if (ioctl (fd_mon, I_PUSH, "buffer") < 0)
+		syslog(LOG_WARNING,"Buffer module not found -- unreliable");
 
 	if (pushlog & 2)
 		if (ioctl (fd_mon, I_PUSH, "strlog") < 0)
diff --git a/isdn_4/master.h b/isdn_4/master.h
index 64a3ad4..c81ff15 100644
--- a/isdn_4/master.h
+++ b/isdn_4/master.h
@@ -45,7 +45,7 @@
 #include "isdn_proto.h"
 #include "wildmat.h"
 #include "vectcmp.h"
-#ifdef linux
+#if 0 /* def linux */
 #include <linux/fs.h>
 #endif
 #if LEVEL < 4
diff --git a/ksupport/count.c b/ksupport/count.c
index 108f378..f8a47c6 100644
--- a/ksupport/count.c
+++ b/ksupport/count.c
@@ -3,16 +3,13 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "stropts.h"
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
-#include <sys/errno.h>
 #include "streams.h"
 #include "streamlib.h"
 
diff --git a/ksupport/log.c b/ksupport/log.c
index 4a8e0ab..519fb05 100644
--- a/ksupport/log.c
+++ b/ksupport/log.c
@@ -3,22 +3,19 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/sysmacros.h>
 #include "stropts.h"
 #ifdef DO_ADDUSER
 #include "f_user.h"
 #endif
-#include <sys/errno.h>
 #include "streams.h"
 #include "streamlib.h"
 
 #ifdef AUX
 #include <sys/protosw.h>
 #endif
-#include <netinet/in.h>
 #ifndef linux
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
@@ -26,8 +23,10 @@
 #include <linux/sched.h>
 #endif
 #endif
+#ifndef __KERNEL__
+#include <netinet/in.h>
 #include <netinet/tcp.h>
-#include "kernel.h"
+#endif
 
 #define MAXB 100
 
diff --git a/ksupport/logh.c b/ksupport/logh.c
index 0ad5115..255555c 100644
--- a/ksupport/logh.c
+++ b/ksupport/logh.c
@@ -3,10 +3,14 @@
 
 #include "f_module.h"
 #include "primitives.h"
+#ifdef __KERNEL__
+#include <linux/time.h>
+#else
 #include <sys/time.h>
+#include <sys/sysmacros.h>
+#endif
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #include "streamlib.h"
diff --git a/ksupport/proto.c b/ksupport/proto.c
index 964f967..7863d4f 100644
--- a/ksupport/proto.c
+++ b/ksupport/proto.c
@@ -3,15 +3,11 @@
 #include "f_module.h"
 #include "primitives.h"
 #include "f_malloc.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "stropts.h"
 #include "f_user.h"
-#include <sys/errno.h>
-#include <f_termio.h>
+#include "f_termio.h"
 #ifndef linux
 #include <sys/tty.h>
 #endif
diff --git a/ksupport/qinfo.c b/ksupport/qinfo.c
index ec35d86..1e8767e 100644
--- a/ksupport/qinfo.c
+++ b/ksupport/qinfo.c
@@ -3,19 +3,14 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #include "f_user.h"
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "isdn_proto.h"
-#ifndef KERNEL
-#include "kernel.h"
-#endif
 
 #define MAXB 10
 
diff --git a/ksupport/smallq.c b/ksupport/smallq.c
index 72015c3..903a55d 100644
--- a/ksupport/smallq.c
+++ b/ksupport/smallq.c
@@ -1,12 +1,9 @@
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/errno.h>
 #include "smallq.h"
 #include "streams.h"
 #include "streamlib.h"
-#ifndef KERNEL
 #include "kernel.h"
-#endif
 
 /**** extremely simple queue handling ****/
 #define LI 0
diff --git a/ksupport/streamlib.c b/ksupport/streamlib.c
index 0eb5b30..53cf6e3 100644
--- a/ksupport/streamlib.c
+++ b/ksupport/streamlib.c
@@ -5,9 +5,9 @@
 #include "primitives.h"
 #include "kernel.h"
 #include "streamlib.h"
-#include <sys/errno.h>
+#ifndef __KERNEL__
 #include <ctype.h>
-#include <sys/time.h>
+#endif
 #include "isdn_proto.h"
 #include "isdn_limits.h"
 #include "msgtype.h"
@@ -155,13 +155,10 @@ dsize (mblk_t * mp)
 
 
 /**
- * pullupmsg
+ * pullupm
  *
  * Concatenate the first n bytes of a message.
  *
- * Note that the caller is responsible for checking that a long-enough
- * message is returned.
- *
  * This code returns NULL if the length is zero and the message is empty.
  */
 #ifdef CONFIG_DEBUG_STREAMS
@@ -171,6 +168,7 @@ mblk_t *pullupm(mblk_t *p_msg, short length)
 #endif
 {
 	mblk_t *p_newmsg;
+	short offset = 0;
 
 	if(p_msg == NULL)
 		return NULL;
@@ -188,22 +186,26 @@ mblk_t *pullupm(mblk_t *p_msg, short length)
 			return NULL;
 #endif
 	}
-	if(length == 0 && p_msg->b_cont == NULL && p_msg->b_rptr >= p_msg->b_wptr) {
-		freeb(p_msg);
-		return NULL;
-	}
-	if (length == 0 || p_msg->b_cont == NULL) 
+	if((length == 0) && (p_msg->b_cont == NULL)) {
+		if (p_msg->b_rptr >= p_msg->b_wptr) {
+			freeb(p_msg);
+			return NULL;
+		}
 		return p_msg;
-	if(length < 0)
+	}
+	if(length < 0) {
+		offset = -length;
 		length = msgsize(p_msg);
-	if (p_msg->b_wptr - p_msg->b_rptr >= length)
+	}
+	if ((p_msg->b_wptr - p_msg->b_rptr >= length) && (DATA_START(p_msg)+offset <= p_msg->b_rptr))
 		return p_msg;
 
-	if ((p_newmsg = allocb(length, BPRI_MED)) == NULL) {
-		return p_msg;
-	}
+	if ((p_newmsg = allocb(offset+length, BPRI_MED)) == NULL)
+		return NULL;
 	
 	DATA_TYPE(p_newmsg) = DATA_TYPE(p_msg);
+	p_newmsg->b_rptr += offset;
+	p_newmsg->b_wptr = p_newmsg->b_rptr;
 
 	/*
 	 * Copy the data.
@@ -241,6 +243,76 @@ mblk_t *pullupm(mblk_t *p_msg, short length)
 
 
 
+/**
+ * embedm
+ *
+ * Concatenate the first n bytes of a message.
+ *
+ * This code returns NULL if the length is zero and the message is empty.
+ */
+#ifdef CONFIG_DEBUG_STREAMS
+mblk_t *deb_embedm(const char *deb_file, unsigned int deb_line, mblk_t *p_msg, short offstart, short offend)
+#else
+mblk_t *embedm(mblk_t *p_msg, short offstart, short offend)
+#endif
+{
+	mblk_t *p_newmsg;
+	int length;
+
+	if(p_msg == NULL)
+		return NULL;
+
+#ifdef CONFIG_DEBUG_STREAMS
+	if(deb_msgdsize(deb_file,deb_line,p_msg) < 0)
+		return NULL;
+#endif
+	while(p_msg != NULL && p_msg->b_rptr >= p_msg->b_wptr && p_msg->b_cont != NULL) {
+		mblk_t *p_temp = p_msg->b_cont;
+		freeb(p_msg);
+		p_msg = p_temp;
+#ifdef CONFIG_DEBUG_STREAMS
+		if(msgdsize(p_msg) < 0)
+			return NULL;
+#endif
+	}
+	length = msgsize(p_msg);
+
+	if ((p_newmsg = allocb(offstart+length+offend, BPRI_MED)) == NULL)
+		return NULL;
+	
+	DATA_TYPE(p_newmsg) = DATA_TYPE(p_msg);
+	p_newmsg->b_rptr += offstart;
+	p_newmsg->b_wptr = p_newmsg->b_rptr;
+
+	/*
+	 * Copy the data.
+	 */ 
+	while (length > 0 && p_msg != NULL) {
+#ifdef CONFIG_DEBUG_STREAMS
+		if(msgdsize(p_msg) < 0)
+			return NULL;
+#endif
+		if(p_msg->b_wptr > p_msg->b_rptr) {
+			short n = min(p_msg->b_wptr - p_msg->b_rptr, length);
+			memcpy(p_newmsg->b_wptr, p_msg->b_rptr, n);
+			p_newmsg->b_wptr += n;
+			p_msg->b_rptr += n;
+			length -= n;
+			if (p_msg->b_rptr != p_msg->b_wptr)
+				break;
+		}
+		{	mblk_t *p_cont;
+			p_cont = p_msg->b_cont;
+			freeb(p_msg);
+			p_msg = p_cont;
+		}
+	}
+	freeb(p_msg);
+	return p_newmsg;
+}
+
+
+
 #ifdef CONFIG_DEBUG_STREAMS
 void
 deb_putbqff(const char *deb_file,unsigned int deb_line, queue_t * q, mblk_t * mp)
diff --git a/ksupport/x75lib.c b/ksupport/x75lib.c
index 4eb3553..e9f279b 100644
--- a/ksupport/x75lib.c
+++ b/ksupport/x75lib.c
@@ -1,7 +1,7 @@
 #include "f_module.h"
 #include "primitives.h"
 #include "streams.h"
-#include <sys/errno.h>
+#include "kernel.h"
 #ifndef linux
 #include <sys/var.h>
 #endif
diff --git a/pr_on/pr_on.c b/pr_on/pr_on.c
index 04dca85..18cef78 100644
--- a/pr_on/pr_on.c
+++ b/pr_on/pr_on.c
@@ -3,15 +3,11 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/param.h>
-#include <sys/sysmacros.h>
+#include "kernel.h"
 #include "streams.h"
 #include "stropts.h"
 #include "f_user.h"
 #include "f_malloc.h"
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "isdn_proto.h"
 #include "msgtype.h"
diff --git a/rate/rate.c b/rate/rate.c
index f024e75..9d5e17c 100644
--- a/rate/rate.c
+++ b/rate/rate.c
@@ -4,18 +4,14 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "rate.h"
 #include "isdn_proto.h"
diff --git a/reconnect/reconnect.c b/reconnect/reconnect.c
index d566546..4fa4f0a 100644
--- a/reconnect/reconnect.c
+++ b/reconnect/reconnect.c
@@ -4,18 +4,14 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "reconnect.h"
 #include "isdn_proto.h"
diff --git a/str_if/str_if.h b/str_if/str_if.h
index 30f2de3..26cad62 100644
--- a/str_if/str_if.h
+++ b/str_if/str_if.h
@@ -1,8 +1,7 @@
 #ifndef _STR_IF_H
 #define _STR_IF_H
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
+#include "kernel.h"
 #include "primitives.h"
 
 #ifndef SIOCGETU
diff --git a/str_if/str_in.c b/str_if/str_in.c
index 222cca6..df698bf 100644
--- a/str_if/str_in.c
+++ b/str_if/str_in.c
@@ -15,7 +15,7 @@
 #define DOT ->
 #endif
 
-#include <sys/types.h>
+#include "kernel.h"
 
 #define NSTR 8
 
@@ -25,7 +25,6 @@
 #include <sys/socket.h>
 #endif
 
-#include <sys/time.h>
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
@@ -45,10 +44,8 @@
 #endif
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/errno.h>
 #include "f_ioctl.h"
 #include <sys/file.h>
-#include <sys/uio.h>
 
 #include "str_if.h"
 #include "streamlib.h"
diff --git a/str_if/str_linux.c b/str_if/str_linux.c
index 2234cf5..33b620e 100644
--- a/str_if/str_linux.c
+++ b/str_if/str_linux.c
@@ -15,33 +15,28 @@
 
 #include "f_module.h"
 
-#define UNREGISTER   /* does seem to work */
+#undef UNREGISTER   /* not! */
 
 #include "primitives.h"
 #include "f_ip.h"
 #include "f_malloc.h"
 #include "ppp.h"
 
-#include <sys/types.h>
+#include "kernel.h"
 
 #define NSTR 8
 
 #include "primitives.h"
 #include "streams.h"
 #include "stropts.h"
-#include <sys/socket.h>
+#include <linux/socket.h>
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 
-#include <sys/time.h>
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
-#include <sys/socket.h>
-#include <sys/errno.h>
 #include "f_ioctl.h"
-#include <sys/file.h>
-#include <sys/uio.h>
 
 #include "str_if.h"
 #include "streamlib.h"
diff --git a/str_if/tools/slipto.c b/str_if/tools/slipto.c
index aaf2395..596d2ce 100644
--- a/str_if/tools/slipto.c
+++ b/str_if/tools/slipto.c
@@ -159,8 +159,8 @@ enable (void)
 
 #ifdef ROUTE_IF
 		if(!dontroutemyhost) 
-			sprintf(makeroute+strlen(makeroute), "%s add -host %s metric 2 dev lo; ", ROUTE_PATH,ichaddr);
-		sprintf(makeroute+strlen(makeroute), "%s add -host %s metric 2 gw %s dev %s; ", ROUTE_PATH,duaddr,ichaddr,ifname);
+			sprintf(makeroute+strlen(makeroute), "%s add -host %s metric 2 dev %s; ", ROUTE_PATH,ichaddr,ifname);
+		sprintf(makeroute+strlen(makeroute), "%s add -host %s metric 2 " /* "gw %s" */ " dev %s; ", ROUTE_PATH,duaddr, /* ichaddr, */ ifname);
 		if(arpaddr != NULL)
 			sprintf(makeroute+strlen(makeroute), "%s -s %s %s pub; ", ARP_PATH,duaddr,arpaddr);
 
diff --git a/streams/stream.h b/streams/stream.h
index 584fd74..c50b2d4 100644
--- a/streams/stream.h
+++ b/streams/stream.h
@@ -1,8 +1,7 @@
 #if !defined(_LINUX_STREAMS_H)
 #define _LINUX_STREAMS_H
 
-#include <linux/config.h>
-#include <linux/types.h>
+#include "kernel.h"
 #include "compat.h"
 #include "stropts.h"
 #ifdef __KERNEL__
diff --git a/strslip/strslip.c b/strslip/strslip.c
index def1653..c24616b 100644
--- a/strslip/strslip.c
+++ b/strslip/strslip.c
@@ -3,16 +3,12 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 /* #include <sys/user.h> */
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "alaw.h"
 #include "isdn_proto.h"
diff --git a/support/malloc.o b/support/malloc.o
deleted file mode 100644
index 7ccdc336a8d66ee889c3d9076440eb7ae14e251e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12252
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

diff --git a/support/sioctl.c b/support/sioctl.c
index b29f0bd..fa4724a 100644
--- a/support/sioctl.c
+++ b/support/sioctl.c
@@ -1,7 +1,7 @@
 #include "primitives.h"
 #include "f_ioctl.h"
 #include "stropts.h"
-#include <sys/errno.h>
+#include "kernel.h"
 #ifdef linux
 #include <linux/ioctl.h>
 #endif
diff --git a/support/streams.c b/support/streams.c
index 0751617..dff0515 100644
--- a/support/streams.c
+++ b/support/streams.c
@@ -1,17 +1,14 @@
 #include "primitives.h"
 #include "kernel.h"
-#include <sys/file.h>
-#include <sys/errno.h>
 #include "f_signal.h"
 #include "stropts.h"
 #include "f_termio.h"
 #include "f_user.h"
-#include <sys/uio.h>
-#include <malloc.h>
 #include "streams.h"
 #include "streamlib.h"
 #include "string.h"
 #define NDEBUG
+#include <malloc.h>
 #include <assert.h>
 #ifndef ASSERT
 #define ASSERT(x) assert(x)
diff --git a/t70/t70.c b/t70/t70.c
index 4c1387a..0ee6975 100644
--- a/t70/t70.c
+++ b/t70/t70.c
@@ -4,18 +4,14 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "t70.h"
 #include "isdn_proto.h"
diff --git a/timer/timer.c b/timer/timer.c
index f251b44..6a1fb08 100644
--- a/timer/timer.c
+++ b/timer/timer.c
@@ -4,18 +4,14 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "timer.h"
 #include "isdn_proto.h"
diff --git a/tools/Makefile b/tools/Makefile
index 43cc808..71cae3d 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -6,20 +6,26 @@ NOCLEAN = catfone
 all:: 
 
 install::
-	@if test ! -f /etc/isdn.conf; then				 \
-		echo install isdn.conf /etc ;				 \
-		install isdn.conf /etc ;					 \
+	@if test ! -f /etc/isdn.conf; then				 		\
+		echo install isdn.conf /etc ;				 		\
+		install isdn.conf /etc ;					 		\
 	fi
-	@if test -d /etc/rc.d ; then					 \
-		if test ! -f /etc/rc.d/rc.isdn ; then		 \
-			echo install rc.isdn /etc/rc.d ;		 \
-			install rc.isdn /etc/rc.d;				 \
-		fi;											 \
-	else											 \
-		if test ! -f /etc/rc.isdn ; then			 \
-			echo install rc.isdn /etc ;				 \
-			install rc.isdn /etc;					 \
-		fi;											 \
+	@if test -d /sbin/init.d/scripts ; then					\
+		echo "*** /sbin/init.d/scripts/uisdn ***";			\
+		install rc.isdn /sbin/init.d/scripts/uisdn ;		\
+		install rc.isdnmon /sbin/init.d/scripts/uisdnmon ;	\
+	elif test -d /sbin/init.d; then					 		\
+		echo "*** /sbin/init.d/isdn ***";		 			\
+		install rc.isdn /sbin/init.d/isdn ;		 			\
+		install rc.isdnmon /sbin/init.d/isdnmon ;	 		\
+	elif test -d /etc/rc.d ; then					 		\
+		echo "*** /etc/rc.d/rc.isdn ***";		 			\
+		install rc.isdn /etc/rc.d;				 			\
+		install rc.isdnmon /etc/rc.d;				 		\
+	else											 		\
+		echo "*** /etc/rc.isdn ***";		 				\
+		install rc.isdn /etc;					 			\
+		install rc.isdnmon /etc;				 			\
 	fi
 
 include $(TOPDIR)/Make.rules
diff --git a/tools/d_insmod b/tools/d_insmod
index 974d7bb..d565649 100644
--- a/tools/d_insmod
+++ b/tools/d_insmod
@@ -6,7 +6,8 @@
 FILE=$1
 
 VERSION=${VERSION:-$(${TOPDIR}/tools/getversion)}
-dir=/lib/modules/$VERSION
+MODDIR=${MODDIR:-/lib/modules}
+dir=${MODDIR}/$VERSION
 echo isdn/d_$FILE >>$dir/../modules.isdn.all
 rm -f $dir/isdn/d_$FILE
 (
diff --git a/tools/insmod b/tools/insmod
index f827c30..27ce03d 100755
--- a/tools/insmod
+++ b/tools/insmod
@@ -6,7 +6,8 @@
 FILE=$1
 
 VERSION=${VERSION:-$(${TOPDIR}/tools/getversion)}
-dir=/lib/modules/$VERSION
+MODDIR=${MODDIR:-/lib/modules}
+dir=${MODDIR}/$VERSION
 echo isdn/$FILE >>$dir/../modules.isdn.all
 rm -f $dir/isdn/$FILE
 (
diff --git a/tools/isdn.conf b/tools/isdn.conf
index 22ff832..cb0a465 100644
--- a/tools/isdn.conf
+++ b/tools/isdn.conf
@@ -127,16 +127,6 @@ LF Bin? 4000 3 /etc/isdn/bri.68k
 #DL         * Tel0      -    :pr 64
 
 
-## The following is a complete example on how to do a leased line.
-#
-#P  tcp foo * Tel0      RXf  :dI :bc 1 :Ft
-#ML tcp foo * Tel0      -,3  frame xstrlog fakeh reconn str_if 
-#MP tcp foo * Tel0      -    proto :sg 1 :ca 1 :bk 0 :on
-#R  tcp foo * Tel0 root RUBf slipto -d 10.1.1.1 10.1.1.2
-#D  *   foo * Tel0      f    -
-#DL         * Tel0      -    :pr 64
-
-
 ### Tarifzonen sind was Doofes...
 # Um diese Daten zu nutzen, muss in der betreffenden P-Zeile
 # als Key mindestens ein A bis J stehen (Entfernung des Rechners)
diff --git a/tools/rc.isdn b/tools/rc.isdn
index 93e7f36..1374482 100755
--- a/tools/rc.isdn
+++ b/tools/rc.isdn
@@ -1,22 +1,57 @@
 #!/bin/sh
 
-set -e
-PATH=/usr/local/isdn/bin-$(uname -r):/usr/local/isdn/bin:/usr/sbin:/sbin:/usr/lcoal/bin:/usr/bin:/bin
+##  =()<DESTDIR=@<DESTDIR>@>()=
+DESTDIR=/usr/lib/isdn
+##  =()<LOCKNAME=@<LOCKNAME>@>()=
+LOCKNAME=/var/lock
 
-if [ "$1" = "off" ] ; then
+set -e
+
+. /etc/rc.config
+
+if [ "$1" = "config" ] ; then # smurfsche Spezialitäten
+	cat <<'END' >/tmp/cf.$$
+#
+## welcher ISDN-Treiber? uisdn, i4l, off
+#
+ISDN=uisdn
+END
+	fillup /etc/rc.config /tmp/cf.$$
+	rm /tmp/cf.$$
+	cd /sbin/init.d/rc2.d
+	ln -sf ../scripts/uisdn S18uisdn
+	ln -sf ../scripts/uisdn K18uisdn
+	cd /sbin/init.d/rc3.d
+	ln -sf ../scripts/uisdn S18uisdn
+	ln -sf ../scripts/uisdn K18uisdn
+	exit 0
+fi
+
+if [ "$ISDN" != "uisdn" ] ; then exit 0; fi
+
+PATH=${DESTDIR}/bin-$(uname -r):${DESTDIR}/bin:$PATH
+
+if [ "$1" = "off" -o "$1" = "stop" ] ; then
 	trap '' 1 2 15
-	killall rc.isdn || true
 	echo -n "Killing the ISDN server ... "
-	if killall master ; then
-		sleep 10
-		killall -9 master || true
+	if test -f /var/run/isdn.pid ; then
+		read pid < /var/run/isdn.pid
+		rm /var/run/isdn.pid
+	fi
+	pf=$(echo $LOCKNAME | sed -e 's/%s/isdn0/')
+	if test -f $pf ; then
+		read pid <$pf
+		if kill $pid ; then
+			sleep 10
+			kill -9 $pid || true
+		fi
+		rm -f $pf
 	fi
 	
 	echo -n "find modules ..."
-	while read a b c d ; do
-		case "$a" in
-		\#*) ;;
-		*)
+	while read x a b c d ; do
+		case "$x" in
+		MO*)
 			if [ "x$a" = "x-o" ] ; then
 				mod=$b
         		elif [ "x$b" = "x-o" ] ; then
@@ -27,40 +62,40 @@ if [ "$1" = "off" ] ; then
 			mods="$mod $mods"
 		;;
 		esac
-	done < /lib/modules/modules.isdn
+	done < /etc/isdn.conf
 	echo ""
 	echo rmmod $mods
 	exec rmmod $mods
 	exit 0
 fi
 
+if test -d /lib/gnu; then
+	export LD_LIBRARY_PATH=/lib/gnu
+fi
+
+echo $$ > /var/run/isdn.pid
 if lsmod | grep isdn_2 >/dev/null 2>&1 ; then : ; else
 	cd /lib/modules/$(uname -r)
-	if test -f symbols.isdn ; then mv symbols.isdn symbols.isdn.old ; fi
-	while read a ; do
-		case "$a" in
-		\#*) ;;
-		*)
+	if test -f /tmp/symbols.isdn ; then mv /tmp/symbols.isdn /tmp/symbols.isdn.old ; fi
+	while read x a ; do
+		case "$x" in
+		MO*)
 			/bin/echo -n "\rISDN Modules:                                                               "  >&2
 			/bin/echo -n "\rISDN Modules: $a: " >&2
 			eval "insmod -m $a"  ## wegen name=$(cardname Foo0) in $a
 			;;
 		esac
-	done < ../modules.isdn > symbols.isdn
+	done < /etc/isdn.conf > /tmp/symbols.isdn
 	/bin/echo "\rISDN Modules...done.                                                       "
 fi
 
-cd /var/tmp
-## /usr might be write protected and the debugging person
-#  might want to have coredumps. So I provide them.
+cd /var/tmp # for coredumps...
 
 ulimit -c 40000
 # ulimit -d 20000
 
-# monitor -b >>/var/log/acct/ip &
-
 set +e
-while : ; do
+while test -f /var/run/isdn.pid ; do
 	master -wd /etc/isdn.conf 2>>/tmp/isdn.log >>/var/log/isdn
 	sleep 5
 done &
diff --git a/v110/v110.c b/v110/v110.c
index f9794ec..1c88354 100644
--- a/v110/v110.c
+++ b/v110/v110.c
@@ -8,18 +8,14 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
-#include <sys/errno.h>
 #include "streamlib.h"
 #include "v110.h"
 #include "isdn_proto.h"
diff --git a/van_j/compress.h b/van_j/compress.h
index 3676f61..18defa0 100644
--- a/van_j/compress.h
+++ b/van_j/compress.h
@@ -3,8 +3,7 @@
 #ifndef _COMPRESS
 #define _COMPRESS
 
-#include <sys/types.h>
-#include <sys/param.h>
+#include "kernel.h"
 #include "streams.h"
 #include "f_ip.h"
 #include "vanj.h"
@@ -13,7 +12,7 @@
 /*
  * Definitions for tcp compression routines.
  * 
- * $Header: slcompress.h,v 1.10 89/12/31 08:53:02 van Exp $
+ * $Header: /usr/src/cvs/kernel/isdn/van_j/compress.h,v 1.1.1.1 1996/07/29 07:09:09 smurf Exp $
  * 
  * Copyright (c) 1989 Regents of the University of California. All rights
  * reserved.
diff --git a/van_j/van_j.c b/van_j/van_j.c
index 8379a81..64d2b1e 100644
--- a/van_j/van_j.c
+++ b/van_j/van_j.c
@@ -5,17 +5,13 @@
 #include "f_ip.h"
 #include "f_malloc.h"
 #include "ppp.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
 #include "stropts.h"
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif
-#include <sys/errno.h>
 #include "vanj.h"
 #include "van_j.h"
 #include "compress.h"
diff --git a/x75/x75.c b/x75/x75.c
index 7144c9b..070140c 100644
--- a/x75/x75.c
+++ b/x75/x75.c
@@ -10,14 +10,10 @@
 
 #include "f_module.h"
 #include "primitives.h"
-#include <sys/types.h>
-#include <sys/time.h>
+#include "kernel.h"
 #include "f_signal.h"
 #include "f_malloc.h"
-#include <sys/param.h>
-#include <sys/sysmacros.h>
 #include "streams.h"
-#include <sys/errno.h>
 #ifdef DONT_ADDERROR
 #include "f_user.h"
 #endif