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.42 by pcg, Mon Dec 5 12:58:08 2005 UTC vs.
Revision 1.64 by root, Thu Jul 18 17:35:10 2013 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.C -- configuration code
3 Copyright (C) 2003-2005 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 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <cstdio> 34#include <cstdio>
… …
28#include <errno.h> 38#include <errno.h>
29#include <netdb.h> 39#include <netdb.h>
30#include <sys/stat.h> 40#include <sys/stat.h>
31#include <sys/types.h> 41#include <sys/types.h>
32#include <unistd.h> 42#include <unistd.h>
43#include <pwd.h>
33 44
34#include "netcompat.h" 45#include "netcompat.h"
35 46
36#include <openssl/err.h> 47#include <openssl/err.h>
37#include <openssl/pem.h> 48#include <openssl/pem.h>
… …
47char *thisnode; 58char *thisnode;
48char *identname; 59char *identname;
49 60
50struct configuration conf; 61struct configuration conf;
51 62
63u8
52u8 best_protocol (u8 protset) 64best_protocol (u8 protset)
53{ 65{
54 if (protset & PROT_IPv4 ) return PROT_IPv4; 66 if (protset & PROT_IPv4 ) return PROT_IPv4;
55 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 67 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
56 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 68 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
57 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 69 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4; 70 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
59 71
60 return 0; 72 return 0;
61} 73}
62 74
75const char *
63const char *strprotocol (u8 protocol) 76strprotocol (u8 protocol)
64{ 77{
65 if (protocol & PROT_IPv4 ) return "rawip"; 78 if (protocol & PROT_IPv4 ) return "rawip";
66 if (protocol & PROT_ICMPv4) return "icmp"; 79 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4 ) return "udp"; 80 if (protocol & PROT_UDPv4 ) return "udp";
68 if (protocol & PROT_TCPv4 ) return "tcp"; 81 if (protocol & PROT_TCPv4 ) return "tcp";
… …
82 95
83 return false; 96 return false;
84} 97}
85 98
86bool 99bool
87conf_node::can_direct (struct conf_node *other) 100conf_node::may_direct (struct conf_node *other)
88{ 101{
89 if (match_list (allow_direct, other->nodename)) 102 if (match_list (allow_direct, other->nodename))
90 return true; 103 return true;
91 104
92 if (match_list (deny_direct, other->nodename)) 105 if (match_list (deny_direct, other->nodename))
93 return false; 106 return false;
94 107
95 return true; 108 return true;
96}
97
98void
99conf_node::print ()
100{
101 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
102 id,
103 id >> 8, id & 0xff,
104 compress ? 'Y' : 'N',
105 connectmode == C_ONDEMAND ? "ondemand" :
106 connectmode == C_NEVER ? "never" :
107 connectmode == C_ALWAYS ? "always" : "",
108 nodename,
109 hostname ? hostname : "",
110 hostname ? ":" : "",
111 hostname ? udp_port : 0
112 );
113} 109}
114 110
115conf_node::~conf_node () 111conf_node::~conf_node ()
116{ 112{
117#if 0 113#if 0
… …
128 free (dns_hostname); 124 free (dns_hostname);
129#endif 125#endif
130#endif 126#endif
131} 127}
132 128
129void
133void configuration::init () 130configuration::init ()
134{ 131{
135 memset (this, 0, sizeof (*this)); 132 memset (this, 0, sizeof (*this));
136 133
137 mtu = DEFAULT_MTU; 134 mtu = DEFAULT_MTU;
135 nfmark = 0;
138 rekey = DEFAULT_REKEY; 136 rekey = DEFAULT_REKEY;
139 keepalive = DEFAULT_KEEPALIVE; 137 keepalive = DEFAULT_KEEPALIVE;
140 llevel = L_INFO; 138 llevel = L_INFO;
141 ip_proto = IPPROTO_GRE; 139 ip_proto = IPPROTO_GRE;
142#if ENABLE_ICMP 140#if ENABLE_ICMP
… …
147 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 145 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
148 default_node.connectmode = conf_node::C_ALWAYS; 146 default_node.connectmode = conf_node::C_ALWAYS;
149 default_node.compress = true; 147 default_node.compress = true;
150 default_node.protocols = 0; 148 default_node.protocols = 0;
151 default_node.max_retry = DEFAULT_MAX_RETRY; 149 default_node.max_retry = DEFAULT_MAX_RETRY;
150 default_node.max_ttl = DEFAULT_MAX_TTL;
151 default_node.max_queue = DEFAULT_MAX_QUEUE;
152 default_node.if_up_data = strdup (""); 152 default_node.if_up_data = strdup ("");
153 153
154#if ENABLE_DNS 154#if ENABLE_DNS
155 default_node.dns_port = 0; // default is 0 == client 155 default_node.dns_port = 0; // default is 0 == client
156 156
157 dns_case_preserving = true;
157 dns_forw_host = strdup ("127.0.0.1"); 158 dns_forw_host = strdup ("127.0.0.1");
158 dns_forw_port = 53; 159 dns_forw_port = 53;
159 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR; 160 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
160 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL; 161 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
161 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR; 162 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
162 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING; 163 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
163#endif 164#endif
164 165
165 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 166 pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
167 seed_dev = strdup ("/dev/urandom");
168 reseed = DEFAULT_RESEED;
166} 169}
167 170
171void
168void configuration::cleanup() 172configuration::cleanup ()
169{ 173{
170 if (rsa_key) 174 if (rsa_key)
171 RSA_free (rsa_key); 175 RSA_free (rsa_key);
172 176
173 rsa_key = 0; 177 rsa_key = 0;
174 178
179 free (seed_dev); seed_dev = 0;
175 free (pidfilename); pidfilename = 0; 180 free (pidfilename); pidfilename = 0;
176 free (ifname); ifname = 0; 181 free (ifname); ifname = 0;
177#if ENABLE_HTTP_PROXY 182#if ENABLE_HTTP_PROXY
178 free (proxy_host); proxy_host = 0; 183 free (proxy_host); proxy_host = 0;
179 free (proxy_auth); proxy_auth = 0; 184 free (proxy_auth); proxy_auth = 0;
180#endif 185#endif
181#if ENABLE_DNS 186#if ENABLE_DNS
182 free (dns_forw_host); dns_forw_host = 0; 187 free (dns_forw_host); dns_forw_host = 0;
183#endif 188#endif
189 free (change_root); change_root = 0;
190 free (script_if_up); script_if_up = 0;
191 free (script_node_up); script_node_up = 0;
192 free (script_node_change); script_node_change = 0;
193 free (script_node_down); script_node_down = 0;
184} 194}
185 195
186void 196void
187configuration::clear () 197configuration::clear ()
188{ 198{
… …
192 nodes.clear (); 202 nodes.clear ();
193 203
194 cleanup (); 204 cleanup ();
195 init (); 205 init ();
196} 206}
207
208conf_node *
209configuration::find_node (const char *name)
210{
211 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
212 if (!strcmp ((*i)->nodename, name))
213 return *i;
214
215 return 0;
216}
217
218//static bool
219//is_true (const char *name)
220//{
221 //re
222//}
197 223
198#define parse_bool(target,name,trueval,falseval) do { \ 224#define parse_bool(target,name,trueval,falseval) do { \
199 if (!strcmp (val, "yes")) target = trueval; \ 225 if (!strcmp (val, "yes")) target = trueval; \
200 else if (!strcmp (val, "no")) target = falseval; \ 226 else if (!strcmp (val, "no")) target = falseval; \
201 else if (!strcmp (val, "true")) target = trueval; \ 227 else if (!strcmp (val, "true")) target = trueval; \
202 else if (!strcmp (val, "false")) target = falseval; \ 228 else if (!strcmp (val, "false")) target = falseval; \
203 else if (!strcmp (val, "on")) target = trueval; \ 229 else if (!strcmp (val, "on")) target = trueval; \
204 else if (!strcmp (val, "off")) target = falseval; \ 230 else if (!strcmp (val, "off")) target = falseval; \
205 else \ 231 else \
206 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \ 232 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed, ignored"); \
207} while (0) 233} while (0)
208 234
209const char * 235const char *
210configuration_parser::parse_line (char *line) 236configuration_parser::parse_line (char *line)
211{ 237{
… …
226 return 0; /* no tokens on this line */ 252 return 0; /* no tokens on this line */
227 253
228 if (var[0] == '#') 254 if (var[0] == '#')
229 return 0; /* comment: ignore */ 255 return 0; /* comment: ignore */
230 256
257 if (!strcmp (var, "global"))
258 {
259 node = &conf.default_node;
260 return 0;
261 }
262
231 char *val = strtok (NULL, "\t\n\r ="); 263 char *val = strtok (NULL, "\t\n\r =");
232 264
233 if (!val || val[0] == '#') 265 if (!val || val[0] == '#')
234 return _("no value given for variable. (ignored)"); 266 return _("no value given for variable, ignored");
235 267
236 if (!strcmp (var, "on")) 268 else if (!strcmp (var, "on"))
237 { 269 {
238 if (!::thisnode 270 if (::thisnode
239 || (val[0] == '!' && strcmp (val + 1, ::thisnode)) 271 && ((val[0] == '!' && strcmp (val + 1, ::thisnode))
240 || !strcmp (val, ::thisnode)) 272 || !strcmp (val, ::thisnode)))
241 return parse_line (strtok (NULL, "\n\r")); 273 return parse_line (strtok (NULL, "\n\r"));
242 else 274 }
243 return 0; 275
276 else if (!strcmp (var, "include"))
277 {
278 char *fname = conf.config_filename (val);
279 parse_file (fname);
280 free (fname);
244 } 281 }
245 282
246 // truly global 283 // truly global
247 if (!strcmp (var, "loglevel")) 284 else if (!strcmp (var, "loglevel"))
248 { 285 {
249 loglevel l = string_to_loglevel (val); 286 loglevel l = string_to_loglevel (val);
250 287
251 if (l == L_NONE) 288 if (l == L_NONE)
252 return _("unknown loglevel. (skipping)"); 289 return _("unknown loglevel, ignored");
253 } 290 }
291 else if (!strcmp (var, "serial"))
292 strncpy (conf.serial, val, sizeof (conf.serial));
254 else if (!strcmp (var, "ip-proto")) 293 else if (!strcmp (var, "ip-proto"))
255 conf.ip_proto = atoi (val); 294 conf.ip_proto = atoi (val);
256 else if (!strcmp (var, "icmp-type")) 295 else if (!strcmp (var, "icmp-type"))
257 { 296 {
258#if ENABLE_ICMP 297#if ENABLE_ICMP
259 conf.icmp_type = atoi (val); 298 conf.icmp_type = atoi (val);
260#endif 299#endif
261 } 300 }
301 else if (!strcmp (var, "chuser"))
302 {
303 struct passwd *pw = getpwnam (val);
304 if (!pw)
305 return _("user specified for chuser not found");
262 306
263 // per config 307 conf.change_uid = pw->pw_uid;
308 conf.change_gid = pw->pw_gid;
309 }
310 else if (!strcmp (var, "chuid"))
311 conf.change_uid = atoi (val);
312 else if (!strcmp (var, "chgid"))
313 conf.change_gid = atoi (val);
314 else if (!strcmp (var, "chroot"))
315 free (conf.change_root), conf.change_root = strdup (val);
316
317 // per node
264 else if (!strcmp (var, "node")) 318 else if (!strcmp (var, "node"))
265 { 319 {
266 parse_argv (); 320 node = conf.find_node (val);
267 321
322 if (!node)
323 {
268 conf.default_node.id++; 324 conf.default_node.id++;
269 node = new conf_node (conf.default_node); 325 node = new conf_node (conf.default_node);
270 conf.nodes.push_back (node); 326 conf.nodes.push_back (node);
271 node->nodename = strdup (val); 327 node->nodename = strdup (val);
272
273 {
274 char *fname;
275 FILE *f;
276
277 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
278
279 f = fopen (fname, "r");
280 if (f)
281 {
282 node->rsa_key = RSA_new ();
283
284 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
285 {
286 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
287 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
288 exit (EXIT_FAILURE);
289 }
290
291 require (RSA_blinding_on (node->rsa_key, 0));
292
293 fclose (f);
294 } 328 }
295 else
296 {
297 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
298
299 if (need_keys)
300 exit (EXIT_FAILURE);
301 }
302
303 free (fname);
304 }
305
306 if (::thisnode && !strcmp (node->nodename, ::thisnode))
307 conf.thisnode = node;
308 } 329 }
309 else if (!strcmp (var, "private-key")) 330 else if (!strcmp (var, "private-key"))
310 free (conf.prikeyfile), conf.prikeyfile = strdup (val); 331 free (conf.prikeyfile), conf.prikeyfile = strdup (val);
311 else if (!strcmp (var, "ifpersist")) 332 else if (!strcmp (var, "ifpersist"))
312 parse_bool (conf.ifpersist, "ifpersist", true, false); 333 parse_bool (conf.ifpersist, "ifpersist", true, false);
… …
316 conf.rekey = atoi (val); 337 conf.rekey = atoi (val);
317 else if (!strcmp (var, "keepalive")) 338 else if (!strcmp (var, "keepalive"))
318 conf.keepalive = atoi (val); 339 conf.keepalive = atoi (val);
319 else if (!strcmp (var, "mtu")) 340 else if (!strcmp (var, "mtu"))
320 conf.mtu = atoi (val); 341 conf.mtu = atoi (val);
342 else if (!strcmp (var, "nfmark"))
343 conf.nfmark = atoi (val);
344 else if (!strcmp (var, "seed-device"))
345 free (conf.seed_dev), conf.seed_dev = strdup (val);
346 else if (!strcmp (var, "seed-interval"))
347 conf.reseed = atoi (val);
321 else if (!strcmp (var, "if-up")) 348 else if (!strcmp (var, "if-up"))
322 free (conf.script_if_up), conf.script_if_up = strdup (val); 349 free (conf.script_if_up), conf.script_if_up = strdup (val);
323 else if (!strcmp (var, "node-up")) 350 else if (!strcmp (var, "node-up"))
324 free (conf.script_node_up), conf.script_node_up = strdup (val); 351 free (conf.script_node_up), conf.script_node_up = strdup (val);
352 else if (!strcmp (var, "node-change"))
353 free (conf.script_node_change), conf.script_node_change = strdup (val);
325 else if (!strcmp (var, "node-down")) 354 else if (!strcmp (var, "node-down"))
326 free (conf.script_node_down), conf.script_node_down = strdup (val); 355 free (conf.script_node_down), conf.script_node_down = strdup (val);
327 else if (!strcmp (var, "pid-file")) 356 else if (!strcmp (var, "pid-file"))
328 free (conf.pidfilename), conf.pidfilename = strdup (val); 357 free (conf.pidfilename), conf.pidfilename = strdup (val);
329 else if (!strcmp (var, "dns-forw-host")) 358 else if (!strcmp (var, "dns-forw-host"))
… …
358 } 387 }
359 else if (!strcmp (var, "dns-max-outstanding")) 388 else if (!strcmp (var, "dns-max-outstanding"))
360 { 389 {
361#if ENABLE_DNS 390#if ENABLE_DNS
362 conf.dns_max_outstanding = atoi (val); 391 conf.dns_max_outstanding = atoi (val);
392#endif
393 }
394 else if (!strcmp (var, "dns-case-preserving"))
395 {
396#if ENABLE_DNS
397 parse_bool (conf.dns_case_preserving, "dns-case-preserving", true, false);
363#endif 398#endif
364 } 399 }
365 else if (!strcmp (var, "http-proxy-host")) 400 else if (!strcmp (var, "http-proxy-host"))
366 { 401 {
367#if ENABLE_HTTP_PROXY 402#if ENABLE_HTTP_PROXY
… …
423 else if (!strcmp (val, "always")) 458 else if (!strcmp (val, "always"))
424 node->connectmode = conf_node::C_ALWAYS; 459 node->connectmode = conf_node::C_ALWAYS;
425 else if (!strcmp (val, "disabled")) 460 else if (!strcmp (val, "disabled"))
426 node->connectmode = conf_node::C_DISABLED; 461 node->connectmode = conf_node::C_DISABLED;
427 else 462 else
428 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)"); 463 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', ignored");
429 } 464 }
430 else if (!strcmp (var, "inherit-tos")) 465 else if (!strcmp (var, "inherit-tos"))
431 parse_bool (node->inherit_tos, "inherit-tos", true, false); 466 parse_bool (node->inherit_tos, "inherit-tos", true, false);
432 else if (!strcmp (var, "compress")) 467 else if (!strcmp (var, "compress"))
433 parse_bool (node->compress, "compress", true, false); 468 parse_bool (node->compress, "compress", true, false);
… …
460 } 495 }
461 else if (!strcmp (var, "allow-direct")) 496 else if (!strcmp (var, "allow-direct"))
462 node->allow_direct.push_back (strdup (val)); 497 node->allow_direct.push_back (strdup (val));
463 else if (!strcmp (var, "deny-direct")) 498 else if (!strcmp (var, "deny-direct"))
464 node->deny_direct.push_back (strdup (val)); 499 node->deny_direct.push_back (strdup (val));
500 else if (!strcmp (var, "max-ttl"))
501 node->max_ttl = atof (val);
502 else if (!strcmp (var, "max-queue"))
503 node->max_queue = atoi (val);
465 504
466 // unknown or misplaced 505 // unknown or misplaced
467 else 506 else
468 return _("unknown configuration directive. (ignored)"); 507 return _("unknown configuration directive - ignored");
469 508
470 return 0; 509 return 0;
471} 510}
472 511
473void configuration_parser::parse_argv () 512void
513conf_node::finalise ()
474{ 514{
475 for (int i = 0; i < argc; ++i) 515 if (max_queue < 1)
516 {
517 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename);
518 max_queue = 1;
476 { 519 }
477 char *v = argv [i];
478 520
479 if (!*v) 521 if (routerprio > 1 && (connectmode != C_ALWAYS && connectmode != C_DISABLED))
480 continue; 522 {
523 //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename);
524 connectmode = C_ALWAYS;
525 }
526}
481 527
482 char *enode = v; 528void
529configuration_parser::parse_file (const char *fname)
530{
531 if (FILE *f = fopen (fname, "r"))
532 {
533 char line [2048];
534 int lineno = 0;
483 535
484 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode) 536 while (fgets (line, sizeof (line), f))
485 enode++;
486
487 if (*enode != '.')
488 enode = 0;
489
490 char *wnode = node == &conf.default_node
491 ? 0
492 : node->nodename;
493
494 if ((!wnode && !enode)
495 || (wnode && enode && !strncmp (wnode, v, enode - v)))
496 { 537 {
538 lineno++;
539
497 const char *warn = parse_line (enode ? enode + 1 : v); 540 const char *warn = parse_line (line);
498 541
499 if (warn) 542 if (warn)
500 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v); 543 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
501
502 *v = 0;
503 } 544 }
545
546 fclose (f);
547 }
548 else
549 {
550 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
551 exit (EXIT_FAILURE);
504 } 552 }
505} 553}
506 554
507configuration_parser::configuration_parser (configuration &conf, 555configuration_parser::configuration_parser (configuration &conf,
508 bool need_keys, 556 bool need_keys,
509 int argc, 557 int argc,
510 char **argv) 558 char **argv)
511: conf (conf),need_keys (need_keys), argc (argc), argv (argv) 559: conf (conf), need_keys (need_keys), argc (argc), argv (argv)
512{ 560{
513 char *fname; 561 char *fname;
514 FILE *f;
515 562
516 conf.clear (); 563 conf.clear ();
564 node = &conf.default_node;
517 565
518 asprintf (&fname, "%s/gvpe.conf", confbase); 566 asprintf (&fname, "%s/gvpe.conf", confbase);
519 f = fopen (fname, "r"); 567 parse_file (fname);
520
521 if (f)
522 {
523 char line[16384];
524 int lineno = 0;
525 node = &conf.default_node;
526
527 while (fgets (line, sizeof (line), f))
528 {
529 lineno++;
530
531 const char *warn = parse_line (line);
532
533 if (warn)
534 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
535 }
536
537 fclose (f);
538
539 parse_argv ();
540 }
541 else
542 {
543 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
544 exit (EXIT_FAILURE);
545 }
546
547 free (fname); 568 free (fname);
548 569
549 fname = conf.config_filename (conf.prikeyfile, "hostkey"); 570 fname = conf.config_filename (conf.prikeyfile, "hostkey");
550 571
551 f = fopen (fname, "r"); 572 if (FILE *f = fopen (fname, "r"))
552 if (f)
553 { 573 {
554 conf.rsa_key = RSA_new (); 574 conf.rsa_key = RSA_new ();
555 575
556 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) 576 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
557 { 577 {
… …
564 584
565 fclose (f); 585 fclose (f);
566 } 586 }
567 else 587 else
568 { 588 {
569 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
570
571 if (need_keys) 589 if (need_keys)
590 {
591 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
572 exit (EXIT_FAILURE); 592 exit (EXIT_FAILURE);
573 }
574
575 if (need_keys && ::thisnode
576 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
577 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
578 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
579 {
580 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
581 exit (EXIT_FAILURE);
582 } 593 }
594 }
583 595
584 free (fname); 596 free (fname);
585}
586 597
598 fname = conf.config_filename (conf.pidfilename);
599 free (conf.pidfilename); conf.pidfilename = fname;
600
601 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
602 {
603 conf_node *node = *i;
604 char *fname;
605 FILE *f;
606
607 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
608
609 f = fopen (fname, "r");
610 if (f)
611 {
612 node->rsa_key = RSA_new ();
613
614 if (!PEM_read_RSAPublicKey (f, &node->rsa_key, NULL, NULL))
615 {
616 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
617 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
618 exit (EXIT_FAILURE);
619 }
620
621 require (RSA_blinding_on (node->rsa_key, 0));
622
623 fclose (f);
624 }
625 else
626 {
627 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
628
629 if (need_keys)
630 exit (EXIT_FAILURE);
631 }
632
633 free (fname);
634
635 (*i)->finalise ();
636 }
637
638 if (::thisnode)
639 {
640 conf.thisnode = conf.find_node (::thisnode);
641
642 if (need_keys)
643 {
644 if (!conf.thisnode)
645 {
646 slog (L_NOTICE, _("local node ('%s') not found in config file, aborting."), ::thisnode);
647 exit (EXIT_FAILURE);
648 }
649
650 if (conf.rsa_key && conf.thisnode->rsa_key)
651 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
652 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
653 {
654 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
655 exit (EXIT_FAILURE);
656 }
657 }
658 }
659
660 parse_argv ();
661}
662
663void
664configuration_parser::parse_argv ()
665{
666 for (int i = 0; i < argc; ++i)
667 {
668 char *v = argv [i];
669
670 if (!*v)
671 continue;
672
673 char *enode = v;
674
675 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
676 enode++;
677
678 if (*enode != '.')
679 enode = 0;
680
681 if (enode)
682 {
683 char *val = strdup (v);
684 val [enode - v] = 0;
685 node = conf.find_node (val);
686 free (val);
687
688 if (!node)
689 {
690 slog (L_WARN, _("command line option '%s' refers to unknown node, ignoring."), v);
691 continue;
692 }
693 }
694 else
695 node = &conf.default_node;
696
697 const char *warn = parse_line (enode ? enode + 1 : v);
698
699 if (warn)
700 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
701 }
702}
703
704char *
587char *configuration::config_filename (const char *name, const char *dflt) 705configuration::config_filename (const char *name, const char *dflt)
588{ 706{
589 char *fname; 707 char *fname;
590 708
591 asprintf (&fname, name ? name : dflt, ::thisnode); 709 asprintf (&fname, name ? name : dflt, ::thisnode ? ::thisnode : "<unset>");
592 710
593 if (!ABSOLUTE_PATH (fname)) 711 if (!ABSOLUTE_PATH (fname))
594 { 712 {
595 char *rname = fname; 713 char *rname = fname;
596 asprintf (&fname, "%s/%s", confbase, rname); 714 asprintf (&fname, "%s/%s", confbase, rname);
597 free (rname); 715 free (rname);
598 } 716 }
599 717
600 return fname; 718 return fname;
719}
720
721void
722conf_node::print ()
723{
724 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
725 id,
726 id >> 8, id & 0xff,
727 compress ? 'Y' : 'N',
728 connectmode == C_ONDEMAND ? "ondemand"
729 : connectmode == C_NEVER ? "never"
730 : connectmode == C_ALWAYS ? "always"
731 : connectmode == C_DISABLED ? "disabled"
732 : "",
733 nodename,
734 protocols,
735 hostname ? hostname : "",
736 hostname ? ":" : "",
737 hostname ? udp_port : 0
738 );
601} 739}
602 740
603void 741void
604configuration::print () 742configuration::print ()
605{ 743{
… …
612 printf (_("interface: %s\n"), ifname); 750 printf (_("interface: %s\n"), ifname);
613 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 751 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
614 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); 752 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
615 printf ("\n"); 753 printf ("\n");
616 754
617 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 755 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
618 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 756 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
619 757
620 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 758 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
621 (*i)->print (); 759 (*i)->print ();
622 760
623 printf ("\n"); 761 printf ("\n");
… …
633configuration::~configuration () 771configuration::~configuration ()
634{ 772{
635 cleanup (); 773 cleanup ();
636} 774}
637 775
638

Diff Legend

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