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.60 by root, Sat Jul 13 04:10:29 2013 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;
177 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING; 163 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
178#endif 164#endif
179 165
180 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 166 pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
167 seed_dev = strdup ("/dev/urandom");
168 reseed = DEFAULT_RESEED;
181} 169}
182 170
171void
183void configuration::cleanup() 172configuration::cleanup ()
184{ 173{
185 if (rsa_key) 174 if (rsa_key)
186 RSA_free (rsa_key); 175 RSA_free (rsa_key);
187 176
188 rsa_key = 0; 177 rsa_key = 0;
189 178
179 free (seed_dev); seed_dev = 0;
190 free (pidfilename); pidfilename = 0; 180 free (pidfilename); pidfilename = 0;
191 free (ifname); ifname = 0; 181 free (ifname); ifname = 0;
192#if ENABLE_HTTP_PROXY 182#if ENABLE_HTTP_PROXY
193 free (proxy_host); proxy_host = 0; 183 free (proxy_host); proxy_host = 0;
194 free (proxy_auth); proxy_auth = 0; 184 free (proxy_auth); proxy_auth = 0;
195#endif 185#endif
196#if ENABLE_DNS 186#if ENABLE_DNS
197 free (dns_forw_host); dns_forw_host = 0; 187 free (dns_forw_host); dns_forw_host = 0;
198#endif 188#endif
189 free (change_root); change_root = 0;
199 free (script_if_up); script_if_up = 0; 190 free (script_if_up); script_if_up = 0;
200 free (script_node_up); script_node_up = 0; 191 free (script_node_up); script_node_up = 0;
201 free (script_node_change); script_node_change = 0; 192 free (script_node_change); script_node_change = 0;
202 free (script_node_down); script_node_down = 0; 193 free (script_node_down); script_node_down = 0;
203} 194}
… …
211 nodes.clear (); 202 nodes.clear ();
212 203
213 cleanup (); 204 cleanup ();
214 init (); 205 init ();
215} 206}
207
208//static bool
209//is_true (const char *name)
210//{
211 //re
212//}
216 213
217#define parse_bool(target,name,trueval,falseval) do { \ 214#define parse_bool(target,name,trueval,falseval) do { \
218 if (!strcmp (val, "yes")) target = trueval; \ 215 if (!strcmp (val, "yes")) target = trueval; \
219 else if (!strcmp (val, "no")) target = falseval; \ 216 else if (!strcmp (val, "no")) target = falseval; \
220 else if (!strcmp (val, "true")) target = trueval; \ 217 else if (!strcmp (val, "true")) target = trueval; \
221 else if (!strcmp (val, "false")) target = falseval; \ 218 else if (!strcmp (val, "false")) target = falseval; \
222 else if (!strcmp (val, "on")) target = trueval; \ 219 else if (!strcmp (val, "on")) target = trueval; \
223 else if (!strcmp (val, "off")) target = falseval; \ 220 else if (!strcmp (val, "off")) target = falseval; \
224 else \ 221 else \
225 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \ 222 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed, ignored"); \
226} while (0) 223} while (0)
227 224
228const char * 225const char *
229configuration_parser::parse_line (char *line) 226configuration_parser::parse_line (char *line)
230{ 227{
… …
248 return 0; /* comment: ignore */ 245 return 0; /* comment: ignore */
249 246
250 char *val = strtok (NULL, "\t\n\r ="); 247 char *val = strtok (NULL, "\t\n\r =");
251 248
252 if (!val || val[0] == '#') 249 if (!val || val[0] == '#')
253 return _("no value given for variable. (ignored)"); 250 return _("no value given for variable, ignored");
254 251
255 if (!strcmp (var, "on")) 252 else if (!strcmp (var, "on"))
256 { 253 {
257 if (!::thisnode 254 if (::thisnode
258 || (val[0] == '!' && strcmp (val + 1, ::thisnode)) 255 && ((val[0] == '!' && strcmp (val + 1, ::thisnode))
259 || !strcmp (val, ::thisnode)) 256 || !strcmp (val, ::thisnode)))
260 return parse_line (strtok (NULL, "\n\r")); 257 return parse_line (strtok (NULL, "\n\r"));
261 else 258 }
262 return 0; 259
260 else if (!strcmp (var, "include"))
261 {
262 char *fname = conf.config_filename (val);
263 parse_file (fname);
264 free (fname);
263 } 265 }
264 266
265 // truly global 267 // truly global
266 if (!strcmp (var, "loglevel")) 268 else if (!strcmp (var, "loglevel"))
267 { 269 {
268 loglevel l = string_to_loglevel (val); 270 loglevel l = string_to_loglevel (val);
269 271
270 if (l == L_NONE) 272 if (l == L_NONE)
271 return _("unknown loglevel. (skipping)"); 273 return _("unknown loglevel, ignored");
272 } 274 }
273 else if (!strcmp (var, "ip-proto")) 275 else if (!strcmp (var, "ip-proto"))
274 conf.ip_proto = atoi (val); 276 conf.ip_proto = atoi (val);
275 else if (!strcmp (var, "icmp-type")) 277 else if (!strcmp (var, "icmp-type"))
276 { 278 {
277#if ENABLE_ICMP 279#if ENABLE_ICMP
278 conf.icmp_type = atoi (val); 280 conf.icmp_type = atoi (val);
279#endif 281#endif
280 } 282 }
283 else if (!strcmp (var, "chuser"))
284 {
285 struct passwd *pw = getpwnam (val);
286 if (!pw)
287 return _("user specified for chuser not found");
281 288
282 // per config 289 conf.change_uid = pw->pw_uid;
290 conf.change_gid = pw->pw_gid;
291 }
292 else if (!strcmp (var, "chuid"))
293 conf.change_uid = atoi (val);
294 else if (!strcmp (var, "chgid"))
295 conf.change_gid = atoi (val);
296 else if (!strcmp (var, "chroot"))
297 free (conf.change_root), conf.change_root = strdup (val);
298
299 // per node
283 else if (!strcmp (var, "node")) 300 else if (!strcmp (var, "node"))
284 { 301 {
285 parse_argv (); 302 parse_argv ();
286 303
287 conf.default_node.id++; 304 conf.default_node.id++;
… …
337 conf.keepalive = atoi (val); 354 conf.keepalive = atoi (val);
338 else if (!strcmp (var, "mtu")) 355 else if (!strcmp (var, "mtu"))
339 conf.mtu = atoi (val); 356 conf.mtu = atoi (val);
340 else if (!strcmp (var, "nfmark")) 357 else if (!strcmp (var, "nfmark"))
341 conf.nfmark = atoi (val); 358 conf.nfmark = atoi (val);
359 else if (!strcmp (var, "seed-device"))
360 free (conf.seed_dev), conf.seed_dev = strdup (val);
361 else if (!strcmp (var, "seed-interval"))
362 conf.reseed = atoi (val);
342 else if (!strcmp (var, "if-up")) 363 else if (!strcmp (var, "if-up"))
343 free (conf.script_if_up), conf.script_if_up = strdup (val); 364 free (conf.script_if_up), conf.script_if_up = strdup (val);
344 else if (!strcmp (var, "node-up")) 365 else if (!strcmp (var, "node-up"))
345 free (conf.script_node_up), conf.script_node_up = strdup (val); 366 free (conf.script_node_up), conf.script_node_up = strdup (val);
346 else if (!strcmp (var, "node-change")) 367 else if (!strcmp (var, "node-change"))
… …
383 { 404 {
384#if ENABLE_DNS 405#if ENABLE_DNS
385 conf.dns_max_outstanding = atoi (val); 406 conf.dns_max_outstanding = atoi (val);
386#endif 407#endif
387 } 408 }
409 else if (!strcmp (var, "dns-case-preserving"))
410 {
411#if ENABLE_DNS
412 parse_bool (conf.dns_case_preserving, "dns-case-preserving", true, false);
413#endif
414 }
388 else if (!strcmp (var, "http-proxy-host")) 415 else if (!strcmp (var, "http-proxy-host"))
389 { 416 {
390#if ENABLE_HTTP_PROXY 417#if ENABLE_HTTP_PROXY
391 free (conf.proxy_host), conf.proxy_host = strdup (val); 418 free (conf.proxy_host), conf.proxy_host = strdup (val);
392#endif 419#endif
… …
446 else if (!strcmp (val, "always")) 473 else if (!strcmp (val, "always"))
447 node->connectmode = conf_node::C_ALWAYS; 474 node->connectmode = conf_node::C_ALWAYS;
448 else if (!strcmp (val, "disabled")) 475 else if (!strcmp (val, "disabled"))
449 node->connectmode = conf_node::C_DISABLED; 476 node->connectmode = conf_node::C_DISABLED;
450 else 477 else
451 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)"); 478 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', ignored");
452 } 479 }
453 else if (!strcmp (var, "inherit-tos")) 480 else if (!strcmp (var, "inherit-tos"))
454 parse_bool (node->inherit_tos, "inherit-tos", true, false); 481 parse_bool (node->inherit_tos, "inherit-tos", true, false);
455 else if (!strcmp (var, "compress")) 482 else if (!strcmp (var, "compress"))
456 parse_bool (node->compress, "compress", true, false); 483 parse_bool (node->compress, "compress", true, false);
… …
490 else if (!strcmp (var, "max-queue")) 517 else if (!strcmp (var, "max-queue"))
491 node->max_queue = atoi (val); 518 node->max_queue = atoi (val);
492 519
493 // unknown or misplaced 520 // unknown or misplaced
494 else 521 else
495 return _("unknown configuration directive. (ignored)"); 522 return _("unknown configuration directive - ignored");
496 523
497 return 0; 524 return 0;
498} 525}
499 526
527void
500void conf_node::finalise () 528conf_node::finalise ()
501{ 529{
502 if (max_queue < 1) 530 if (max_queue < 1)
503 { 531 {
504 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename); 532 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename);
505 max_queue = 1; 533 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); 538 //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; 539 connectmode = C_ALWAYS;
512 } 540 }
513} 541}
514 542
543void
515void configuration_parser::parse_argv () 544configuration_parser::parse_argv ()
516{ 545{
517 for (int i = 0; i < argc; ++i) 546 for (int i = 0; i < argc; ++i)
518 { 547 {
519 char *v = argv [i]; 548 char *v = argv [i];
520 549
… …
541 if (warn) 570 if (warn)
542 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v); 571 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
543 572
544 *v = 0; 573 *v = 0;
545 } 574 }
575 }
576}
577
578void
579configuration_parser::parse_file (const char *fname)
580{
581 if (FILE *f = fopen (fname, "r"))
582 {
583 char line [2048];
584 int lineno = 0;
585
586 while (fgets (line, sizeof (line), f))
587 {
588 lineno++;
589
590 const char *warn = parse_line (line);
591
592 if (warn)
593 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
594 }
595
596 fclose (f);
597
598 parse_argv ();
599 }
600 else
601 {
602 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
603 exit (EXIT_FAILURE);
546 } 604 }
547} 605}
548 606
549configuration_parser::configuration_parser (configuration &conf, 607configuration_parser::configuration_parser (configuration &conf,
550 bool need_keys, 608 bool need_keys,
551 int argc, 609 int argc,
552 char **argv) 610 char **argv)
553: conf (conf),need_keys (need_keys), argc (argc), argv (argv) 611: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
554{ 612{
555 char *fname; 613 char *fname;
556 FILE *f;
557 614
558 conf.clear (); 615 conf.clear ();
616 node = &conf.default_node;
559 617
560 asprintf (&fname, "%s/gvpe.conf", confbase); 618 asprintf (&fname, "%s/gvpe.conf", confbase);
561 f = fopen (fname, "r"); 619 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); 620 free (fname);
590 621
591 fname = conf.config_filename (conf.prikeyfile, "hostkey"); 622 fname = conf.config_filename (conf.prikeyfile, "hostkey");
592 623
593 f = fopen (fname, "r"); 624 if (FILE *f = fopen (fname, "r"))
594 if (f)
595 { 625 {
596 conf.rsa_key = RSA_new (); 626 conf.rsa_key = RSA_new ();
597 627
598 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) 628 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
599 { 629 {
… …
611 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 641 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
612 642
613 if (need_keys) 643 if (need_keys)
614 exit (EXIT_FAILURE); 644 exit (EXIT_FAILURE);
615 } 645 }
646
647 free (fname);
616 648
617 if (need_keys && ::thisnode 649 if (need_keys && ::thisnode
618 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key) 650 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
619 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0 651 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) 652 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
621 { 653 {
622 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 654 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
623 exit (EXIT_FAILURE); 655 exit (EXIT_FAILURE);
624 } 656 }
625 657
626 free (fname);
627
628 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i) 658 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
629 (*i)->finalise (); 659 (*i)->finalise ();
630} 660}
631 661
662char *
632char *configuration::config_filename (const char *name, const char *dflt) 663configuration::config_filename (const char *name, const char *dflt)
633{ 664{
634 char *fname; 665 char *fname;
635 666
636 asprintf (&fname, name ? name : dflt, ::thisnode); 667 asprintf (&fname, name ? name : dflt, ::thisnode);
637 668
… …
641 asprintf (&fname, "%s/%s", confbase, rname); 672 asprintf (&fname, "%s/%s", confbase, rname);
642 free (rname); 673 free (rname);
643 } 674 }
644 675
645 return fname; 676 return fname;
677}
678
679void
680conf_node::print ()
681{
682 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
683 id,
684 id >> 8, id & 0xff,
685 compress ? 'Y' : 'N',
686 connectmode == C_ONDEMAND ? "ondemand"
687 : connectmode == C_NEVER ? "never"
688 : connectmode == C_ALWAYS ? "always"
689 : connectmode == C_DISABLED ? "disabled"
690 : "",
691 nodename,
692 protocols,
693 hostname ? hostname : "",
694 hostname ? ":" : "",
695 hostname ? udp_port : 0
696 );
646} 697}
647 698
648void 699void
649configuration::print () 700configuration::print ()
650{ 701{
… …
657 printf (_("interface: %s\n"), ifname); 708 printf (_("interface: %s\n"), ifname);
658 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 709 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
659 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); 710 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
660 printf ("\n"); 711 printf ("\n");
661 712
662 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 713 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
663 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 714 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
664 715
665 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 716 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
666 (*i)->print (); 717 (*i)->print ();
667 718
668 printf ("\n"); 719 printf ("\n");
… …
678configuration::~configuration () 729configuration::~configuration ()
679{ 730{
680 cleanup (); 731 cleanup ();
681} 732}
682 733
683

Diff Legend

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