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.51 by pcg, Sat Jul 18 05:59:16 2009 UTC vs.
Revision 1.59 by root, Tue Dec 4 10:29:43 2012 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.C -- configuration code
3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2011 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify it 7 GVPE is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
… …
38#include <errno.h> 38#include <errno.h>
39#include <netdb.h> 39#include <netdb.h>
40#include <sys/stat.h> 40#include <sys/stat.h>
41#include <sys/types.h> 41#include <sys/types.h>
42#include <unistd.h> 42#include <unistd.h>
43#include <pwd.h>
43 44
44#include "netcompat.h" 45#include "netcompat.h"
45 46
46#include <openssl/err.h> 47#include <openssl/err.h>
47#include <openssl/pem.h> 48#include <openssl/pem.h>
… …
57char *thisnode; 58char *thisnode;
58char *identname; 59char *identname;
59 60
60struct configuration conf; 61struct configuration conf;
61 62
63u8
62u8 best_protocol (u8 protset) 64best_protocol (u8 protset)
63{ 65{
64 if (protset & PROT_IPv4 ) return PROT_IPv4; 66 if (protset & PROT_IPv4 ) return PROT_IPv4;
65 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 67 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
66 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 68 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
67 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 69 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
68 if (protset & PROT_DNSv4 ) return PROT_DNSv4; 70 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
69 71
70 return 0; 72 return 0;
71} 73}
72 74
75const char *
73const char *strprotocol (u8 protocol) 76strprotocol (u8 protocol)
74{ 77{
75 if (protocol & PROT_IPv4 ) return "rawip"; 78 if (protocol & PROT_IPv4 ) return "rawip";
76 if (protocol & PROT_ICMPv4) return "icmp"; 79 if (protocol & PROT_ICMPv4) return "icmp";
77 if (protocol & PROT_UDPv4 ) return "udp"; 80 if (protocol & PROT_UDPv4 ) return "udp";
78 if (protocol & PROT_TCPv4 ) return "tcp"; 81 if (protocol & PROT_TCPv4 ) return "tcp";
… …
103 return false; 106 return false;
104 107
105 return true; 108 return true;
106} 109}
107 110
108void
109conf_node::print ()
110{
111 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
112 id,
113 id >> 8, id & 0xff,
114 compress ? 'Y' : 'N',
115 connectmode == C_ONDEMAND ? "ondemand"
116 : connectmode == C_NEVER ? "never"
117 : connectmode == C_ALWAYS ? "always"
118 : connectmode == C_DISABLED ? "disabled"
119 : "",
120 nodename,
121 hostname ? hostname : "",
122 hostname ? ":" : "",
123 hostname ? udp_port : 0
124 );
125}
126
127conf_node::~conf_node () 111conf_node::~conf_node ()
128{ 112{
129#if 0 113#if 0
130 // does not work, because string pointers etc. are shared 114 // does not work, because string pointers etc. are shared
131 // is not called, however 115 // is not called, however
… …
140 free (dns_hostname); 124 free (dns_hostname);
141#endif 125#endif
142#endif 126#endif
143} 127}
144 128
129void
145void configuration::init () 130configuration::init ()
146{ 131{
147 memset (this, 0, sizeof (*this)); 132 memset (this, 0, sizeof (*this));
148 133
149 mtu = DEFAULT_MTU; 134 mtu = DEFAULT_MTU;
150 nfmark = 0; 135 nfmark = 0;
… …
167 default_node.if_up_data = strdup (""); 152 default_node.if_up_data = strdup ("");
168 153
169#if ENABLE_DNS 154#if ENABLE_DNS
170 default_node.dns_port = 0; // default is 0 == client 155 default_node.dns_port = 0; // default is 0 == client
171 156
157 dns_case_preserving = true;
172 dns_forw_host = strdup ("127.0.0.1"); 158 dns_forw_host = strdup ("127.0.0.1");
173 dns_forw_port = 53; 159 dns_forw_port = 53;
174 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR; 160 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
175 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL; 161 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
176 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR; 162 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
… …
178#endif 164#endif
179 165
180 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 166 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
181} 167}
182 168
169void
183void configuration::cleanup() 170configuration::cleanup ()
184{ 171{
185 if (rsa_key) 172 if (rsa_key)
186 RSA_free (rsa_key); 173 RSA_free (rsa_key);
187 174
188 rsa_key = 0; 175 rsa_key = 0;
189 176
190 free (pidfilename); pidfilename = 0; 177 free (pidfilename); pidfilename = 0;
191 free (ifname); ifname = 0; 178 free (ifname); ifname = 0;
192#if ENABLE_HTTP_PROXY 179#if ENABLE_HTTP_PROXY
193 free (proxy_host); proxy_host = 0; 180 free (proxy_host); proxy_host = 0;
194 free (proxy_auth); proxy_auth = 0; 181 free (proxy_auth); proxy_auth = 0;
195#endif 182#endif
196#if ENABLE_DNS 183#if ENABLE_DNS
197 free (dns_forw_host); dns_forw_host = 0; 184 free (dns_forw_host); dns_forw_host = 0;
198#endif 185#endif
186 free (change_root); change_root = 0;
199 free (script_if_up); script_if_up = 0; 187 free (script_if_up); script_if_up = 0;
200 free (script_node_up); script_node_up = 0; 188 free (script_node_up); script_node_up = 0;
201 free (script_node_change); script_node_change = 0; 189 free (script_node_change); script_node_change = 0;
202 free (script_node_down); script_node_down = 0; 190 free (script_node_down); script_node_down = 0;
203} 191}
… …
211 nodes.clear (); 199 nodes.clear ();
212 200
213 cleanup (); 201 cleanup ();
214 init (); 202 init ();
215} 203}
204
205//static bool
206//is_true (const char *name)
207//{
208 //re
209//}
216 210
217#define parse_bool(target,name,trueval,falseval) do { \ 211#define parse_bool(target,name,trueval,falseval) do { \
218 if (!strcmp (val, "yes")) target = trueval; \ 212 if (!strcmp (val, "yes")) target = trueval; \
219 else if (!strcmp (val, "no")) target = falseval; \ 213 else if (!strcmp (val, "no")) target = falseval; \
220 else if (!strcmp (val, "true")) target = trueval; \ 214 else if (!strcmp (val, "true")) target = trueval; \
221 else if (!strcmp (val, "false")) target = falseval; \ 215 else if (!strcmp (val, "false")) target = falseval; \
222 else if (!strcmp (val, "on")) target = trueval; \ 216 else if (!strcmp (val, "on")) target = trueval; \
223 else if (!strcmp (val, "off")) target = falseval; \ 217 else if (!strcmp (val, "off")) target = falseval; \
224 else \ 218 else \
225 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \ 219 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed, ignored"); \
226} while (0) 220} while (0)
227 221
228const char * 222const char *
229configuration_parser::parse_line (char *line) 223configuration_parser::parse_line (char *line)
230{ 224{
… …
248 return 0; /* comment: ignore */ 242 return 0; /* comment: ignore */
249 243
250 char *val = strtok (NULL, "\t\n\r ="); 244 char *val = strtok (NULL, "\t\n\r =");
251 245
252 if (!val || val[0] == '#') 246 if (!val || val[0] == '#')
253 return _("no value given for variable. (ignored)"); 247 return _("no value given for variable, ignored");
254 248
255 if (!strcmp (var, "on")) 249 else if (!strcmp (var, "on"))
256 { 250 {
257 if (!::thisnode 251 if (::thisnode
258 || (val[0] == '!' && strcmp (val + 1, ::thisnode)) 252 && ((val[0] == '!' && strcmp (val + 1, ::thisnode))
259 || !strcmp (val, ::thisnode)) 253 || !strcmp (val, ::thisnode)))
260 return parse_line (strtok (NULL, "\n\r")); 254 return parse_line (strtok (NULL, "\n\r"));
261 else 255 }
262 return 0; 256
257 else if (!strcmp (var, "include"))
258 {
259 char *fname = conf.config_filename (val);
260 parse_file (fname);
261 free (fname);
263 } 262 }
264 263
265 // truly global 264 // truly global
266 if (!strcmp (var, "loglevel")) 265 else if (!strcmp (var, "loglevel"))
267 { 266 {
268 loglevel l = string_to_loglevel (val); 267 loglevel l = string_to_loglevel (val);
269 268
270 if (l == L_NONE) 269 if (l == L_NONE)
271 return _("unknown loglevel. (skipping)"); 270 return _("unknown loglevel, ignored");
272 } 271 }
273 else if (!strcmp (var, "ip-proto")) 272 else if (!strcmp (var, "ip-proto"))
274 conf.ip_proto = atoi (val); 273 conf.ip_proto = atoi (val);
275 else if (!strcmp (var, "icmp-type")) 274 else if (!strcmp (var, "icmp-type"))
276 { 275 {
277#if ENABLE_ICMP 276#if ENABLE_ICMP
278 conf.icmp_type = atoi (val); 277 conf.icmp_type = atoi (val);
279#endif 278#endif
280 } 279 }
280 else if (!strcmp (var, "chuser"))
281 {
282 struct passwd *pw = getpwnam (val);
283 if (!pw)
284 return _("user specified for chuser not found");
281 285
282 // per config 286 conf.change_uid = pw->pw_uid;
287 conf.change_gid = pw->pw_gid;
288 }
289 else if (!strcmp (var, "chuid"))
290 conf.change_uid = atoi (val);
291 else if (!strcmp (var, "chgid"))
292 conf.change_gid = atoi (val);
293 else if (!strcmp (var, "chroot"))
294 free (conf.change_root), conf.change_root = strdup (val);
295
296 // per node
283 else if (!strcmp (var, "node")) 297 else if (!strcmp (var, "node"))
284 { 298 {
285 parse_argv (); 299 parse_argv ();
286 300
287 conf.default_node.id++; 301 conf.default_node.id++;
… …
383 { 397 {
384#if ENABLE_DNS 398#if ENABLE_DNS
385 conf.dns_max_outstanding = atoi (val); 399 conf.dns_max_outstanding = atoi (val);
386#endif 400#endif
387 } 401 }
402 else if (!strcmp (var, "dns-case-preserving"))
403 {
404#if ENABLE_DNS
405 parse_bool (conf.dns_case_preserving, "dns-case-preserving", true, false);
406#endif
407 }
388 else if (!strcmp (var, "http-proxy-host")) 408 else if (!strcmp (var, "http-proxy-host"))
389 { 409 {
390#if ENABLE_HTTP_PROXY 410#if ENABLE_HTTP_PROXY
391 free (conf.proxy_host), conf.proxy_host = strdup (val); 411 free (conf.proxy_host), conf.proxy_host = strdup (val);
392#endif 412#endif
… …
446 else if (!strcmp (val, "always")) 466 else if (!strcmp (val, "always"))
447 node->connectmode = conf_node::C_ALWAYS; 467 node->connectmode = conf_node::C_ALWAYS;
448 else if (!strcmp (val, "disabled")) 468 else if (!strcmp (val, "disabled"))
449 node->connectmode = conf_node::C_DISABLED; 469 node->connectmode = conf_node::C_DISABLED;
450 else 470 else
451 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)"); 471 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', ignored");
452 } 472 }
453 else if (!strcmp (var, "inherit-tos")) 473 else if (!strcmp (var, "inherit-tos"))
454 parse_bool (node->inherit_tos, "inherit-tos", true, false); 474 parse_bool (node->inherit_tos, "inherit-tos", true, false);
455 else if (!strcmp (var, "compress")) 475 else if (!strcmp (var, "compress"))
456 parse_bool (node->compress, "compress", true, false); 476 parse_bool (node->compress, "compress", true, false);
… …
490 else if (!strcmp (var, "max-queue")) 510 else if (!strcmp (var, "max-queue"))
491 node->max_queue = atoi (val); 511 node->max_queue = atoi (val);
492 512
493 // unknown or misplaced 513 // unknown or misplaced
494 else 514 else
495 return _("unknown configuration directive. (ignored)"); 515 return _("unknown configuration directive - ignored");
496 516
497 return 0; 517 return 0;
498} 518}
499 519
520void
500void conf_node::finalise () 521conf_node::finalise ()
501{ 522{
502 if (max_queue < 1) 523 if (max_queue < 1)
503 { 524 {
504 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename); 525 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename);
505 max_queue = 1; 526 max_queue = 1;
… …
510 //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename); 531 //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename);
511 connectmode = C_ALWAYS; 532 connectmode = C_ALWAYS;
512 } 533 }
513} 534}
514 535
536void
515void configuration_parser::parse_argv () 537configuration_parser::parse_argv ()
516{ 538{
517 for (int i = 0; i < argc; ++i) 539 for (int i = 0; i < argc; ++i)
518 { 540 {
519 char *v = argv [i]; 541 char *v = argv [i];
520 542
… …
541 if (warn) 563 if (warn)
542 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v); 564 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
543 565
544 *v = 0; 566 *v = 0;
545 } 567 }
568 }
569}
570
571void
572configuration_parser::parse_file (const char *fname)
573{
574 if (FILE *f = fopen (fname, "r"))
575 {
576 char line [2048];
577 int lineno = 0;
578
579 while (fgets (line, sizeof (line), f))
580 {
581 lineno++;
582
583 const char *warn = parse_line (line);
584
585 if (warn)
586 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
587 }
588
589 fclose (f);
590
591 parse_argv ();
592 }
593 else
594 {
595 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
596 exit (EXIT_FAILURE);
546 } 597 }
547} 598}
548 599
549configuration_parser::configuration_parser (configuration &conf, 600configuration_parser::configuration_parser (configuration &conf,
550 bool need_keys, 601 bool need_keys,
551 int argc, 602 int argc,
552 char **argv) 603 char **argv)
553: conf (conf),need_keys (need_keys), argc (argc), argv (argv) 604: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
554{ 605{
555 char *fname; 606 char *fname;
556 FILE *f;
557 607
558 conf.clear (); 608 conf.clear ();
609 node = &conf.default_node;
559 610
560 asprintf (&fname, "%s/gvpe.conf", confbase); 611 asprintf (&fname, "%s/gvpe.conf", confbase);
561 f = fopen (fname, "r"); 612 parse_file (fname);
562
563 if (f)
564 {
565 char line[16384];
566 int lineno = 0;
567 node = &conf.default_node;
568
569 while (fgets (line, sizeof (line), f))
570 {
571 lineno++;
572
573 const char *warn = parse_line (line);
574
575 if (warn)
576 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
577 }
578
579 fclose (f);
580
581 parse_argv ();
582 }
583 else
584 {
585 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
586 exit (EXIT_FAILURE);
587 }
588
589 free (fname); 613 free (fname);
590 614
591 fname = conf.config_filename (conf.prikeyfile, "hostkey"); 615 fname = conf.config_filename (conf.prikeyfile, "hostkey");
592 616
593 f = fopen (fname, "r"); 617 if (FILE *f = fopen (fname, "r"))
594 if (f)
595 { 618 {
596 conf.rsa_key = RSA_new (); 619 conf.rsa_key = RSA_new ();
597 620
598 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) 621 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
599 { 622 {
… …
611 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 634 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
612 635
613 if (need_keys) 636 if (need_keys)
614 exit (EXIT_FAILURE); 637 exit (EXIT_FAILURE);
615 } 638 }
639
640 free (fname);
616 641
617 if (need_keys && ::thisnode 642 if (need_keys && ::thisnode
618 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key) 643 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
619 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0 644 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
620 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0) 645 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
621 { 646 {
622 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 647 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
623 exit (EXIT_FAILURE); 648 exit (EXIT_FAILURE);
624 } 649 }
625 650
626 free (fname);
627
628 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i) 651 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
629 (*i)->finalise (); 652 (*i)->finalise ();
630} 653}
631 654
655char *
632char *configuration::config_filename (const char *name, const char *dflt) 656configuration::config_filename (const char *name, const char *dflt)
633{ 657{
634 char *fname; 658 char *fname;
635 659
636 asprintf (&fname, name ? name : dflt, ::thisnode); 660 asprintf (&fname, name ? name : dflt, ::thisnode);
637 661
… …
641 asprintf (&fname, "%s/%s", confbase, rname); 665 asprintf (&fname, "%s/%s", confbase, rname);
642 free (rname); 666 free (rname);
643 } 667 }
644 668
645 return fname; 669 return fname;
670}
671
672void
673conf_node::print ()
674{
675 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
676 id,
677 id >> 8, id & 0xff,
678 compress ? 'Y' : 'N',
679 connectmode == C_ONDEMAND ? "ondemand"
680 : connectmode == C_NEVER ? "never"
681 : connectmode == C_ALWAYS ? "always"
682 : connectmode == C_DISABLED ? "disabled"
683 : "",
684 nodename,
685 protocols,
686 hostname ? hostname : "",
687 hostname ? ":" : "",
688 hostname ? udp_port : 0
689 );
646} 690}
647 691
648void 692void
649configuration::print () 693configuration::print ()
650{ 694{
… …
657 printf (_("interface: %s\n"), ifname); 701 printf (_("interface: %s\n"), ifname);
658 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 702 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
659 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); 703 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
660 printf ("\n"); 704 printf ("\n");
661 705
662 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 706 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
663 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 707 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
664 708
665 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 709 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
666 (*i)->print (); 710 (*i)->print ();
667 711
668 printf ("\n"); 712 printf ("\n");
… …
678configuration::~configuration () 722configuration::~configuration ()
679{ 723{
680 cleanup (); 724 cleanup ();
681} 725}
682 726
683

Diff Legend

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