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.19 by pcg, Thu Oct 16 20:35:14 2003 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 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) 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
59 return PROT_IPv4; 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
60 58
61 return PROT_UDPv4; 59 return 0;
62} 60}
63 61
64const char *strprotocol (u8 protocol) 62const char *strprotocol (u8 protocol)
65{ 63{
66 if (protocol & PROT_IPv4 ) return "rawip"; 64 if (protocol & PROT_IPv4 ) return "rawip";
65 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4) return "udp"; 66 if (protocol & PROT_UDPv4 ) return "udp";
67 if (protocol & PROT_TCPv4 ) return "tcp";
68 68
69 return "<unknown>"; 69 return "<unknown>";
70} 70}
71 71
72configuration::configuration () 72void
73conf_node::print ()
73{ 74{
74 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 );
75} 87}
76 88
77configuration::~configuration () 89conf_node::~conf_node ()
78{ 90{
79 cleanup (); 91 if (rsa_key)
92 RSA_free (rsa_key);
93
94 free (nodename);
95 free (hostname);
80} 96}
81 97
82void configuration::init () 98void configuration::init ()
83{ 99{
84 memset (this, 0, sizeof (*this)); 100 memset (this, 0, sizeof (*this));
85 101
102 mtu = DEFAULT_MTU;
86 rekey = DEFAULT_REKEY; 103 rekey = DEFAULT_REKEY;
87 keepalive = DEFAULT_KEEPALIVE; 104 keepalive = DEFAULT_KEEPALIVE;
88 llevel = L_INFO; 105 llevel = L_INFO;
89 ip_proto = IPPROTO_GRE; 106 ip_proto = IPPROTO_GRE;
107#if ENABLE_ICMP
108 icmp_type = ICMP_ECHOREPLY;
109#endif
90 110
91 default_node.udp_port = DEFAULT_UDPPORT; 111 default_node.udp_port = DEFAULT_UDPPORT;
92 default_node.tcp_port = DEFAULT_UDPPORT; 112 default_node.tcp_port = DEFAULT_UDPPORT;
93 default_node.connectmode = conf_node::C_ALWAYS; 113 default_node.connectmode = conf_node::C_ALWAYS;
94 default_node.compress = true; 114 default_node.compress = true;
… …
98void configuration::cleanup() 118void configuration::cleanup()
99{ 119{
100 if (rsa_key) 120 if (rsa_key)
101 RSA_free (rsa_key); 121 RSA_free (rsa_key);
102 122
103 free (ifname);
104
105 rsa_key = 0; 123 rsa_key = 0;
106 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
107} 130}
108 131
109void 132void
110configuration::clear_config () 133configuration::clear_config ()
111{ 134{
… …
202 else 225 else
203 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);
204 } 227 }
205 else if (!strcmp (var, "ip-proto")) 228 else if (!strcmp (var, "ip-proto"))
206 ip_proto = atoi (val); 229 ip_proto = atoi (val);
230#if ENABLE_ICMP
231 //TODO: error message
232 else if (!strcmp (var, "icmp-type"))
233 icmp_type = atoi (val);
234#endif
207 235
208 // per config 236 // per config
209 else if (!strcmp (var, "node")) 237 else if (!strcmp (var, "node"))
210 { 238 {
211 default_node.id++; 239 default_node.id++;
… …
270 script_if_up = strdup (val); 298 script_if_up = strdup (val);
271 else if (!strcmp (var, "node-up")) 299 else if (!strcmp (var, "node-up"))
272 script_node_up = strdup (val); 300 script_node_up = strdup (val);
273 else if (!strcmp (var, "node-down")) 301 else if (!strcmp (var, "node-down"))
274 script_node_down = strdup (val); 302 script_node_down = strdup (val);
303#if ENABLE_HTTP_PROXY
304 else if (!strcmp (var, "http-proxy-host"))
305 proxy_host = strdup (val);
306 else if (!strcmp (var, "http-proxy-port"))
307 proxy_port = atoi (val);
308 else if (!strcmp (var, "http-proxy-auth"))
309 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
310#endif
275 311
276 /* node-specific, non-defaultable */ 312 /* node-specific, non-defaultable */
277 else if (node != &default_node && !strcmp (var, "hostname")) 313 else if (node != &default_node && !strcmp (var, "hostname"))
278 { 314 {
279 free (node->hostname); 315 free (node->hostname);
… …
311 parse_bool (node->compress, "compress", true, false); 347 parse_bool (node->compress, "compress", true, false);
312 } 348 }
313 // all these bool options really really cost a lot of executable size! 349 // all these bool options really really cost a lot of executable size!
314 else if (!strcmp (var, "enable-tcp")) 350 else if (!strcmp (var, "enable-tcp"))
315 { 351 {
352#if ENABLE_TCP
316 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 353 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
354#endif
355 }
356 else if (!strcmp (var, "enable-icmp"))
357 {
358#if ENABLE_ICMP
359 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
360#endif
317 } 361 }
318 else if (!strcmp (var, "enable-udp")) 362 else if (!strcmp (var, "enable-udp"))
319 { 363 {
320 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 364 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
321 } 365 }
… …
324 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 368 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
325 } 369 }
326 370
327 // unknown or misplaced 371 // unknown or misplaced
328 else 372 else
329 {
330 slog (L_WARN, 373 slog (L_WARN,
331 _("unknown or misplaced variable `%s', at '%s' line %d"), 374 _("unknown or misplaced variable `%s', at '%s' line %d"),
332 var, fname, lineno); 375 var, fname, lineno);
333 }
334 } 376 }
335 377
336 fclose (f); 378 fclose (f);
337 } 379 }
338 else 380 else
… …
397 printf (_("MTU: %d\n"), mtu); 439 printf (_("MTU: %d\n"), mtu);
398 printf (_("rekeying interval: %d\n"), rekey); 440 printf (_("rekeying interval: %d\n"), rekey);
399 printf (_("keepalive interval: %d\n"), keepalive); 441 printf (_("keepalive interval: %d\n"), keepalive);
400 printf (_("interface: %s\n"), ifname); 442 printf (_("interface: %s\n"), ifname);
401 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 443 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
402 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 444 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
403 printf ("\n"); 445 printf ("\n");
404 446
405 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 447 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
406 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 448 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
407 449
… …
409 (*i)->print (); 451 (*i)->print ();
410 452
411 printf ("\n"); 453 printf ("\n");
412} 454}
413 455
414void 456configuration::configuration ()
415conf_node::print ()
416{ 457{
417 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 458 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} 459}
430 460
461configuration::~configuration ()
462{
463 cleanup ();
464}
465
466

Diff Legend

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