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.41 by pcg, Tue Apr 26 00:55:55 2005 UTC vs.
Revision 1.63 by root, Thu Jul 18 13:35:16 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";
69 if (protocol & PROT_DNSv4 ) return "dns"; 82 if (protocol & PROT_DNSv4 ) return "dns";
70 83
71 return "<unknown>"; 84 return "<unknown>";
72} 85}
73 86
74void 87static bool
75conf_node::print () 88match_list (const vector<const char *> &list, const char *str)
76{ 89{
77 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 90 for (vector<const char *>::const_iterator i = list.end (); i-- > list.begin (); )
78 id, 91 if ((*i)[0] == '*' && !(*i)[1])
79 id >> 8, id & 0xff, 92 return true;
80 compress ? 'Y' : 'N', 93 else if (!strcmp (*i, str))
81 connectmode == C_ONDEMAND ? "ondemand" : 94 return true;
82 connectmode == C_NEVER ? "never" : 95
83 connectmode == C_ALWAYS ? "always" : "", 96 return false;
84 nodename, 97}
85 hostname ? hostname : "", 98
86 hostname ? ":" : "", 99bool
87 hostname ? udp_port : 0 100conf_node::may_direct (struct conf_node *other)
88 ); 101{
102 if (match_list (allow_direct, other->nodename))
103 return true;
104
105 if (match_list (deny_direct, other->nodename))
106 return false;
107
108 return true;
89} 109}
90 110
91conf_node::~conf_node () 111conf_node::~conf_node ()
92{ 112{
93#if 0 113#if 0
… …
104 free (dns_hostname); 124 free (dns_hostname);
105#endif 125#endif
106#endif 126#endif
107} 127}
108 128
129void
109void configuration::init () 130configuration::init ()
110{ 131{
111 memset (this, 0, sizeof (*this)); 132 memset (this, 0, sizeof (*this));
112 133
113 mtu = DEFAULT_MTU; 134 mtu = DEFAULT_MTU;
135 nfmark = 0;
114 rekey = DEFAULT_REKEY; 136 rekey = DEFAULT_REKEY;
115 keepalive = DEFAULT_KEEPALIVE; 137 keepalive = DEFAULT_KEEPALIVE;
116 llevel = L_INFO; 138 llevel = L_INFO;
117 ip_proto = IPPROTO_GRE; 139 ip_proto = IPPROTO_GRE;
118#if ENABLE_ICMP 140#if ENABLE_ICMP
… …
123 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 145 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
124 default_node.connectmode = conf_node::C_ALWAYS; 146 default_node.connectmode = conf_node::C_ALWAYS;
125 default_node.compress = true; 147 default_node.compress = true;
126 default_node.protocols = 0; 148 default_node.protocols = 0;
127 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;
128 default_node.if_up_data = strdup (""); 152 default_node.if_up_data = strdup ("");
129 153
130#if ENABLE_DNS 154#if ENABLE_DNS
131 default_node.dns_port = 0; // default is 0 == client 155 default_node.dns_port = 0; // default is 0 == client
132 156
157 dns_case_preserving = true;
133 dns_forw_host = strdup ("127.0.0.1"); 158 dns_forw_host = strdup ("127.0.0.1");
134 dns_forw_port = 53; 159 dns_forw_port = 53;
135 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR; 160 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
136 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL; 161 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
137 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR; 162 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
138 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING; 163 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
139#endif 164#endif
140 165
141 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 166 pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
167 seed_dev = strdup ("/dev/urandom");
168 reseed = DEFAULT_RESEED;
142} 169}
143 170
171void
144void configuration::cleanup() 172configuration::cleanup ()
145{ 173{
146 if (rsa_key) 174 if (rsa_key)
147 RSA_free (rsa_key); 175 RSA_free (rsa_key);
148 176
149 rsa_key = 0; 177 rsa_key = 0;
150 178
179 free (seed_dev); seed_dev = 0;
151 free (pidfilename); pidfilename = 0; 180 free (pidfilename); pidfilename = 0;
152 free (ifname); ifname = 0; 181 free (ifname); ifname = 0;
153#if ENABLE_HTTP_PROXY 182#if ENABLE_HTTP_PROXY
154 free (proxy_host); proxy_host = 0; 183 free (proxy_host); proxy_host = 0;
155 free (proxy_auth); proxy_auth = 0; 184 free (proxy_auth); proxy_auth = 0;
156#endif 185#endif
157#if ENABLE_DNS 186#if ENABLE_DNS
158 free (dns_forw_host); dns_forw_host = 0; 187 free (dns_forw_host); dns_forw_host = 0;
159#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;
160} 194}
161 195
162void 196void
163configuration::clear () 197configuration::clear ()
164{ 198{
… …
168 nodes.clear (); 202 nodes.clear ();
169 203
170 cleanup (); 204 cleanup ();
171 init (); 205 init ();
172} 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//}
173 223
174#define parse_bool(target,name,trueval,falseval) do { \ 224#define parse_bool(target,name,trueval,falseval) do { \
175 if (!strcmp (val, "yes")) target = trueval; \ 225 if (!strcmp (val, "yes")) target = trueval; \
176 else if (!strcmp (val, "no")) target = falseval; \ 226 else if (!strcmp (val, "no")) target = falseval; \
177 else if (!strcmp (val, "true")) target = trueval; \ 227 else if (!strcmp (val, "true")) target = trueval; \
178 else if (!strcmp (val, "false")) target = falseval; \ 228 else if (!strcmp (val, "false")) target = falseval; \
179 else if (!strcmp (val, "on")) target = trueval; \ 229 else if (!strcmp (val, "on")) target = trueval; \
180 else if (!strcmp (val, "off")) target = falseval; \ 230 else if (!strcmp (val, "off")) target = falseval; \
181 else \ 231 else \
182 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"); \
183} while (0) 233} while (0)
184 234
185const char * 235const char *
186configuration_parser::parse_line (char *line) 236configuration_parser::parse_line (char *line)
187{ 237{
… …
202 return 0; /* no tokens on this line */ 252 return 0; /* no tokens on this line */
203 253
204 if (var[0] == '#') 254 if (var[0] == '#')
205 return 0; /* comment: ignore */ 255 return 0; /* comment: ignore */
206 256
257 if (!strcmp (var, "global"))
258 {
259 node = &conf.default_node;
260 return 0;
261 }
262
207 char *val = strtok (NULL, "\t\n\r ="); 263 char *val = strtok (NULL, "\t\n\r =");
208 264
209 if (!val || val[0] == '#') 265 if (!val || val[0] == '#')
210 return _("no value given for variable. (ignored)"); 266 return _("no value given for variable, ignored");
211 267
212 if (!strcmp (var, "on")) 268 else if (!strcmp (var, "on"))
213 { 269 {
214 if (!::thisnode 270 if (::thisnode
215 || (val[0] == '!' && strcmp (val + 1, ::thisnode)) 271 && ((val[0] == '!' && strcmp (val + 1, ::thisnode))
216 || !strcmp (val, ::thisnode)) 272 || !strcmp (val, ::thisnode)))
217 return parse_line (strtok (NULL, "\n\r")); 273 return parse_line (strtok (NULL, "\n\r"));
218 else 274 }
219 return 0; 275
276 else if (!strcmp (var, "include"))
277 {
278 char *fname = conf.config_filename (val);
279 parse_file (fname);
280 free (fname);
220 } 281 }
221 282
222 // truly global 283 // truly global
223 if (!strcmp (var, "loglevel")) 284 else if (!strcmp (var, "loglevel"))
224 { 285 {
225 loglevel l = string_to_loglevel (val); 286 loglevel l = string_to_loglevel (val);
226 287
227 if (l == L_NONE) 288 if (l == L_NONE)
228 return _("unknown loglevel. (skipping)"); 289 return _("unknown loglevel, ignored");
229 } 290 }
230 else if (!strcmp (var, "ip-proto")) 291 else if (!strcmp (var, "ip-proto"))
231 conf.ip_proto = atoi (val); 292 conf.ip_proto = atoi (val);
232 else if (!strcmp (var, "icmp-type")) 293 else if (!strcmp (var, "icmp-type"))
233 { 294 {
234#if ENABLE_ICMP 295#if ENABLE_ICMP
235 conf.icmp_type = atoi (val); 296 conf.icmp_type = atoi (val);
236#endif 297#endif
237 } 298 }
299 else if (!strcmp (var, "chuser"))
300 {
301 struct passwd *pw = getpwnam (val);
302 if (!pw)
303 return _("user specified for chuser not found");
238 304
239 // per config 305 conf.change_uid = pw->pw_uid;
306 conf.change_gid = pw->pw_gid;
307 }
308 else if (!strcmp (var, "chuid"))
309 conf.change_uid = atoi (val);
310 else if (!strcmp (var, "chgid"))
311 conf.change_gid = atoi (val);
312 else if (!strcmp (var, "chroot"))
313 free (conf.change_root), conf.change_root = strdup (val);
314
315 // per node
240 else if (!strcmp (var, "node")) 316 else if (!strcmp (var, "node"))
241 { 317 {
242 parse_argv (); 318 node = conf.find_node (val);
243 319
320 if (!node)
321 {
244 conf.default_node.id++; 322 conf.default_node.id++;
245 node = new conf_node (conf.default_node); 323 node = new conf_node (conf.default_node);
246 conf.nodes.push_back (node); 324 conf.nodes.push_back (node);
247 node->nodename = strdup (val); 325 node->nodename = strdup (val);
248
249 {
250 char *fname;
251 FILE *f;
252
253 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
254
255 f = fopen (fname, "r");
256 if (f)
257 {
258 node->rsa_key = RSA_new ();
259
260 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
261 {
262 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
263 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
264 exit (EXIT_FAILURE);
265 }
266
267 require (RSA_blinding_on (node->rsa_key, 0));
268
269 fclose (f);
270 } 326 }
271 else
272 {
273 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
274
275 if (need_keys)
276 exit (EXIT_FAILURE);
277 }
278
279 free (fname);
280 }
281
282 if (::thisnode && !strcmp (node->nodename, ::thisnode))
283 conf.thisnode = node;
284 } 327 }
285 else if (!strcmp (var, "private-key")) 328 else if (!strcmp (var, "private-key"))
286 free (conf.prikeyfile), conf.prikeyfile = strdup (val); 329 free (conf.prikeyfile), conf.prikeyfile = strdup (val);
287 else if (!strcmp (var, "ifpersist")) 330 else if (!strcmp (var, "ifpersist"))
288 parse_bool (conf.ifpersist, "ifpersist", true, false); 331 parse_bool (conf.ifpersist, "ifpersist", true, false);
… …
292 conf.rekey = atoi (val); 335 conf.rekey = atoi (val);
293 else if (!strcmp (var, "keepalive")) 336 else if (!strcmp (var, "keepalive"))
294 conf.keepalive = atoi (val); 337 conf.keepalive = atoi (val);
295 else if (!strcmp (var, "mtu")) 338 else if (!strcmp (var, "mtu"))
296 conf.mtu = atoi (val); 339 conf.mtu = atoi (val);
340 else if (!strcmp (var, "nfmark"))
341 conf.nfmark = atoi (val);
342 else if (!strcmp (var, "seed-device"))
343 free (conf.seed_dev), conf.seed_dev = strdup (val);
344 else if (!strcmp (var, "seed-interval"))
345 conf.reseed = atoi (val);
297 else if (!strcmp (var, "if-up")) 346 else if (!strcmp (var, "if-up"))
298 free (conf.script_if_up), conf.script_if_up = strdup (val); 347 free (conf.script_if_up), conf.script_if_up = strdup (val);
299 else if (!strcmp (var, "node-up")) 348 else if (!strcmp (var, "node-up"))
300 free (conf.script_node_up), conf.script_node_up = strdup (val); 349 free (conf.script_node_up), conf.script_node_up = strdup (val);
350 else if (!strcmp (var, "node-change"))
351 free (conf.script_node_change), conf.script_node_change = strdup (val);
301 else if (!strcmp (var, "node-down")) 352 else if (!strcmp (var, "node-down"))
302 free (conf.script_node_down), conf.script_node_down = strdup (val); 353 free (conf.script_node_down), conf.script_node_down = strdup (val);
303 else if (!strcmp (var, "pid-file")) 354 else if (!strcmp (var, "pid-file"))
304 free (conf.pidfilename), conf.pidfilename = strdup (val); 355 free (conf.pidfilename), conf.pidfilename = strdup (val);
305 else if (!strcmp (var, "dns-forw-host")) 356 else if (!strcmp (var, "dns-forw-host"))
… …
334 } 385 }
335 else if (!strcmp (var, "dns-max-outstanding")) 386 else if (!strcmp (var, "dns-max-outstanding"))
336 { 387 {
337#if ENABLE_DNS 388#if ENABLE_DNS
338 conf.dns_max_outstanding = atoi (val); 389 conf.dns_max_outstanding = atoi (val);
390#endif
391 }
392 else if (!strcmp (var, "dns-case-preserving"))
393 {
394#if ENABLE_DNS
395 parse_bool (conf.dns_case_preserving, "dns-case-preserving", true, false);
339#endif 396#endif
340 } 397 }
341 else if (!strcmp (var, "http-proxy-host")) 398 else if (!strcmp (var, "http-proxy-host"))
342 { 399 {
343#if ENABLE_HTTP_PROXY 400#if ENABLE_HTTP_PROXY
… …
399 else if (!strcmp (val, "always")) 456 else if (!strcmp (val, "always"))
400 node->connectmode = conf_node::C_ALWAYS; 457 node->connectmode = conf_node::C_ALWAYS;
401 else if (!strcmp (val, "disabled")) 458 else if (!strcmp (val, "disabled"))
402 node->connectmode = conf_node::C_DISABLED; 459 node->connectmode = conf_node::C_DISABLED;
403 else 460 else
404 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)"); 461 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', ignored");
405 } 462 }
406 else if (!strcmp (var, "inherit-tos")) 463 else if (!strcmp (var, "inherit-tos"))
407 parse_bool (node->inherit_tos, "inherit-tos", true, false); 464 parse_bool (node->inherit_tos, "inherit-tos", true, false);
408 else if (!strcmp (var, "compress")) 465 else if (!strcmp (var, "compress"))
409 parse_bool (node->compress, "compress", true, false); 466 parse_bool (node->compress, "compress", true, false);
… …
432 } 489 }
433 else if (!strcmp (var, "enable-rawip")) 490 else if (!strcmp (var, "enable-rawip"))
434 { 491 {
435 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 492 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
436 } 493 }
494 else if (!strcmp (var, "allow-direct"))
495 node->allow_direct.push_back (strdup (val));
496 else if (!strcmp (var, "deny-direct"))
497 node->deny_direct.push_back (strdup (val));
498 else if (!strcmp (var, "max-ttl"))
499 node->max_ttl = atof (val);
500 else if (!strcmp (var, "max-queue"))
501 node->max_queue = atoi (val);
437 502
438 // unknown or misplaced 503 // unknown or misplaced
439 else 504 else
440 return _("unknown configuration directive. (ignored)"); 505 return _("unknown configuration directive - ignored");
441 506
442 return 0; 507 return 0;
443} 508}
444 509
445void configuration_parser::parse_argv () 510void
511conf_node::finalise ()
446{ 512{
447 for (int i = 0; i < argc; ++i) 513 if (max_queue < 1)
514 {
515 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename);
516 max_queue = 1;
448 { 517 }
449 char *v = argv [i];
450 518
451 if (!*v) 519 if (routerprio > 1 && (connectmode != C_ALWAYS && connectmode != C_DISABLED))
452 continue; 520 {
521 //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename);
522 connectmode = C_ALWAYS;
523 }
524}
453 525
454 char *enode = v; 526void
527configuration_parser::parse_file (const char *fname)
528{
529 if (FILE *f = fopen (fname, "r"))
530 {
531 char line [2048];
532 int lineno = 0;
455 533
456 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode) 534 while (fgets (line, sizeof (line), f))
457 enode++;
458
459 if (*enode != '.')
460 enode = 0;
461
462 char *wnode = node == &conf.default_node
463 ? 0
464 : node->nodename;
465
466 if ((!wnode && !enode)
467 || (wnode && enode && !strncmp (wnode, v, enode - v)))
468 { 535 {
536 lineno++;
537
469 const char *warn = parse_line (enode ? enode + 1 : v); 538 const char *warn = parse_line (line);
470 539
471 if (warn) 540 if (warn)
472 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v); 541 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
473
474 *v = 0;
475 } 542 }
543
544 fclose (f);
545 }
546 else
547 {
548 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
549 exit (EXIT_FAILURE);
476 } 550 }
477} 551}
478 552
479configuration_parser::configuration_parser (configuration &conf, 553configuration_parser::configuration_parser (configuration &conf,
480 bool need_keys, 554 bool need_keys,
481 int argc, 555 int argc,
482 char **argv) 556 char **argv)
483: conf (conf),need_keys (need_keys), argc (argc), argv (argv) 557: conf (conf), need_keys (need_keys), argc (argc), argv (argv)
484{ 558{
485 char *fname; 559 char *fname;
486 FILE *f;
487 560
488 conf.clear (); 561 conf.clear ();
562 node = &conf.default_node;
489 563
490 asprintf (&fname, "%s/gvpe.conf", confbase); 564 asprintf (&fname, "%s/gvpe.conf", confbase);
491 f = fopen (fname, "r"); 565 parse_file (fname);
492
493 if (f)
494 {
495 char line[16384];
496 int lineno = 0;
497 node = &conf.default_node;
498
499 while (fgets (line, sizeof (line), f))
500 {
501 lineno++;
502
503 const char *warn = parse_line (line);
504
505 if (warn)
506 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
507 }
508
509 fclose (f);
510
511 parse_argv ();
512 }
513 else
514 {
515 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
516 exit (EXIT_FAILURE);
517 }
518
519 free (fname); 566 free (fname);
520 567
521 fname = conf.config_filename (conf.prikeyfile, "hostkey"); 568 fname = conf.config_filename (conf.prikeyfile, "hostkey");
522 569
523 f = fopen (fname, "r"); 570 if (FILE *f = fopen (fname, "r"))
524 if (f)
525 { 571 {
526 conf.rsa_key = RSA_new (); 572 conf.rsa_key = RSA_new ();
527 573
528 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) 574 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
529 { 575 {
… …
536 582
537 fclose (f); 583 fclose (f);
538 } 584 }
539 else 585 else
540 { 586 {
541 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
542
543 if (need_keys) 587 if (need_keys)
588 {
589 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
544 exit (EXIT_FAILURE); 590 exit (EXIT_FAILURE);
545 }
546
547 if (need_keys && ::thisnode
548 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
549 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
550 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
551 {
552 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
553 exit (EXIT_FAILURE);
554 } 591 }
592 }
555 593
556 free (fname); 594 free (fname);
557}
558 595
596 fname = conf.config_filename (conf.pidfilename);
597 free (conf.pidfilename); conf.pidfilename = fname;
598
599 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
600 {
601 conf_node *node = *i;
602 char *fname;
603 FILE *f;
604
605 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
606
607 f = fopen (fname, "r");
608 if (f)
609 {
610 node->rsa_key = RSA_new ();
611
612 if (!PEM_read_RSAPublicKey (f, &node->rsa_key, NULL, NULL))
613 {
614 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
615 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
616 exit (EXIT_FAILURE);
617 }
618
619 require (RSA_blinding_on (node->rsa_key, 0));
620
621 fclose (f);
622 }
623 else
624 {
625 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
626
627 if (need_keys)
628 exit (EXIT_FAILURE);
629 }
630
631 free (fname);
632
633 (*i)->finalise ();
634 }
635
636 if (::thisnode)
637 {
638 conf.thisnode = conf.find_node (::thisnode);
639
640 if (need_keys)
641 {
642 if (!conf.thisnode)
643 {
644 slog (L_NOTICE, _("local node ('%s') not found in config file, aborting."), ::thisnode);
645 exit (EXIT_FAILURE);
646 }
647
648 if (conf.rsa_key && conf.thisnode->rsa_key)
649 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
650 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
651 {
652 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
653 exit (EXIT_FAILURE);
654 }
655 }
656 }
657
658 parse_argv ();
659}
660
661void
662configuration_parser::parse_argv ()
663{
664 for (int i = 0; i < argc; ++i)
665 {
666 char *v = argv [i];
667
668 if (!*v)
669 continue;
670
671 char *enode = v;
672
673 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
674 enode++;
675
676 if (*enode != '.')
677 enode = 0;
678
679 if (enode)
680 {
681 char *val = strdup (v);
682 val [enode - v] = 0;
683 node = conf.find_node (val);
684 free (val);
685
686 if (!node)
687 {
688 slog (L_WARN, _("command line option '%s' refers to unknown node, ignoring."), v);
689 continue;
690 }
691 }
692 else
693 node = &conf.default_node;
694
695 const char *warn = parse_line (enode ? enode + 1 : v);
696
697 if (warn)
698 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
699 }
700}
701
702char *
559char *configuration::config_filename (const char *name, const char *dflt) 703configuration::config_filename (const char *name, const char *dflt)
560{ 704{
561 char *fname; 705 char *fname;
562 706
563 asprintf (&fname, name ? name : dflt, ::thisnode); 707 asprintf (&fname, name ? name : dflt, ::thisnode ? ::thisnode : "<unset>");
564 708
565 if (!ABSOLUTE_PATH (fname)) 709 if (!ABSOLUTE_PATH (fname))
566 { 710 {
567 char *rname = fname; 711 char *rname = fname;
568 asprintf (&fname, "%s/%s", confbase, rname); 712 asprintf (&fname, "%s/%s", confbase, rname);
569 free (rname); 713 free (rname);
570 } 714 }
571 715
572 return fname; 716 return fname;
717}
718
719void
720conf_node::print ()
721{
722 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
723 id,
724 id >> 8, id & 0xff,
725 compress ? 'Y' : 'N',
726 connectmode == C_ONDEMAND ? "ondemand"
727 : connectmode == C_NEVER ? "never"
728 : connectmode == C_ALWAYS ? "always"
729 : connectmode == C_DISABLED ? "disabled"
730 : "",
731 nodename,
732 protocols,
733 hostname ? hostname : "",
734 hostname ? ":" : "",
735 hostname ? udp_port : 0
736 );
573} 737}
574 738
575void 739void
576configuration::print () 740configuration::print ()
577{ 741{
… …
584 printf (_("interface: %s\n"), ifname); 748 printf (_("interface: %s\n"), ifname);
585 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 749 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
586 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); 750 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
587 printf ("\n"); 751 printf ("\n");
588 752
589 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 753 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
590 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 754 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
591 755
592 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 756 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
593 (*i)->print (); 757 (*i)->print ();
594 758
595 printf ("\n"); 759 printf ("\n");
… …
605configuration::~configuration () 769configuration::~configuration ()
606{ 770{
607 cleanup (); 771 cleanup ();
608} 772}
609 773
610

Diff Legend

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