2000-11-25 Antti P Miettinen <antti.p.miettinen@nokia.com>

	* wrapup/Makefile.am: Added modem subdir.
	* configure.in, Makefile.am: Added modem subdir.
	* net/Makefile.am: Added if_pppvar.h, pppcompress.h.
	* pppd/Makefile.am: Added pppmain.c (which needs work).
	* pppd/chat.c, pppd/fsm.c, pppd/fsm.h, pppd/ipxcp.c, pppd/main.c,
	pppd/ppp_tty.c, pppd/upap.c: Changes from Thomas Doerfler
	<Thomas.Doerfler@imd-systems.de> and cosmetic changes by me.
	Actually main.c and ppp_tty.c should be scratched. The modem
	subdir has the real ppp_tty.c and the real pppd main is in pppmain.c.

9 files changed, 30 insertions, 12 deletions

diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog
index 652f88d402..c19ffd6ef5 100644
--- a/cpukit/libnetworking/ChangeLog
+++ b/cpukit/libnetworking/ChangeLog
@@ -1,3 +1,15 @@
+2000-11-25  Antti P Miettinen  <antti.p.miettinen@nokia.com>
+
+	* wrapup/Makefile.am: Added modem subdir.
+	* configure.in, Makefile.am: Added modem subdir.
+	* net/Makefile.am: Added if_pppvar.h, pppcompress.h.
+	* pppd/Makefile.am: Added pppmain.c (which needs work).
+	* pppd/chat.c, pppd/fsm.c, pppd/fsm.h, pppd/ipxcp.c, pppd/main.c,
+	pppd/ppp_tty.c, pppd/upap.c: Changes from Thomas Doerfler 
+	<Thomas.Doerfler@imd-systems.de> and cosmetic changes by me.
+	Actually main.c and ppp_tty.c should be scratched. The modem
+	subdir has the real ppp_tty.c and the real pppd main is in pppmain.c.
+
 2000-11-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS.
diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index 21dc2f690c..7f09e1d21b 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I ../../../aclocal
 
 SUBDIRS = include arpa kern machine sys vm lib libc net netinet nfs rtems \
-    rtems_servers pppd rtems_webserver wrapup
+    rtems_servers pppd modem rtems_webserver wrapup
 
 EXTRA_DIST = CHANGELOG bpfilter.h loop.h netdb.h opt_ipfw.h opt_mrouting.h \
     opt_tcpdebug.h poll.h resolv.h syslog.h memory.h
diff --git a/cpukit/libnetworking/net/Makefile.am b/cpukit/libnetworking/net/Makefile.am
index 73423b7f49..b6c69607ee 100644
--- a/cpukit/libnetworking/net/Makefile.am
+++ b/cpukit/libnetworking/net/Makefile.am
@@ -35,7 +35,8 @@ EXTRA_DIST = if.c if_ethersubr.c if_loop.c radix.c raw_cb.c raw_usrreq.c \
     route.c rtsock.c
 
 H_FILES = bpf.h ethernet.h if.h if_arp.h if_dl.h if_llc.h if_ppp.h \
-    if_types.h netisr.h ppp-comp.h ppp_defs.h radix.h raw_cb.h route.h
+    if_types.h netisr.h ppp-comp.h ppp_defs.h radix.h raw_cb.h route.h \
+    if_pppvar.h pppcompress.h
 
 noinst_HEADERS = $(H_FILES)
 
diff --git a/cpukit/libnetworking/wrapup/Makefile.am b/cpukit/libnetworking/wrapup/Makefile.am
index 8637ff6620..5c8135ace6 100644
--- a/cpukit/libnetworking/wrapup/Makefile.am
+++ b/cpukit/libnetworking/wrapup/Makefile.am
@@ -8,7 +8,7 @@ if HAS_POSIX
 POSIX_PIECES = rtems_webserver
 endif
 
-NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers pppd \
+NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers pppd modem \
     $(POSIX_PIECES)
 OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o)
 LIB = $(ARCH)/libnetworking.a
diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am
index dd78bc0c7a..836d2ab110 100644
--- a/cpukit/pppd/Makefile.am
+++ b/cpukit/pppd/Makefile.am
@@ -7,9 +7,10 @@ AUTOMAKE_OPTIONS = foreign 1.4
 LIBNAME = lib.a
 LIB = $(ARCH)/$(LIBNAME)
 
-# What to do about main.c?
+# renamed main.c to pppmain.c
 C_FILES = auth.c cbcp.c ccp.c chap.c chap_ms.c chat.c demand.c fsm.c ipcp.c \
-    ipxcp.c lcp.c magic.c options.c upap.c md4.c md5.c rtems-ppp.c
+    ipxcp.c lcp.c magic.c options.c upap.c md4.c md5.c rtems-ppp.c \
+    pppmain.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
@@ -40,6 +41,6 @@ EXTRA_DIST = README STATUS auth.c cbcp.c cbcp.h ccp.c ccp.h chap.c chap.h \
     chap_ms.c chap_ms.h chat.c demand.c fsm.c fsm.h ipcp.c ipcp.h ipxcp.c \
     ipxcp.h lcp.c lcp.h magic.c magic.h main.c md4.c md4.h md5.c md5.h \
     options.c patchlevel.h pathnames.h ppp_tty.c pppd.h rtems-ppp.c upap.c \
-    upap.h $(EXTRA_FILES)
+    upap.h pppmain.c $(EXTRA_FILES)
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/pppd/chat.c b/cpukit/pppd/chat.c
index ad4c0c932e..eca2066e93 100644
--- a/cpukit/pppd/chat.c
+++ b/cpukit/pppd/chat.c
@@ -838,7 +838,11 @@ register char *s;
 	    break;
 
 	case 'p':
+#if 0 /* FIXME!!! */
 	    usleep(10000); 	/* 1/100th of a second (arg is microseconds) */
+#else
+	    sleep(1);
+#endif
 	    break;
 
 	default:
diff --git a/cpukit/pppd/fsm.c b/cpukit/pppd/fsm.c
index 09b67486e5..0d50b35c6c 100644
--- a/cpukit/pppd/fsm.c
+++ b/cpukit/pppd/fsm.c
@@ -36,7 +36,7 @@
 #include "fsm.h"
 
 static void fsm_timeout __P((void *));
-static void fsm_rconfreq __P((fsm *, u_char, u_char *, int));
+static void fsm_rconfreq __P((fsm *, int, u_char *, int));
 static void fsm_rconfack __P((fsm *, int, u_char *, int));
 static void fsm_rconfnakrej __P((fsm *, int, int, u_char *, int));
 static void fsm_rtermreq __P((fsm *, int, u_char *, int));
@@ -371,7 +371,7 @@ fsm_input(f, inpacket, l)
 static void
 fsm_rconfreq(f, id, inp, len)
     fsm *f;
-    u_char id;
+    int id;
     u_char *inp;
     int len;
 {
@@ -773,7 +773,7 @@ fsm_sconfreq(f, retransmit)
 void
 fsm_sdata(f, code, id, data, datalen)
     fsm *f;
-    u_char code, id;
+    int code, id;
     u_char *data;
     int datalen;
 {
diff --git a/cpukit/pppd/fsm.h b/cpukit/pppd/fsm.h
index c04050a369..f289429fdc 100644
--- a/cpukit/pppd/fsm.h
+++ b/cpukit/pppd/fsm.h
@@ -135,7 +135,7 @@ void fsm_open __P((fsm *));
 void fsm_close __P((fsm *, char *));
 void fsm_input __P((fsm *, u_char *, int));
 void fsm_protreject __P((fsm *));
-void fsm_sdata __P((fsm *, u_char, u_char, u_char *, int));
+void fsm_sdata __P((fsm *, int, int, u_char *, int));
 
 
 /*
diff --git a/cpukit/pppd/upap.c b/cpukit/pppd/upap.c
index 78b3b2f5f7..c3c6cf1d6d 100644
--- a/cpukit/pppd/upap.c
+++ b/cpukit/pppd/upap.c
@@ -72,7 +72,7 @@ static void upap_rauthreq __P((upap_state *, u_char *, int, int));
 static void upap_rauthack __P((upap_state *, u_char *, int, int));
 static void upap_rauthnak __P((upap_state *, u_char *, int, int));
 static void upap_sauthreq __P((upap_state *));
-static void upap_sresp __P((upap_state *, u_char, u_char, char *, int));
+static void upap_sresp __P((upap_state *, int, int, char *, int));
 
 
 /*
@@ -520,7 +520,7 @@ upap_sauthreq(u)
 static void
 upap_sresp(u, code, id, msg, msglen)
     upap_state *u;
-    u_char code, id;
+    int code, id;
     char *msg;
     int msglen;
 {