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.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 ) return PROT_IPv4; 58 if (protset & PROT_IPv4 ) return PROT_IPv4;
59 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
59 if (protset & PROT_UDPv4) return PROT_UDPv4; 60 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
60 if (protset & PROT_TCPv4) return PROT_TCPv4; 61 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
61 62
62 return 0; 63 return 0;
63} 64}
64 65
65const char *strprotocol (u8 protocol) 66const char *strprotocol (u8 protocol)
66{ 67{
67 if (protocol & PROT_IPv4 ) return "rawip"; 68 if (protocol & PROT_IPv4 ) return "rawip";
69 if (protocol & PROT_ICMPv4) return "icmp";
68 if (protocol & PROT_UDPv4) return "udp"; 70 if (protocol & PROT_UDPv4 ) return "udp";
69 if (protocol & PROT_TCPv4) return "tcp"; 71 if (protocol & PROT_TCPv4 ) return "tcp";
70 72
71 return "<unknown>"; 73 return "<unknown>";
72} 74}
73 75
74configuration::configuration () 76void
77conf_node::print ()
75{ 78{
76 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 );
77} 91}
78 92
79configuration::~configuration () 93conf_node::~conf_node ()
80{ 94{
81 cleanup (); 95 if (rsa_key)
96 RSA_free (rsa_key);
97
98 free (nodename);
99 free (hostname);
82} 100}
83 101
84void configuration::init () 102void configuration::init ()
85{ 103{
86 memset (this, 0, sizeof (*this)); 104 memset (this, 0, sizeof (*this));
87 105
88 rekey = DEFAULT_REKEY; 106 rekey = DEFAULT_REKEY;
89 keepalive = DEFAULT_KEEPALIVE; 107 keepalive = DEFAULT_KEEPALIVE;
90 llevel = L_INFO; 108 llevel = L_INFO;
91 ip_proto = IPPROTO_GRE; 109 ip_proto = IPPROTO_GRE;
110#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY;
112#endif
92 113
93 default_node.udp_port = DEFAULT_UDPPORT; 114 default_node.udp_port = DEFAULT_UDPPORT;
94 default_node.tcp_port = DEFAULT_UDPPORT; 115 default_node.tcp_port = DEFAULT_UDPPORT;
95 default_node.connectmode = conf_node::C_ALWAYS; 116 default_node.connectmode = conf_node::C_ALWAYS;
96 default_node.compress = true; 117 default_node.compress = true;
… …
100void configuration::cleanup() 121void configuration::cleanup()
101{ 122{
102 if (rsa_key) 123 if (rsa_key)
103 RSA_free (rsa_key); 124 RSA_free (rsa_key);
104 125
105 free (ifname);
106
107 rsa_key = 0; 126 rsa_key = 0;
108 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
109} 133}
110 134
111void 135void
112configuration::clear_config () 136configuration::clear_config ()
113{ 137{
… …
204 else 228 else
205 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);
206 } 230 }
207 else if (!strcmp (var, "ip-proto")) 231 else if (!strcmp (var, "ip-proto"))
208 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
209 238
210 // per config 239 // per config
211 else if (!strcmp (var, "node")) 240 else if (!strcmp (var, "node"))
212 { 241 {
213 default_node.id++; 242 default_node.id++;
… …
272 script_if_up = strdup (val); 301 script_if_up = strdup (val);
273 else if (!strcmp (var, "node-up")) 302 else if (!strcmp (var, "node-up"))
274 script_node_up = strdup (val); 303 script_node_up = strdup (val);
275 else if (!strcmp (var, "node-down")) 304 else if (!strcmp (var, "node-down"))
276 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
277 314
278 /* node-specific, non-defaultable */ 315 /* node-specific, non-defaultable */
279 else if (node != &default_node && !strcmp (var, "hostname")) 316 else if (node != &default_node && !strcmp (var, "hostname"))
280 { 317 {
281 free (node->hostname); 318 free (node->hostname);
… …
317 { 354 {
318#if ENABLE_TCP 355#if ENABLE_TCP
319 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;
320#endif 357#endif
321 } 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
364 }
322 else if (!strcmp (var, "enable-udp")) 365 else if (!strcmp (var, "enable-udp"))
323 { 366 {
324 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;
325 } 368 }
326 else if (!strcmp (var, "enable-rawip")) 369 else if (!strcmp (var, "enable-rawip"))
… …
328 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;
329 } 372 }
330 373
331 // unknown or misplaced 374 // unknown or misplaced
332 else 375 else
333 {
334 slog (L_WARN, 376 slog (L_WARN,
335 _("unknown or misplaced variable `%s', at '%s' line %d"), 377 _("unknown or misplaced variable `%s', at '%s' line %d"),
336 var, fname, lineno); 378 var, fname, lineno);
337 }
338 } 379 }
339 380
340 fclose (f); 381 fclose (f);
341 } 382 }
342 else 383 else
… …
401 printf (_("MTU: %d\n"), mtu); 442 printf (_("MTU: %d\n"), mtu);
402 printf (_("rekeying interval: %d\n"), rekey); 443 printf (_("rekeying interval: %d\n"), rekey);
403 printf (_("keepalive interval: %d\n"), keepalive); 444 printf (_("keepalive interval: %d\n"), keepalive);
404 printf (_("interface: %s\n"), ifname); 445 printf (_("interface: %s\n"), ifname);
405 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 446 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
406 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);
407 printf ("\n"); 448 printf ("\n");
408 449
409 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 450 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
410 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 451 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
411 452
… …
413 (*i)->print (); 454 (*i)->print ();
414 455
415 printf ("\n"); 456 printf ("\n");
416} 457}
417 458
418void 459configuration::configuration ()
419conf_node::print ()
420{ 460{
421 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 461 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} 462}
434 463
464configuration::~configuration ()
465{
466 cleanup ();
467}
468
469

Diff Legend

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