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.53 by root, Tue Feb 8 23:13:48 2011 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>
… …
103 104
104 if (match_list (deny_direct, other->nodename)) 105 if (match_list (deny_direct, other->nodename))
105 return false; 106 return false;
106 107
107 return true; 108 return true;
108}
109
110void
111conf_node::print ()
112{
113 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
114 id,
115 id >> 8, id & 0xff,
116 compress ? 'Y' : 'N',
117 connectmode == C_ONDEMAND ? "ondemand"
118 : connectmode == C_NEVER ? "never"
119 : connectmode == C_ALWAYS ? "always"
120 : connectmode == C_DISABLED ? "disabled"
121 : "",
122 nodename,
123 hostname ? hostname : "",
124 hostname ? ":" : "",
125 hostname ? udp_port : 0
126 );
127} 109}
128 110
129conf_node::~conf_node () 111conf_node::~conf_node ()
130{ 112{
131#if 0 113#if 0
… …
170 default_node.if_up_data = strdup (""); 152 default_node.if_up_data = strdup ("");
171 153
172#if ENABLE_DNS 154#if ENABLE_DNS
173 default_node.dns_port = 0; // default is 0 == client 155 default_node.dns_port = 0; // default is 0 == client
174 156
157 dns_case_preserving = true;
175 dns_forw_host = strdup ("127.0.0.1"); 158 dns_forw_host = strdup ("127.0.0.1");
176 dns_forw_port = 53; 159 dns_forw_port = 53;
177 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR; 160 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
178 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL; 161 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
179 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR; 162 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
… …
198 free (proxy_auth); proxy_auth = 0; 181 free (proxy_auth); proxy_auth = 0;
199#endif 182#endif
200#if ENABLE_DNS 183#if ENABLE_DNS
201 free (dns_forw_host); dns_forw_host = 0; 184 free (dns_forw_host); dns_forw_host = 0;
202#endif 185#endif
186 free (change_root); change_root = 0;
203 free (script_if_up); script_if_up = 0; 187 free (script_if_up); script_if_up = 0;
204 free (script_node_up); script_node_up = 0; 188 free (script_node_up); script_node_up = 0;
205 free (script_node_change); script_node_change = 0; 189 free (script_node_change); script_node_change = 0;
206 free (script_node_down); script_node_down = 0; 190 free (script_node_down); script_node_down = 0;
207} 191}
… …
215 nodes.clear (); 199 nodes.clear ();
216 200
217 cleanup (); 201 cleanup ();
218 init (); 202 init ();
219} 203}
204
205//static bool
206//is_true (const char *name)
207//{
208 //re
209//}
220 210
221#define parse_bool(target,name,trueval,falseval) do { \ 211#define parse_bool(target,name,trueval,falseval) do { \
222 if (!strcmp (val, "yes")) target = trueval; \ 212 if (!strcmp (val, "yes")) target = trueval; \
223 else if (!strcmp (val, "no")) target = falseval; \ 213 else if (!strcmp (val, "no")) target = falseval; \
224 else if (!strcmp (val, "true")) target = trueval; \ 214 else if (!strcmp (val, "true")) target = trueval; \
225 else if (!strcmp (val, "false")) target = falseval; \ 215 else if (!strcmp (val, "false")) target = falseval; \
226 else if (!strcmp (val, "on")) target = trueval; \ 216 else if (!strcmp (val, "on")) target = trueval; \
227 else if (!strcmp (val, "off")) target = falseval; \ 217 else if (!strcmp (val, "off")) target = falseval; \
228 else \ 218 else \
229 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"); \
230} while (0) 220} while (0)
231 221
232const char * 222const char *
233configuration_parser::parse_line (char *line) 223configuration_parser::parse_line (char *line)
234{ 224{
… …
252 return 0; /* comment: ignore */ 242 return 0; /* comment: ignore */
253 243
254 char *val = strtok (NULL, "\t\n\r ="); 244 char *val = strtok (NULL, "\t\n\r =");
255 245
256 if (!val || val[0] == '#') 246 if (!val || val[0] == '#')
257 return _("no value given for variable. (ignored)"); 247 return _("no value given for variable, ignored");
258 248
259 if (!strcmp (var, "on")) 249 else if (!strcmp (var, "on"))
260 { 250 {
261 if (!::thisnode 251 if (::thisnode
262 || (val[0] == '!' && strcmp (val + 1, ::thisnode)) 252 && ((val[0] == '!' && strcmp (val + 1, ::thisnode))
263 || !strcmp (val, ::thisnode)) 253 || !strcmp (val, ::thisnode)))
264 return parse_line (strtok (NULL, "\n\r")); 254 return parse_line (strtok (NULL, "\n\r"));
265 else 255 }
266 return 0; 256
257 else if (!strcmp (var, "include"))
258 {
259 char *fname = conf.config_filename (val);
260 parse_file (fname);
261 free (fname);
267 } 262 }
268 263
269 // truly global 264 // truly global
270 if (!strcmp (var, "loglevel")) 265 else if (!strcmp (var, "loglevel"))
271 { 266 {
272 loglevel l = string_to_loglevel (val); 267 loglevel l = string_to_loglevel (val);
273 268
274 if (l == L_NONE) 269 if (l == L_NONE)
275 return _("unknown loglevel. (skipping)"); 270 return _("unknown loglevel, ignored");
276 } 271 }
277 else if (!strcmp (var, "ip-proto")) 272 else if (!strcmp (var, "ip-proto"))
278 conf.ip_proto = atoi (val); 273 conf.ip_proto = atoi (val);
279 else if (!strcmp (var, "icmp-type")) 274 else if (!strcmp (var, "icmp-type"))
280 { 275 {
281#if ENABLE_ICMP 276#if ENABLE_ICMP
282 conf.icmp_type = atoi (val); 277 conf.icmp_type = atoi (val);
283#endif 278#endif
284 } 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");
285 285
286 // 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
287 else if (!strcmp (var, "node")) 297 else if (!strcmp (var, "node"))
288 { 298 {
289 parse_argv (); 299 parse_argv ();
290 300
291 conf.default_node.id++; 301 conf.default_node.id++;
… …
387 { 397 {
388#if ENABLE_DNS 398#if ENABLE_DNS
389 conf.dns_max_outstanding = atoi (val); 399 conf.dns_max_outstanding = atoi (val);
390#endif 400#endif
391 } 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 }
392 else if (!strcmp (var, "http-proxy-host")) 408 else if (!strcmp (var, "http-proxy-host"))
393 { 409 {
394#if ENABLE_HTTP_PROXY 410#if ENABLE_HTTP_PROXY
395 free (conf.proxy_host), conf.proxy_host = strdup (val); 411 free (conf.proxy_host), conf.proxy_host = strdup (val);
396#endif 412#endif
… …
450 else if (!strcmp (val, "always")) 466 else if (!strcmp (val, "always"))
451 node->connectmode = conf_node::C_ALWAYS; 467 node->connectmode = conf_node::C_ALWAYS;
452 else if (!strcmp (val, "disabled")) 468 else if (!strcmp (val, "disabled"))
453 node->connectmode = conf_node::C_DISABLED; 469 node->connectmode = conf_node::C_DISABLED;
454 else 470 else
455 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");
456 } 472 }
457 else if (!strcmp (var, "inherit-tos")) 473 else if (!strcmp (var, "inherit-tos"))
458 parse_bool (node->inherit_tos, "inherit-tos", true, false); 474 parse_bool (node->inherit_tos, "inherit-tos", true, false);
459 else if (!strcmp (var, "compress")) 475 else if (!strcmp (var, "compress"))
460 parse_bool (node->compress, "compress", true, false); 476 parse_bool (node->compress, "compress", true, false);
… …
494 else if (!strcmp (var, "max-queue")) 510 else if (!strcmp (var, "max-queue"))
495 node->max_queue = atoi (val); 511 node->max_queue = atoi (val);
496 512
497 // unknown or misplaced 513 // unknown or misplaced
498 else 514 else
499 return _("unknown configuration directive. (ignored)"); 515 return _("unknown configuration directive - ignored");
500 516
501 return 0; 517 return 0;
502} 518}
503 519
504void 520void
… …
547 if (warn) 563 if (warn)
548 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);
549 565
550 *v = 0; 566 *v = 0;
551 } 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);
552 } 597 }
553} 598}
554 599
555configuration_parser::configuration_parser (configuration &conf, 600configuration_parser::configuration_parser (configuration &conf,
556 bool need_keys, 601 bool need_keys,
557 int argc, 602 int argc,
558 char **argv) 603 char **argv)
559: conf (conf),need_keys (need_keys), argc (argc), argv (argv) 604: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
560{ 605{
561 char *fname; 606 char *fname;
562 FILE *f;
563 607
564 conf.clear (); 608 conf.clear ();
609 node = &conf.default_node;
565 610
566 asprintf (&fname, "%s/gvpe.conf", confbase); 611 asprintf (&fname, "%s/gvpe.conf", confbase);
567 f = fopen (fname, "r"); 612 parse_file (fname);
568
569 if (f)
570 {
571 char line[16384];
572 int lineno = 0;
573 node = &conf.default_node;
574
575 while (fgets (line, sizeof (line), f))
576 {
577 lineno++;
578
579 const char *warn = parse_line (line);
580
581 if (warn)
582 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
583 }
584
585 fclose (f);
586
587 parse_argv ();
588 }
589 else
590 {
591 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
592 exit (EXIT_FAILURE);
593 }
594
595 free (fname); 613 free (fname);
596 614
597 fname = conf.config_filename (conf.prikeyfile, "hostkey"); 615 fname = conf.config_filename (conf.prikeyfile, "hostkey");
598 616
599 f = fopen (fname, "r"); 617 if (FILE *f = fopen (fname, "r"))
600 if (f)
601 { 618 {
602 conf.rsa_key = RSA_new (); 619 conf.rsa_key = RSA_new ();
603 620
604 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) 621 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
605 { 622 {
… …
617 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));
618 635
619 if (need_keys) 636 if (need_keys)
620 exit (EXIT_FAILURE); 637 exit (EXIT_FAILURE);
621 } 638 }
639
640 free (fname);
622 641
623 if (need_keys && ::thisnode 642 if (need_keys && ::thisnode
624 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key) 643 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
625 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
626 || 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)
627 { 646 {
628 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);
629 exit (EXIT_FAILURE); 648 exit (EXIT_FAILURE);
630 } 649 }
631 650
632 free (fname);
633
634 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)
635 (*i)->finalise (); 652 (*i)->finalise ();
636} 653}
637 654
638char * 655char *
… …
648 asprintf (&fname, "%s/%s", confbase, rname); 665 asprintf (&fname, "%s/%s", confbase, rname);
649 free (rname); 666 free (rname);
650 } 667 }
651 668
652 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 );
653} 690}
654 691
655void 692void
656configuration::print () 693configuration::print ()
657{ 694{
… …
664 printf (_("interface: %s\n"), ifname); 701 printf (_("interface: %s\n"), ifname);
665 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 702 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
666 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);
667 printf ("\n"); 704 printf ("\n");
668 705
669 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 706 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
670 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 707 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
671 708
672 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 709 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
673 (*i)->print (); 710 (*i)->print ();
674 711
675 printf ("\n"); 712 printf ("\n");

Diff Legend

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