Update debian/changelog

[l2tpns.git] / l2tpns.h

diff --git a/l2tpns.h b/l2tpns.h
index 5b68df7..ee355b0 100644 (file)
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -9,6 +9,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <netinet/in.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <netinet/in.h>

+#include <net/ethernet.h>

 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <sys/types.h>


@@ -23,6 +24,12 @@
 #define MAXADDRESS     20              // Maximum length for the Endpoint Discrminiator address
 #define MAXSESSION     60000           // could be up to 65535
 #define MAXTBFS                6000            // Maximum token bucket filters. Might need up to 2 * session.
 #define MAXADDRESS     20              // Maximum length for the Endpoint Discrminiator address
 #define MAXSESSION     60000           // could be up to 65535
 #define MAXTBFS                6000            // Maximum token bucket filters. Might need up to 2 * session.

+#define MAXSESSINGRP   12              // Maximum number of member links in grouped session
+#define MAXGROUPE              300     // could be up to 65535, Maximum number of grouped session
+#define MAXROUTEINGRP  15              // max static routes per group
+
+// Tunnel Id reserved for pppoe
+#define TUNNEL_ID_PPPOE        1

 
 #define RADIUS_SHIFT   6
 #define RADIUS_FDS     (1 << RADIUS_SHIFT)
 
 #define RADIUS_SHIFT   6
 #define RADIUS_FDS     (1 << RADIUS_SHIFT)


@@ -38,6 +45,7 @@
 #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 MAXCLASS       128             // radius class attribute size
 #define MAXUSER                128             // username
 #define MAXPASS                128             // password
 #define MAXCLASS       128             // radius class attribute size


@@ -48,7 +56,7 @@
 #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 MP_BEGIN        0x80            // This value is used when (b)egin bit is set in MP header
 #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


@@ -56,10 +64,17 @@
 #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 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     750             // Maximum length for Multilink fragment (MTU / 2 sessions)
-#define MAXFRAGNUM     128             // Maximum number of Multilink fragment in a bundle (must be in the form of 2^X)
+#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
                                        // it's not expected to have a space for more than 10 unassembled packets = 10 * MAXBUNDLESES

-#define        MAXFRAGNUM_MASK 127             // Must be equal to MAXFRAGNUM-1
+#define        MAXFRAGNUM_MASK (MAXFRAGNUM - 1)                // Must be equal to MAXFRAGNUM-1
+
+// Multi bind address constants
+#define MAX_UDPFD 4
+#define MAX_BINDADDR MAX_UDPFD
+// 4 + 1 for the udplac
+#define INIT_TABUDPFD {-1, -1, -1, -1, -1}
+#define INIT_TABUDPVAR {0, 0, 0, 0, 0}

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


@@ -202,6 +217,7 @@ enum {
 typedef uint16_t sessionidt;
 typedef uint16_t bundleidt;
 typedef uint16_t tunnelidt;
 typedef uint16_t sessionidt;
 typedef uint16_t bundleidt;
 typedef uint16_t tunnelidt;

+typedef uint16_t groupidt;

 typedef uint32_t clockt;
 typedef uint8_t hasht[16];
 
 typedef uint32_t clockt;
 typedef uint8_t hasht[16];
 


@@ -234,7 +250,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;
 


@@ -254,8 +270,10 @@ typedef struct {
 
 typedef struct {
        sessionidt sid;                 // Fragment originating session
 
 typedef struct {
        sessionidt sid;                 // Fragment originating session

+       tunnelidt tid;                  // Fragment originating tunnel

        uint8_t flags;                  // MP frame flags
        uint32_t seq;                   // fragment seq num
        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;
         uint16_t length;                // Fragment length
         uint8_t data[MAXFRAGLEN];       // Fragment data
 } fragmentt;


@@ -315,10 +333,41 @@ typedef struct
        char class[MAXCLASS];
        uint8_t ipv6prefixlen;          // IPv6 route prefix length
        struct in6_addr ipv6route;      // Static IPv6 route
        char class[MAXCLASS];
        uint8_t ipv6prefixlen;          // IPv6 route prefix length
        struct in6_addr ipv6route;      // Static IPv6 route

-       char reserved[12];              // Space to expand structure without changing HB_VERSION
+       sessionidt forwardtosession;    // LNS id_session to forward
+       uint8_t src_hwaddr[ETH_ALEN];   // MAC addr source (for pppoe sessions 6 bytes)
+       char reserved[4];                               // Space to expand structure without changing HB_VERSION

 }
 sessiont;
 
 }
 sessiont;
 

+typedef struct
+{
+       uint32_t tx_rate;
+       uint32_t prev_coutgrp;
+       sessionidt sid;
+       uint8_t weight;
+}
+groupsesslistt;
+
+typedef struct
+{
+       int state;                              // current state (groupestate enum)
+       uint32_t time_changed;
+       groupidt prev;
+       sessionidt smax;
+       sessionidt smin;
+       groupsesslistt sesslist[MAXSESSINGRP];
+       routet route[MAXROUTEINGRP];            // static routes
+       uint8_t nbroutesgrp;
+       uint8_t nbsession;
+}
+groupsesst;
+
+union iphash
+{
+       sessionidt sess;
+       union iphash *idx;
+};                     // Mapping from IP address to session structures.
+

 typedef struct
 {
         int state;                              // current state (bundlestate enum)
 typedef struct
 {
         int state;                              // current state (bundlestate enum)


@@ -339,9 +388,9 @@ bundlet;
 
 typedef struct
 {
 
 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
        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


@@ -403,6 +452,11 @@ typedef struct
 
        // Last Multilink frame sequence number received
        uint32_t last_seq;
 
        // 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


@@ -410,7 +464,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


@@ -430,6 +484,9 @@ 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

+       uint16_t isremotelns;   // != 0 if the tunnel is to remote LNS (== index on the conf remote lns)
+       uint16_t indexudp;      // Index UDP file handle (in udpfd[])
+       char reserved[12];              // Space to expand structure without changing HB_VERSION

 }
 tunnelt;
 
 }
 tunnelt;
 


@@ -493,6 +550,13 @@ enum
        BUNDLEUNDEF,            // Undefined
 };
 
        BUNDLEUNDEF,            // Undefined
 };
 

+enum
+{
+       GROUPEFREE,             // Not in use
+       GROUPEOPEN,             // Active bundle
+       GROUPEUNDEF             // Undefined
+};
+

 enum
 {
        NULLCLASS = 0,          //End Point Discriminator classes
 enum
 {
        NULLCLASS = 0,          //End Point Discriminator classes


@@ -617,6 +681,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


@@ -632,7 +700,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            tundevicename[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


@@ -668,6 +736,7 @@ typedef struct
        int             num_tbfs;                       // number of throttle buckets
 
        char            accounting_dir[128];
        int             num_tbfs;                       // number of throttle buckets
 
        char            accounting_dir[128];

+       int             account_all_origin; // Accouting all origin (LAC data + Remote LNS Data + PPPOE data)

        in_addr_t       bind_address;
        in_addr_t       peer_address;
        int             send_garp;                      // Set to true to garp for vip address on startup
        in_addr_t       bind_address;
        in_addr_t       peer_address;
        int             send_garp;                      // Set to true to garp for vip address on startup


@@ -696,8 +765,10 @@ typedef struct
        int             cluster_undefined_sessions;     // How many sessions we're yet to receive from the master.
        int             cluster_undefined_bundles;      // How many bundles we're yet to receive from the master.
        int             cluster_undefined_tunnels;      // How many tunnels we're yet to receive from the master.
        int             cluster_undefined_sessions;     // How many sessions we're yet to receive from the master.
        int             cluster_undefined_bundles;      // How many bundles we're yet to receive from the master.
        int             cluster_undefined_tunnels;      // How many tunnels we're yet to receive from the master.

+       int             cluster_undefined_groupes;      // How many groupes we're yet to receive from the master.

        int             cluster_highest_sessionid;
        int             cluster_highest_bundleid;
        int             cluster_highest_sessionid;
        int             cluster_highest_bundleid;

+       int             cluster_highest_groupeid;

        int             cluster_highest_tunnelid;
        clockt          cluster_last_hb;                // Last time we saw a heartbeat from the master.
        int             cluster_last_hb_ver;            // Heartbeat version last seen from master
        int             cluster_highest_tunnelid;
        clockt          cluster_last_hb;                // Last time we saw a heartbeat from the master.
        int             cluster_last_hb_ver;            // Heartbeat version last seen from master


@@ -713,6 +784,8 @@ typedef struct
 
        int             cluster_master_min_adv;         // Master advertises routes while the number of up to date
                                                        // slaves is less than this value.
 
        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
 
        // Guest change
        char            guest_user[MAXUSER];            // Guest account username
 


@@ -724,8 +797,35 @@ 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
 #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;
+       int disable_lac_func;
+       int auth_tunnel_change_addr_src;
+       int highest_rlnsid;
+       uint16_t bind_portremotelns;
+       in_addr_t bind_address_remotelns;
+       char pppoe_if_to_bind[IFNAMSIZ];        // Name pppoe interface to bind
+       char pppoe_service_name[64];    // pppoe service name
+       char pppoe_ac_name[64];
+       uint8_t pppoe_hwaddr[ETH_ALEN]; // MAC addr of interface pppoe to bind
+       int pppoe_only_equal_svc_name; // Accept only PADI with service-name equal to server
+       int disable_sending_hello; // Disable l2tp sending HELLO message for Apple compatibility.
+       int disable_no_spoof; // Disable no spoof (permit load balancing client --> internet)
+       int nbudpfd; // number UDP file handle
+       int nbmultiaddress; // number multi address to bind
+       int indexlacudpfd;      // Index UDP LAC file handle (in udpfd[])
+       in_addr_t bind_n_address[MAX_BINDADDR];
+       in_addr_t iftun_n_address[MAX_BINDADDR];
+       char bind_multi_address[256];
+       int grp_txrate_average_time; // caculation txrate average time (default 10s)

 } configt;
 
 enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6 };
 } configt;
 
 enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6 };


@@ -819,6 +919,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);
 


@@ -827,6 +934,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);


@@ -837,6 +945,7 @@ void processipv6in(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
 void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
 void sendchap(sessionidt s, tunnelidt t);
 uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelidt t, uint16_t mtype, uint8_t prio, bundleidt bid, uint8_t mp_bits);
 void processccp(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l);
 void sendchap(sessionidt s, tunnelidt t);
 uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, sessionidt s, tunnelidt t, uint16_t mtype, uint8_t prio, bundleidt bid, uint8_t mp_bits);

+uint8_t *opt_makeppp(uint8_t *p, int l, sessionidt s, tunnelidt t, uint16_t mtype, uint8_t prio, bundleidt bid, uint8_t mp_bits);

 void sendlcp(sessionidt s, tunnelidt t);
 void send_ipin(sessionidt s, uint8_t *buf, int len);
 void sendccp(sessionidt s, tunnelidt t);
 void sendlcp(sessionidt s, tunnelidt t);
 void send_ipin(sessionidt s, uint8_t *buf, int len);
 void sendccp(sessionidt s, tunnelidt t);


@@ -852,7 +961,7 @@ 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);

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

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


@@ -872,13 +981,34 @@ int tun_write(uint8_t *data, int size);
 void adjust_tcp_mss(sessionidt s, tunnelidt t, uint8_t *buf, int len, uint8_t *tcp);
 void sendipcp(sessionidt s, tunnelidt t);
 void sendipv6cp(sessionidt s, tunnelidt t);
 void adjust_tcp_mss(sessionidt s, tunnelidt t, uint8_t *buf, int len, uint8_t *tcp);
 void sendipcp(sessionidt s, tunnelidt t);
 void sendipv6cp(sessionidt s, tunnelidt t);

-void processudp(uint8_t *buf, int len, struct sockaddr_in *addr);
+void processudp(uint8_t *buf, int len, struct sockaddr_in *addr, uint16_t indexudpfd);
+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);

+void netlink_addattr(struct nlmsghdr *nh, int type, const void *data, int alen);
+ssize_t netlink_send(struct nlmsghdr *nh);
+void cache_ipmap(in_addr_t ip, sessionidt s);
+
+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);
+
+// grpsess.c
+sessionidt grp_getnextsession(groupidt g, in_addr_t ip);
+void grp_initdata(void);
+void grp_processvendorspecific(sessionidt s, uint8_t *pvs);
+groupidt grp_groupbysession(sessionidt s);
+groupidt grp_groupbyip(in_addr_t ip);
+void grp_setgrouproute(groupidt g, int add);
+void grp_time_changed(void);
+void grp_removesession(groupidt g, sessionidt s);
+int grp_cluster_load_groupe(groupidt g, groupsesst *new);

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


@@ -898,7 +1028,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, ...);


@@ -913,6 +1044,8 @@ extern bundlet *bundle;
 extern sessiont *session;
 extern sessionlocalt *sess_local;
 extern ippoolt *ip_address_pool;
 extern sessiont *session;
 extern sessionlocalt *sess_local;
 extern ippoolt *ip_address_pool;

+extern groupsesst *grpsession;
+extern groupidt gnextgrpid;

 #define sessionfree (session[0].next)
 
 
 #define sessionfree (session[0].next)
 
 


@@ -925,19 +1058,24 @@ extern struct Tstats *_statistics;
 extern in_addr_t my_address;
 extern int clifd;
 extern int epollfd;
 extern in_addr_t my_address;
 extern int clifd;
 extern int epollfd;

+extern int tunidx;             // ifr_ifindex of tun device
+extern union iphash ip_hash[256];

 
 struct event_data {
        enum {
 
 struct event_data {
        enum {

-               FD_TYPE_CLI,
-               FD_TYPE_CLUSTER,
-               FD_TYPE_TUN,
-               FD_TYPE_UDP,
-               FD_TYPE_CONTROL,
-               FD_TYPE_DAE,
+               FD_TYPE_CLI,
+               FD_TYPE_CLUSTER,
+               FD_TYPE_TUN,
+               FD_TYPE_UDP,
+               FD_TYPE_CONTROL,
+               FD_TYPE_DAE,

                FD_TYPE_RADIUS,
                FD_TYPE_BGP,
                FD_TYPE_RADIUS,
                FD_TYPE_BGP,

+               FD_TYPE_NETLINK,
+               FD_TYPE_PPPOEDISC,
+               FD_TYPE_PPPOESESS

        } type;
        } type;

-       int index; // for RADIUS, BGP
+       int index; // for RADIUS, BGP, UDP

 };
 
 #define TIME (config->current_time)
 };
 
 #define TIME (config->current_time)