--- gvpe/src/conf.h 2012/01/17 21:25:50 1.40 +++ gvpe/src/conf.h 2012/12/04 10:29:43 1.42 @@ -39,13 +39,13 @@ #include "slog.h" #include "global.h" -#define DEFAULT_REKEY 3600 -#define DEFAULT_KEEPALIVE 60 // one keepalive/minute (it's just 8 bytes...) -#define DEFAULT_UDPPORT 655 // same as tinc, conflicts would be rare -#define DEFAULT_MTU 1500 // let's ether-net -#define DEFAULT_MAX_RETRY 3600 // retry at least this often -#define DEFAULT_MAX_TTL 60 // packets expire after this many seconds -#define DEFAULT_MAX_QUEUE 512 // never queue more than this many packets +#define DEFAULT_REKEY 3600 +#define DEFAULT_KEEPALIVE 60 // one keepalive/minute (it's just 8 bytes...) +#define DEFAULT_UDPPORT 655 // same as tinc, conflicts would be rare +#define DEFAULT_MTU 1500 // let's ether-net +#define DEFAULT_MAX_RETRY 3600 // retry at least this often +#define DEFAULT_MAX_TTL 60 // packets expire after this many seconds +#define DEFAULT_MAX_QUEUE 512 // never queue more than this many packets #define DEFAULT_DNS_TIMEOUT_FACTOR 8.F // initial retry timeout multiple #define DEFAULT_DNS_SEND_INTERVAL .01F // minimum send interval @@ -59,8 +59,7 @@ PROT_TCPv4 = 0x04, // tcp over ipv4 (server) PROT_ICMPv4 = 0x08, // icmp over ipv4 PROT_DNSv4 = 0x10, // dns tunnel ipv4 (server) - PROT_IPv42 = 0x20, // temporary hack to invetsigate packet loss - PROT_ALL = 0x3f + PROT_ALL = 0x1f }; #define PROT_RELIABLE (PROT_TCPv4 | PROT_DNSv4) @@ -135,9 +134,9 @@ RSA *rsa_key; // our private rsa key loglevel llevel; u8 ip_proto; // the ip protocol to use -#if 1//D2 - u8 ip2_proto; // the ip protocol to use -#endif + uid_t change_uid; // the uid of the user to switch to, or 0 + gid_t change_gid; // the gid of the user to switch to, or 0 + char *change_root;// the path to chroot to, "/" == anonymous #if ENABLE_ICMP u8 icmp_type; // the icmp type for the icmp-protocol #endif