// L2TPNS Global Stuff
-// $Id: l2tpns.h,v 1.121 2009/12/08 14:49:28 bodea Exp $
+// $Id: l2tpns.h,v 1.121 2009-12-08 14:49:28 bodea Exp $
#ifndef __L2TPNS_H__
#define __L2TPNS_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 MAXHOSTNAME 256 // hostname
#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 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 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
typedef struct // route
{
in_addr_t ip;
- in_addr_t mask;
+ int prefixlen;
}
routet;
{
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;
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;
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
- 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
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
- 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_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];
- 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;
clockt timeout; // Session timeout
- 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
+ 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 classlen; // class (needed for radius accounting messages)
+ char class[MAXCLASS];
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
+ char reserved[12]; // Space to expand structure without changing HB_VERSION
}
sessiont;
// 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
#define SET_STAT(x, y)
#endif
+#ifndef IFNAMSIZ
+# define IFNAMSIZ 16
+#endif
+
typedef struct
{
int debug; // debugging level
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
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
} configt;
enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6 };
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);
// 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, ...);
FD_TYPE_DAE,
FD_TYPE_RADIUS,
FD_TYPE_BGP,
+ FD_TYPE_NETLINK,
} type;
int index; // for RADIUS, BGP
};
#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__ */
projects / l2tpns.git / blobdiff