X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/6b36bc85b235d93d46058c8d7015f61f6bcbc45a..4df24fd868177859ddd778f1f45bc825f6264cfb:/l2tpns.h diff --git a/l2tpns.h b/l2tpns.h index 5b68df7..e83234d 100644 --- a/l2tpns.h +++ b/l2tpns.h @@ -38,6 +38,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 MAXHOSTNAME 256 // hostname #define MAXUSER 128 // username #define MAXPASS 128 // password #define MAXCLASS 128 // radius class attribute size @@ -48,7 +49,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 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 @@ -56,10 +57,10 @@ #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 -#define MAXFRAGNUM_MASK 127 // Must be equal to MAXFRAGNUM-1 +#define MAXFRAGNUM_MASK 511 // Must be equal to MAXFRAGNUM-1 // Constants #ifndef ETCDIR @@ -234,7 +235,7 @@ struct cli_tunnel_actions { typedef struct // route { in_addr_t ip; - in_addr_t mask; + int prefixlen; } routet; @@ -242,7 +243,10 @@ typedef struct controls // control message { 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; @@ -254,8 +258,10 @@ typedef struct { typedef struct { 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; @@ -315,7 +321,12 @@ typedef struct char class[MAXCLASS]; uint8_t ipv6prefixlen; // IPv6 route prefix length struct in6_addr ipv6route; // Static IPv6 route +#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; @@ -403,6 +414,11 @@ typedef struct // 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 @@ -617,6 +633,10 @@ struct Tstats #define SET_STAT(x, y) #endif +#ifndef IFNAMSIZ +# define IFNAMSIZ 16 +#endif + typedef struct { int debug; // debugging level @@ -632,7 +652,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 - char tundevice[10]; // tun device name + char tundevice[IFNAMSIZ]; // tun device name char log_filename[128]; char l2tp_secret[64]; // L2TP shared secret @@ -713,6 +733,8 @@ typedef struct 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 @@ -724,7 +746,17 @@ typedef struct uint16_t as; int keepalive; int hold; + struct in_addr update_source; } 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 +#ifdef LAC + int highest_rlnsid; #endif } configt; @@ -819,6 +851,13 @@ typedef struct #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); @@ -873,12 +912,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 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); +#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 @@ -898,7 +945,8 @@ void become_master(void); // We're the master; kick off any required master init // 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, ...); @@ -936,6 +984,7 @@ struct event_data { FD_TYPE_DAE, FD_TYPE_RADIUS, FD_TYPE_BGP, + FD_TYPE_NETLINK, } type; int index; // for RADIUS, BGP };