pppd: Include time.h before using time_t

[ppp.git] / include / net / ppp_defs.h

diff --git a/include/net/ppp_defs.h b/include/net/ppp_defs.h
index ccd4f6e8c5b2eb2b0b48c751de4fdf880ffe96ff..ed04486059b479005627018f5b0be09e292dd317 100644 (file)
--- a/include/net/ppp_defs.h
+++ b/include/net/ppp_defs.h
@@ -1,32 +1,42 @@
-/*     $Id: ppp_defs.h,v 1.3 1994/10/22 11:56:19 paulus Exp $  */
+/*     $Id: ppp_defs.h,v 1.17 2002/12/06 09:49:15 paulus Exp $ */

 
 /*
  * ppp_defs.h - PPP definitions.
  *
 
 /*
  * ppp_defs.h - PPP definitions.
  *

- * Copyright (c) 1994 The Australian National University.
- * All rights reserved.
+ * Copyright (c) 1984 Paul Mackerras. All rights reserved.

  *
  *

- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, provided that the above copyright
- * notice appears in all copies.  This software is provided without any
- * warranty, express or implied. The Australian National University
- * makes no representations about the suitability of this software for
- * any purpose.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:

  *
  *

- * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.

  *
  *

- * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
- * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
- * OR MODIFICATIONS.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name(s) of the authors of this software must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission.
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Paul Mackerras
+ *     <paulus@samba.org>".
+ *
+ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */
 
  */
 

+#include <time.h>
+

 #ifndef _PPP_DEFS_H_
 #define _PPP_DEFS_H_
 
 #ifndef _PPP_DEFS_H_
 #define _PPP_DEFS_H_
 


@@ -35,7 +45,21 @@
  */
 #define PPP_HDRLEN     4       /* octets for standard ppp header */
 #define PPP_FCSLEN     2       /* octets for FCS */
  */
 #define PPP_HDRLEN     4       /* octets for standard ppp header */
 #define PPP_FCSLEN     2       /* octets for FCS */

+
+/*
+ * Packet sizes
+ *
+ * Note - lcp shouldn't be allowed to negotiate stuff outside these
+ *       limits.  See lcp.h in the pppd directory.
+ * (XXX - these constants should simply be shared by lcp.c instead
+ *       of living in lcp.h)
+ */
+#define        PPP_MTU         1500    /* Default MTU (size of Info field) */
+#define PPP_MAXMTU     65535 - (PPP_HDRLEN + PPP_FCSLEN)
+#define PPP_MINMTU     64

 #define PPP_MRU                1500    /* default MRU = max length of info field */
 #define PPP_MRU                1500    /* default MRU = max length of info field */

+#define PPP_MAXMRU     65000   /* Largest MRU we allow */
+#define PPP_MINMRU     128

 
 #define PPP_ADDRESS(p) (((u_char *)(p))[0])
 #define PPP_CONTROL(p) (((u_char *)(p))[1])
 
 #define PPP_ADDRESS(p) (((u_char *)(p))[0])
 #define PPP_CONTROL(p) (((u_char *)(p))[1])


@@ -54,15 +78,24 @@
  * Protocol field values.
  */
 #define PPP_IP         0x21    /* Internet Protocol */
  * Protocol field values.
  */
 #define PPP_IP         0x21    /* Internet Protocol */

+#define PPP_AT         0x29    /* AppleTalk Protocol */
+#define PPP_IPX                0x2b    /* IPX protocol */

 #define        PPP_VJC_COMP    0x2d    /* VJ compressed TCP */
 #define        PPP_VJC_UNCOMP  0x2f    /* VJ uncompressed TCP */
 #define        PPP_VJC_COMP    0x2d    /* VJ compressed TCP */
 #define        PPP_VJC_UNCOMP  0x2f    /* VJ uncompressed TCP */

+#define PPP_IPV6       0x57    /* Internet Protocol Version 6 */

 #define PPP_COMP       0xfd    /* compressed packet */
 #define PPP_IPCP       0x8021  /* IP Control Protocol */
 #define PPP_COMP       0xfd    /* compressed packet */
 #define PPP_IPCP       0x8021  /* IP Control Protocol */

+#define PPP_ATCP       0x8029  /* AppleTalk Control Protocol */
+#define PPP_IPXCP      0x802b  /* IPX Control Protocol */
+#define PPP_IPV6CP     0x8057  /* IPv6 Control Protocol */

 #define PPP_CCP                0x80fd  /* Compression Control Protocol */
 #define PPP_CCP                0x80fd  /* Compression Control Protocol */

+#define PPP_ECP                0x8053  /* Encryption Control Protocol */

 #define PPP_LCP                0xc021  /* Link Control Protocol */
 #define PPP_PAP                0xc023  /* Password Authentication Protocol */
 #define PPP_LQR                0xc025  /* Link Quality Report protocol */
 #define PPP_CHAP       0xc223  /* Cryptographic Handshake Auth. Protocol */
 #define PPP_LCP                0xc021  /* Link Control Protocol */
 #define PPP_PAP                0xc023  /* Password Authentication Protocol */
 #define PPP_LQR                0xc025  /* Link Quality Report protocol */
 #define PPP_CHAP       0xc223  /* Cryptographic Handshake Auth. Protocol */

+#define PPP_CBCP       0xc029  /* Callback Control Protocol */
+#define PPP_EAP                0xc227  /* Extensible Authentication Protocol */

 
 /*
  * Values for FCS calculations.
 
 /*
  * Values for FCS calculations.


@@ -74,11 +107,14 @@
 /*
  * A 32-bit unsigned integral type.
  */
 /*
  * A 32-bit unsigned integral type.
  */

-#ifndef __BIT_TYPES_DEFINED__
+
+#if !defined(__BIT_TYPES_DEFINED__) && !defined(_BITYPES) \
+ && !defined(__FreeBSD__) && (NS_TARGET < 40)

 #ifdef UINT32_T
 typedef UINT32_T       u_int32_t;
 #else
 #ifdef UINT32_T
 typedef UINT32_T       u_int32_t;
 #else

-typedef unsigned long  u_int32_t;
+typedef unsigned int   u_int32_t;
+typedef unsigned short  u_int16_t;

 #endif
 #endif
 
 #endif
 #endif
 


@@ -101,43 +137,52 @@ enum NPmode {
  * Statistics.
  */
 struct pppstat {
  * Statistics.
  */
 struct pppstat {

-    u_int      ppp_ibytes;     /* bytes received */
-    u_int      ppp_ipackets;   /* packets received */
-    u_int      ppp_ierrors;    /* receive errors */
-    u_int      ppp_obytes;     /* bytes sent */
-    u_int      ppp_opackets;   /* packets sent */
-    u_int      ppp_oerrors;    /* transmit errors */
+    unsigned int ppp_ibytes;   /* bytes received */
+    unsigned int ppp_ipackets; /* packets received */
+    unsigned int ppp_ierrors;  /* receive errors */
+    unsigned int ppp_obytes;   /* bytes sent */
+    unsigned int ppp_opackets; /* packets sent */
+    unsigned int ppp_oerrors;  /* transmit errors */

 };
 
 struct vjstat {
 };
 
 struct vjstat {

-    u_int      vjs_packets;    /* outbound packets */
-    u_int      vjs_compressed; /* outbound compressed packets */
-    u_int      vjs_searches;   /* searches for connection state */
-    u_int      vjs_misses;     /* times couldn't find conn. state */
-    u_int      vjs_uncompressedin; /* inbound uncompressed packets */
-    u_int      vjs_compressedin;   /* inbound compressed packets */
-    u_int      vjs_errorin;    /* inbound unknown type packets */
-    u_int      vjs_tossed;     /* inbound packets tossed because of error */
+    unsigned int vjs_packets;  /* outbound packets */
+    unsigned int vjs_compressed; /* outbound compressed packets */
+    unsigned int vjs_searches; /* searches for connection state */
+    unsigned int vjs_misses;   /* times couldn't find conn. state */
+    unsigned int vjs_uncompressedin; /* inbound uncompressed packets */
+    unsigned int vjs_compressedin; /* inbound compressed packets */
+    unsigned int vjs_errorin;  /* inbound unknown type packets */
+    unsigned int vjs_tossed;   /* inbound packets tossed because of error */

 };
 
 struct ppp_stats {
 };
 
 struct ppp_stats {

-    struct pppstat     p;      /* basic PPP statistics */
-    struct vjstat      vj;     /* VJ header compression statistics */
+    struct pppstat p;          /* basic PPP statistics */
+    struct vjstat vj;          /* VJ header compression statistics */

 };
 
 struct compstat {
 };
 
 struct compstat {

-    u_int      unc_bytes;      /* total uncompressed bytes */
-    u_int      unc_packets;    /* total uncompressed packets */
-    u_int      comp_bytes;     /* compressed bytes */
-    u_int      comp_packets;   /* compressed packets */
-    u_int      inc_bytes;      /* incompressible bytes */
-    u_int      inc_packets;    /* incompressible packets */
-    double     ratio;          /* recent compression ratio */
+    unsigned int unc_bytes;    /* total uncompressed bytes */
+    unsigned int unc_packets;  /* total uncompressed packets */
+    unsigned int comp_bytes;   /* compressed bytes */
+    unsigned int comp_packets; /* compressed packets */
+    unsigned int inc_bytes;    /* incompressible bytes */
+    unsigned int inc_packets;  /* incompressible packets */
+    unsigned int ratio;                /* recent compression ratio << 8 */

 };
 
 struct ppp_comp_stats {
 };
 
 struct ppp_comp_stats {

-    struct compstat    c;      /* packet compression statistics */
-    struct compstat    d;      /* packet decompression statistics */
+    struct compstat c;         /* packet compression statistics */
+    struct compstat d;         /* packet decompression statistics */
+};
+
+/*
+ * The following structure records the time in seconds since
+ * the last NP packet was sent or received.
+ */
+struct ppp_idle {
+    time_t xmit_idle;          /* time since last NP packet sent */
+    time_t recv_idle;          /* time since last NP packet received */

 };
 
 #ifndef __P
 };
 
 #ifndef __P