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 | |
… | |
… | |
31 | #include <netdb.h> |
29 | #include <netdb.h> |
32 | #include <sys/stat.h> |
30 | #include <sys/stat.h> |
33 | #include <sys/types.h> |
31 | #include <sys/types.h> |
34 | #include <unistd.h> |
32 | #include <unistd.h> |
35 | |
33 | |
36 | #include <netinet/in.h> |
34 | #include "netcompat.h" |
37 | #include <netinet/ip_icmp.h> |
|
|
38 | |
35 | |
39 | #include <openssl/err.h> |
36 | #include <openssl/err.h> |
40 | #include <openssl/pem.h> |
37 | #include <openssl/pem.h> |
41 | #include <openssl/rsa.h> |
38 | #include <openssl/rsa.h> |
42 | #include <openssl/rand.h> |
39 | #include <openssl/rand.h> |
|
|
40 | #include <openssl/bn.h> |
43 | |
41 | |
44 | #include "gettext.h" |
42 | #include "gettext.h" |
45 | |
43 | |
46 | #include "conf.h" |
44 | #include "conf.h" |
47 | #include "slog.h" |
45 | #include "slog.h" |
48 | #include "util.h" |
46 | #include "util.h" |
49 | |
47 | |
50 | char *confbase; |
48 | char *confbase; |
51 | char *thisnode; |
49 | char *thisnode; |
52 | char *identname; |
50 | char *identname; |
53 | char *pidfilename; |
|
|
54 | |
51 | |
55 | struct configuration conf; |
52 | struct configuration conf; |
56 | |
53 | |
57 | u8 best_protocol (u8 protset) |
54 | u8 best_protocol (u8 protset) |
58 | { |
55 | { |
59 | if (protset & PROT_IPv4 ) return PROT_IPv4; |
56 | if (protset & PROT_IPv4 ) return PROT_IPv4; |
60 | if (protset & PROT_ICMPv4) return PROT_ICMPv4; |
57 | if (protset & PROT_ICMPv4) return PROT_ICMPv4; |
61 | if (protset & PROT_UDPv4 ) return PROT_UDPv4; |
58 | if (protset & PROT_UDPv4 ) return PROT_UDPv4; |
62 | if (protset & PROT_TCPv4 ) return PROT_TCPv4; |
59 | if (protset & PROT_TCPv4 ) return PROT_TCPv4; |
|
|
60 | if (protset & PROT_DNSv4 ) return PROT_DNSv4; |
63 | |
61 | |
64 | return 0; |
62 | return 0; |
65 | } |
63 | } |
66 | |
64 | |
67 | const char *strprotocol (u8 protocol) |
65 | const char *strprotocol (u8 protocol) |
68 | { |
66 | { |
69 | if (protocol & PROT_IPv4 ) return "rawip"; |
67 | if (protocol & PROT_IPv4 ) return "rawip"; |
70 | if (protocol & PROT_ICMPv4) return "icmp"; |
68 | if (protocol & PROT_ICMPv4) return "icmp"; |
71 | if (protocol & PROT_UDPv4 ) return "udp"; |
69 | if (protocol & PROT_UDPv4 ) return "udp"; |
72 | if (protocol & PROT_TCPv4 ) return "tcp"; |
70 | if (protocol & PROT_TCPv4 ) return "tcp"; |
|
|
71 | if (protocol & PROT_DNSv4 ) return "dns"; |
73 | |
72 | |
74 | return "<unknown>"; |
73 | return "<unknown>"; |
75 | } |
74 | } |
76 | |
75 | |
77 | void |
76 | void |
… | |
… | |
96 | if (rsa_key) |
95 | if (rsa_key) |
97 | RSA_free (rsa_key); |
96 | RSA_free (rsa_key); |
98 | |
97 | |
99 | free (nodename); |
98 | free (nodename); |
100 | free (hostname); |
99 | free (hostname); |
|
|
100 | #if ENABLE_DNS |
|
|
101 | free (domain); |
|
|
102 | free (dns_hostname); |
|
|
103 | #endif |
101 | } |
104 | } |
102 | |
105 | |
103 | void configuration::init () |
106 | void configuration::init () |
104 | { |
107 | { |
105 | memset (this, 0, sizeof (*this)); |
108 | memset (this, 0, sizeof (*this)); |
106 | |
109 | |
|
|
110 | mtu = DEFAULT_MTU; |
107 | rekey = DEFAULT_REKEY; |
111 | rekey = DEFAULT_REKEY; |
108 | keepalive = DEFAULT_KEEPALIVE; |
112 | keepalive = DEFAULT_KEEPALIVE; |
109 | llevel = L_INFO; |
113 | llevel = L_INFO; |
110 | ip_proto = IPPROTO_GRE; |
114 | ip_proto = IPPROTO_GRE; |
|
|
115 | #if ENABLE_ICMP |
111 | icmp_type = ICMP_ECHOREPLY; |
116 | icmp_type = ICMP_ECHOREPLY; |
|
|
117 | #endif |
112 | |
118 | |
113 | default_node.udp_port = DEFAULT_UDPPORT; |
119 | default_node.udp_port = DEFAULT_UDPPORT; |
114 | default_node.tcp_port = DEFAULT_UDPPORT; |
120 | default_node.tcp_port = DEFAULT_UDPPORT; // ehrm |
115 | default_node.connectmode = conf_node::C_ALWAYS; |
121 | default_node.connectmode = conf_node::C_ALWAYS; |
116 | default_node.compress = true; |
122 | default_node.compress = true; |
117 | default_node.protocols = PROT_UDPv4; |
123 | default_node.protocols = 0; |
|
|
124 | default_node.max_retry = DEFAULT_MAX_RETRY; |
|
|
125 | |
|
|
126 | #if ENABLE_DNS |
|
|
127 | default_node.dns_port = 53; |
|
|
128 | dns_forw_port = 53; |
|
|
129 | #endif |
|
|
130 | |
|
|
131 | conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); |
118 | } |
132 | } |
119 | |
133 | |
120 | void configuration::cleanup() |
134 | void configuration::cleanup() |
121 | { |
135 | { |
122 | if (rsa_key) |
136 | if (rsa_key) |
123 | RSA_free (rsa_key); |
137 | RSA_free (rsa_key); |
124 | |
138 | |
125 | rsa_key = 0; |
139 | rsa_key = 0; |
126 | |
140 | |
|
|
141 | free (pidfilename); pidfilename = 0; |
127 | free (ifname); ifname = 0; |
142 | free (ifname); ifname = 0; |
128 | #if ENABLE_HTTP_PROXY |
143 | #if ENABLE_HTTP_PROXY |
129 | free (proxy_host); proxy_host = 0; |
144 | free (proxy_host); proxy_host = 0; |
130 | free (proxy_auth); proxy_auth = 0; |
145 | free (proxy_auth); proxy_auth = 0; |
|
|
146 | #endif |
|
|
147 | #if ENABLE_DNS |
|
|
148 | free (dns_forw_host); dns_forw_host = 0; |
131 | #endif |
149 | #endif |
132 | } |
150 | } |
133 | |
151 | |
134 | void |
152 | void |
135 | configuration::clear_config () |
153 | configuration::clear_config () |
… | |
… | |
160 | char *fname; |
178 | char *fname; |
161 | FILE *f; |
179 | FILE *f; |
162 | |
180 | |
163 | clear_config (); |
181 | clear_config (); |
164 | |
182 | |
165 | asprintf (&fname, "%s/vped.conf", confbase); |
183 | asprintf (&fname, "%s/gvpe.conf", confbase); |
166 | f = fopen (fname, "r"); |
184 | f = fopen (fname, "r"); |
167 | |
185 | |
168 | if (f) |
186 | if (f) |
169 | { |
187 | { |
170 | char line[16384]; |
188 | char line[16384]; |
… | |
… | |
228 | slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); |
246 | slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); |
229 | } |
247 | } |
230 | else if (!strcmp (var, "ip-proto")) |
248 | else if (!strcmp (var, "ip-proto")) |
231 | ip_proto = atoi (val); |
249 | ip_proto = atoi (val); |
232 | else if (!strcmp (var, "icmp-type")) |
250 | else if (!strcmp (var, "icmp-type")) |
|
|
251 | { |
|
|
252 | #if ENABLE_ICMP |
233 | icmp_type = atoi (val); |
253 | icmp_type = atoi (val); |
|
|
254 | #endif |
|
|
255 | } |
234 | |
256 | |
235 | // per config |
257 | // per config |
236 | else if (!strcmp (var, "node")) |
258 | else if (!strcmp (var, "node")) |
237 | { |
259 | { |
238 | default_node.id++; |
260 | default_node.id++; |
… | |
… | |
256 | |
278 | |
257 | if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) |
279 | if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) |
258 | { |
280 | { |
259 | ERR_load_RSA_strings (); ERR_load_PEM_strings (); |
281 | 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)); |
282 | slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); |
261 | exit (1); |
283 | exit (EXIT_FAILURE); |
262 | } |
284 | } |
263 | |
285 | |
264 | RSA_blinding_on (node->rsa_key, 0); |
286 | require (RSA_blinding_on (node->rsa_key, 0)); |
265 | |
287 | |
266 | fclose (f); |
288 | fclose (f); |
267 | } |
289 | } |
268 | else |
290 | else |
269 | { |
291 | { |
270 | slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); |
292 | slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); |
271 | |
293 | |
272 | if (need_keys) |
294 | if (need_keys) |
273 | exit (1); |
295 | exit (EXIT_FAILURE); |
274 | } |
296 | } |
275 | |
297 | |
276 | free (fname); |
298 | free (fname); |
277 | } |
299 | } |
278 | |
300 | |
279 | if (!::thisnode || !strcmp (node->nodename, ::thisnode)) |
301 | if (::thisnode && !strcmp (node->nodename, ::thisnode)) |
280 | thisnode = node; |
302 | thisnode = node; |
281 | } |
303 | } |
282 | else if (!strcmp (var, "private-key")) |
304 | else if (!strcmp (var, "private-key")) |
283 | prikeyfile = strdup (val); |
305 | free (prikeyfile), prikeyfile = strdup (val); |
284 | else if (!strcmp (var, "ifpersist")) |
306 | else if (!strcmp (var, "ifpersist")) |
285 | { |
307 | { |
286 | parse_bool (ifpersist, "ifpersist", true, false); |
308 | parse_bool (ifpersist, "ifpersist", true, false); |
287 | } |
309 | } |
288 | else if (!strcmp (var, "ifname")) |
310 | else if (!strcmp (var, "ifname")) |
289 | ifname = strdup (val); |
311 | free (ifname), ifname = strdup (val); |
290 | else if (!strcmp (var, "rekey")) |
312 | else if (!strcmp (var, "rekey")) |
291 | rekey = atoi (val); |
313 | rekey = atoi (val); |
292 | else if (!strcmp (var, "keepalive")) |
314 | else if (!strcmp (var, "keepalive")) |
293 | keepalive = atoi (val); |
315 | keepalive = atoi (val); |
294 | else if (!strcmp (var, "mtu")) |
316 | else if (!strcmp (var, "mtu")) |
295 | mtu = atoi (val); |
317 | mtu = atoi (val); |
296 | else if (!strcmp (var, "if-up")) |
318 | else if (!strcmp (var, "if-up")) |
297 | script_if_up = strdup (val); |
319 | free (script_if_up), script_if_up = strdup (val); |
298 | else if (!strcmp (var, "node-up")) |
320 | else if (!strcmp (var, "node-up")) |
299 | script_node_up = strdup (val); |
321 | free (script_node_up), script_node_up = strdup (val); |
300 | else if (!strcmp (var, "node-down")) |
322 | else if (!strcmp (var, "node-down")) |
301 | script_node_down = strdup (val); |
323 | free (script_node_down), script_node_down = strdup (val); |
|
|
324 | else if (!strcmp (var, "pid-file")) |
|
|
325 | free (pidfilename), pidfilename = strdup (val); |
|
|
326 | #if ENABLE_DNS |
|
|
327 | else if (!strcmp (var, "dns-forw-host")) |
|
|
328 | free (dns_forw_host), dns_forw_host = strdup (val); |
|
|
329 | else if (!strcmp (var, "dns-forw-port")) |
|
|
330 | dns_forw_port = atoi (val); |
|
|
331 | #endif |
|
|
332 | else if (!strcmp (var, "http-proxy-host")) |
|
|
333 | { |
302 | #if ENABLE_HTTP_PROXY |
334 | #if ENABLE_HTTP_PROXY |
303 | else if (!strcmp (var, "http-proxy-host")) |
|
|
304 | proxy_host = strdup (val); |
335 | free (proxy_host), proxy_host = strdup (val); |
|
|
336 | #endif |
|
|
337 | } |
305 | else if (!strcmp (var, "http-proxy-port")) |
338 | else if (!strcmp (var, "http-proxy-port")) |
|
|
339 | { |
|
|
340 | #if ENABLE_HTTP_PROXY |
306 | proxy_port = atoi (val); |
341 | proxy_port = atoi (val); |
|
|
342 | #endif |
|
|
343 | } |
307 | else if (!strcmp (var, "http-proxy-auth")) |
344 | else if (!strcmp (var, "http-proxy-auth")) |
|
|
345 | { |
|
|
346 | #if ENABLE_HTTP_PROXY |
308 | proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); |
347 | proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); |
309 | #endif |
348 | #endif |
|
|
349 | } |
310 | |
350 | |
311 | /* node-specific, non-defaultable */ |
351 | /* node-specific, non-defaultable */ |
312 | else if (node != &default_node && !strcmp (var, "hostname")) |
352 | else if (node != &default_node && !strcmp (var, "hostname")) |
313 | { |
|
|
314 | free (node->hostname); |
|
|
315 | node->hostname = strdup (val); |
353 | free (node->hostname), node->hostname = strdup (val); |
316 | } |
|
|
317 | |
354 | |
318 | /* node-specific, defaultable */ |
355 | /* node-specific, defaultable */ |
319 | else if (!strcmp (var, "udp-port")) |
356 | else if (!strcmp (var, "udp-port")) |
320 | node->udp_port = atoi (val); |
357 | node->udp_port = atoi (val); |
321 | else if (!strcmp (var, "tcp-port")) |
358 | else if (!strcmp (var, "tcp-port")) |
322 | node->tcp_port = atoi (val); |
359 | node->tcp_port = atoi (val); |
|
|
360 | #if ENABLE_DNS |
|
|
361 | else if (!strcmp (var, "dns-hostname")) |
|
|
362 | free (node->dns_hostname), node->dns_hostname = strdup (val); |
|
|
363 | else if (!strcmp (var, "dns-port")) |
|
|
364 | node->dns_port = atoi (val); |
|
|
365 | #endif |
|
|
366 | else if (!strcmp (var, "dns-domain")) |
|
|
367 | { |
|
|
368 | #if ENABLE_DNS |
|
|
369 | free (node->domain), node->domain = strdup (val); |
|
|
370 | #endif |
|
|
371 | } |
323 | else if (!strcmp (var, "router-priority")) |
372 | else if (!strcmp (var, "router-priority")) |
324 | node->routerprio = atoi (val); |
373 | node->routerprio = atoi (val); |
|
|
374 | else if (!strcmp (var, "max-retry")) |
|
|
375 | node->max_retry = atoi (val); |
325 | else if (!strcmp (var, "connect")) |
376 | else if (!strcmp (var, "connect")) |
326 | { |
377 | { |
327 | if (!strcmp (val, "ondemand")) |
378 | if (!strcmp (val, "ondemand")) |
328 | node->connectmode = conf_node::C_ONDEMAND; |
379 | node->connectmode = conf_node::C_ONDEMAND; |
329 | else if (!strcmp (val, "never")) |
380 | else if (!strcmp (val, "never")) |
… | |
… | |
332 | node->connectmode = conf_node::C_ALWAYS; |
383 | node->connectmode = conf_node::C_ALWAYS; |
333 | else if (!strcmp (val, "disabled")) |
384 | else if (!strcmp (val, "disabled")) |
334 | node->connectmode = conf_node::C_DISABLED; |
385 | node->connectmode = conf_node::C_DISABLED; |
335 | else |
386 | else |
336 | slog (L_WARN, |
387 | slog (L_WARN, |
337 | _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), |
388 | _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), |
338 | var, fname, lineno); |
389 | var, fname, lineno); |
339 | } |
390 | } |
340 | else if (!strcmp (var, "inherit-tos")) |
391 | else if (!strcmp (var, "inherit-tos")) |
341 | { |
392 | { |
342 | parse_bool (node->inherit_tos, "inherit-tos", true, false); |
393 | parse_bool (node->inherit_tos, "inherit-tos", true, false); |
343 | } |
394 | } |
… | |
… | |
354 | } |
405 | } |
355 | else if (!strcmp (var, "enable-icmp")) |
406 | else if (!strcmp (var, "enable-icmp")) |
356 | { |
407 | { |
357 | #if ENABLE_ICMP |
408 | #if ENABLE_ICMP |
358 | u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; |
409 | u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; |
|
|
410 | #endif |
|
|
411 | } |
|
|
412 | else if (!strcmp (var, "enable-dns")) |
|
|
413 | { |
|
|
414 | #if ENABLE_DNS |
|
|
415 | u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v; |
359 | #endif |
416 | #endif |
360 | } |
417 | } |
361 | else if (!strcmp (var, "enable-udp")) |
418 | else if (!strcmp (var, "enable-udp")) |
362 | { |
419 | { |
363 | u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; |
420 | u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; |
… | |
… | |
377 | fclose (f); |
434 | fclose (f); |
378 | } |
435 | } |
379 | else |
436 | else |
380 | { |
437 | { |
381 | slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); |
438 | slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); |
382 | exit (1); |
439 | exit (EXIT_FAILURE); |
383 | } |
440 | } |
384 | |
441 | |
385 | free (fname); |
442 | free (fname); |
386 | |
443 | |
387 | fname = config_filename (prikeyfile, "hostkey"); |
444 | fname = config_filename (prikeyfile, "hostkey"); |
… | |
… | |
393 | |
450 | |
394 | if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) |
451 | if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) |
395 | { |
452 | { |
396 | ERR_load_RSA_strings (); ERR_load_PEM_strings (); |
453 | 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)); |
454 | slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); |
398 | exit (1); |
455 | exit (EXIT_FAILURE); |
399 | } |
456 | } |
400 | |
457 | |
401 | RSA_blinding_on (rsa_key, 0); |
458 | require (RSA_blinding_on (rsa_key, 0)); |
402 | |
459 | |
403 | fclose (f); |
460 | fclose (f); |
404 | } |
461 | } |
405 | else |
462 | else |
406 | { |
463 | { |
407 | slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); |
464 | slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); |
408 | |
465 | |
409 | if (need_keys) |
466 | if (need_keys) |
410 | exit (1); |
467 | exit (EXIT_FAILURE); |
411 | } |
468 | } |
|
|
469 | |
|
|
470 | if (need_keys && ::thisnode |
|
|
471 | && rsa_key && thisnode && thisnode->rsa_key) |
|
|
472 | if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0 |
|
|
473 | || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) |
|
|
474 | { |
|
|
475 | slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); |
|
|
476 | exit (EXIT_FAILURE); |
|
|
477 | } |
412 | |
478 | |
413 | free (fname); |
479 | free (fname); |
414 | } |
480 | } |
415 | |
481 | |
416 | char *configuration::config_filename (const char *name, const char *dflt) |
482 | char *configuration::config_filename (const char *name, const char *dflt) |
… | |
… | |
452 | printf ("\n"); |
518 | printf ("\n"); |
453 | } |
519 | } |
454 | |
520 | |
455 | configuration::configuration () |
521 | configuration::configuration () |
456 | { |
522 | { |
|
|
523 | asprintf (&confbase, "%s/gvpe", CONFDIR); |
|
|
524 | |
457 | init (); |
525 | init (); |
458 | } |
526 | } |
459 | |
527 | |
460 | configuration::~configuration () |
528 | configuration::~configuration () |
461 | { |
529 | { |