diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
| commit | df49c60c9671e4a28e636964d744c1f59fb6cb68 (patch) | |
| tree | eabd85e189514ad412a35414ba5d483dcda3ef1f /c/src/libnetworking/pppd | |
| parent | Purged as many egcs references as possible. (diff) | |
| download | rtems-df49c60c9671e4a28e636964d744c1f59fb6cb68.tar.bz2 | |
Merged from 4.5.0-beta3a
Diffstat (limited to 'c/src/libnetworking/pppd')
| -rw-r--r-- | c/src/libnetworking/pppd/Makefile.am | 4 | ||||
| -rw-r--r-- | c/src/libnetworking/pppd/options.c | 4 | ||||
| -rw-r--r-- | c/src/libnetworking/pppd/pppd.h | 4 | ||||
| -rw-r--r-- | c/src/libnetworking/pppd/rtems-ppp.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/c/src/libnetworking/pppd/Makefile.am b/c/src/libnetworking/pppd/Makefile.am index 1c860d5a14..e6a27c80c8 100644 --- a/c/src/libnetworking/pppd/Makefile.am +++ b/c/src/libnetworking/pppd/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/libnetworking/pppd/options.c b/c/src/libnetworking/pppd/options.c index 6eafb89eca..759ed988f8 100644 --- a/c/src/libnetworking/pppd/options.c +++ b/c/src/libnetworking/pppd/options.c @@ -93,8 +93,8 @@ char *connector[]={"TIMEOUT","3","ABORT","\nBUSY\r","ABORT","\nNO DIALTONE\r","A /*char *connector[]={"TIMEOUT","3","ABORT","\nBUSY\r","ABORT","\nNO DIALTONE\r","ABORT","\nNO CARRIER\r","ABORT","\nNO ANSWER\r","ABORT","\nRINGING\r\n\r\nRINGING\r", "","\rAT","OK-+++\\c-OK","ATH0","TIMEOUT","30","OK","ATDT0202122","CONNECT","","ppp","","Username:","ppp","Password:","ppp"}; */ -char *disconnector []; /* Script to disestablish physical link */ -char *welcomer []; /* Script to run after phys link estab. */ +char **disconnector; /* Script to disestablish physical link */ +char **welcomer; /* Script to run after phys link estab. */ int maxconnect = 0; /* Maximum connect time */ char user[MAXNAMELEN]="stb"; /* Username for PAP */ char passwd[MAXSECRETLEN]="stb"; /* Password for PAP */ diff --git a/c/src/libnetworking/pppd/pppd.h b/c/src/libnetworking/pppd/pppd.h index 7c12e38ae5..274eb07176 100644 --- a/c/src/libnetworking/pppd/pppd.h +++ b/c/src/libnetworking/pppd/pppd.h @@ -86,8 +86,8 @@ extern u_int32_t netmask; /* IP netmask to set on interface */ extern int lockflag; /* Create lock file to lock the serial dev */ extern int nodetach; /* Don't detach from controlling tty */ extern char *connector[]; /* Script to establish physical link */ -extern char *disconnector[]; /* Script to disestablish physical link */ -extern char *welcomer[]; /* Script to welcome client after connection */ +extern char **disconnector; /* Script to disestablish physical link */ +extern char **welcomer; /* Script to welcome client after connection */ extern int maxconnect; /* Maximum connect time (seconds) */ extern char user[]; /* Our name for authenticating ourselves */ extern char passwd[]; /* Password for PAP */ diff --git a/c/src/libnetworking/pppd/rtems-ppp.c b/c/src/libnetworking/pppd/rtems-ppp.c index 4bc8f925b2..d54825c9ef 100644 --- a/c/src/libnetworking/pppd/rtems-ppp.c +++ b/c/src/libnetworking/pppd/rtems-ppp.c @@ -507,8 +507,8 @@ output(unit, p, len) } extern int rtems_bsdnet_microseconds_per_tick; -#include <rtems/rtems_bsdnet_internal.h> -#include <rtems/rtems/event.h> +#include <rtems.h> +#include <rtems/rtems_bsdnet.h> /* * wait_input - wait until there is data available on ttyfd, * for the length of time specified by *timo (indefinite @@ -1039,7 +1039,7 @@ dodefaultroute(g, cmd) struct sockaddr_in address; struct sockaddr_in netmask; - struct sockaddr_in broadcast; + /* struct sockaddr_in broadcast; */ struct sockaddr_in gateway; /* struct { |