diff options
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/ppp/alias_cmd.c | 3 | ||||
-rw-r--r-- | usr.sbin/ppp/bundle.c | 4 | ||||
-rw-r--r-- | usr.sbin/ppp/chap.c | 7 | ||||
-rw-r--r-- | usr.sbin/ppp/chat.c | 3 | ||||
-rw-r--r-- | usr.sbin/ppp/command.c | 6 | ||||
-rw-r--r-- | usr.sbin/ppp/datalink.c | 3 | ||||
-rw-r--r-- | usr.sbin/ppp/defs.c | 4 | ||||
-rw-r--r-- | usr.sbin/ppp/ip.c | 3 | ||||
-rw-r--r-- | usr.sbin/ppp/ipcp.c | 3 | ||||
-rw-r--r-- | usr.sbin/ppp/main.c | 6 | ||||
-rw-r--r-- | usr.sbin/ppp/modem.c | 3 | ||||
-rw-r--r-- | usr.sbin/ppp/nat_cmd.c | 3 | ||||
-rw-r--r-- | usr.sbin/ppp/physical.c | 4 | ||||
-rw-r--r-- | usr.sbin/ppp/probe.c | 7 | ||||
-rw-r--r-- | usr.sbin/ppp/server.c | 20 | ||||
-rw-r--r-- | usr.sbin/ppp/timer.c | 4 | ||||
-rw-r--r-- | usr.sbin/ppp/tun.c | 6 |
17 files changed, 26 insertions, 63 deletions
diff --git a/usr.sbin/ppp/alias_cmd.c b/usr.sbin/ppp/alias_cmd.c index 9be19fa..8ebd5ec 100644 --- a/usr.sbin/ppp/alias_cmd.c +++ b/usr.sbin/ppp/alias_cmd.c @@ -2,7 +2,7 @@ * The code in this file was written by Eivind Eklund <perhaps@yes.no>, * who places it in the public domain without restriction. * - * $Id: alias_cmd.c,v 1.14 1998/06/15 19:05:59 brian Exp $ + * $Id: alias_cmd.c,v 1.15 1998/06/27 14:17:23 brian Exp $ */ #include <sys/types.h> @@ -11,7 +11,6 @@ #include <netdb.h> #include <netinet/in_systm.h> #include <netinet/in.h> -#include <netinet/tcp.h> #include <netinet/ip.h> #include <sys/un.h> diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c index d9532c3..990a0c6 100644 --- a/usr.sbin/ppp/bundle.c +++ b/usr.sbin/ppp/bundle.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bundle.c,v 1.25 1998/06/27 12:03:46 brian Exp $ + * $Id: bundle.c,v 1.26 1998/06/27 14:17:23 brian Exp $ */ #include <sys/param.h> @@ -43,7 +43,6 @@ #include <errno.h> #include <fcntl.h> #include <paths.h> -#include <signal.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -77,7 +76,6 @@ #include "async.h" #include "physical.h" #include "modem.h" -#include "loadalias.h" #include "auth.h" #include "lcpproto.h" #include "chap.h" diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c index 7119925..db7f9f2 100644 --- a/usr.sbin/ppp/chap.c +++ b/usr.sbin/ppp/chap.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: chap.c,v 1.31 1998/05/21 21:44:25 brian Exp $ + * $Id: chap.c,v 1.32 1998/05/21 22:55:02 brian Exp $ * * TODO: */ @@ -27,10 +27,11 @@ #include <netinet/ip.h> #include <sys/un.h> +#ifdef HAVE_DES #include <md4.h> +#endif #include <md5.h> #include <stdlib.h> -#include <string.h> #include <termios.h> #include "mbuf.h" @@ -58,7 +59,9 @@ #include "bundle.h" #include "chat.h" #include "datalink.h" +#ifdef HAVE_DES #include "chap_ms.h" +#endif static const char *chapcodes[] = { "???", "CHALLENGE", "RESPONSE", "SUCCESS", "FAILURE" diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c index 353bf77..76699fb 100644 --- a/usr.sbin/ppp/chat.c +++ b/usr.sbin/ppp/chat.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: chat.c,v 1.48 1998/06/15 19:06:38 brian Exp $ + * $Id: chat.c,v 1.49 1998/06/24 19:33:31 brian Exp $ */ #include <sys/types.h> @@ -35,7 +35,6 @@ #include <errno.h> #include <fcntl.h> #include <paths.h> -#include <signal.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c index 15c50fb..e016328 100644 --- a/usr.sbin/ppp/command.c +++ b/usr.sbin/ppp/command.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: command.c,v 1.149 1998/06/25 22:33:15 brian Exp $ + * $Id: command.c,v 1.150 1998/06/27 14:17:24 brian Exp $ * */ #include <sys/types.h> @@ -36,7 +36,6 @@ #include <errno.h> #include <fcntl.h> #include <paths.h> -#include <signal.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -61,7 +60,6 @@ #endif #include "lqr.h" #include "hdlc.h" -#include "loadalias.h" #include "systems.h" #include "filter.h" #include "descriptor.h" @@ -124,7 +122,7 @@ #define NEG_DNS 50 const char Version[] = "2.0-beta"; -const char VersionDate[] = "$Date: 1998/06/25 22:33:15 $"; +const char VersionDate[] = "$Date: 1998/06/27 14:17:24 $"; static int ShowCommand(struct cmdargs const *); static int TerminalCommand(struct cmdargs const *); diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c index 018df41..d3d6a34 100644 --- a/usr.sbin/ppp/datalink.c +++ b/usr.sbin/ppp/datalink.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: datalink.c,v 1.12 1998/06/24 19:33:31 brian Exp $ + * $Id: datalink.c,v 1.13 1998/06/25 22:33:17 brian Exp $ */ #include <sys/types.h> @@ -38,7 +38,6 @@ #include <string.h> #include <sys/uio.h> #include <termios.h> -#include <unistd.h> #include "mbuf.h" #include "log.h" diff --git a/usr.sbin/ppp/defs.c b/usr.sbin/ppp/defs.c index 95177de..32b72b3 100644 --- a/usr.sbin/ppp/defs.c +++ b/usr.sbin/ppp/defs.c @@ -23,14 +23,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: defs.c,v 1.15 1998/05/29 18:32:11 brian Exp $ + * $Id: defs.c,v 1.16 1998/06/15 19:06:41 brian Exp $ */ #include <stdlib.h> #include <string.h> #include <sys/errno.h> +#if !defined(__FreeBSD__) || __FreeBSD__ < 3 #include <time.h> +#endif #include <unistd.h> #include "defs.h" diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c index ef3fab2..d2c4fd3 100644 --- a/usr.sbin/ppp/ip.c +++ b/usr.sbin/ppp/ip.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ip.c,v 1.45 1998/06/27 12:03:36 brian Exp $ + * $Id: ip.c,v 1.46 1998/06/27 14:17:26 brian Exp $ * * TODO: * o Return ICMP message for filterd packet @@ -50,7 +50,6 @@ #include "fsm.h" #include "lqr.h" #include "hdlc.h" -#include "loadalias.h" #include "throughput.h" #include "iplist.h" #include "slcompress.h" diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c index e01b34a..1ee7df9 100644 --- a/usr.sbin/ppp/ipcp.c +++ b/usr.sbin/ppp/ipcp.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: ipcp.c,v 1.58 1998/06/25 22:33:25 brian Exp $ + * $Id: ipcp.c,v 1.59 1998/06/27 14:17:27 brian Exp $ * * TODO: * o More RFC1772 backward compatibility @@ -58,7 +58,6 @@ #include "ipcp.h" #include "filter.h" #include "descriptor.h" -#include "loadalias.h" #include "vjcomp.h" #include "lqr.h" #include "hdlc.h" diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c index 86eceb7..0d13bcc 100644 --- a/usr.sbin/ppp/main.c +++ b/usr.sbin/ppp/main.c @@ -17,13 +17,12 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: main.c,v 1.137 1998/06/27 12:03:37 brian Exp $ + * $Id: main.c,v 1.138 1998/06/27 14:17:28 brian Exp $ * * TODO: */ #include <sys/types.h> -#include <sys/socket.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> @@ -59,13 +58,10 @@ #include "link.h" #include "mp.h" #include "bundle.h" -#include "loadalias.h" #include "auth.h" #include "systems.h" -#include "ip.h" #include "sig.h" #include "main.h" -#include "tun.h" #include "server.h" #include "prompt.h" #include "chat.h" diff --git a/usr.sbin/ppp/modem.c b/usr.sbin/ppp/modem.c index fbe6bcc..236f7ed 100644 --- a/usr.sbin/ppp/modem.c +++ b/usr.sbin/ppp/modem.c @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: modem.c,v 1.92 1998/06/18 22:43:18 brian Exp $ + * $Id: modem.c,v 1.93 1998/06/24 19:33:32 brian Exp $ * * TODO: */ @@ -75,7 +75,6 @@ #include "auth.h" #include "chap.h" #include "datalink.h" -#include "systems.h" static int modem_DescriptorWrite(struct descriptor *, struct bundle *, diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c index 9be19fa..8ebd5ec 100644 --- a/usr.sbin/ppp/nat_cmd.c +++ b/usr.sbin/ppp/nat_cmd.c @@ -2,7 +2,7 @@ * The code in this file was written by Eivind Eklund <perhaps@yes.no>, * who places it in the public domain without restriction. * - * $Id: alias_cmd.c,v 1.14 1998/06/15 19:05:59 brian Exp $ + * $Id: alias_cmd.c,v 1.15 1998/06/27 14:17:23 brian Exp $ */ #include <sys/types.h> @@ -11,7 +11,6 @@ #include <netdb.h> #include <netinet/in_systm.h> #include <netinet/in.h> -#include <netinet/tcp.h> #include <netinet/ip.h> #include <sys/un.h> diff --git a/usr.sbin/ppp/physical.c b/usr.sbin/ppp/physical.c index 022c563..952d2e6 100644 --- a/usr.sbin/ppp/physical.c +++ b/usr.sbin/ppp/physical.c @@ -16,12 +16,10 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: physical.c,v 1.2 1998/05/21 21:47:37 brian Exp $ + * $Id: physical.c,v 1.3 1998/05/23 22:24:47 brian Exp $ * */ -#include <sys/types.h> - #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr.sbin/ppp/probe.c b/usr.sbin/ppp/probe.c index 6f830a9..027fe1b 100644 --- a/usr.sbin/ppp/probe.c +++ b/usr.sbin/ppp/probe.c @@ -23,14 +23,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: probe.c,v 1.1 1998/06/24 19:36:36 brian Exp $ */ -#include <sys/types.h> - -/* -#include <string.h> -*/ #include <sys/time.h> #include <unistd.h> diff --git a/usr.sbin/ppp/server.c b/usr.sbin/ppp/server.c index b8dd938..3fb1de5 100644 --- a/usr.sbin/ppp/server.c +++ b/usr.sbin/ppp/server.c @@ -23,15 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: server.c,v 1.20 1998/06/16 19:40:41 brian Exp $ + * $Id: server.c,v 1.21 1998/06/24 19:33:36 brian Exp $ */ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> #include <sys/un.h> #include <errno.h> @@ -41,27 +39,11 @@ #include <termios.h> #include <unistd.h> -#include "mbuf.h" #include "log.h" -#include "defs.h" #include "descriptor.h" #include "server.h" #include "id.h" #include "prompt.h" -#include "timer.h" -#include "lqr.h" -#include "hdlc.h" -#include "fsm.h" -#include "lcp.h" -#include "ccp.h" -#include "throughput.h" -#include "link.h" -#include "mp.h" -#include "iplist.h" -#include "slcompress.h" -#include "ipcp.h" -#include "filter.h" -#include "bundle.h" static int server_UpdateSet(struct descriptor *d, fd_set *r, fd_set *w, fd_set *e, int *n) diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c index f7b4d01..9accce3 100644 --- a/usr.sbin/ppp/timer.c +++ b/usr.sbin/ppp/timer.c @@ -17,17 +17,15 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: timer.c,v 1.29 1998/06/15 19:06:56 brian Exp $ + * $Id: timer.c,v 1.30 1998/06/20 01:36:38 brian Exp $ * * TODO: */ -#include <errno.h> #include <signal.h> #include <stdio.h> #include <sys/time.h> #include <termios.h> -#include <unistd.h> #include "log.h" #include "sig.h" diff --git a/usr.sbin/ppp/tun.c b/usr.sbin/ppp/tun.c index e0dd313..af27bad 100644 --- a/usr.sbin/ppp/tun.c +++ b/usr.sbin/ppp/tun.c @@ -23,12 +23,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tun.c,v 1.6.4.18 1998/05/06 23:50:22 brian Exp $ + * $Id: tun.c,v 1.7 1998/05/21 21:48:52 brian Exp $ */ #include <sys/types.h> -#include <sys/socket.h> -#include <net/if.h> +#include <sys/socket.h> /* For IFF_ defines */ +#include <net/if.h> /* For IFF_ defines */ #include <netinet/in.h> #include <net/if_tun.h> #include <netinet/in_systm.h> |