RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* 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.
This commit is contained in:
Joel Sherrill
2000-11-25 19:42:21 +00:00
parent e2af631fef
commit a6abd67af5
23 changed files with 77 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
c/src/exec/libnetworking/ChangeLog
View File

@@ -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> 2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS. * Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS.

2
c/src/exec/libnetworking/Makefile.am
View File

@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I ../../../aclocal ACLOCAL_AMFLAGS = -I ../../../aclocal
SUBDIRS = include arpa kern machine sys vm lib libc net netinet nfs rtems \ 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 \ 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 opt_tcpdebug.h poll.h resolv.h syslog.h memory.h

3
c/src/exec/libnetworking/net/Makefile.am
View File

@@ -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 route.c rtsock.c
H_FILES = bpf.h ethernet.h if.h if_arp.h if_dl.h if_llc.h if_ppp.h \ 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) noinst_HEADERS = $(H_FILES)

2
c/src/exec/libnetworking/wrapup/Makefile.am
View File

@@ -8,7 +8,7 @@ if HAS_POSIX
POSIX_PIECES = rtems_webserver POSIX_PIECES = rtems_webserver
endif 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) $(POSIX_PIECES)
OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o) OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o)
LIB = $(ARCH)/libnetworking.a LIB = $(ARCH)/libnetworking.a

12
c/src/libnetworking/ChangeLog
View File

@@ -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> 2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS. * Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS.

2
c/src/libnetworking/Makefile.am
View File

@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I ../../../aclocal ACLOCAL_AMFLAGS = -I ../../../aclocal
SUBDIRS = include arpa kern machine sys vm lib libc net netinet nfs rtems \ 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 \ 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 opt_tcpdebug.h poll.h resolv.h syslog.h memory.h

1
c/src/libnetworking/configure.in
View File

@@ -47,6 +47,7 @@ net/Makefile
netinet/Makefile netinet/Makefile
nfs/Makefile nfs/Makefile
pppd/Makefile pppd/Makefile
modem/Makefile
rtems/Makefile rtems/Makefile
rtems_servers/Makefile rtems_servers/Makefile
rtems_webserver/Makefile rtems_webserver/Makefile

3
c/src/libnetworking/net/Makefile.am
View File

@@ -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 route.c rtsock.c
H_FILES = bpf.h ethernet.h if.h if_arp.h if_dl.h if_llc.h if_ppp.h \ 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) noinst_HEADERS = $(H_FILES)

7
c/src/libnetworking/pppd/Makefile.am
View File

@@ -7,9 +7,10 @@ AUTOMAKE_OPTIONS = foreign 1.4
LIBNAME = lib.a LIBNAME = lib.a
LIB = $(ARCH)/$(LIBNAME) 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 \ 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) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
OBJS = $(C_O_FILES) 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 \ 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 \ 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 \ 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 include $(top_srcdir)/../../../automake/local.am

4
c/src/libnetworking/pppd/chat.c
View File

@@ -838,7 +838,11 @@ register char *s;
break; break;
case 'p': case 'p':
#if 0 /* FIXME!!! */
usleep(10000); /* 1/100th of a second (arg is microseconds) */ usleep(10000); /* 1/100th of a second (arg is microseconds) */
#else
sleep(1);
#endif
break; break;
default: default:

6
c/src/libnetworking/pppd/fsm.c
View File

@@ -36,7 +36,7 @@
#include "fsm.h" #include "fsm.h"
static void fsm_timeout __P((void *)); 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_rconfack __P((fsm *, int, u_char *, int));
static void fsm_rconfnakrej __P((fsm *, int, 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)); static void fsm_rtermreq __P((fsm *, int, u_char *, int));
@@ -371,7 +371,7 @@ fsm_input(f, inpacket, l)
static void static void
fsm_rconfreq(f, id, inp, len) fsm_rconfreq(f, id, inp, len)
fsm *f; fsm *f;
u_char id; int id;
u_char *inp; u_char *inp;
int len; int len;
{ {
@@ -773,7 +773,7 @@ fsm_sconfreq(f, retransmit)
void void
fsm_sdata(f, code, id, data, datalen) fsm_sdata(f, code, id, data, datalen)
fsm *f; fsm *f;
u_char code, id; int code, id;
u_char *data; u_char *data;
int datalen; int datalen;
{ {

2
c/src/libnetworking/pppd/fsm.h
View File

@@ -135,7 +135,7 @@ void fsm_open __P((fsm *));
void fsm_close __P((fsm *, char *)); void fsm_close __P((fsm *, char *));
void fsm_input __P((fsm *, u_char *, int)); void fsm_input __P((fsm *, u_char *, int));
void fsm_protreject __P((fsm *)); 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));
/* /*

4
c/src/libnetworking/pppd/upap.c
View File

@@ -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_rauthack __P((upap_state *, u_char *, int, int));
static void upap_rauthnak __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_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 static void
upap_sresp(u, code, id, msg, msglen) upap_sresp(u, code, id, msg, msglen)
upap_state *u; upap_state *u;
u_char code, id; int code, id;
char *msg; char *msg;
int msglen; int msglen;
{ {

2
c/src/libnetworking/wrapup/Makefile.am
View File

@@ -8,7 +8,7 @@ if HAS_POSIX
POSIX_PIECES = rtems_webserver POSIX_PIECES = rtems_webserver
endif 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) $(POSIX_PIECES)
OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o) OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o)
LIB = $(ARCH)/libnetworking.a LIB = $(ARCH)/libnetworking.a

12
cpukit/libnetworking/ChangeLog
View File

@@ -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> 2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS. * Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS.

2
cpukit/libnetworking/Makefile.am
View File

@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I ../../../aclocal ACLOCAL_AMFLAGS = -I ../../../aclocal
SUBDIRS = include arpa kern machine sys vm lib libc net netinet nfs rtems \ 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 \ 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 opt_tcpdebug.h poll.h resolv.h syslog.h memory.h

3
cpukit/libnetworking/net/Makefile.am
View File

@@ -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 route.c rtsock.c
H_FILES = bpf.h ethernet.h if.h if_arp.h if_dl.h if_llc.h if_ppp.h \ 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) noinst_HEADERS = $(H_FILES)

2
cpukit/libnetworking/wrapup/Makefile.am
View File

@@ -8,7 +8,7 @@ if HAS_POSIX
POSIX_PIECES = rtems_webserver POSIX_PIECES = rtems_webserver
endif 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) $(POSIX_PIECES)
OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o) OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o)
LIB = $(ARCH)/libnetworking.a LIB = $(ARCH)/libnetworking.a

7
cpukit/pppd/Makefile.am
View File

@@ -7,9 +7,10 @@ AUTOMAKE_OPTIONS = foreign 1.4
LIBNAME = lib.a LIBNAME = lib.a
LIB = $(ARCH)/$(LIBNAME) 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 \ 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) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
OBJS = $(C_O_FILES) 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 \ 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 \ 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 \ 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 include $(top_srcdir)/../../../automake/local.am

4
cpukit/pppd/chat.c
View File

@@ -838,7 +838,11 @@ register char *s;
break; break;
case 'p': case 'p':
#if 0 /* FIXME!!! */
usleep(10000); /* 1/100th of a second (arg is microseconds) */ usleep(10000); /* 1/100th of a second (arg is microseconds) */
#else
sleep(1);
#endif
break; break;
default: default:

6
cpukit/pppd/fsm.c
View File

@@ -36,7 +36,7 @@
#include "fsm.h" #include "fsm.h"
static void fsm_timeout __P((void *)); 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_rconfack __P((fsm *, int, u_char *, int));
static void fsm_rconfnakrej __P((fsm *, int, 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)); static void fsm_rtermreq __P((fsm *, int, u_char *, int));
@@ -371,7 +371,7 @@ fsm_input(f, inpacket, l)
static void static void
fsm_rconfreq(f, id, inp, len) fsm_rconfreq(f, id, inp, len)
fsm *f; fsm *f;
u_char id; int id;
u_char *inp; u_char *inp;
int len; int len;
{ {
@@ -773,7 +773,7 @@ fsm_sconfreq(f, retransmit)
void void
fsm_sdata(f, code, id, data, datalen) fsm_sdata(f, code, id, data, datalen)
fsm *f; fsm *f;
u_char code, id; int code, id;
u_char *data; u_char *data;
int datalen; int datalen;
{ {

2
cpukit/pppd/fsm.h
View File

@@ -135,7 +135,7 @@ void fsm_open __P((fsm *));
void fsm_close __P((fsm *, char *)); void fsm_close __P((fsm *, char *));
void fsm_input __P((fsm *, u_char *, int)); void fsm_input __P((fsm *, u_char *, int));
void fsm_protreject __P((fsm *)); 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));
/* /*

4
cpukit/pppd/upap.c
View File

@@ -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_rauthack __P((upap_state *, u_char *, int, int));
static void upap_rauthnak __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_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 static void
upap_sresp(u, code, id, msg, msglen) upap_sresp(u, code, id, msg, msglen)
upap_state *u; upap_state *u;
u_char code, id; int code, id;
char *msg; char *msg;
int msglen; int msglen;
{ {