remove parsemac

[l2tpns.git] / l2tpns.h

diff --git a/l2tpns.h b/l2tpns.h
index 1412cbd..a50dc55 100644 (file)
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
-// $Id: l2tpns.h,v 1.98 2005/11/14 08:38:02 bodea Exp $
+// $Id: l2tpns.h,v 1.103 2005/12/06 00:00:32 bodea Exp $
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <libcli.h>
 
-#define VERSION        "2.1.11"
+#define VERSION        "2.1.13"
 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535
@@ -235,13 +235,12 @@ typedef struct
                uint8_t ipcp:4;         //   IPCP   state
                uint8_t ipv6cp:4;       //   IPV6CP state
                uint8_t ccp:4;          //   CCP    state
-               uint8_t pad;            // unused
        } ppp;
+       char reserved_1[2];             // unused: padding
        in_addr_t ip;                   // IP of session set by RADIUS response (host byte order).
        int ip_pool_index;              // index to IP pool
        uint32_t unique_id;             // unique session id
-       uint16_t nr;                    // next receive
-       uint16_t ns;                    // next send
+       char reserved_2[4];             // unused: was ns/nr
        uint32_t magic;                 // ppp magic number
        uint32_t pin, pout;             // packet counts
        uint32_t cin, cout;             // byte counts
@@ -271,7 +270,7 @@ typedef struct
        uint8_t walled_garden;          // is this session gardened?
        uint8_t ipv6prefixlen;          // IPv6 route prefix length
        struct in6_addr ipv6route;      // Static IPv6 route
-       char reserved[11];              // Space to expand structure without changing HB_VERSION
+       char reserved_3[11];            // Space to expand structure without changing HB_VERSION
 }
 sessiont;
 
@@ -615,7 +614,7 @@ typedef struct
 #endif
 } configt;
 
-enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6, MAC };
+enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6 };
 typedef struct
 {
        char *key;