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.21 by pcg, Sat Jan 17 01:18:36 2004 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.c -- configuration code
3 Copyright (C) 1998 Robert van der Meulen 3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
4 1998-2002 Ivo Timmermans <ivo@o2w.nl>
5 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
6 2000 Cris van Pelt <tribbel@arise.dhs.org>
7 2003 Marc Lehmann <pcg@goof.com>
8 4
9 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version. 8 (at your option) any later version.
… …
31#include <netdb.h> 27#include <netdb.h>
32#include <sys/stat.h> 28#include <sys/stat.h>
33#include <sys/types.h> 29#include <sys/types.h>
34#include <unistd.h> 30#include <unistd.h>
35 31
36#include <netinet/in.h> 32#include "netcompat.h"
37 33
38#include <openssl/err.h> 34#include <openssl/err.h>
39#include <openssl/pem.h> 35#include <openssl/pem.h>
40#include <openssl/rsa.h> 36#include <openssl/rsa.h>
41#include <openssl/rand.h> 37#include <openssl/rand.h>
… …
53 49
54struct configuration conf; 50struct configuration conf;
55 51
56u8 best_protocol (u8 protset) 52u8 best_protocol (u8 protset)
57{ 53{
58 if (protset & PROT_IPv4 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
59 if (protset & PROT_UDPv4) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
60 if (protset & PROT_TCPv4) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
61 58
62 return 0; 59 return 0;
63} 60}
64 61
65const char *strprotocol (u8 protocol) 62const char *strprotocol (u8 protocol)
66{ 63{
67 if (protocol & PROT_IPv4 ) return "rawip"; 64 if (protocol & PROT_IPv4 ) return "rawip";
65 if (protocol & PROT_ICMPv4) return "icmp";
68 if (protocol & PROT_UDPv4) return "udp"; 66 if (protocol & PROT_UDPv4 ) return "udp";
69 if (protocol & PROT_TCPv4) return "tcp"; 67 if (protocol & PROT_TCPv4 ) return "tcp";
70 68
71 return "<unknown>"; 69 return "<unknown>";
72} 70}
73 71
74configuration::configuration () 72void
73conf_node::print ()
75{ 74{
76 init (); 75 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
76 id,
77 id >> 8, id & 0xff,
78 compress ? 'Y' : 'N',
79 connectmode == C_ONDEMAND ? "ondemand" :
80 connectmode == C_NEVER ? "never" :
81 connectmode == C_ALWAYS ? "always" : "",
82 nodename,
83 hostname ? hostname : "",
84 hostname ? ":" : "",
85 hostname ? udp_port : 0
86 );
77} 87}
78 88
79configuration::~configuration () 89conf_node::~conf_node ()
80{ 90{
81 cleanup (); 91 if (rsa_key)
92 RSA_free (rsa_key);
93
94 free (nodename);
95 free (hostname);
82} 96}
83 97
84void configuration::init () 98void configuration::init ()
85{ 99{
86 memset (this, 0, sizeof (*this)); 100 memset (this, 0, sizeof (*this));
87 101
102 mtu = DEFAULT_MTU;
88 rekey = DEFAULT_REKEY; 103 rekey = DEFAULT_REKEY;
89 keepalive = DEFAULT_KEEPALIVE; 104 keepalive = DEFAULT_KEEPALIVE;
90 llevel = L_INFO; 105 llevel = L_INFO;
91 ip_proto = IPPROTO_GRE; 106 ip_proto = IPPROTO_GRE;
107#if ENABLE_ICMP
108 icmp_type = ICMP_ECHOREPLY;
109#endif
92 110
93 default_node.udp_port = DEFAULT_UDPPORT; 111 default_node.udp_port = DEFAULT_UDPPORT;
94 default_node.tcp_port = DEFAULT_UDPPORT; 112 default_node.tcp_port = DEFAULT_UDPPORT;
95 default_node.connectmode = conf_node::C_ALWAYS; 113 default_node.connectmode = conf_node::C_ALWAYS;
96 default_node.compress = true; 114 default_node.compress = true;
… …
100void configuration::cleanup() 118void configuration::cleanup()
101{ 119{
102 if (rsa_key) 120 if (rsa_key)
103 RSA_free (rsa_key); 121 RSA_free (rsa_key);
104 122
105 free (ifname);
106
107 rsa_key = 0; 123 rsa_key = 0;
108 ifname = 0; 124
125 free (ifname); ifname = 0;
126#if ENABLE_HTTP_PROXY
127 free (proxy_host); proxy_host = 0;
128 free (proxy_auth); proxy_auth = 0;
129#endif
109} 130}
110 131
111void 132void
112configuration::clear_config () 133configuration::clear_config ()
113{ 134{
… …
204 else 225 else
205 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 226 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
206 } 227 }
207 else if (!strcmp (var, "ip-proto")) 228 else if (!strcmp (var, "ip-proto"))
208 ip_proto = atoi (val); 229 ip_proto = atoi (val);
230 else if (!strcmp (var, "icmp-type"))
231 {
232#if ENABLE_ICMP
233 icmp_type = atoi (val);
234#endif
235 }
209 236
210 // per config 237 // per config
211 else if (!strcmp (var, "node")) 238 else if (!strcmp (var, "node"))
212 { 239 {
213 default_node.id++; 240 default_node.id++;
… …
272 script_if_up = strdup (val); 299 script_if_up = strdup (val);
273 else if (!strcmp (var, "node-up")) 300 else if (!strcmp (var, "node-up"))
274 script_node_up = strdup (val); 301 script_node_up = strdup (val);
275 else if (!strcmp (var, "node-down")) 302 else if (!strcmp (var, "node-down"))
276 script_node_down = strdup (val); 303 script_node_down = strdup (val);
304 else if (!strcmp (var, "http-proxy-host"))
305 {
306#if ENABLE_HTTP_PROXY
307 proxy_host = strdup (val);
308#endif
309 }
310 else if (!strcmp (var, "http-proxy-port"))
311 {
312#if ENABLE_HTTP_PROXY
313 proxy_port = atoi (val);
314#endif
315 }
316 else if (!strcmp (var, "http-proxy-auth"))
317 {
318#if ENABLE_HTTP_PROXY
319 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
320#endif
321 }
277 322
278 /* node-specific, non-defaultable */ 323 /* node-specific, non-defaultable */
279 else if (node != &default_node && !strcmp (var, "hostname")) 324 else if (node != &default_node && !strcmp (var, "hostname"))
280 { 325 {
281 free (node->hostname); 326 free (node->hostname);
… …
317 { 362 {
318#if ENABLE_TCP 363#if ENABLE_TCP
319 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 364 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
320#endif 365#endif
321 } 366 }
367 else if (!strcmp (var, "enable-icmp"))
368 {
369#if ENABLE_ICMP
370 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
371#endif
372 }
322 else if (!strcmp (var, "enable-udp")) 373 else if (!strcmp (var, "enable-udp"))
323 { 374 {
324 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 375 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
325 } 376 }
326 else if (!strcmp (var, "enable-rawip")) 377 else if (!strcmp (var, "enable-rawip"))
… …
328 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 379 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
329 } 380 }
330 381
331 // unknown or misplaced 382 // unknown or misplaced
332 else 383 else
333 {
334 slog (L_WARN, 384 slog (L_WARN,
335 _("unknown or misplaced variable `%s', at '%s' line %d"), 385 _("unknown or misplaced variable `%s', at '%s' line %d"),
336 var, fname, lineno); 386 var, fname, lineno);
337 }
338 } 387 }
339 388
340 fclose (f); 389 fclose (f);
341 } 390 }
342 else 391 else
… …
401 printf (_("MTU: %d\n"), mtu); 450 printf (_("MTU: %d\n"), mtu);
402 printf (_("rekeying interval: %d\n"), rekey); 451 printf (_("rekeying interval: %d\n"), rekey);
403 printf (_("keepalive interval: %d\n"), keepalive); 452 printf (_("keepalive interval: %d\n"), keepalive);
404 printf (_("interface: %s\n"), ifname); 453 printf (_("interface: %s\n"), ifname);
405 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 454 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
406 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 455 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
407 printf ("\n"); 456 printf ("\n");
408 457
409 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 458 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
410 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 459 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
411 460
… …
413 (*i)->print (); 462 (*i)->print ();
414 463
415 printf ("\n"); 464 printf ("\n");
416} 465}
417 466
418void 467configuration::configuration ()
419conf_node::print ()
420{ 468{
421 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 469 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} 470}
434 471
472configuration::~configuration ()
473{
474 cleanup ();
475}
476
477

Diff Legend

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