--- gvpe/src/conf.C 2003/03/28 04:05:10 1.5 +++ gvpe/src/conf.C 2003/04/13 00:35:46 1.15 @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -53,14 +54,50 @@ struct configuration conf; -configuration::configuration () +u8 best_protocol (u8 protset) { - init (); + if (protset & PROT_IPv4 ) return PROT_IPv4; + if (protset & PROT_ICMPv4) return PROT_ICMPv4; + if (protset & PROT_UDPv4 ) return PROT_UDPv4; + if (protset & PROT_TCPv4 ) return PROT_TCPv4; + + return 0; } -configuration::~configuration () +const char *strprotocol (u8 protocol) { - cleanup (); + if (protocol & PROT_IPv4 ) return "rawip"; + if (protocol & PROT_ICMPv4) return "icmp"; + if (protocol & PROT_UDPv4 ) return "udp"; + if (protocol & PROT_TCPv4 ) return "tcp"; + + return ""; +} + +void +conf_node::print () +{ + printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", + id, + id >> 8, id & 0xff, + compress ? 'Y' : 'N', + connectmode == C_ONDEMAND ? "ondemand" : + connectmode == C_NEVER ? "never" : + connectmode == C_ALWAYS ? "always" : "", + nodename, + hostname ? hostname : "", + hostname ? ":" : "", + hostname ? udp_port : 0 + ); +} + +conf_node::~conf_node () +{ + if (rsa_key) + RSA_free (rsa_key); + + free (nodename); + free (hostname); } void configuration::init () @@ -71,12 +108,13 @@ keepalive = DEFAULT_KEEPALIVE; llevel = L_INFO; ip_proto = IPPROTO_GRE; + icmp_type = ICMP_ECHOREPLY; default_node.udp_port = DEFAULT_UDPPORT; + default_node.tcp_port = DEFAULT_UDPPORT; default_node.connectmode = conf_node::C_ALWAYS; default_node.compress = true; - default_node.can_send = PROT_UDPv4; - default_node.can_recv = PROT_IPv4; + default_node.protocols = PROT_UDPv4; } void configuration::cleanup() @@ -84,10 +122,13 @@ if (rsa_key) RSA_free (rsa_key); - free (ifname); - rsa_key = 0; - ifname = 0; + + free (ifname); ifname = 0; +#if ENABLE_HTTP_PROXY + free (proxy_host); proxy_host = 0; + free (proxy_auth); proxy_auth = 0; +#endif } void @@ -188,6 +229,8 @@ } else if (!strcmp (var, "ip-proto")) ip_proto = atoi (val); + else if (!strcmp (var, "icmp-type")) + icmp_type = atoi (val); // per config else if (!strcmp (var, "node")) @@ -256,6 +299,14 @@ script_node_up = strdup (val); else if (!strcmp (var, "node-down")) script_node_down = strdup (val); +#if ENABLE_HTTP_PROXY + else if (!strcmp (var, "http-proxy-host")) + proxy_host = strdup (val); + else if (!strcmp (var, "http-proxy-port")) + proxy_port = atoi (val); + else if (!strcmp (var, "http-proxy-auth")) + proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); +#endif /* node-specific, non-defaultable */ else if (node != &default_node && !strcmp (var, "hostname")) @@ -267,6 +318,8 @@ /* node-specific, defaultable */ else if (!strcmp (var, "udp-port")) node->udp_port = atoi (val); + else if (!strcmp (var, "tcp-port")) + node->tcp_port = atoi (val); else if (!strcmp (var, "router-priority")) node->routerprio = atoi (val); else if (!strcmp (var, "connect")) @@ -293,30 +346,32 @@ parse_bool (node->compress, "compress", true, false); } // all these bool options really really cost a lot of executable size! - else if (!strcmp (var, "can-send-udp")) + else if (!strcmp (var, "enable-tcp")) { - u8 v; parse_bool (v, "can-send-udp", PROT_UDPv4, 0); node->can_send = (node->can_send & ~PROT_UDPv4) | v; +#if ENABLE_TCP + u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; +#endif } - else if (!strcmp (var, "can-recv-udp")) + else if (!strcmp (var, "enable-icmp")) { - u8 v; parse_bool (v, "can-recv-udp", PROT_UDPv4, 0); node->can_recv = (node->can_recv & ~PROT_UDPv4) | v; +#if ENABLE_ICMP + u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; +#endif } - else if (!strcmp (var, "can-send-rawip")) + else if (!strcmp (var, "enable-udp")) { - u8 v; parse_bool (v, "can-send-rawip", PROT_IPv4, 0); node->can_send = (node->can_send & ~PROT_IPv4) | v; + u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; } - else if (!strcmp (var, "can-recv-rawip")) + else if (!strcmp (var, "enable-rawip")) { - u8 v; parse_bool (v, "can-recv-rawip", PROT_IPv4, 0); node->can_recv = (node->can_recv & ~PROT_IPv4) | v; + u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; } // unknown or misplaced else - { - slog (L_WARN, - _("unknown or misplaced variable `%s', at '%s' line %d"), - var, fname, lineno); - } + slog (L_WARN, + _("unknown or misplaced variable `%s', at '%s' line %d"), + var, fname, lineno); } fclose (f); @@ -385,7 +440,7 @@ printf (_("keepalive interval: %d\n"), keepalive); printf (_("interface: %s\n"), ifname); printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : ""); - printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); + printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); printf ("\n"); printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", @@ -397,20 +452,14 @@ printf ("\n"); } -void -conf_node::print () +configuration::configuration () { - printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", - id, - id >> 8, id & 0xff, - compress ? 'Y' : 'N', - connectmode == C_ONDEMAND ? "ondemand" : - connectmode == C_NEVER ? "never" : - connectmode == C_ALWAYS ? "always" : "", - nodename, - hostname ? hostname : "", - hostname ? ":" : "", - hostname ? udp_port : 0 - ); + init (); } +configuration::~configuration () +{ + cleanup (); +} + +