Update changelog (LAC functionnality)

[l2tpns.git] / l2tpns.h

diff --git a/l2tpns.h b/l2tpns.h
index 628b8a1..0d07ae3 100644 (file)
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -1,5 +1,5 @@
 // L2TPNS Global Stuff
 // L2TPNS Global Stuff

-// $Id: l2tpns.h,v 1.120 2006/10/23 02:51:53 bodea Exp $
+// $Id: l2tpns.h,v 1.121 2009-12-08 14:49:28 bodea Exp $

 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__
 
 #ifndef __L2TPNS_H__
 #define __L2TPNS_H__


@@ -14,15 +14,13 @@
 #include <sys/types.h>
 #include <libcli.h>
 
 #include <sys/types.h>
 #include <libcli.h>
 

-#define VERSION        "2.2.0"
+#define VERSION        "2.2.1"

 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535
 #define MAXBUNDLE      300             // could be up to 65535
 
 // Limits
 #define MAXTUNNEL      500             // could be up to 65535
 #define MAXBUNDLE      300             // could be up to 65535

-#define MAXBUNDLESES   10              // Maximum number of member links in bundle
+#define MAXBUNDLESES   12              // Maximum number of member links in bundle

 #define MAXADDRESS     20              // Maximum length for the Endpoint Discrminiator address
 #define MAXADDRESS     20              // Maximum length for the Endpoint Discrminiator address

-#define MAXFRAGNUM     1500            // Maximum number of Multilink fragment in a bundle
-#define MAXFRAGLEN      1000           // Maximum length for Multilink fragment

 #define MAXSESSION     60000           // could be up to 65535
 #define MAXTBFS                6000            // Maximum token bucket filters. Might need up to 2 * session.
 
 #define MAXSESSION     60000           // could be up to 65535
 #define MAXTBFS                6000            // Maximum token bucket filters. Might need up to 2 * session.
 


@@ -40,8 +38,10 @@
 #define PPPoE_MRU      1492            // maximum PPPoE MRU (rfc2516: 1500 less PPPoE header (6) and PPP protocol ID (2))
 #define MAXETHER       (MAXMTU+18)     // max packet we try sending to tun
 #define MAXTEL         96              // telephone number
 #define PPPoE_MRU      1492            // maximum PPPoE MRU (rfc2516: 1500 less PPPoE header (6) and PPP protocol ID (2))
 #define MAXETHER       (MAXMTU+18)     // max packet we try sending to tun
 #define MAXTEL         96              // telephone number

+#define MAXHOSTNAME    256             // hostname

 #define MAXUSER                128             // username
 #define MAXPASS                128             // password
 #define MAXUSER                128             // username
 #define MAXPASS                128             // password

+#define MAXCLASS       128             // radius class attribute size

 #define MAXPLUGINS     20              // maximum number of plugins to load
 #define MAXRADSERVER   10              // max radius servers
 #define MAXROUTE       10              // max static routes per session
 #define MAXPLUGINS     20              // maximum number of plugins to load
 #define MAXRADSERVER   10              // max radius servers
 #define MAXROUTE       10              // max static routes per session


@@ -49,12 +49,18 @@
 #define RINGBUFFER_SIZE        10000           // Number of ringbuffer entries to allocate
 #define MAX_LOG_LENGTH 512             // Maximum size of log message
 #define ECHO_TIMEOUT   10              // Time between last packet sent and LCP ECHO generation
 #define RINGBUFFER_SIZE        10000           // Number of ringbuffer entries to allocate
 #define MAX_LOG_LENGTH 512             // Maximum size of log message
 #define ECHO_TIMEOUT   10              // Time between last packet sent and LCP ECHO generation

-#define IDLE_TIMEOUT   240             // Time between last packet seen and session shutdown
+#define IDLE_ECHO_TIMEOUT      240             // Time between last packet seen and session shutdown

 #define BUSY_WAIT_TIME 3000            // 5 minutes in 1/10th seconds to wait for radius to cleanup on shutdown
 
 #define BUSY_WAIT_TIME 3000            // 5 minutes in 1/10th seconds to wait for radius to cleanup on shutdown
 

-#define MP_BEGIN       0x80            // This value is used when (b)egin bit is set in MP header
-#define MP_END         0x40            // This value is used when (e)nd bit is set in MP header
-#define MP_BOTH_BITS   0xC0            // This value is used when both bits (begin and end) are set in MP header
+#define MP_BEGIN        0x80            // This value is used when (b)egin bit is set in MP header
+#define MP_END          0x40            // This value is used when (e)nd bit is set in MP header
+#define MP_BOTH_BITS    0xC0            // This value is used when both bits (begin and end) are set in MP header
+
+#define MINFRAGLEN     64              // Minumum fragment length
+#define MAXFRAGLEN     1496    // Maximum length for Multilink fragment (The multilink may contain only one link)
+#define MAXFRAGNUM     512             // Maximum number of Multilink fragment in a bundle (must be in the form of 2^X)
+                                       // it's not expected to have a space for more than 10 unassembled packets = 10 * MAXBUNDLESES
+#define        MAXFRAGNUM_MASK 511             // Must be equal to MAXFRAGNUM-1

 
 // Constants
 #ifndef ETCDIR
 
 // Constants
 #ifndef ETCDIR


@@ -229,7 +235,7 @@ struct cli_tunnel_actions {
 typedef struct                 // route
 {
        in_addr_t ip;
 typedef struct                 // route
 {
        in_addr_t ip;

-       in_addr_t mask;
+       int prefixlen;

 }
 routet;
 
 }
 routet;
 


@@ -237,7 +243,10 @@ typedef struct controls            // control message
 {
        struct controls *next;  // next in queue
        uint16_t length;        // length
 {
        struct controls *next;  // next in queue
        uint16_t length;        // length

-       uint8_t buf[MAXCONTROL];
+       union {
+               uint8_t buf[MAXCONTROL];
+               uint16_t buf16[MAXCONTROL/2];
+       } __attribute__ ((__transparent_union__));

 }
 controlt;
 
 }
 controlt;
 


@@ -248,8 +257,13 @@ typedef struct {
 } epdist;
 
 typedef struct {
 } epdist;
 
 typedef struct {

-       uint16_t length;                // Fragment length
-       uint8_t data[MAXFRAGLEN];       // Fragment data
+       sessionidt sid;                 // Fragment originating session
+       tunnelidt tid;                  // Fragment originating tunnel
+       uint8_t flags;                  // MP frame flags
+       uint32_t seq;                   // fragment seq num
+       uint32_t jitteravg;
+        uint16_t length;                // Fragment length
+        uint8_t data[MAXFRAGLEN];       // Fragment data

 } fragmentt;
 
 typedef struct
 } fragmentt;
 
 typedef struct


@@ -265,11 +279,10 @@ typedef struct
                uint8_t ipv6cp:4;       //   IPV6CP state
                uint8_t ccp:4;          //   CCP    state
        } ppp;
                uint8_t ipv6cp:4;       //   IPV6CP state
                uint8_t ccp:4;          //   CCP    state
        } ppp;

-       char reserved_1[2];             // unused: padding
+       uint16_t mru;                   // maximum receive unit

        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
        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

-       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
        uint32_t magic;                 // ppp magic number
        uint32_t pin, pout;             // packet counts
        uint32_t cin, cout;             // byte counts


@@ -279,61 +292,71 @@ typedef struct
        uint16_t throttle_out;          // downstream throttle rate
        uint8_t filter_in;              // input filter index (to ip_filters[N-1]; 0 if none)
        uint8_t filter_out;             // output filter index
        uint16_t throttle_out;          // downstream throttle rate
        uint8_t filter_in;              // input filter index (to ip_filters[N-1]; 0 if none)
        uint8_t filter_out;             // output filter index

-       uint16_t mru;                   // maximum receive unit
+       uint16_t snoop_port;            // Interception destination port
+       in_addr_t snoop_ip;             // Interception destination IP

        clockt opened;                  // when started
        clockt die;                     // being closed, when to finally free
        uint32_t session_timeout;       // Maximum session time in seconds
        clockt opened;                  // when started
        clockt die;                     // being closed, when to finally free
        uint32_t session_timeout;       // Maximum session time in seconds

-       uint32_t idle_timeout;          // Maximum idle time in seconds
+       uint32_t idle_timeout;          // Maximum idle time in seconds

        time_t last_packet;             // Last packet from the user (used for idle timeouts)
        time_t last_packet;             // Last packet from the user (used for idle timeouts)

-       time_t last_data;               // Last data packet to/from the user (used for idle timeouts)
+       time_t last_data;               // Last data packet to/from the user (used for idle timeouts)

        in_addr_t dns1, dns2;           // DNS servers
        routet route[MAXROUTE];         // static routes
        uint16_t tbf_in;                // filter bucket for throttling in from the user.
        uint16_t tbf_out;               // filter bucket for throttling out to the user.
        int random_vector_length;
        uint8_t random_vector[MAXTEL];
        in_addr_t dns1, dns2;           // DNS servers
        routet route[MAXROUTE];         // static routes
        uint16_t tbf_in;                // filter bucket for throttling in from the user.
        uint16_t tbf_out;               // filter bucket for throttling out to the user.
        int random_vector_length;
        uint8_t random_vector[MAXTEL];

-       char user[MAXUSER];             // user (needed in seesion for radius stop messages)
+       char user[MAXUSER];             // user (needed in session for radius stop messages)

        char called[MAXTEL];            // called number
        char calling[MAXTEL];           // calling number
        uint32_t tx_connect_speed;
        uint32_t rx_connect_speed;
        char called[MAXTEL];            // called number
        char calling[MAXTEL];           // calling number
        uint32_t tx_connect_speed;
        uint32_t rx_connect_speed;

-       uint32_t mrru;                  // Multilink Max-Receive-Reconstructed-Unit
-       uint8_t mssf;                   // Multilink Short Sequence Number Header Format
-       epdist epdis;                   // Multilink Endpoint Discriminator
-       bundleidt bundle;               // Multilink Bundle Identifier
-       in_addr_t snoop_ip;             // Interception destination IP
-       uint16_t snoop_port;            // Interception destination port
+       clockt timeout;                 // Session timeout
+       uint32_t mrru;                  // Multilink Max-Receive-Reconstructed-Unit
+       epdist epdis;                   // Multilink Endpoint Discriminator
+       bundleidt bundle;               // Multilink Bundle Identifier
+       uint8_t mssf;                   // Multilink Short Sequence Number Header Format

        uint8_t walled_garden;          // is this session gardened?
        uint8_t walled_garden;          // is this session gardened?

+       uint8_t classlen;               // class (needed for radius accounting messages)
+       char class[MAXCLASS];

        uint8_t ipv6prefixlen;          // IPv6 route prefix length
        struct in6_addr ipv6route;      // Static IPv6 route
        uint8_t ipv6prefixlen;          // IPv6 route prefix length
        struct in6_addr ipv6route;      // Static IPv6 route

-       char reserved_3[11];            // Space to expand structure without changing HB_VERSION
+#ifdef LAC
+       sessionidt forwardtosession;    // LNS id_session to forward
+       char reserved[10];              // Space to expand structure without changing HB_VERSION
+#else
+       char reserved[12];              // Space to expand structure without changing HB_VERSION
+#endif

 }
 sessiont;
 
 typedef struct
 {
 }
 sessiont;
 
 typedef struct
 {

-       int state;                              // current state (bundlestate enum)
-       uint32_t seq_num_t;                     // Sequence Number (transmission)
-       uint32_t seq_num_m;                     // Last received frame sequence number (bearing B bit)
-       uint32_t offset;                        // Offset between sequence number and array index
-       uint8_t pending_frag;                   // Indicate that there is pending fragments to reassemble
-       uint8_t num_of_links;                   // Number of links joint to this bundle
-       uint32_t online_time;                   // The time this bundle is online
-       clockt last_check;                      // Last time the timeout is checked
-       uint32_t mrru;                          // Multilink Max-Receive-Reconstructed-Unit
-       uint8_t mssf;                           // Multilink Short Sequence Number Header Format
-       epdist epdis;                           // Multilink Endpoint Discriminator
-       char user[MAXUSER];                     // Needed for matching member links
-       sessionidt current_ses;                 // Current session to use for sending (used in RR load-balancing)
-       sessionidt members[MAXBUNDLESES];       // Array for member links sessions
+        int state;                              // current state (bundlestate enum)
+        uint32_t seq_num_t;                     // Sequence Number (transmission)
+        uint32_t timeout;                       // Session-Timeout for bundle
+       uint32_t max_seq;                       // Max value of sequence number field
+        uint8_t num_of_links;                   // Number of links joint to this bundle
+        uint32_t online_time;                   // The time this bundle is online
+        clockt last_check;                      // Last time the timeout is checked
+        uint32_t mrru;                          // Multilink Max-Receive-Reconstructed-Unit
+        uint8_t mssf;                           // Multilink Short Sequence Number Header Format
+        epdist epdis;                           // Multilink Endpoint Discriminator
+        char user[MAXUSER];                     // Needed for matching member links
+        sessionidt current_ses;                 // Current session to use for sending (used in RR load-balancing)
+        sessionidt members[MAXBUNDLESES];       // Array for member links sessions

 }
 bundlet;
 
 typedef struct
 {
 }
 bundlet;
 
 typedef struct
 {

-       fragmentt fragment[MAXFRAGNUM];
-       uint8_t reassembled_frame[MAXETHER];    // The reassembled frame
-       uint16_t re_frame_len;                  // The reassembled frame length
+        fragmentt fragment[MAXFRAGNUM];
+        uint8_t reassembled_frame[MAXETHER];    // The reassembled frame
+        uint16_t re_frame_len;                  // The reassembled frame length
+       uint16_t re_frame_begin_index, re_frame_end_index;      // reassembled frame begin index, end index respectively
+       uint16_t start_index, end_index;        // start and end sequence numbers available on the fragments array respectively
+       uint32_t M;                             // Minumum frame sequence number received over all bundle members
+       uint32_t start_seq;                     // Last received frame sequence number (bearing B bit)

 }
 fragmentationt;
 
 }
 fragmentationt;
 


@@ -388,6 +411,14 @@ typedef struct
 
        // last LCP Echo
        time_t last_echo;
 
        // last LCP Echo
        time_t last_echo;

+
+       // Last Multilink frame sequence number received
+       uint32_t last_seq;
+
+       // jitter average of the session
+       uint32_t jitteravg;
+       // time in milliseconds of the last fragment.
+       uint64_t prev_time;

 } sessionlocalt;
 
 // session flags
 } sessionlocalt;
 
 // session flags


@@ -395,7 +426,7 @@ typedef struct
 #define SESSION_ACFC   (1 << 1)        // use Address-and-Control-Field-Compression
 #define SESSION_STARTED        (1 << 2)        // RADIUS Start record sent
 
 #define SESSION_ACFC   (1 << 1)        // use Address-and-Control-Field-Compression
 #define SESSION_STARTED        (1 << 2)        // RADIUS Start record sent
 

-// 168 bytes per tunnel
+// 328 bytes per tunnel

 typedef struct
 {
        tunnelidt far;          // far end tunnel ID
 typedef struct
 {
        tunnelidt far;          // far end tunnel ID


@@ -415,6 +446,12 @@ typedef struct
        uint16_t controlc;      // outstaind messages in queue
        controlt *controls;     // oldest message
        controlt *controle;     // newest message
        uint16_t controlc;      // outstaind messages in queue
        controlt *controls;     // oldest message
        controlt *controle;     // newest message

+#ifdef LAC
+       uint16_t isremotelns;   // != 0 if the tunnel is to remote LNS (== index on the conf remote lns)
+       char reserved[14];              // Space to expand structure without changing HB_VERSION
+#else
+       char reserved[16];              // Space to expand structure without changing HB_VERSION
+#endif

 }
 tunnelt;
 
 }
 tunnelt;
 


@@ -497,6 +534,7 @@ enum
        RADIUSSTOP,             // sending stop accounting to RADIUS server
        RADIUSINTERIM,          // sending interim accounting to RADIUS server
        RADIUSWAIT,             // waiting timeout before available, in case delayed replies
        RADIUSSTOP,             // sending stop accounting to RADIUS server
        RADIUSINTERIM,          // sending interim accounting to RADIUS server
        RADIUSWAIT,             // waiting timeout before available, in case delayed replies

+       RADIUSJUSTAUTH,         // sending auth to RADIUS server, just authentication, no ip assigning

 };
 
 struct Tstats
 };
 
 struct Tstats


@@ -601,6 +639,10 @@ struct Tstats
 #define SET_STAT(x, y)
 #endif
 
 #define SET_STAT(x, y)
 #endif
 

+#ifndef IFNAMSIZ
+# define IFNAMSIZ 16
+#endif
+

 typedef struct
 {
        int             debug;                          // debugging level
 typedef struct
 {
        int             debug;                          // debugging level


@@ -616,7 +658,7 @@ typedef struct
        int             reload_config;                  // flag to re-read config (set by cli)
        int             multi_read_count;               // amount of packets to read per fd in processing loop
 
        int             reload_config;                  // flag to re-read config (set by cli)
        int             multi_read_count;               // amount of packets to read per fd in processing loop
 

-       char            tundevice[10];                  // tun device name
+       char            tundevice[IFNAMSIZ];            // tun device name

        char            log_filename[128];
 
        char            l2tp_secret[64];                // L2TP shared secret
        char            log_filename[128];
 
        char            l2tp_secret[64];                // L2TP shared secret


@@ -644,7 +686,7 @@ typedef struct
        int             radius_authprefer;
 
        int             allow_duplicate_users;          // allow multiple logins with the same username
        int             radius_authprefer;
 
        int             allow_duplicate_users;          // allow multiple logins with the same username

-       char            guest_user[MAXUSER];            // allow multiple logins to guest account username
+       int             kill_timedout_sessions;         // kill authenticated sessions with "session_timeout == 0"

 
        in_addr_t       default_dns1, default_dns2;
 
 
        in_addr_t       default_dns1, default_dns2;
 


@@ -691,11 +733,17 @@ typedef struct
        int             cluster_hb_interval;            // How often to send a heartbeat.
        int             cluster_hb_timeout;             // How many missed heartbeats trigger an election.
        uint64_t        cluster_table_version;          // # state changes processed by cluster
        int             cluster_hb_interval;            // How often to send a heartbeat.
        int             cluster_hb_timeout;             // How many missed heartbeats trigger an election.
        uint64_t        cluster_table_version;          // # state changes processed by cluster

-       int             cluster_master_min_adv;         // Master advertises routes while the number of up to date
-                                                       // slaves is less than this value.

 
        struct in6_addr ipv6_prefix;                    // Our IPv6 network pool.
 
 
        struct in6_addr ipv6_prefix;                    // Our IPv6 network pool.
 

+
+       int             cluster_master_min_adv;         // Master advertises routes while the number of up to date
+                                                       // slaves is less than this value.
+       in_addr_t       cli_bind_address;               // bind address for CLI
+       char            hostname[MAXHOSTNAME];  // hostname (overridden by -h on command line)
+       // Guest change
+       char            guest_user[MAXUSER];            // Guest account username
+

 #ifdef BGP
 #define BGP_NUM_PEERS  2
        uint16_t as_number;
 #ifdef BGP
 #define BGP_NUM_PEERS  2
        uint16_t as_number;


@@ -704,7 +752,21 @@ typedef struct
                uint16_t as;
                int keepalive;
                int hold;
                uint16_t as;
                int keepalive;
                int hold;

+               struct in_addr update_source;

        } neighbour[BGP_NUM_PEERS];
        } neighbour[BGP_NUM_PEERS];

+       in_addr_t       nexthop_address;
+       struct in6_addr nexthop6_address;
+#endif
+
+       int echo_timeout; // Time between last packet sent and LCP ECHO generation
+       int idle_echo_timeout; // Time between last packet seen and
+                                                  // Drop sessions who have not responded within IDLE_ECHO_TIMEOUT seconds
+       in_addr_t iftun_address;
+#ifdef LAC
+       int disable_lac_func;
+       int highest_rlnsid;
+       uint16_t bind_portremotelns;
+       in_addr_t bind_address_remotelns;

 #endif
 } configt;
 
 #endif
 } configt;
 


@@ -799,6 +861,13 @@ typedef struct
 #define TERM_PORT_REINIT               21
 #define TERM_PORT_DISABLED             22
 
 #define TERM_PORT_REINIT               21
 #define TERM_PORT_DISABLED             22
 

+// on slaves, alow BGP to withdraw cleanly before exiting
+#define QUIT_DELAY     5
+
+// quit actions (master)
+#define QUIT_FAILOVER  1 // SIGTERM: exit when all control messages have been acked (for cluster failover)
+#define QUIT_SHUTDOWN  2 // SIGQUIT: shutdown sessions/tunnels, reject new connections
+

 // arp.c
 void sendarp(int ifr_idx, const unsigned char* mac, in_addr_t ip);
 
 // arp.c
 void sendarp(int ifr_idx, const unsigned char* mac, in_addr_t ip);
 


@@ -807,6 +876,7 @@ void sendarp(int ifr_idx, const unsigned char* mac, in_addr_t ip);
 void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
 void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
 void lcp_open(sessionidt s, tunnelidt t);
 void processpap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
 void processchap(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
 void lcp_open(sessionidt s, tunnelidt t);

+void lcp_restart(sessionidt s);

 void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
 void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
 void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
 void processlcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
 void processipcp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
 void processipv6cp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);


@@ -832,7 +902,9 @@ void radiusretry(uint16_t r);
 uint16_t radiusnew(sessionidt s);
 void radiusclear(uint16_t r, sessionidt s);
 void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen, struct in_addr *local);
 uint16_t radiusnew(sessionidt s);
 void radiusclear(uint16_t r, sessionidt s);
 void processdae(uint8_t *buf, int len, struct sockaddr_in *addr, int alen, struct in_addr *local);

-
+#ifdef LAC
+int rad_tunnel_pwdecode(uint8_t *pl2tpsecret, size_t *pl2tpsecretlen, const char *radiussecret, const uint8_t * auth);
+#endif

 
 // l2tpns.c
 clockt backoff(uint8_t try);
 
 // l2tpns.c
 clockt backoff(uint8_t try);


@@ -853,12 +925,20 @@ void adjust_tcp_mss(sessionidt s, tunnelidt t, uint8_t *buf, int len, uint8_t *t
 void sendipcp(sessionidt s, tunnelidt t);
 void sendipv6cp(sessionidt s, tunnelidt t);
 void processudp(uint8_t *buf, int len, struct sockaddr_in *addr);
 void sendipcp(sessionidt s, tunnelidt t);
 void sendipv6cp(sessionidt s, tunnelidt t);
 void processudp(uint8_t *buf, int len, struct sockaddr_in *addr);

+void processipout(uint8_t *buf, int len);

 void snoop_send_packet(uint8_t *packet, uint16_t size, in_addr_t destination, uint16_t port);
 int find_filter(char const *name, size_t len);
 int ip_filter(uint8_t *buf, int len, uint8_t filter);
 int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc);
 void snoop_send_packet(uint8_t *packet, uint16_t size, in_addr_t destination, uint16_t port);
 int find_filter(char const *name, size_t len);
 int ip_filter(uint8_t *buf, int len, uint8_t filter);
 int cmd_show_ipcache(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_show_hist_idle(struct cli_def *cli, char *command, char **argv, int argc);
 int cmd_show_hist_open(struct cli_def *cli, char *command, char **argv, int argc);

+#ifdef LAC
+tunnelidt lac_new_tunnel();
+void lac_tunnelclear(tunnelidt t);
+void lac_send_SCCRQ(tunnelidt t, uint8_t * auth, unsigned int auth_len);
+void lac_send_ICRQ(tunnelidt t, sessionidt s);
+void lac_tunnelshutdown(tunnelidt t, char *reason, int result, int error, char *msg);
+#endif

 
 #undef LOG
 #undef LOG_HEX
 
 #undef LOG
 #undef LOG_HEX


@@ -878,7 +958,8 @@ void become_master(void);   // We're the master; kick off any required master init
 
 
 // cli.c
 
 
 // cli.c

-void init_cli(char *hostname);
+void init_cli();
+void cli_init_complete(char *hostname);

 void cli_do_file(FILE *fh);
 void cli_do(int sockfd);
 int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...);
 void cli_do_file(FILE *fh);
 void cli_do(int sockfd);
 int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...);


@@ -916,6 +997,10 @@ struct event_data {
                FD_TYPE_DAE,
                FD_TYPE_RADIUS,
                FD_TYPE_BGP,
                FD_TYPE_DAE,
                FD_TYPE_RADIUS,
                FD_TYPE_BGP,

+               FD_TYPE_NETLINK,
+#ifdef LAC
+               FD_TYPE_UDPLAC,
+#endif

        } type;
        int index; // for RADIUS, BGP
 };
        } type;
        int index; // for RADIUS, BGP
 };


@@ -929,19 +1014,4 @@ extern uint16_t MSS;
 #define CLI_HELP_REQUESTED     (argc > 0 && argv[argc-1][strlen(argv[argc-1])-1] == '?')
 #define CLI_HELP_NO_ARGS       (argc > 1 || argv[0][1]) ? CLI_OK : cli_arg_help(cli, 1, NULL)
 
 #define CLI_HELP_REQUESTED     (argc > 0 && argv[argc-1][strlen(argv[argc-1])-1] == '?')
 #define CLI_HELP_NO_ARGS       (argc > 1 || argv[0][1]) ? CLI_OK : cli_arg_help(cli, 1, NULL)
 

-// CVS identifiers (for "show version file")
-extern char const *cvs_id_arp;
-extern char const *cvs_id_cli;
-extern char const *cvs_id_cluster;
-extern char const *cvs_id_constants;
-extern char const *cvs_id_control;
-extern char const *cvs_id_icmp;
-extern char const *cvs_id_l2tpns;
-extern char const *cvs_id_ll;
-extern char const *cvs_id_md5;
-extern char const *cvs_id_ppp;
-extern char const *cvs_id_radius;
-extern char const *cvs_id_tbf;
-extern char const *cvs_id_util;
-

 #endif /* __L2TPNS_H__ */
 #endif /* __L2TPNS_H__ */