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.17 by pcg, Tue Oct 14 15:48:15 2003 UTC vs.
Revision 1.38 by pcg, Wed Mar 23 17:03:58 2005 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.c -- configuration code
3 Copyright (C) 1998 Robert van der Meulen 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 1998-2002 Ivo Timmermans <ivo@o2w.nl>
5 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
6 2000 Cris van Pelt <tribbel@arise.dhs.org>
7 2003 Marc Lehmann <pcg@goof.com>
8 4
5 This file is part of GVPE.
6
9 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version. 10 (at your option) any later version.
13 11
14 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,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 GNU General Public License for more details. 15 GNU General Public License for more details.
18 16
19 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
20 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
21 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22*/ 20*/
23 21
24#include "config.h" 22#include "config.h"
25 23
… …
37 35
38#include <openssl/err.h> 36#include <openssl/err.h>
39#include <openssl/pem.h> 37#include <openssl/pem.h>
40#include <openssl/rsa.h> 38#include <openssl/rsa.h>
41#include <openssl/rand.h> 39#include <openssl/rand.h>
42 40#include <openssl/bn.h>
43#include "gettext.h"
44 41
45#include "conf.h" 42#include "conf.h"
46#include "slog.h" 43#include "slog.h"
47#include "util.h" 44#include "util.h"
48 45
49char *confbase; 46char *confbase;
50char *thisnode; 47char *thisnode;
51char *identname; 48char *identname;
52char *pidfilename;
53 49
54struct configuration conf; 50struct configuration conf;
55 51
56u8 best_protocol (u8 protset) 52u8 best_protocol (u8 protset)
57{ 53{
58 if (protset & PROT_IPv4 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
59 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
60 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
61 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
62 59
63 return 0; 60 return 0;
64} 61}
65 62
66const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
67{ 64{
68 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
69 if (protocol & PROT_ICMPv4) return "icmp"; 66 if (protocol & PROT_ICMPv4) return "icmp";
70 if (protocol & PROT_UDPv4 ) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
71 if (protocol & PROT_TCPv4 ) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns";
72 70
73 return "<unknown>"; 71 return "<unknown>";
74} 72}
75 73
76void 74void
… …
95 if (rsa_key) 93 if (rsa_key)
96 RSA_free (rsa_key); 94 RSA_free (rsa_key);
97 95
98 free (nodename); 96 free (nodename);
99 free (hostname); 97 free (hostname);
98#if ENABLE_DNS
99 free (domain);
100 free (dns_hostname);
101#endif
100} 102}
101 103
102void configuration::init () 104void configuration::init ()
103{ 105{
104 memset (this, 0, sizeof (*this)); 106 memset (this, 0, sizeof (*this));
105 107
108 mtu = DEFAULT_MTU;
106 rekey = DEFAULT_REKEY; 109 rekey = DEFAULT_REKEY;
107 keepalive = DEFAULT_KEEPALIVE; 110 keepalive = DEFAULT_KEEPALIVE;
108 llevel = L_INFO; 111 llevel = L_INFO;
109 ip_proto = IPPROTO_GRE; 112 ip_proto = IPPROTO_GRE;
110#if ENABLE_ICMP 113#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY; 114 icmp_type = ICMP_ECHOREPLY;
112#endif 115#endif
113 116
114 default_node.udp_port = DEFAULT_UDPPORT; 117 default_node.udp_port = DEFAULT_UDPPORT;
115 default_node.tcp_port = DEFAULT_UDPPORT; 118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
116 default_node.connectmode = conf_node::C_ALWAYS; 119 default_node.connectmode = conf_node::C_ALWAYS;
117 default_node.compress = true; 120 default_node.compress = true;
118 default_node.protocols = PROT_UDPv4; 121 default_node.protocols = 0;
122 default_node.max_retry = DEFAULT_MAX_RETRY;
123
124#if ENABLE_DNS
125 default_node.dns_port = 0; // default is 0 == client
126
127 dns_forw_host = strdup ("127.0.0.1");
128 dns_forw_port = 53;
129 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
130 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
131 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
132 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
133#endif
134
135 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
119} 136}
120 137
121void configuration::cleanup() 138void configuration::cleanup()
122{ 139{
123 if (rsa_key) 140 if (rsa_key)
124 RSA_free (rsa_key); 141 RSA_free (rsa_key);
125 142
126 rsa_key = 0; 143 rsa_key = 0;
127 144
145 free (pidfilename); pidfilename = 0;
128 free (ifname); ifname = 0; 146 free (ifname); ifname = 0;
129#if ENABLE_HTTP_PROXY 147#if ENABLE_HTTP_PROXY
130 free (proxy_host); proxy_host = 0; 148 free (proxy_host); proxy_host = 0;
131 free (proxy_auth); proxy_auth = 0; 149 free (proxy_auth); proxy_auth = 0;
150#endif
151#if ENABLE_DNS
152 free (dns_forw_host); dns_forw_host = 0;
132#endif 153#endif
133} 154}
134 155
135void 156void
136configuration::clear_config () 157configuration::clear_config ()
… …
142 163
143 cleanup (); 164 cleanup ();
144 init (); 165 init ();
145} 166}
146 167
147#define parse_bool(target,name,trueval,falseval) \ 168#define parse_bool(target,name,trueval,falseval) do { \
148 if (!strcmp (val, "yes")) target = trueval; \ 169 if (!strcmp (val, "yes")) target = trueval; \
149 else if (!strcmp (val, "no")) target = falseval; \ 170 else if (!strcmp (val, "no")) target = falseval; \
150 else if (!strcmp (val, "true")) target = trueval; \ 171 else if (!strcmp (val, "true")) target = trueval; \
151 else if (!strcmp (val, "false")) target = falseval; \ 172 else if (!strcmp (val, "false")) target = falseval; \
152 else if (!strcmp (val, "on")) target = trueval; \ 173 else if (!strcmp (val, "on")) target = trueval; \
153 else if (!strcmp (val, "off")) target = falseval; \ 174 else if (!strcmp (val, "off")) target = falseval; \
154 else \ 175 else \
155 slog (L_WARN, \ 176 slog (L_WARN, \
156 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 177 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
157 name, var, fname, lineno); 178 name, var, fname, lineno); \
179} while (0)
158 180
159void configuration::read_config (bool need_keys) 181void configuration::read_config (bool need_keys)
160{ 182{
161 char *fname; 183 char *fname;
162 FILE *f; 184 FILE *f;
163 185
164 clear_config (); 186 clear_config ();
165 187
166 asprintf (&fname, "%s/vped.conf", confbase); 188 asprintf (&fname, "%s/gvpe.conf", confbase);
167 f = fopen (fname, "r"); 189 f = fopen (fname, "r");
168 190
169 if (f) 191 if (f)
170 { 192 {
171 char line[16384]; 193 char line[16384];
… …
201 val = strtok (NULL, "\t\n\r ="); 223 val = strtok (NULL, "\t\n\r =");
202 224
203 if (!val || val[0] == '#') 225 if (!val || val[0] == '#')
204 { 226 {
205 slog (L_WARN, 227 slog (L_WARN,
206 _("no value for variable `%s', at '%s' line %d"), 228 _("no value for variable `%s', at '%s' line %d, skipping."),
207 var, fname, lineno); 229 var, fname, lineno);
208 break; 230 continue;
209 } 231 }
210 232
211 if (!strcmp (var, "on")) 233 if (!strcmp (var, "on"))
212 { 234 {
213 if (!::thisnode 235 if (!::thisnode
… …
228 else 250 else
229 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 251 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
230 } 252 }
231 else if (!strcmp (var, "ip-proto")) 253 else if (!strcmp (var, "ip-proto"))
232 ip_proto = atoi (val); 254 ip_proto = atoi (val);
255 else if (!strcmp (var, "icmp-type"))
256 {
233#if ENABLE_ICMP 257#if ENABLE_ICMP
234 //TODO: error message
235 else if (!strcmp (var, "icmp-type"))
236 icmp_type = atoi (val); 258 icmp_type = atoi (val);
237#endif 259#endif
260 }
238 261
239 // per config 262 // per config
240 else if (!strcmp (var, "node")) 263 else if (!strcmp (var, "node"))
241 { 264 {
242 default_node.id++; 265 default_node.id++;
… …
260 283
261 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 284 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
262 { 285 {
263 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 286 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
264 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 287 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
265 exit (1); 288 exit (EXIT_FAILURE);
266 } 289 }
267 290
268 RSA_blinding_on (node->rsa_key, 0); 291 require (RSA_blinding_on (node->rsa_key, 0));
269 292
270 fclose (f); 293 fclose (f);
271 } 294 }
272 else 295 else
273 { 296 {
274 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 297 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
275 298
276 if (need_keys) 299 if (need_keys)
277 exit (1); 300 exit (EXIT_FAILURE);
278 } 301 }
279 302
280 free (fname); 303 free (fname);
281 } 304 }
282 305
283 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 306 if (::thisnode && !strcmp (node->nodename, ::thisnode))
284 thisnode = node; 307 thisnode = node;
285 } 308 }
286 else if (!strcmp (var, "private-key")) 309 else if (!strcmp (var, "private-key"))
287 prikeyfile = strdup (val); 310 free (prikeyfile), prikeyfile = strdup (val);
288 else if (!strcmp (var, "ifpersist")) 311 else if (!strcmp (var, "ifpersist"))
289 {
290 parse_bool (ifpersist, "ifpersist", true, false); 312 parse_bool (ifpersist, "ifpersist", true, false);
291 }
292 else if (!strcmp (var, "ifname")) 313 else if (!strcmp (var, "ifname"))
293 ifname = strdup (val); 314 free (ifname), ifname = strdup (val);
294 else if (!strcmp (var, "rekey")) 315 else if (!strcmp (var, "rekey"))
295 rekey = atoi (val); 316 rekey = atoi (val);
296 else if (!strcmp (var, "keepalive")) 317 else if (!strcmp (var, "keepalive"))
297 keepalive = atoi (val); 318 keepalive = atoi (val);
298 else if (!strcmp (var, "mtu")) 319 else if (!strcmp (var, "mtu"))
299 mtu = atoi (val); 320 mtu = atoi (val);
300 else if (!strcmp (var, "if-up")) 321 else if (!strcmp (var, "if-up"))
301 script_if_up = strdup (val); 322 free (script_if_up), script_if_up = strdup (val);
302 else if (!strcmp (var, "node-up")) 323 else if (!strcmp (var, "node-up"))
303 script_node_up = strdup (val); 324 free (script_node_up), script_node_up = strdup (val);
304 else if (!strcmp (var, "node-down")) 325 else if (!strcmp (var, "node-down"))
305 script_node_down = strdup (val); 326 free (script_node_down), script_node_down = strdup (val);
327 else if (!strcmp (var, "pid-file"))
328 free (pidfilename), pidfilename = strdup (val);
329 else if (!strcmp (var, "dns-forw-host"))
330 {
331#if ENABLE_DNS
332 free (dns_forw_host), dns_forw_host = strdup (val);
333#endif
334 }
335 else if (!strcmp (var, "dns-forw-port"))
336 {
337#if ENABLE_DNS
338 dns_forw_port = atoi (val);
339#endif
340 }
341 else if (!strcmp (var, "dns-timeout-factor"))
342 {
343#if ENABLE_DNS
344 dns_timeout_factor = atof (val);
345#endif
346 }
347 else if (!strcmp (var, "dns-send-interval"))
348 {
349#if ENABLE_DNS
350 dns_send_interval = atoi (val);
351#endif
352 }
353 else if (!strcmp (var, "dns-overlap-factor"))
354 {
355#if ENABLE_DNS
356 dns_overlap_factor = atof (val);
357#endif
358 }
359 else if (!strcmp (var, "dns-max-outstanding"))
360 {
361#if ENABLE_DNS
362 dns_max_outstanding = atoi (val);
363#endif
364 }
365 else if (!strcmp (var, "http-proxy-host"))
366 {
306#if ENABLE_HTTP_PROXY 367#if ENABLE_HTTP_PROXY
307 else if (!strcmp (var, "http-proxy-host"))
308 proxy_host = strdup (val); 368 free (proxy_host), proxy_host = strdup (val);
369#endif
370 }
309 else if (!strcmp (var, "http-proxy-port")) 371 else if (!strcmp (var, "http-proxy-port"))
372 {
373#if ENABLE_HTTP_PROXY
310 proxy_port = atoi (val); 374 proxy_port = atoi (val);
375#endif
376 }
311 else if (!strcmp (var, "http-proxy-auth")) 377 else if (!strcmp (var, "http-proxy-auth"))
378 {
379#if ENABLE_HTTP_PROXY
312 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 380 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
313#endif 381#endif
382 }
314 383
315 /* node-specific, non-defaultable */ 384 /* node-specific, non-defaultable */
316 else if (node != &default_node && !strcmp (var, "hostname")) 385 else if (node != &default_node && !strcmp (var, "hostname"))
317 {
318 free (node->hostname);
319 node->hostname = strdup (val); 386 free (node->hostname), node->hostname = strdup (val);
320 }
321 387
322 /* node-specific, defaultable */ 388 /* node-specific, defaultable */
323 else if (!strcmp (var, "udp-port")) 389 else if (!strcmp (var, "udp-port"))
324 node->udp_port = atoi (val); 390 node->udp_port = atoi (val);
325 else if (!strcmp (var, "tcp-port")) 391 else if (!strcmp (var, "tcp-port"))
326 node->tcp_port = atoi (val); 392 node->tcp_port = atoi (val);
393 else if (!strcmp (var, "dns-hostname"))
394 {
395#if ENABLE_DNS
396 free (node->dns_hostname), node->dns_hostname = strdup (val);
397#endif
398 }
399 else if (!strcmp (var, "dns-port"))
400 {
401#if ENABLE_DNS
402 node->dns_port = atoi (val);
403#endif
404 }
405 else if (!strcmp (var, "dns-domain"))
406 {
407#if ENABLE_DNS
408 free (node->domain), node->domain = strdup (val);
409#endif
410 }
327 else if (!strcmp (var, "router-priority")) 411 else if (!strcmp (var, "router-priority"))
328 node->routerprio = atoi (val); 412 node->routerprio = atoi (val);
413 else if (!strcmp (var, "max-retry"))
414 node->max_retry = atoi (val);
329 else if (!strcmp (var, "connect")) 415 else if (!strcmp (var, "connect"))
330 { 416 {
331 if (!strcmp (val, "ondemand")) 417 if (!strcmp (val, "ondemand"))
332 node->connectmode = conf_node::C_ONDEMAND; 418 node->connectmode = conf_node::C_ONDEMAND;
333 else if (!strcmp (val, "never")) 419 else if (!strcmp (val, "never"))
… …
336 node->connectmode = conf_node::C_ALWAYS; 422 node->connectmode = conf_node::C_ALWAYS;
337 else if (!strcmp (val, "disabled")) 423 else if (!strcmp (val, "disabled"))
338 node->connectmode = conf_node::C_DISABLED; 424 node->connectmode = conf_node::C_DISABLED;
339 else 425 else
340 slog (L_WARN, 426 slog (L_WARN,
341 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 427 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
342 var, fname, lineno); 428 var, fname, lineno);
343 } 429 }
344 else if (!strcmp (var, "inherit-tos")) 430 else if (!strcmp (var, "inherit-tos"))
345 {
346 parse_bool (node->inherit_tos, "inherit-tos", true, false); 431 parse_bool (node->inherit_tos, "inherit-tos", true, false);
347 }
348 else if (!strcmp (var, "compress")) 432 else if (!strcmp (var, "compress"))
349 {
350 parse_bool (node->compress, "compress", true, false); 433 parse_bool (node->compress, "compress", true, false);
351 }
352 // all these bool options really really cost a lot of executable size! 434 // all these bool options really really cost a lot of executable size!
353 else if (!strcmp (var, "enable-tcp")) 435 else if (!strcmp (var, "enable-tcp"))
354 { 436 {
355#if ENABLE_TCP 437#if ENABLE_TCP
356 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 438 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
358 } 440 }
359 else if (!strcmp (var, "enable-icmp")) 441 else if (!strcmp (var, "enable-icmp"))
360 { 442 {
361#if ENABLE_ICMP 443#if ENABLE_ICMP
362 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 444 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
445#endif
446 }
447 else if (!strcmp (var, "enable-dns"))
448 {
449#if ENABLE_DNS
450 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
363#endif 451#endif
364 } 452 }
365 else if (!strcmp (var, "enable-udp")) 453 else if (!strcmp (var, "enable-udp"))
366 { 454 {
367 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 455 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
372 } 460 }
373 461
374 // unknown or misplaced 462 // unknown or misplaced
375 else 463 else
376 slog (L_WARN, 464 slog (L_WARN,
377 _("unknown or misplaced variable `%s', at '%s' line %d"), 465 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
378 var, fname, lineno); 466 var, fname, lineno);
379 } 467 }
380 468
381 fclose (f); 469 fclose (f);
382 } 470 }
383 else 471 else
384 { 472 {
385 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 473 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
386 exit (1); 474 exit (EXIT_FAILURE);
387 } 475 }
388 476
389 free (fname); 477 free (fname);
390 478
391 fname = config_filename (prikeyfile, "hostkey"); 479 fname = config_filename (prikeyfile, "hostkey");
… …
397 485
398 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 486 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
399 { 487 {
400 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 488 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
401 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 489 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
402 exit (1); 490 exit (EXIT_FAILURE);
403 } 491 }
404 492
405 RSA_blinding_on (rsa_key, 0); 493 require (RSA_blinding_on (rsa_key, 0));
406 494
407 fclose (f); 495 fclose (f);
408 } 496 }
409 else 497 else
410 { 498 {
411 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 499 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
412 500
413 if (need_keys) 501 if (need_keys)
414 exit (1); 502 exit (EXIT_FAILURE);
415 } 503 }
504
505 if (need_keys && ::thisnode
506 && rsa_key && thisnode && thisnode->rsa_key)
507 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
508 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
509 {
510 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
511 exit (EXIT_FAILURE);
512 }
416 513
417 free (fname); 514 free (fname);
418} 515}
419 516
420char *configuration::config_filename (const char *name, const char *dflt) 517char *configuration::config_filename (const char *name, const char *dflt)
… …
456 printf ("\n"); 553 printf ("\n");
457} 554}
458 555
459configuration::configuration () 556configuration::configuration ()
460{ 557{
558 asprintf (&confbase, "%s/gvpe", CONFDIR);
559
461 init (); 560 init ();
462} 561}
463 562
464configuration::~configuration () 563configuration::~configuration ()
465{ 564{

Diff Legend

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