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.56 by root, Sun Mar 6 21:01:36 2011 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
… …
57char *thisnode; 57char *thisnode;
58char *identname; 58char *identname;
59 59
60struct configuration conf; 60struct configuration conf;
61 61
62u8
62u8 best_protocol (u8 protset) 63best_protocol (u8 protset)
63{ 64{
64 if (protset & PROT_IPv4 ) return PROT_IPv4; 65 if (protset & PROT_IPv4 ) return PROT_IPv4;
65 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 66 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
66 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 67 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
67 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 68 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
68 if (protset & PROT_DNSv4 ) return PROT_DNSv4; 69 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
69 70
70 return 0; 71 return 0;
71} 72}
72 73
74const char *
73const char *strprotocol (u8 protocol) 75strprotocol (u8 protocol)
74{ 76{
75 if (protocol & PROT_IPv4 ) return "rawip"; 77 if (protocol & PROT_IPv4 ) return "rawip";
76 if (protocol & PROT_ICMPv4) return "icmp"; 78 if (protocol & PROT_ICMPv4) return "icmp";
77 if (protocol & PROT_UDPv4 ) return "udp"; 79 if (protocol & PROT_UDPv4 ) return "udp";
78 if (protocol & PROT_TCPv4 ) return "tcp"; 80 if (protocol & PROT_TCPv4 ) return "tcp";
… …
103 return false; 105 return false;
104 106
105 return true; 107 return true;
106} 108}
107 109
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 () 110conf_node::~conf_node ()
128{ 111{
129#if 0 112#if 0
130 // does not work, because string pointers etc. are shared 113 // does not work, because string pointers etc. are shared
131 // is not called, however 114 // is not called, however
… …
140 free (dns_hostname); 123 free (dns_hostname);
141#endif 124#endif
142#endif 125#endif
143} 126}
144 127
128void
145void configuration::init () 129configuration::init ()
146{ 130{
147 memset (this, 0, sizeof (*this)); 131 memset (this, 0, sizeof (*this));
148 132
149 mtu = DEFAULT_MTU; 133 mtu = DEFAULT_MTU;
150 nfmark = 0; 134 nfmark = 0;
… …
167 default_node.if_up_data = strdup (""); 151 default_node.if_up_data = strdup ("");
168 152
169#if ENABLE_DNS 153#if ENABLE_DNS
170 default_node.dns_port = 0; // default is 0 == client 154 default_node.dns_port = 0; // default is 0 == client
171 155
156 dns_case_preserving = true;
172 dns_forw_host = strdup ("127.0.0.1"); 157 dns_forw_host = strdup ("127.0.0.1");
173 dns_forw_port = 53; 158 dns_forw_port = 53;
174 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR; 159 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
175 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL; 160 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
176 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR; 161 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
… …
178#endif 163#endif
179 164
180 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 165 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
181} 166}
182 167
168void
183void configuration::cleanup() 169configuration::cleanup ()
184{ 170{
185 if (rsa_key) 171 if (rsa_key)
186 RSA_free (rsa_key); 172 RSA_free (rsa_key);
187 173
188 rsa_key = 0; 174 rsa_key = 0;
189 175
190 free (pidfilename); pidfilename = 0; 176 free (pidfilename); pidfilename = 0;
191 free (ifname); ifname = 0; 177 free (ifname); ifname = 0;
192#if ENABLE_HTTP_PROXY 178#if ENABLE_HTTP_PROXY
193 free (proxy_host); proxy_host = 0; 179 free (proxy_host); proxy_host = 0;
194 free (proxy_auth); proxy_auth = 0; 180 free (proxy_auth); proxy_auth = 0;
195#endif 181#endif
196#if ENABLE_DNS 182#if ENABLE_DNS
197 free (dns_forw_host); dns_forw_host = 0; 183 free (dns_forw_host); dns_forw_host = 0;
198#endif 184#endif
199 free (script_if_up); script_if_up = 0; 185 free (script_if_up); script_if_up = 0;
200 free (script_node_up); script_node_up = 0; 186 free (script_node_up); script_node_up = 0;
201 free (script_node_change); script_node_change = 0; 187 free (script_node_change); script_node_change = 0;
… …
211 nodes.clear (); 197 nodes.clear ();
212 198
213 cleanup (); 199 cleanup ();
214 init (); 200 init ();
215} 201}
202
203//static bool
204//is_true (const char *name)
205//{
206 //re
207//}
216 208
217#define parse_bool(target,name,trueval,falseval) do { \ 209#define parse_bool(target,name,trueval,falseval) do { \
218 if (!strcmp (val, "yes")) target = trueval; \ 210 if (!strcmp (val, "yes")) target = trueval; \
219 else if (!strcmp (val, "no")) target = falseval; \ 211 else if (!strcmp (val, "no")) target = falseval; \
220 else if (!strcmp (val, "true")) target = trueval; \ 212 else if (!strcmp (val, "true")) target = trueval; \
221 else if (!strcmp (val, "false")) target = falseval; \ 213 else if (!strcmp (val, "false")) target = falseval; \
222 else if (!strcmp (val, "on")) target = trueval; \ 214 else if (!strcmp (val, "on")) target = trueval; \
223 else if (!strcmp (val, "off")) target = falseval; \ 215 else if (!strcmp (val, "off")) target = falseval; \
224 else \ 216 else \
225 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \ 217 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed, ignored"); \
226} while (0) 218} while (0)
227 219
228const char * 220const char *
229configuration_parser::parse_line (char *line) 221configuration_parser::parse_line (char *line)
230{ 222{
… …
248 return 0; /* comment: ignore */ 240 return 0; /* comment: ignore */
249 241
250 char *val = strtok (NULL, "\t\n\r ="); 242 char *val = strtok (NULL, "\t\n\r =");
251 243
252 if (!val || val[0] == '#') 244 if (!val || val[0] == '#')
253 return _("no value given for variable. (ignored)"); 245 return _("no value given for variable, ignored");
254 246
255 if (!strcmp (var, "on")) 247 else if (!strcmp (var, "on"))
256 { 248 {
257 if (!::thisnode 249 if (::thisnode
258 || (val[0] == '!' && strcmp (val + 1, ::thisnode)) 250 && ((val[0] == '!' && strcmp (val + 1, ::thisnode))
259 || !strcmp (val, ::thisnode)) 251 || !strcmp (val, ::thisnode)))
260 return parse_line (strtok (NULL, "\n\r")); 252 return parse_line (strtok (NULL, "\n\r"));
261 else 253 }
262 return 0; 254
255 else if (!strcmp (var, "include"))
256 {
257 char *fname = conf.config_filename (val);
258 parse_file (fname);
259 free (fname);
263 } 260 }
264 261
265 // truly global 262 // truly global
266 if (!strcmp (var, "loglevel")) 263 else if (!strcmp (var, "loglevel"))
267 { 264 {
268 loglevel l = string_to_loglevel (val); 265 loglevel l = string_to_loglevel (val);
269 266
270 if (l == L_NONE) 267 if (l == L_NONE)
271 return _("unknown loglevel. (skipping)"); 268 return _("unknown loglevel, ignored");
272 } 269 }
273 else if (!strcmp (var, "ip-proto")) 270 else if (!strcmp (var, "ip-proto"))
274 conf.ip_proto = atoi (val); 271 conf.ip_proto = atoi (val);
275 else if (!strcmp (var, "icmp-type")) 272 else if (!strcmp (var, "icmp-type"))
276 { 273 {
… …
383 { 380 {
384#if ENABLE_DNS 381#if ENABLE_DNS
385 conf.dns_max_outstanding = atoi (val); 382 conf.dns_max_outstanding = atoi (val);
386#endif 383#endif
387 } 384 }
385 else if (!strcmp (var, "dns-case-preserving"))
386 {
387#if ENABLE_DNS
388 parse_bool (conf.dns_case_preserving, "dns-case-preserving", true, false);
389#endif
390 }
388 else if (!strcmp (var, "http-proxy-host")) 391 else if (!strcmp (var, "http-proxy-host"))
389 { 392 {
390#if ENABLE_HTTP_PROXY 393#if ENABLE_HTTP_PROXY
391 free (conf.proxy_host), conf.proxy_host = strdup (val); 394 free (conf.proxy_host), conf.proxy_host = strdup (val);
392#endif 395#endif
… …
446 else if (!strcmp (val, "always")) 449 else if (!strcmp (val, "always"))
447 node->connectmode = conf_node::C_ALWAYS; 450 node->connectmode = conf_node::C_ALWAYS;
448 else if (!strcmp (val, "disabled")) 451 else if (!strcmp (val, "disabled"))
449 node->connectmode = conf_node::C_DISABLED; 452 node->connectmode = conf_node::C_DISABLED;
450 else 453 else
451 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)"); 454 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', ignored");
452 } 455 }
453 else if (!strcmp (var, "inherit-tos")) 456 else if (!strcmp (var, "inherit-tos"))
454 parse_bool (node->inherit_tos, "inherit-tos", true, false); 457 parse_bool (node->inherit_tos, "inherit-tos", true, false);
455 else if (!strcmp (var, "compress")) 458 else if (!strcmp (var, "compress"))
456 parse_bool (node->compress, "compress", true, false); 459 parse_bool (node->compress, "compress", true, false);
… …
490 else if (!strcmp (var, "max-queue")) 493 else if (!strcmp (var, "max-queue"))
491 node->max_queue = atoi (val); 494 node->max_queue = atoi (val);
492 495
493 // unknown or misplaced 496 // unknown or misplaced
494 else 497 else
495 return _("unknown configuration directive. (ignored)"); 498 return _("unknown configuration directive - ignored");
496 499
497 return 0; 500 return 0;
498} 501}
499 502
503void
500void conf_node::finalise () 504conf_node::finalise ()
501{ 505{
502 if (max_queue < 1) 506 if (max_queue < 1)
503 { 507 {
504 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename); 508 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename);
505 max_queue = 1; 509 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); 514 //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; 515 connectmode = C_ALWAYS;
512 } 516 }
513} 517}
514 518
519void
515void configuration_parser::parse_argv () 520configuration_parser::parse_argv ()
516{ 521{
517 for (int i = 0; i < argc; ++i) 522 for (int i = 0; i < argc; ++i)
518 { 523 {
519 char *v = argv [i]; 524 char *v = argv [i];
520 525
… …
541 if (warn) 546 if (warn)
542 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v); 547 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
543 548
544 *v = 0; 549 *v = 0;
545 } 550 }
551 }
552}
553
554void
555configuration_parser::parse_file (const char *fname)
556{
557 if (FILE *f = fopen (fname, "r"))
558 {
559 char line [2048];
560 int lineno = 0;
561
562 while (fgets (line, sizeof (line), f))
563 {
564 lineno++;
565
566 const char *warn = parse_line (line);
567
568 if (warn)
569 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
570 }
571
572 fclose (f);
573
574 parse_argv ();
575 }
576 else
577 {
578 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
579 exit (EXIT_FAILURE);
546 } 580 }
547} 581}
548 582
549configuration_parser::configuration_parser (configuration &conf, 583configuration_parser::configuration_parser (configuration &conf,
550 bool need_keys, 584 bool need_keys,
551 int argc, 585 int argc,
552 char **argv) 586 char **argv)
553: conf (conf),need_keys (need_keys), argc (argc), argv (argv) 587: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
554{ 588{
555 char *fname; 589 char *fname;
556 FILE *f;
557 590
558 conf.clear (); 591 conf.clear ();
592 node = &conf.default_node;
559 593
560 asprintf (&fname, "%s/gvpe.conf", confbase); 594 asprintf (&fname, "%s/gvpe.conf", confbase);
561 f = fopen (fname, "r"); 595 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); 596 free (fname);
590 597
591 fname = conf.config_filename (conf.prikeyfile, "hostkey"); 598 fname = conf.config_filename (conf.prikeyfile, "hostkey");
592 599
593 f = fopen (fname, "r"); 600 if (FILE *f = fopen (fname, "r"))
594 if (f)
595 { 601 {
596 conf.rsa_key = RSA_new (); 602 conf.rsa_key = RSA_new ();
597 603
598 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) 604 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
599 { 605 {
… …
611 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 617 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
612 618
613 if (need_keys) 619 if (need_keys)
614 exit (EXIT_FAILURE); 620 exit (EXIT_FAILURE);
615 } 621 }
622
623 free (fname);
616 624
617 if (need_keys && ::thisnode 625 if (need_keys && ::thisnode
618 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key) 626 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
619 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0 627 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) 628 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
621 { 629 {
622 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 630 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
623 exit (EXIT_FAILURE); 631 exit (EXIT_FAILURE);
624 } 632 }
625 633
626 free (fname);
627
628 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i) 634 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
629 (*i)->finalise (); 635 (*i)->finalise ();
630} 636}
631 637
638char *
632char *configuration::config_filename (const char *name, const char *dflt) 639configuration::config_filename (const char *name, const char *dflt)
633{ 640{
634 char *fname; 641 char *fname;
635 642
636 asprintf (&fname, name ? name : dflt, ::thisnode); 643 asprintf (&fname, name ? name : dflt, ::thisnode);
637 644
… …
641 asprintf (&fname, "%s/%s", confbase, rname); 648 asprintf (&fname, "%s/%s", confbase, rname);
642 free (rname); 649 free (rname);
643 } 650 }
644 651
645 return fname; 652 return fname;
653}
654
655void
656conf_node::print ()
657{
658 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
659 id,
660 id >> 8, id & 0xff,
661 compress ? 'Y' : 'N',
662 connectmode == C_ONDEMAND ? "ondemand"
663 : connectmode == C_NEVER ? "never"
664 : connectmode == C_ALWAYS ? "always"
665 : connectmode == C_DISABLED ? "disabled"
666 : "",
667 nodename,
668 protocols,
669 hostname ? hostname : "",
670 hostname ? ":" : "",
671 hostname ? udp_port : 0
672 );
646} 673}
647 674
648void 675void
649configuration::print () 676configuration::print ()
650{ 677{
… …
657 printf (_("interface: %s\n"), ifname); 684 printf (_("interface: %s\n"), ifname);
658 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 685 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
659 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); 686 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
660 printf ("\n"); 687 printf ("\n");
661 688
662 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 689 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
663 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 690 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
664 691
665 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 692 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
666 (*i)->print (); 693 (*i)->print ();
667 694
668 printf ("\n"); 695 printf ("\n");
… …
678configuration::~configuration () 705configuration::~configuration ()
679{ 706{
680 cleanup (); 707 cleanup ();
681} 708}
682 709
683

Diff Legend

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