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.11 by pcg, Wed Apr 2 21:43:44 2003 UTC vs.
Revision 1.16 by pcg, Tue Oct 14 03:22:09 2003 UTC

… …
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 <netinet/in.h>
37#include <arpa/inet.h>
38#ifdef ENABLE_ICMP
39# ifdef HAVE_NETINET_IN_SYSTM_H
40# include <netinet/in_systm.h>
41# endif
42# ifdef HAVE_NETINET_IP_H
43# include <netinet/ip.h>
44# endif
45# include <netinet/ip_icmp.h>
46#endif
37 47
38#include <openssl/err.h> 48#include <openssl/err.h>
39#include <openssl/pem.h> 49#include <openssl/pem.h>
40#include <openssl/rsa.h> 50#include <openssl/rsa.h>
41#include <openssl/rand.h> 51#include <openssl/rand.h>
… …
53 63
54struct configuration conf; 64struct configuration conf;
55 65
56u8 best_protocol (u8 protset) 66u8 best_protocol (u8 protset)
57{ 67{
58 if (protset & PROT_IPv4 ) return PROT_IPv4; 68 if (protset & PROT_IPv4 ) return PROT_IPv4;
69 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
59 if (protset & PROT_UDPv4) return PROT_UDPv4; 70 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
60 if (protset & PROT_TCPv4) return PROT_TCPv4; 71 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
61 72
62 return 0; 73 return 0;
63} 74}
64 75
65const char *strprotocol (u8 protocol) 76const char *strprotocol (u8 protocol)
66{ 77{
67 if (protocol & PROT_IPv4 ) return "rawip"; 78 if (protocol & PROT_IPv4 ) return "rawip";
79 if (protocol & PROT_ICMPv4) return "icmp";
68 if (protocol & PROT_UDPv4) return "udp"; 80 if (protocol & PROT_UDPv4 ) return "udp";
69 if (protocol & PROT_TCPv4) return "tcp"; 81 if (protocol & PROT_TCPv4 ) return "tcp";
70 82
71 return "<unknown>"; 83 return "<unknown>";
72} 84}
73 85
74configuration::configuration () 86void
87conf_node::print ()
75{ 88{
76 init (); 89 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
90 id,
91 id >> 8, id & 0xff,
92 compress ? 'Y' : 'N',
93 connectmode == C_ONDEMAND ? "ondemand" :
94 connectmode == C_NEVER ? "never" :
95 connectmode == C_ALWAYS ? "always" : "",
96 nodename,
97 hostname ? hostname : "",
98 hostname ? ":" : "",
99 hostname ? udp_port : 0
100 );
77} 101}
78 102
79configuration::~configuration () 103conf_node::~conf_node ()
80{ 104{
81 cleanup (); 105 if (rsa_key)
106 RSA_free (rsa_key);
107
108 free (nodename);
109 free (hostname);
82} 110}
83 111
84void configuration::init () 112void configuration::init ()
85{ 113{
86 memset (this, 0, sizeof (*this)); 114 memset (this, 0, sizeof (*this));
87 115
88 rekey = DEFAULT_REKEY; 116 rekey = DEFAULT_REKEY;
89 keepalive = DEFAULT_KEEPALIVE; 117 keepalive = DEFAULT_KEEPALIVE;
90 llevel = L_INFO; 118 llevel = L_INFO;
91 ip_proto = IPPROTO_GRE; 119 ip_proto = IPPROTO_GRE;
120#if ENABLE_ICMP
121 icmp_type = ICMP_ECHOREPLY;
122#endif
92 123
93 default_node.udp_port = DEFAULT_UDPPORT; 124 default_node.udp_port = DEFAULT_UDPPORT;
94 default_node.tcp_port = DEFAULT_UDPPORT; 125 default_node.tcp_port = DEFAULT_UDPPORT;
95 default_node.connectmode = conf_node::C_ALWAYS; 126 default_node.connectmode = conf_node::C_ALWAYS;
96 default_node.compress = true; 127 default_node.compress = true;
… …
100void configuration::cleanup() 131void configuration::cleanup()
101{ 132{
102 if (rsa_key) 133 if (rsa_key)
103 RSA_free (rsa_key); 134 RSA_free (rsa_key);
104 135
105 free (ifname);
106
107 rsa_key = 0; 136 rsa_key = 0;
108 ifname = 0; 137
138 free (ifname); ifname = 0;
139#if ENABLE_HTTP_PROXY
140 free (proxy_host); proxy_host = 0;
141 free (proxy_auth); proxy_auth = 0;
142#endif
109} 143}
110 144
111void 145void
112configuration::clear_config () 146configuration::clear_config ()
113{ 147{
… …
204 else 238 else
205 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 239 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
206 } 240 }
207 else if (!strcmp (var, "ip-proto")) 241 else if (!strcmp (var, "ip-proto"))
208 ip_proto = atoi (val); 242 ip_proto = atoi (val);
243#if ENABLE_ICMP
244 //TODO: error message
245 else if (!strcmp (var, "icmp-type"))
246 icmp_type = atoi (val);
247#endif
209 248
210 // per config 249 // per config
211 else if (!strcmp (var, "node")) 250 else if (!strcmp (var, "node"))
212 { 251 {
213 default_node.id++; 252 default_node.id++;
… …
272 script_if_up = strdup (val); 311 script_if_up = strdup (val);
273 else if (!strcmp (var, "node-up")) 312 else if (!strcmp (var, "node-up"))
274 script_node_up = strdup (val); 313 script_node_up = strdup (val);
275 else if (!strcmp (var, "node-down")) 314 else if (!strcmp (var, "node-down"))
276 script_node_down = strdup (val); 315 script_node_down = strdup (val);
316#if ENABLE_HTTP_PROXY
317 else if (!strcmp (var, "http-proxy-host"))
318 proxy_host = strdup (val);
319 else if (!strcmp (var, "http-proxy-port"))
320 proxy_port = atoi (val);
321 else if (!strcmp (var, "http-proxy-auth"))
322 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
323#endif
277 324
278 /* node-specific, non-defaultable */ 325 /* node-specific, non-defaultable */
279 else if (node != &default_node && !strcmp (var, "hostname")) 326 else if (node != &default_node && !strcmp (var, "hostname"))
280 { 327 {
281 free (node->hostname); 328 free (node->hostname);
… …
317 { 364 {
318#if ENABLE_TCP 365#if ENABLE_TCP
319 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 366 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
320#endif 367#endif
321 } 368 }
369 else if (!strcmp (var, "enable-icmp"))
370 {
371#if ENABLE_ICMP
372 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
373#endif
374 }
322 else if (!strcmp (var, "enable-udp")) 375 else if (!strcmp (var, "enable-udp"))
323 { 376 {
324 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 377 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
325 } 378 }
326 else if (!strcmp (var, "enable-rawip")) 379 else if (!strcmp (var, "enable-rawip"))
… …
328 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 381 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
329 } 382 }
330 383
331 // unknown or misplaced 384 // unknown or misplaced
332 else 385 else
333 {
334 slog (L_WARN, 386 slog (L_WARN,
335 _("unknown or misplaced variable `%s', at '%s' line %d"), 387 _("unknown or misplaced variable `%s', at '%s' line %d"),
336 var, fname, lineno); 388 var, fname, lineno);
337 }
338 } 389 }
339 390
340 fclose (f); 391 fclose (f);
341 } 392 }
342 else 393 else
… …
401 printf (_("MTU: %d\n"), mtu); 452 printf (_("MTU: %d\n"), mtu);
402 printf (_("rekeying interval: %d\n"), rekey); 453 printf (_("rekeying interval: %d\n"), rekey);
403 printf (_("keepalive interval: %d\n"), keepalive); 454 printf (_("keepalive interval: %d\n"), keepalive);
404 printf (_("interface: %s\n"), ifname); 455 printf (_("interface: %s\n"), ifname);
405 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 456 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
406 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 457 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
407 printf ("\n"); 458 printf ("\n");
408 459
409 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 460 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
410 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 461 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
411 462
… …
413 (*i)->print (); 464 (*i)->print ();
414 465
415 printf ("\n"); 466 printf ("\n");
416} 467}
417 468
418void 469configuration::configuration ()
419conf_node::print ()
420{ 470{
421 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 471 init ();
422 id,
423 id >> 8, id & 0xff,
424 compress ? 'Y' : 'N',
425 connectmode == C_ONDEMAND ? "ondemand" :
426 connectmode == C_NEVER ? "never" :
427 connectmode == C_ALWAYS ? "always" : "",
428 nodename,
429 hostname ? hostname : "",
430 hostname ? ":" : "",
431 hostname ? udp_port : 0
432 );
433} 472}
434 473
474configuration::~configuration ()
475{
476 cleanup ();
477}
478
479

Diff Legend

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