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.67 by root, Thu Oct 25 04:32:27 2018 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,2018 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{
188 { 238 {
189 char *end = line + strlen (line); 239 char *end = line + strlen (line);
190 240
191 while (*end < ' ' && end >= line) 241 while (end >= line && *end < ' ')
192 end--; 242 end--;
193 243
194 *++end = 0; 244 *++end = 0;
195 } 245 }
196 246
… …
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 }
291 else if (!strcmp (var, "serial"))
292 strncpy (conf.serial, val, sizeof (conf.serial));
230 else if (!strcmp (var, "ip-proto")) 293 else if (!strcmp (var, "ip-proto"))
231 conf.ip_proto = atoi (val); 294 conf.ip_proto = atoi (val);
232 else if (!strcmp (var, "icmp-type")) 295 else if (!strcmp (var, "icmp-type"))
233 { 296 {
234#if ENABLE_ICMP 297#if ENABLE_ICMP
235 conf.icmp_type = atoi (val); 298 conf.icmp_type = atoi (val);
236#endif 299#endif
237 } 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");
238 306
239 // 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
240 else if (!strcmp (var, "node")) 318 else if (!strcmp (var, "node"))
241 { 319 {
242 parse_argv (); 320 node = conf.find_node (val);
243 321
322 if (!node)
323 {
244 conf.default_node.id++; 324 conf.default_node.id++;
245 node = new conf_node (conf.default_node); 325 node = new conf_node (conf.default_node);
246 conf.nodes.push_back (node); 326 conf.nodes.push_back (node);
247 node->nodename = strdup (val); 327 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 } 328 }
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 } 329 }
285 else if (!strcmp (var, "private-key")) 330 else if (!strcmp (var, "private-key"))
286 free (conf.prikeyfile), conf.prikeyfile = strdup (val); 331 free (conf.prikeyfile), conf.prikeyfile = strdup (val);
287 else if (!strcmp (var, "ifpersist")) 332 else if (!strcmp (var, "ifpersist"))
288 parse_bool (conf.ifpersist, "ifpersist", true, false); 333 parse_bool (conf.ifpersist, "ifpersist", true, false);
… …
292 conf.rekey = atoi (val); 337 conf.rekey = atoi (val);
293 else if (!strcmp (var, "keepalive")) 338 else if (!strcmp (var, "keepalive"))
294 conf.keepalive = atoi (val); 339 conf.keepalive = atoi (val);
295 else if (!strcmp (var, "mtu")) 340 else if (!strcmp (var, "mtu"))
296 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);
297 else if (!strcmp (var, "if-up")) 348 else if (!strcmp (var, "if-up"))
298 free (conf.script_if_up), conf.script_if_up = strdup (val); 349 free (conf.script_if_up), conf.script_if_up = strdup (val);
299 else if (!strcmp (var, "node-up")) 350 else if (!strcmp (var, "node-up"))
300 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);
301 else if (!strcmp (var, "node-down")) 354 else if (!strcmp (var, "node-down"))
302 free (conf.script_node_down), conf.script_node_down = strdup (val); 355 free (conf.script_node_down), conf.script_node_down = strdup (val);
303 else if (!strcmp (var, "pid-file")) 356 else if (!strcmp (var, "pid-file"))
304 free (conf.pidfilename), conf.pidfilename = strdup (val); 357 free (conf.pidfilename), conf.pidfilename = strdup (val);
305 else if (!strcmp (var, "dns-forw-host")) 358 else if (!strcmp (var, "dns-forw-host"))
… …
334 } 387 }
335 else if (!strcmp (var, "dns-max-outstanding")) 388 else if (!strcmp (var, "dns-max-outstanding"))
336 { 389 {
337#if ENABLE_DNS 390#if ENABLE_DNS
338 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);
339#endif 398#endif
340 } 399 }
341 else if (!strcmp (var, "http-proxy-host")) 400 else if (!strcmp (var, "http-proxy-host"))
342 { 401 {
343#if ENABLE_HTTP_PROXY 402#if ENABLE_HTTP_PROXY
… …
399 else if (!strcmp (val, "always")) 458 else if (!strcmp (val, "always"))
400 node->connectmode = conf_node::C_ALWAYS; 459 node->connectmode = conf_node::C_ALWAYS;
401 else if (!strcmp (val, "disabled")) 460 else if (!strcmp (val, "disabled"))
402 node->connectmode = conf_node::C_DISABLED; 461 node->connectmode = conf_node::C_DISABLED;
403 else 462 else
404 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");
405 } 464 }
406 else if (!strcmp (var, "inherit-tos")) 465 else if (!strcmp (var, "inherit-tos"))
407 parse_bool (node->inherit_tos, "inherit-tos", true, false); 466 parse_bool (node->inherit_tos, "inherit-tos", true, false);
408 else if (!strcmp (var, "compress")) 467 else if (!strcmp (var, "compress"))
409 parse_bool (node->compress, "compress", true, false); 468 parse_bool (node->compress, "compress", true, false);
469 else if (!strcmp (var, "low-power"))
470 parse_bool (node->low_power, "low-power", true, false);
410 // all these bool options really really cost a lot of executable size! 471 // all these bool options really really cost a lot of executable size!
411 else if (!strcmp (var, "enable-tcp")) 472 else if (!strcmp (var, "enable-tcp"))
412 { 473 {
413#if ENABLE_TCP 474#if ENABLE_TCP
414 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 475 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
432 } 493 }
433 else if (!strcmp (var, "enable-rawip")) 494 else if (!strcmp (var, "enable-rawip"))
434 { 495 {
435 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 496 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
436 } 497 }
498 else if (!strcmp (var, "allow-direct"))
499 node->allow_direct.push_back (strdup (val));
500 else if (!strcmp (var, "deny-direct"))
501 node->deny_direct.push_back (strdup (val));
502 else if (!strcmp (var, "max-ttl"))
503 node->max_ttl = atof (val);
504 else if (!strcmp (var, "max-queue"))
505 node->max_queue = atoi (val);
437 506
438 // unknown or misplaced 507 // unknown or misplaced
439 else 508 else
440 return _("unknown configuration directive. (ignored)"); 509 return _("unknown configuration directive - ignored");
441 510
442 return 0; 511 return 0;
443} 512}
444 513
445void configuration_parser::parse_argv () 514void
515conf_node::finalise ()
446{ 516{
447 for (int i = 0; i < argc; ++i) 517 if (max_queue < 1)
518 {
519 slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename);
520 max_queue = 1;
448 { 521 }
449 char *v = argv [i];
450 522
451 if (!*v) 523 if (routerprio > 1 && (connectmode != C_ALWAYS && connectmode != C_DISABLED))
452 continue; 524 {
525 //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename);
526 connectmode = C_ALWAYS;
527 }
528}
453 529
454 char *enode = v; 530void
531configuration_parser::parse_file (const char *fname)
532{
533 if (FILE *f = fopen (fname, "r"))
534 {
535 char line [2048];
536 int lineno = 0;
455 537
456 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode) 538 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 { 539 {
540 lineno++;
541
469 const char *warn = parse_line (enode ? enode + 1 : v); 542 const char *warn = parse_line (line);
470 543
471 if (warn) 544 if (warn)
472 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v); 545 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
473
474 *v = 0;
475 } 546 }
547
548 fclose (f);
549 }
550 else
551 {
552 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
553 exit (EXIT_FAILURE);
476 } 554 }
477} 555}
478 556
479configuration_parser::configuration_parser (configuration &conf, 557configuration_parser::configuration_parser (configuration &conf,
480 bool need_keys, 558 bool need_keys,
481 int argc, 559 int argc,
482 char **argv) 560 char **argv)
483: conf (conf),need_keys (need_keys), argc (argc), argv (argv) 561: conf (conf), need_keys (need_keys), argc (argc), argv (argv)
484{ 562{
485 char *fname; 563 char *fname;
486 FILE *f;
487 564
488 conf.clear (); 565 conf.clear ();
566 node = &conf.default_node;
489 567
490 asprintf (&fname, "%s/gvpe.conf", confbase); 568 asprintf (&fname, "%s/gvpe.conf", confbase);
491 f = fopen (fname, "r"); 569 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); 570 free (fname);
520 571
521 fname = conf.config_filename (conf.prikeyfile, "hostkey"); 572 fname = conf.config_filename (conf.prikeyfile, "hostkey");
522 573
523 f = fopen (fname, "r"); 574 if (FILE *f = fopen (fname, "r"))
524 if (f)
525 { 575 {
526 conf.rsa_key = RSA_new (); 576 conf.rsa_key = RSA_new ();
527 577
528 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) 578 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
529 { 579 {
… …
536 586
537 fclose (f); 587 fclose (f);
538 } 588 }
539 else 589 else
540 { 590 {
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) 591 if (need_keys)
592 {
593 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
544 exit (EXIT_FAILURE); 594 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 } 595 }
596 }
555 597
556 free (fname); 598 free (fname);
557}
558 599
600 fname = conf.config_filename (conf.pidfilename);
601 free (conf.pidfilename); conf.pidfilename = fname;
602
603 for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i)
604 {
605 conf_node *node = *i;
606 char *fname;
607 FILE *f;
608
609 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
610
611 f = fopen (fname, "r");
612 if (f)
613 {
614 node->rsa_key = RSA_new ();
615
616 if (!PEM_read_RSAPublicKey (f, &node->rsa_key, NULL, NULL))
617 {
618 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
619 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
620 exit (EXIT_FAILURE);
621 }
622
623 require (RSA_blinding_on (node->rsa_key, 0));
624
625 fclose (f);
626 }
627 else
628 {
629 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
630
631 if (need_keys)
632 exit (EXIT_FAILURE);
633 }
634
635 free (fname);
636
637 (*i)->finalise ();
638 }
639
640 if (::thisnode)
641 {
642 conf.thisnode = conf.find_node (::thisnode);
643
644 if (need_keys)
645 {
646 if (!conf.thisnode)
647 {
648 slog (L_NOTICE, _("local node ('%s') not found in config file, aborting."), ::thisnode);
649 exit (EXIT_FAILURE);
650 }
651
652 if (conf.rsa_key && conf.thisnode->rsa_key)
653 {
654 const BIGNUM *conf_n, *conf_e, *thisnode_n, *thisnode_e;
655
656#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !LIBRESSL_VERSION_NUMBER
657 RSA_get0_key (conf.rsa_key, &conf_n, &conf_e, 0);
658 RSA_get0_key (conf.thisnode->rsa_key, &thisnode_n, &thisnode_e, 0);
659#else
660 conf_n = conf.thisnode->rsa_key->n;
661 conf_e = conf.thisnode->rsa_key->e;
662 thisnode_n = conf.rsa_key->n;
663 thisnode_e = conf.rsa_key->e;
664#endif
665 if (BN_cmp (conf_n, thisnode_n) != 0 || BN_cmp (conf_e, thisnode_e) != 0)
666 {
667 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
668 exit (EXIT_FAILURE);
669 }
670 }
671 }
672 }
673
674 parse_argv ();
675}
676
677void
678configuration_parser::parse_argv ()
679{
680 for (int i = 0; i < argc; ++i)
681 {
682 char *v = argv [i];
683
684 if (!*v)
685 continue;
686
687 char *enode = v;
688
689 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
690 enode++;
691
692 if (*enode != '.')
693 enode = 0;
694
695 if (enode)
696 {
697 char *val = strdup (v);
698 val [enode - v] = 0;
699 node = conf.find_node (val);
700 free (val);
701
702 if (!node)
703 {
704 slog (L_WARN, _("command line option '%s' refers to unknown node, ignoring."), v);
705 continue;
706 }
707 }
708 else
709 node = &conf.default_node;
710
711 const char *warn = parse_line (enode ? enode + 1 : v);
712
713 if (warn)
714 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
715 }
716}
717
718char *
559char *configuration::config_filename (const char *name, const char *dflt) 719configuration::config_filename (const char *name, const char *dflt)
560{ 720{
561 char *fname; 721 char *fname;
562 722
563 asprintf (&fname, name ? name : dflt, ::thisnode); 723 asprintf (&fname, name ? name : dflt, ::thisnode ? ::thisnode : "<unset>");
564 724
565 if (!ABSOLUTE_PATH (fname)) 725 if (!ABSOLUTE_PATH (fname))
566 { 726 {
567 char *rname = fname; 727 char *rname = fname;
568 asprintf (&fname, "%s/%s", confbase, rname); 728 asprintf (&fname, "%s/%s", confbase, rname);
569 free (rname); 729 free (rname);
570 } 730 }
571 731
572 return fname; 732 return fname;
733}
734
735void
736conf_node::print ()
737{
738 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n",
739 id,
740 id >> 8, id & 0xff,
741 compress ? 'Y' : 'N',
742 connectmode == C_ONDEMAND ? "ondemand"
743 : connectmode == C_NEVER ? "never"
744 : connectmode == C_ALWAYS ? "always"
745 : connectmode == C_DISABLED ? "disabled"
746 : "",
747 nodename,
748 protocols,
749 hostname ? hostname : "",
750 hostname ? ":" : "",
751 hostname ? udp_port : 0
752 );
573} 753}
574 754
575void 755void
576configuration::print () 756configuration::print ()
577{ 757{
… …
584 printf (_("interface: %s\n"), ifname); 764 printf (_("interface: %s\n"), ifname);
585 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 765 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
586 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); 766 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
587 printf ("\n"); 767 printf ("\n");
588 768
589 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 769 printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n",
590 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 770 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port"));
591 771
592 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) 772 for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i)
593 (*i)->print (); 773 (*i)->print ();
594 774
595 printf ("\n"); 775 printf ("\n");
… …
605configuration::~configuration () 785configuration::~configuration ()
606{ 786{
607 cleanup (); 787 cleanup ();
608} 788}
609 789
610

Diff Legend

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