X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/12f16f60c19b470a3a4e5ee145485095dc674dee..59b55de4d7768bf41f2dd928e214ef6d98eb3351:/l2tpns.h?ds=inline diff --git a/l2tpns.h b/l2tpns.h index eb575a3..c42b6b7 100644 --- a/l2tpns.h +++ b/l2tpns.h @@ -1,5 +1,5 @@ // L2TPNS Global Stuff -// $Id: l2tpns.h,v 1.38 2004/11/27 05:19:53 bodea Exp $ +// $Id: l2tpns.h,v 1.65 2005/05/05 10:02:08 bodea Exp $ #ifndef __L2TPNS_H__ #define __L2TPNS_H__ @@ -15,11 +15,11 @@ #include #include -#define VERSION "2.0.9" +#define VERSION "2.1.0" // Limits #define MAXTUNNEL 500 // could be up to 65535 -#define MAXSESSION 50000 // could be up to 65535 +#define MAXSESSION 60000 // could be up to 65535 #define MAXTBFS 6000 // Maximum token bucket filters. Might need up to 2 * session. #define RADIUS_SHIFT 5 @@ -32,6 +32,8 @@ #define MAXCONTROL 1000 // max length control message we ever send... #define MAXETHER (1500+18) // max packet we try sending to tun #define MAXTEL 96 // telephone number +#define MAXUSER 128 // username +#define MAXPASS 128 // password #define MAXPLUGINS 20 // maximum number of plugins to load #define MAXRADSERVER 10 // max radius servers #define MAXROUTE 10 // max static routes per session @@ -51,10 +53,6 @@ #define LIBDIR "/usr/lib/l2tpns" #endif -#ifndef STATEDIR -#define STATEDIR "/var/lib/l2tpns" -#endif - #ifndef PLUGINDIR #define PLUGINDIR LIBDIR // Plugins #endif @@ -67,31 +65,30 @@ #define FLASHDIR ETCDIR #endif -#ifndef DATADIR -#define DATADIR STATEDIR -#endif - #define TUNDEVICE "/dev/net/tun" -#define STATEFILE DATADIR "/state.dump" // State dump file +#define RANDOMDEVICE "/dev/urandom" // default, not as secure as /dev/random but non-blocking #define CONFIGFILE FLASHDIR "/startup-config" // Configuration file #define CLIUSERS FLASHDIR "/users" // CLI Users file #define IPPOOLFILE FLASHDIR "/ip_pool" // Address pool configuration #define ACCT_TIME 3000 // 5 minute accounting interval +#define ACCT_SHUT_TIME 600 // 1 minute for counters of shutdown sessions #define L2TPPORT 1701 // L2TP port #define RADPORT 1645 // old radius port... #define PKTARP 0x0806 // ARP packet type -#define PKTIP 0x0800 // IP packet type -#define PSEUDOMAC 0x0200 // pseudo MAC prefix (local significant MAC) +#define PKTIP 0x0800 // IPv4 packet type +#define PKTIPV6 0x86DD // IPv6 packet type #define PPPPAP 0xC023 #define PPPCHAP 0xC223 #define PPPLCP 0xC021 #define PPPIPCP 0x8021 +#define PPPIPV6CP 0x8057 #define PPPCCP 0x80FD #define PPPIP 0x0021 +#define PPPIPV6 0x0057 #define PPPMP 0x003D #define MIN_IP_SIZE 0x19 -enum -{ + +enum { ConfigReq = 1, ConfigAck, ConfigNak, @@ -106,24 +103,30 @@ enum IdentRequest }; +enum { + AccessRequest = 1, + AccessAccept, + AccessReject, + AccountingRequest, + AccountingResponse, + AccessChallenge = 11 +}; + // Types -typedef unsigned short u16; -typedef unsigned int u32; -typedef unsigned char u8; -typedef u32 ipt; -typedef u16 portt; -typedef u16 sessionidt; -typedef u16 tunnelidt; -typedef u32 clockt; -typedef u8 hasht[16]; +typedef uint16_t sessionidt; +typedef uint16_t tunnelidt; +typedef uint32_t clockt; +typedef uint8_t hasht[16]; // CLI actions struct cli_session_actions { char action; - ipt snoop_ip; - u16 snoop_port; + in_addr_t snoop_ip; + uint16_t snoop_port; int throttle_in; int throttle_out; + int filter_in; + int filter_out; }; #define CLI_SESS_KILL 0x01 @@ -131,6 +134,8 @@ struct cli_session_actions { #define CLI_SESS_NOSNOOP 0x04 #define CLI_SESS_THROTTLE 0x08 #define CLI_SESS_NOTHROTTLE 0x10 +#define CLI_SESS_FILTER 0x20 +#define CLI_SESS_NOFILTER 0x40 struct cli_tunnel_actions { char action; @@ -138,22 +143,19 @@ struct cli_tunnel_actions { #define CLI_TUN_KILL 0x01 -// dump header: update number if internal format changes -#define DUMP_MAGIC "L2TPNS#" VERSION "#" - // structures typedef struct // route { - ipt ip; - ipt mask; + in_addr_t ip; + in_addr_t mask; } routet; -typedef struct controls // control message +typedef struct controls // control message { - struct controls *next; // next in queue - u16 length; // length - u8 buf[MAXCONTROL]; + struct controls *next; // next in queue + uint16_t length; // length + uint8_t buf[MAXCONTROL]; } controlt; @@ -162,58 +164,73 @@ typedef struct sessionidt next; // next session in linked list sessionidt far; // far end session ID tunnelidt tunnel; // near end tunnel ID - ipt ip; // IP of session set by RADIUS response (host byte order). + in_addr_t ip; // IP of session set by RADIUS response (host byte order). int ip_pool_index; // index to IP pool - unsigned long unique_id; // unique session id - u16 nr; // next receive - u16 ns; // next send - u32 magic; // ppp magic number - u32 cin, cout; // byte counts - u32 pin, pout; // packet counts - u32 total_cin; // This counter is never reset while a session is open - u32 total_cout; // This counter is never reset while a session is open - u32 id; // session id - u16 throttle_in; // upstream throttle rate (kbps) - u16 throttle_out; // downstream throttle rate + uint32_t unique_id; // unique session id + uint16_t nr; // next receive + uint16_t ns; // next send + uint32_t magic; // ppp magic number + uint32_t cin, cout; // byte counts + uint32_t pin, pout; // packet counts + uint32_t total_cin; // This counter is never reset while a session is open + uint32_t total_cout; // This counter is never reset while a session is open + uint16_t throttle_in; // upstream throttle rate (kbps) + uint16_t throttle_out; // downstream throttle rate clockt opened; // when started clockt die; // being closed, when to finally free time_t last_packet; // Last packet from the user (used for idle timeouts) - ipt dns1, dns2; // DNS servers + in_addr_t dns1, dns2; // DNS servers routet route[MAXROUTE]; // static routes - u16 radius; // which radius session is being used (0 for not waiting on authentication) - u16 mru; // maximum receive unit - u16 tbf_in; // filter bucket for throttling in from the user. - u16 tbf_out; // filter bucket for throttling out to the user. - u8 l2tp_flags; // various bit flags from the ICCN on the l2tp tunnel. - u8 reserved_old_snoop; // No longer used - remove at some time - u8 walled_garden; // is this session gardened? - u8 flags1; // additional flags (currently unused); + uint16_t mru; // maximum receive unit + uint16_t tbf_in; // filter bucket for throttling in from the user. + uint16_t tbf_out; // filter bucket for throttling out to the user. + uint8_t l2tp_flags; // various bit flags from the ICCN on the l2tp tunnel. + uint32_t flags; // Various session flags. + uint8_t walled_garden; // is this session gardened? char random_vector[MAXTEL]; int random_vector_length; - char user[129]; // user (needed in seesion for radius stop messages) (can we reduce this? --mo) + char user[MAXUSER]; // user (needed in seesion for radius stop messages) char called[MAXTEL]; // called number char calling[MAXTEL]; // calling number - u32 tx_connect_speed; - u32 rx_connect_speed; - u32 flags; // Various session flags. - ipt snoop_ip; // Interception destination IP - u16 snoop_port; // Interception destination port - u16 sid; // near end session id. - u8 filter_in; // input filter index (to ip_filters[N-1]; 0 if none) - u8 filter_out; // output filter index - char reserved[18]; // Space to expand structure without changing HB_VERSION + uint32_t tx_connect_speed; + uint32_t rx_connect_speed; + in_addr_t snoop_ip; // Interception destination IP + uint16_t snoop_port; // Interception destination port + uint8_t filter_in; // input filter index (to ip_filters[N-1]; 0 if none) + uint8_t filter_out; // output filter index + struct in6_addr ipv6route; // Static IPv6 route + uint8_t ipv6prefixlen; // IPv6 route prefix length + char reserved[1]; // Space to expand structure without changing HB_VERSION } sessiont; #define SF_IPCP_ACKED 1 // Has this session seen an IPCP Ack? #define SF_LCP_ACKED 2 // LCP negotiated #define SF_CCP_ACKED 4 // CCP negotiated +#define SF_IPV6CP_ACKED 8 // IPv6 negotiated +#define SF_IPV6_NACKED 16 // IPv6 rejected +#define SF_IPV6_ROUTED 32 // advertised v6 route + +#define AUTHPAP 1 // allow PAP +#define AUTHCHAP 2 // allow CHAP typedef struct { - u32 cin; - u32 cout; -} sessioncountt; + // byte counters + uint32_t cin; + uint32_t cout; + + // DoS prevention + clockt last_packet_out; + uint32_t packets_out; + uint32_t packets_dropped; + + // RADIUS session in use + uint16_t radius; + + // interim RADIUS + time_t last_interim; +} sessionlocalt; #define SESSIONPFC 1 // PFC negotiated flags #define SESSIONACFC 2 // ACFC negotiated flags @@ -222,11 +239,11 @@ typedef struct typedef struct { tunnelidt far; // far end tunnel ID - ipt ip; // Ip for far end - portt port; // port for far end - u16 window; // Rx window - u16 nr; // next receive - u16 ns; // next send + in_addr_t ip; // Ip for far end + uint16_t port; // port for far end + uint16_t window; // Rx window + uint16_t nr; // next receive + uint16_t ns; // next send int state; // current state (tunnelstate enum) clockt last; // when last control message sent (used for resend timeout) clockt retry; // when to try resenting pending control @@ -234,8 +251,8 @@ typedef struct clockt lastrec; // when the last control message was received char hostname[128]; // tunnel hostname char vendor[128]; // LAC vendor - u8 try; // number of retrys on a control message - u16 controlc; // outstaind messages in queue + uint8_t try; // number of retrys on a control message + uint16_t controlc; // outstaind messages in queue controlt *controls; // oldest message controlt *controle; // newest message } @@ -249,16 +266,16 @@ typedef struct // outstanding RADIUS requests clockt retry; // when to try next char calling[MAXTEL]; // calling number char pass[129]; // password - u8 id; // ID for PPP response - u8 try; // which try we are on - u8 state; // state of radius requests - u8 chap; // set if CHAP used (is CHAP identifier) + uint8_t id; // ID for PPP response + uint8_t try; // which try we are on + uint8_t state; // state of radius requests + uint8_t chap; // set if CHAP used (is CHAP identifier) } radiust; typedef struct { - ipt address; // Host byte order.. + in_addr_t address; // Host byte order.. char assigned; // 1 if assigned, 0 if free sessionidt session; clockt last; // last used @@ -273,7 +290,6 @@ struct Tringbuffer char level; sessionidt session; tunnelidt tunnel; - ipt address; char message[MAX_LOG_LENGTH]; } buffer[RINGBUFFER_SIZE]; int head; @@ -302,84 +318,95 @@ enum RADIUSIPCP, // sending IPCP to end user RADIUSSTART, // sending start accounting to RADIUS server RADIUSSTOP, // sending stop accounting to RADIUS server + RADIUSINTERIM, // sending interim accounting to RADIUS server RADIUSWAIT, // waiting timeout before available, in case delayed replies - RADIUSDEAD, // errored while talking to radius server. }; struct Tstats { - time_t start_time; - time_t last_reset; - - unsigned long tun_rx_packets; - unsigned long tun_tx_packets; - unsigned long tun_rx_bytes; - unsigned long tun_tx_bytes; - unsigned long tun_rx_errors; - unsigned long tun_tx_errors; - - unsigned long tunnel_rx_packets; - unsigned long tunnel_tx_packets; - unsigned long tunnel_rx_bytes; - unsigned long tunnel_tx_bytes; - unsigned long tunnel_rx_errors; - unsigned long tunnel_tx_errors; - - unsigned long tunnel_retries; - unsigned long radius_retries; - - unsigned long arp_sent; - - unsigned long packets_snooped; - - unsigned long tunnel_created; - unsigned long session_created; - unsigned long tunnel_timeout; - unsigned long session_timeout; - unsigned long radius_timeout; - unsigned long radius_overflow; - unsigned long tunnel_overflow; - unsigned long session_overflow; - - unsigned long ip_allocated; - unsigned long ip_freed; - - unsigned long c_forwarded; - unsigned long recv_forward; + time_t start_time; + time_t last_reset; + + uint32_t tun_rx_packets; + uint32_t tun_tx_packets; + uint32_t tun_rx_bytes; + uint32_t tun_tx_bytes; + uint32_t tun_rx_errors; + uint32_t tun_tx_errors; + uint32_t tun_rx_dropped; + + uint32_t tunnel_rx_packets; + uint32_t tunnel_tx_packets; + uint32_t tunnel_rx_bytes; + uint32_t tunnel_tx_bytes; + uint32_t tunnel_rx_errors; + uint32_t tunnel_tx_errors; + + uint32_t tunnel_retries; + uint32_t radius_retries; + + uint32_t arp_sent; + + uint32_t packets_snooped; + + uint32_t tunnel_created; + uint32_t session_created; + uint32_t tunnel_timeout; + uint32_t session_timeout; + uint32_t radius_timeout; + uint32_t radius_overflow; + uint32_t tunnel_overflow; + uint32_t session_overflow; + + uint32_t ip_allocated; + uint32_t ip_freed; + + uint32_t c_forwarded; + uint32_t recv_forward; + + uint32_t select_called; + uint32_t multi_read_used; + uint32_t multi_read_exceeded; + #ifdef STATISTICS - unsigned long call_processtun; - unsigned long call_processipout; - unsigned long call_processudp; - unsigned long call_sessionbyip; - unsigned long call_sessionbyuser; - unsigned long call_sendarp; - unsigned long call_sendipcp; - unsigned long call_tunnelsend; - unsigned long call_sessionkill; - unsigned long call_sessionshutdown; - unsigned long call_tunnelkill; - unsigned long call_tunnelshutdown; - unsigned long call_assign_ip_address; - unsigned long call_free_ip_address; - unsigned long call_dump_acct_info; - unsigned long call_sessionsetup; - unsigned long call_processpap; - unsigned long call_processchap; - unsigned long call_processlcp; - unsigned long call_processipcp; - unsigned long call_processipin; - unsigned long call_processccp; - unsigned long call_sendchap; - unsigned long call_processrad; - unsigned long call_radiussend; - unsigned long call_radiusretry; + uint32_t call_processtun; + uint32_t call_processipout; + uint32_t call_processipv6out; + uint32_t call_processudp; + uint32_t call_sessionbyip; + uint32_t call_sessionbyipv6; + uint32_t call_sessionbyuser; + uint32_t call_sendarp; + uint32_t call_sendipcp; + uint32_t call_processipv6cp; + uint32_t call_tunnelsend; + uint32_t call_sessionkill; + uint32_t call_sessionshutdown; + uint32_t call_tunnelkill; + uint32_t call_tunnelshutdown; + uint32_t call_assign_ip_address; + uint32_t call_free_ip_address; + uint32_t call_dump_acct_info; + uint32_t call_sessionsetup; + uint32_t call_processpap; + uint32_t call_processchap; + uint32_t call_processlcp; + uint32_t call_processipcp; + uint32_t call_processipin; + uint32_t call_processipv6in; + uint32_t call_processccp; + uint32_t call_sendchap; + uint32_t call_processrad; + uint32_t call_radiussend; + uint32_t call_radiusretry; + uint32_t call_random_data; #endif }; #ifdef STATISTICS #ifdef STAT_CALLS -#define CSTAT(x) STAT(x) +#define CSTAT(x) STAT(call_ ## x) #else #define CSTAT(x) #endif @@ -416,22 +443,28 @@ typedef struct char log_filename[128]; char l2tpsecret[64]; + char random_device[256]; // random device path, defaults to RANDOMDEVICE + char radiussecret[64]; int radius_accounting; - ipt radiusserver[MAXRADSERVER]; // radius servers - u16 radiusport[MAXRADSERVER]; // radius base ports - u8 numradiusservers; // radius server count + int radius_interim; + in_addr_t radiusserver[MAXRADSERVER]; // radius servers + uint16_t radiusport[MAXRADSERVER]; // radius base ports + uint8_t numradiusservers; // radius server count short num_radfds; // Number of radius filehandles allocated - ipt default_dns1, default_dns2; + char radius_authtypes_s[32]; // list of valid authentication types (chap, pap) in order of preference + int radius_authtypes; + int radius_authprefer; + + in_addr_t default_dns1, default_dns2; unsigned long rl_rate; // default throttle rate int num_tbfs; // number of throttle buckets - int save_state; char accounting_dir[128]; - ipt bind_address; - ipt peer_address; + in_addr_t bind_address; + in_addr_t peer_address; int send_garp; // Set to true to garp for vip address on startup int target_uid; @@ -442,14 +475,15 @@ typedef struct int next_tbf; // Next HTB id available to use int scheduler_fifo; // If the system has multiple CPUs, use FIFO scheduling policy for this process. int lock_pages; // Lock pages into memory. - int icmp_rate; // Max number of ICMP unreachable per second to send> + int icmp_rate; // Max number of ICMP unreachable per second to send + int max_packets; // DoS prevention: per session limit of packets/0.1s - u32 cluster_address; // Multicast address of cluster. + in_addr_t cluster_address; // Multicast address of cluster. // Send to this address to have everyone hear. char cluster_interface[64]; // Which interface to listen for multicast on. int cluster_iam_master; // Are we the cluster master??? int cluster_iam_uptodate; // Set if we've got a full set of state from the master. - u32 cluster_master_address; // The network address of the cluster master. + in_addr_t cluster_master_address; // The network address of the cluster master. // Zero if i am the cluster master. int cluster_seq_number; // Sequence number of the next heartbeat we'll send out // (or the seq number we're next expecting if we're a slave). @@ -462,20 +496,23 @@ 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 + + struct in6_addr ipv6_prefix; // Our IPv6 network pool. #ifdef BGP #define BGP_NUM_PEERS 2 - u16 as_number; + uint16_t as_number; struct { - char name[64]; - u16 as; - int keepalive; - int hold; - } neighbour[BGP_NUM_PEERS]; + char name[64]; + uint16_t as; + int keepalive; + int hold; + } neighbour[BGP_NUM_PEERS]; #endif } configt; -enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IP, MAC }; +enum config_typet { INT, STRING, UNSIGNED_LONG, SHORT, BOOL, IPv4, IPv6, MAC }; typedef struct { char *key; @@ -486,15 +523,15 @@ typedef struct typedef struct { - u8 op; // operation + uint8_t op; // operation #define FILTER_PORT_OP_NONE 0 // all ports match #define FILTER_PORT_OP_EQ 1 #define FILTER_PORT_OP_NEQ 2 #define FILTER_PORT_OP_GT 3 #define FILTER_PORT_OP_LT 4 #define FILTER_PORT_OP_RANGE 5 - portt port; - portt port2; // for range + uint16_t port; // port (host byte order) + uint16_t port2; // range } ip_filter_portt; typedef struct @@ -502,18 +539,21 @@ typedef struct int action; // permit/deny #define FILTER_ACTION_DENY 1 #define FILTER_ACTION_PERMIT 2 - int proto; // protocol: IPPROTO_* (netinet/in.h) - ipt src_ip; // source ip - ipt src_wild; + uint8_t proto; // protocol: IPPROTO_* (netinet/in.h) + in_addr_t src_ip; // source ip (network byte order) + in_addr_t src_wild; ip_filter_portt src_ports; - ipt dst_ip; // dest ip - ipt dst_wild; + in_addr_t dst_ip; // dest ip + in_addr_t dst_wild; ip_filter_portt dst_ports; - u8 tcp_flag_op; // match type: any, all -#define FILTER_FLAG_OP_ANY 0 -#define FILTER_FLAG_OP_ALL 1 - u8 tcp_sflags; // flags set - u8 tcp_cflags; // flags clear + uint8_t frag; // apply to non-initial fragments + uint8_t tcp_flag_op; // match type: any, all, established +#define FILTER_FLAG_OP_ANY 1 +#define FILTER_FLAG_OP_ALL 2 +#define FILTER_FLAG_OP_EST 3 + uint8_t tcp_sflags; // flags set + uint8_t tcp_cflags; // flags clear + uint32_t counter; // match count } ip_filter_rulet; #define TCP_FLAG_FIN 0x01 @@ -534,51 +574,59 @@ typedef struct } ip_filtert; // arp.c -void sendarp(int ifr_idx, const unsigned char* mac, ipt ip); +void sendarp(int ifr_idx, const unsigned char* mac, in_addr_t ip); // ppp.c -void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l); -void processchap(tunnelidt t, sessionidt s, u8 * p, u16 l); -void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l); -void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l); -void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l); -void processccp(tunnelidt t, sessionidt s, u8 * p, u16 l); +void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l); +void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l); +void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l); +void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l); +void processipv6cp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l); +void processipin(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l); +void processipv6in(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l); +void processccp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l); void sendchap(tunnelidt t, sessionidt s); -u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtype); +uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, tunnelidt t, sessionidt s, uint16_t mtype); void initlcp(tunnelidt t, sessionidt s); -void send_ipin(sessionidt s, u8 * buf, int len); +void send_ipin(sessionidt s, uint8_t *buf, int len); // radius.c void initrad(void); -void radiussend(u16 r, u8 state); -void processrad(u8 *buf, int len, char socket_index); -void radiusretry(u16 r); -u16 radiusnew(sessionidt s); -void radiusclear(u16 r, sessionidt s); +void radiussend(uint16_t r, uint8_t state); +void processrad(uint8_t *buf, int len, char socket_index); +void radiusretry(uint16_t r); +uint16_t radiusnew(sessionidt s); +void radiusclear(uint16_t r, sessionidt s); // l2tpns.c -clockt backoff(u8 try); -sessionidt sessionbyip(ipt ip); +clockt backoff(uint8_t try); +void send_ipv6_ra(tunnelidt t, sessionidt s, struct in6_addr *ip); +void route6set(sessionidt s, struct in6_addr ip, int prefixlen, int add); +sessionidt sessionbyip(in_addr_t ip); +sessionidt sessionbyipv6(struct in6_addr ip); sessionidt sessionbyuser(char *username); -void sessionshutdown(sessionidt s, char *reason); -void send_garp(ipt ip); -void tunnelsend(u8 * buf, u16 l, tunnelidt t); +void random_data(uint8_t *buf, int len); +void sessionkill(sessionidt s, char *reason); +void sessionshutdown(sessionidt s, char *reason, int result, int error); +void send_garp(in_addr_t ip); +void tunnelsend(uint8_t *buf, uint16_t l, tunnelidt t); void sendipcp(tunnelidt t, sessionidt s); -void processudp(u8 * buf, int len, struct sockaddr_in *addr); -void snoop_send_packet(char *packet, u16 size, ipt destination, u16 port); +void processudp(uint8_t *buf, int len, struct sockaddr_in *addr); +void snoop_send_packet(char *packet, uint16_t size, in_addr_t destination, uint16_t port); +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); #undef LOG #undef LOG_HEX -#define LOG(D, a, s, t, f, ...) ({ if (D <= config->debug) _log(D, a, s, t, f, ## __VA_ARGS__); }) +#define LOG(D, s, t, f, ...) ({ if (D <= config->debug) _log(D, s, t, f, ## __VA_ARGS__); }) #define LOG_HEX(D, t, d, s) ({ if (D <= config->debug) _log_hex(D, t, d, s); }) -void _log(int level, ipt address, sessionidt s, tunnelidt t, const char *format, ...) __attribute__((format (printf, 5, 6))); +void _log(int level, sessionidt s, tunnelidt t, const char *format, ...) __attribute__((format (printf, 4, 5))); void _log_hex(int level, const char *title, const char *data, int maxsize); int sessionsetup(tunnelidt t, sessionidt s); @@ -597,12 +645,12 @@ int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...); // icmp.c -void host_unreachable(ipt destination, u16 id, ipt source, char *packet, int packet_len); +void host_unreachable(in_addr_t destination, uint16_t id, in_addr_t source, char *packet, int packet_len); extern tunnelt *tunnel; extern sessiont *session; -extern sessioncountt *sess_count; +extern sessionlocalt *sess_local; extern ippoolt *ip_address_pool; #define sessionfree (session[0].next) @@ -611,12 +659,12 @@ if (count++ < max) { \ void *array[20]; \ char **strings; \ int size, i; \ - LOG(0, 0, 0, t, "Backtrace follows"); \ + LOG(0, 0, t, "Backtrace follows"); \ size = backtrace(array, 10); \ strings = backtrace_symbols(array, size); \ if (strings) for (i = 0; i < size; i++) \ { \ - LOG(0, 0, 0, t, "%s\n", strings[i]); \ + LOG(0, 0, t, "%s\n", strings[i]); \ } \ free(strings); \ } @@ -625,10 +673,10 @@ if (count++ < max) { \ extern configt *config; extern time_t basetime; // Time when this process started. extern time_t time_now; // Seconds since EPOCH. -extern u32 last_id; +extern uint32_t last_id; extern struct Tstats *_statistics; -extern ipt my_address; -extern int tun_write(u8 *data, int size); +extern in_addr_t my_address; +extern int tun_write(uint8_t *data, int size); extern int clifd;