ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/conf.C
(Generate patch)

Comparing gvpe/src/conf.C (file contents):
Revision 1.8 by pcg, Wed Apr 2 03:25:17 2003 UTC vs.
Revision 1.17 by pcg, Tue Oct 14 15:48:15 2003 UTC

… …
31#include <netdb.h> 31#include <netdb.h>
32#include <sys/stat.h> 32#include <sys/stat.h>
33#include <sys/types.h> 33#include <sys/types.h>
34#include <unistd.h> 34#include <unistd.h>
35 35
36#include <netinet/in.h> 36#include "netcompat.h"
37 37
38#include <openssl/err.h> 38#include <openssl/err.h>
39#include <openssl/pem.h> 39#include <openssl/pem.h>
40#include <openssl/rsa.h> 40#include <openssl/rsa.h>
41#include <openssl/rand.h> 41#include <openssl/rand.h>
… …
53 53
54struct configuration conf; 54struct configuration conf;
55 55
56u8 best_protocol (u8 protset) 56u8 best_protocol (u8 protset)
57{ 57{
58 if (protset & PROT_IPv4) 58 if (protset & PROT_IPv4 ) return PROT_IPv4;
59 return PROT_IPv4; 59 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
60 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
61 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
60 62
61 return PROT_UDPv4; 63 return 0;
62} 64}
63 65
64const char *strprotocol (u8 protocol) 66const char *strprotocol (u8 protocol)
65{ 67{
66 if (protocol & PROT_IPv4 ) return "rawip"; 68 if (protocol & PROT_IPv4 ) return "rawip";
69 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4) return "udp"; 70 if (protocol & PROT_UDPv4 ) return "udp";
71 if (protocol & PROT_TCPv4 ) return "tcp";
68 72
69 return "<unknown>"; 73 return "<unknown>";
70} 74}
71 75
72configuration::configuration () 76void
77conf_node::print ()
73{ 78{
74 init (); 79 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
80 id,
81 id >> 8, id & 0xff,
82 compress ? 'Y' : 'N',
83 connectmode == C_ONDEMAND ? "ondemand" :
84 connectmode == C_NEVER ? "never" :
85 connectmode == C_ALWAYS ? "always" : "",
86 nodename,
87 hostname ? hostname : "",
88 hostname ? ":" : "",
89 hostname ? udp_port : 0
90 );
75} 91}
76 92
77configuration::~configuration () 93conf_node::~conf_node ()
78{ 94{
79 cleanup (); 95 if (rsa_key)
96 RSA_free (rsa_key);
97
98 free (nodename);
99 free (hostname);
80} 100}
81 101
82void configuration::init () 102void configuration::init ()
83{ 103{
84 memset (this, 0, sizeof (*this)); 104 memset (this, 0, sizeof (*this));
85 105
86 rekey = DEFAULT_REKEY; 106 rekey = DEFAULT_REKEY;
87 keepalive = DEFAULT_KEEPALIVE; 107 keepalive = DEFAULT_KEEPALIVE;
88 llevel = L_INFO; 108 llevel = L_INFO;
89 ip_proto = IPPROTO_GRE; 109 ip_proto = IPPROTO_GRE;
110#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY;
112#endif
90 113
91 default_node.udp_port = DEFAULT_UDPPORT; 114 default_node.udp_port = DEFAULT_UDPPORT;
92 default_node.tcp_port = DEFAULT_UDPPORT; 115 default_node.tcp_port = DEFAULT_UDPPORT;
93 default_node.connectmode = conf_node::C_ALWAYS; 116 default_node.connectmode = conf_node::C_ALWAYS;
94 default_node.compress = true; 117 default_node.compress = true;
… …
98void configuration::cleanup() 121void configuration::cleanup()
99{ 122{
100 if (rsa_key) 123 if (rsa_key)
101 RSA_free (rsa_key); 124 RSA_free (rsa_key);
102 125
103 free (ifname);
104
105 rsa_key = 0; 126 rsa_key = 0;
106 ifname = 0; 127
128 free (ifname); ifname = 0;
129#if ENABLE_HTTP_PROXY
130 free (proxy_host); proxy_host = 0;
131 free (proxy_auth); proxy_auth = 0;
132#endif
107} 133}
108 134
109void 135void
110configuration::clear_config () 136configuration::clear_config ()
111{ 137{
… …
202 else 228 else
203 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 229 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
204 } 230 }
205 else if (!strcmp (var, "ip-proto")) 231 else if (!strcmp (var, "ip-proto"))
206 ip_proto = atoi (val); 232 ip_proto = atoi (val);
233#if ENABLE_ICMP
234 //TODO: error message
235 else if (!strcmp (var, "icmp-type"))
236 icmp_type = atoi (val);
237#endif
207 238
208 // per config 239 // per config
209 else if (!strcmp (var, "node")) 240 else if (!strcmp (var, "node"))
210 { 241 {
211 default_node.id++; 242 default_node.id++;
… …
270 script_if_up = strdup (val); 301 script_if_up = strdup (val);
271 else if (!strcmp (var, "node-up")) 302 else if (!strcmp (var, "node-up"))
272 script_node_up = strdup (val); 303 script_node_up = strdup (val);
273 else if (!strcmp (var, "node-down")) 304 else if (!strcmp (var, "node-down"))
274 script_node_down = strdup (val); 305 script_node_down = strdup (val);
306#if ENABLE_HTTP_PROXY
307 else if (!strcmp (var, "http-proxy-host"))
308 proxy_host = strdup (val);
309 else if (!strcmp (var, "http-proxy-port"))
310 proxy_port = atoi (val);
311 else if (!strcmp (var, "http-proxy-auth"))
312 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
313#endif
275 314
276 /* node-specific, non-defaultable */ 315 /* node-specific, non-defaultable */
277 else if (node != &default_node && !strcmp (var, "hostname")) 316 else if (node != &default_node && !strcmp (var, "hostname"))
278 { 317 {
279 free (node->hostname); 318 free (node->hostname);
… …
311 parse_bool (node->compress, "compress", true, false); 350 parse_bool (node->compress, "compress", true, false);
312 } 351 }
313 // all these bool options really really cost a lot of executable size! 352 // all these bool options really really cost a lot of executable size!
314 else if (!strcmp (var, "enable-tcp")) 353 else if (!strcmp (var, "enable-tcp"))
315 { 354 {
355#if ENABLE_TCP
316 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 356 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
357#endif
358 }
359 else if (!strcmp (var, "enable-icmp"))
360 {
361#if ENABLE_ICMP
362 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
363#endif
317 } 364 }
318 else if (!strcmp (var, "enable-udp")) 365 else if (!strcmp (var, "enable-udp"))
319 { 366 {
320 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 367 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
321 } 368 }
… …
324 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 371 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
325 } 372 }
326 373
327 // unknown or misplaced 374 // unknown or misplaced
328 else 375 else
329 {
330 slog (L_WARN, 376 slog (L_WARN,
331 _("unknown or misplaced variable `%s', at '%s' line %d"), 377 _("unknown or misplaced variable `%s', at '%s' line %d"),
332 var, fname, lineno); 378 var, fname, lineno);
333 }
334 } 379 }
335 380
336 fclose (f); 381 fclose (f);
337 } 382 }
338 else 383 else
… …
397 printf (_("MTU: %d\n"), mtu); 442 printf (_("MTU: %d\n"), mtu);
398 printf (_("rekeying interval: %d\n"), rekey); 443 printf (_("rekeying interval: %d\n"), rekey);
399 printf (_("keepalive interval: %d\n"), keepalive); 444 printf (_("keepalive interval: %d\n"), keepalive);
400 printf (_("interface: %s\n"), ifname); 445 printf (_("interface: %s\n"), ifname);
401 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 446 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
402 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 447 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
403 printf ("\n"); 448 printf ("\n");
404 449
405 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 450 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
406 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 451 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
407 452
… …
409 (*i)->print (); 454 (*i)->print ();
410 455
411 printf ("\n"); 456 printf ("\n");
412} 457}
413 458
414void 459configuration::configuration ()
415conf_node::print ()
416{ 460{
417 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 461 init ();
418 id,
419 id >> 8, id & 0xff,
420 compress ? 'Y' : 'N',
421 connectmode == C_ONDEMAND ? "ondemand" :
422 connectmode == C_NEVER ? "never" :
423 connectmode == C_ALWAYS ? "always" : "",
424 nodename,
425 hostname ? hostname : "",
426 hostname ? ":" : "",
427 hostname ? udp_port : 0
428 );
429} 462}
430 463
464configuration::~configuration ()
465{
466 cleanup ();
467}
468
469

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines