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

Diff Legend

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