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.13 by pcg, Tue Apr 8 02:00:54 2003 UTC vs.
Revision 1.37 by pcg, Wed Mar 23 14:33:34 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
… …
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/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>
43 40#include <openssl/bn.h>
44#include "gettext.h"
45 41
46#include "conf.h" 42#include "conf.h"
47#include "slog.h" 43#include "slog.h"
48#include "util.h" 44#include "util.h"
49 45
50char *confbase; 46char *confbase;
51char *thisnode; 47char *thisnode;
52char *identname; 48char *identname;
53char *pidfilename;
54 49
55struct configuration conf; 50struct configuration conf;
56 51
57u8 best_protocol (u8 protset) 52u8 best_protocol (u8 protset)
58{ 53{
59 if (protset & PROT_IPv4 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
60 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
61 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
62 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
63 59
64 return 0; 60 return 0;
65} 61}
66 62
67const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
68{ 64{
69 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
70 if (protocol & PROT_ICMPv4) return "icmp"; 66 if (protocol & PROT_ICMPv4) return "icmp";
71 if (protocol & PROT_UDPv4 ) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
72 if (protocol & PROT_TCPv4 ) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns";
73 70
74 return "<unknown>"; 71 return "<unknown>";
75} 72}
76 73
77void 74void
… …
96 if (rsa_key) 93 if (rsa_key)
97 RSA_free (rsa_key); 94 RSA_free (rsa_key);
98 95
99 free (nodename); 96 free (nodename);
100 free (hostname); 97 free (hostname);
98#if ENABLE_DNS
99 free (domain);
100 free (dns_hostname);
101#endif
101} 102}
102 103
103void configuration::init () 104void configuration::init ()
104{ 105{
105 memset (this, 0, sizeof (*this)); 106 memset (this, 0, sizeof (*this));
106 107
108 mtu = DEFAULT_MTU;
107 rekey = DEFAULT_REKEY; 109 rekey = DEFAULT_REKEY;
108 keepalive = DEFAULT_KEEPALIVE; 110 keepalive = DEFAULT_KEEPALIVE;
109 llevel = L_INFO; 111 llevel = L_INFO;
110 ip_proto = IPPROTO_GRE; 112 ip_proto = IPPROTO_GRE;
113#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY; 114 icmp_type = ICMP_ECHOREPLY;
115#endif
112 116
113 default_node.udp_port = DEFAULT_UDPPORT; 117 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; 118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
115 default_node.connectmode = conf_node::C_ALWAYS; 119 default_node.connectmode = conf_node::C_ALWAYS;
116 default_node.compress = true; 120 default_node.compress = true;
117 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 dns_forw_host = strdup ("127.0.0.1");
127 dns_forw_port = 53;
128#endif
129
130 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
118} 131}
119 132
120void configuration::cleanup() 133void configuration::cleanup()
121{ 134{
122 if (rsa_key) 135 if (rsa_key)
123 RSA_free (rsa_key); 136 RSA_free (rsa_key);
124 137
125 rsa_key = 0; 138 rsa_key = 0;
126 139
140 free (pidfilename); pidfilename = 0;
127 free (ifname); ifname = 0; 141 free (ifname); ifname = 0;
128#if ENABLE_HTTP_PROXY 142#if ENABLE_HTTP_PROXY
129 free (proxy_host); proxy_host = 0; 143 free (proxy_host); proxy_host = 0;
130 free (proxy_auth); proxy_auth = 0; 144 free (proxy_auth); proxy_auth = 0;
145#endif
146#if ENABLE_DNS
147 free (dns_forw_host); dns_forw_host = 0;
131#endif 148#endif
132} 149}
133 150
134void 151void
135configuration::clear_config () 152configuration::clear_config ()
… …
141 158
142 cleanup (); 159 cleanup ();
143 init (); 160 init ();
144} 161}
145 162
146#define parse_bool(target,name,trueval,falseval) \ 163#define parse_bool(target,name,trueval,falseval) do { \
147 if (!strcmp (val, "yes")) target = trueval; \ 164 if (!strcmp (val, "yes")) target = trueval; \
148 else if (!strcmp (val, "no")) target = falseval; \ 165 else if (!strcmp (val, "no")) target = falseval; \
149 else if (!strcmp (val, "true")) target = trueval; \ 166 else if (!strcmp (val, "true")) target = trueval; \
150 else if (!strcmp (val, "false")) target = falseval; \ 167 else if (!strcmp (val, "false")) target = falseval; \
151 else if (!strcmp (val, "on")) target = trueval; \ 168 else if (!strcmp (val, "on")) target = trueval; \
152 else if (!strcmp (val, "off")) target = falseval; \ 169 else if (!strcmp (val, "off")) target = falseval; \
153 else \ 170 else \
154 slog (L_WARN, \ 171 slog (L_WARN, \
155 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 172 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
156 name, var, fname, lineno); 173 name, var, fname, lineno); \
174} while (0)
157 175
158void configuration::read_config (bool need_keys) 176void configuration::read_config (bool need_keys)
159{ 177{
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];
… …
200 val = strtok (NULL, "\t\n\r ="); 218 val = strtok (NULL, "\t\n\r =");
201 219
202 if (!val || val[0] == '#') 220 if (!val || val[0] == '#')
203 { 221 {
204 slog (L_WARN, 222 slog (L_WARN,
205 _("no value for variable `%s', at '%s' line %d"), 223 _("no value for variable `%s', at '%s' line %d, skipping."),
206 var, fname, lineno); 224 var, fname, lineno);
207 break; 225 continue;
208 } 226 }
209 227
210 if (!strcmp (var, "on")) 228 if (!strcmp (var, "on"))
211 { 229 {
212 if (!::thisnode 230 if (!::thisnode
… …
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 {
286 parse_bool (ifpersist, "ifpersist", true, false); 307 parse_bool (ifpersist, "ifpersist", true, false);
287 }
288 else if (!strcmp (var, "ifname")) 308 else if (!strcmp (var, "ifname"))
289 ifname = strdup (val); 309 free (ifname), ifname = strdup (val);
290 else if (!strcmp (var, "rekey")) 310 else if (!strcmp (var, "rekey"))
291 rekey = atoi (val); 311 rekey = atoi (val);
292 else if (!strcmp (var, "keepalive")) 312 else if (!strcmp (var, "keepalive"))
293 keepalive = atoi (val); 313 keepalive = atoi (val);
294 else if (!strcmp (var, "mtu")) 314 else if (!strcmp (var, "mtu"))
295 mtu = atoi (val); 315 mtu = atoi (val);
296 else if (!strcmp (var, "if-up")) 316 else if (!strcmp (var, "if-up"))
297 script_if_up = strdup (val); 317 free (script_if_up), script_if_up = strdup (val);
298 else if (!strcmp (var, "node-up")) 318 else if (!strcmp (var, "node-up"))
299 script_node_up = strdup (val); 319 free (script_node_up), script_node_up = strdup (val);
300 else if (!strcmp (var, "node-down")) 320 else if (!strcmp (var, "node-down"))
301 script_node_down = strdup (val); 321 free (script_node_down), script_node_down = strdup (val);
322 else if (!strcmp (var, "pid-file"))
323 free (pidfilename), pidfilename = strdup (val);
324 else if (!strcmp (var, "dns-forw-host"))
325 {
326#if ENABLE_DNS
327 free (dns_forw_host), dns_forw_host = strdup (val);
328#endif
329 }
330 else if (!strcmp (var, "dns-forw-port"))
331 {
332#if ENABLE_DNS
333 dns_forw_port = atoi (val);
334#endif
335 }
336 else if (!strcmp (var, "http-proxy-host"))
337 {
302#if ENABLE_HTTP_PROXY 338#if ENABLE_HTTP_PROXY
303 else if (!strcmp (var, "http-proxy-host"))
304 proxy_host = strdup (val); 339 free (proxy_host), proxy_host = strdup (val);
340#endif
341 }
305 else if (!strcmp (var, "http-proxy-port")) 342 else if (!strcmp (var, "http-proxy-port"))
343 {
344#if ENABLE_HTTP_PROXY
306 proxy_port = atoi (val); 345 proxy_port = atoi (val);
346#endif
347 }
307 else if (!strcmp (var, "http-proxy-auth")) 348 else if (!strcmp (var, "http-proxy-auth"))
349 {
350#if ENABLE_HTTP_PROXY
308 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 351 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
309#endif 352#endif
353 }
310 354
311 /* node-specific, non-defaultable */ 355 /* node-specific, non-defaultable */
312 else if (node != &default_node && !strcmp (var, "hostname")) 356 else if (node != &default_node && !strcmp (var, "hostname"))
313 {
314 free (node->hostname);
315 node->hostname = strdup (val); 357 free (node->hostname), node->hostname = strdup (val);
316 }
317 358
318 /* node-specific, defaultable */ 359 /* node-specific, defaultable */
319 else if (!strcmp (var, "udp-port")) 360 else if (!strcmp (var, "udp-port"))
320 node->udp_port = atoi (val); 361 node->udp_port = atoi (val);
321 else if (!strcmp (var, "tcp-port")) 362 else if (!strcmp (var, "tcp-port"))
322 node->tcp_port = atoi (val); 363 node->tcp_port = atoi (val);
364 else if (!strcmp (var, "dns-hostname"))
365 {
366#if ENABLE_DNS
367 free (node->dns_hostname), node->dns_hostname = strdup (val);
368#endif
369 }
370 else if (!strcmp (var, "dns-port"))
371 {
372#if ENABLE_DNS
373 node->dns_port = atoi (val);
374#endif
375 }
376 else if (!strcmp (var, "dns-domain"))
377 {
378#if ENABLE_DNS
379 free (node->domain), node->domain = strdup (val);
380#endif
381 }
323 else if (!strcmp (var, "router-priority")) 382 else if (!strcmp (var, "router-priority"))
324 node->routerprio = atoi (val); 383 node->routerprio = atoi (val);
384 else if (!strcmp (var, "max-retry"))
385 node->max_retry = atoi (val);
325 else if (!strcmp (var, "connect")) 386 else if (!strcmp (var, "connect"))
326 { 387 {
327 if (!strcmp (val, "ondemand")) 388 if (!strcmp (val, "ondemand"))
328 node->connectmode = conf_node::C_ONDEMAND; 389 node->connectmode = conf_node::C_ONDEMAND;
329 else if (!strcmp (val, "never")) 390 else if (!strcmp (val, "never"))
… …
332 node->connectmode = conf_node::C_ALWAYS; 393 node->connectmode = conf_node::C_ALWAYS;
333 else if (!strcmp (val, "disabled")) 394 else if (!strcmp (val, "disabled"))
334 node->connectmode = conf_node::C_DISABLED; 395 node->connectmode = conf_node::C_DISABLED;
335 else 396 else
336 slog (L_WARN, 397 slog (L_WARN,
337 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 398 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
338 var, fname, lineno); 399 var, fname, lineno);
339 } 400 }
340 else if (!strcmp (var, "inherit-tos")) 401 else if (!strcmp (var, "inherit-tos"))
341 {
342 parse_bool (node->inherit_tos, "inherit-tos", true, false); 402 parse_bool (node->inherit_tos, "inherit-tos", true, false);
343 }
344 else if (!strcmp (var, "compress")) 403 else if (!strcmp (var, "compress"))
345 {
346 parse_bool (node->compress, "compress", true, false); 404 parse_bool (node->compress, "compress", true, false);
347 }
348 // all these bool options really really cost a lot of executable size! 405 // all these bool options really really cost a lot of executable size!
349 else if (!strcmp (var, "enable-tcp")) 406 else if (!strcmp (var, "enable-tcp"))
350 { 407 {
351#if ENABLE_TCP 408#if ENABLE_TCP
352 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 409 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
354 } 411 }
355 else if (!strcmp (var, "enable-icmp")) 412 else if (!strcmp (var, "enable-icmp"))
356 { 413 {
357#if ENABLE_ICMP 414#if ENABLE_ICMP
358 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 415 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
416#endif
417 }
418 else if (!strcmp (var, "enable-dns"))
419 {
420#if ENABLE_DNS
421 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
359#endif 422#endif
360 } 423 }
361 else if (!strcmp (var, "enable-udp")) 424 else if (!strcmp (var, "enable-udp"))
362 { 425 {
363 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 426 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
368 } 431 }
369 432
370 // unknown or misplaced 433 // unknown or misplaced
371 else 434 else
372 slog (L_WARN, 435 slog (L_WARN,
373 _("unknown or misplaced variable `%s', at '%s' line %d"), 436 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
374 var, fname, lineno); 437 var, fname, lineno);
375 } 438 }
376 439
377 fclose (f); 440 fclose (f);
378 } 441 }
379 else 442 else
380 { 443 {
381 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 444 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
382 exit (1); 445 exit (EXIT_FAILURE);
383 } 446 }
384 447
385 free (fname); 448 free (fname);
386 449
387 fname = config_filename (prikeyfile, "hostkey"); 450 fname = config_filename (prikeyfile, "hostkey");
… …
393 456
394 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 457 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
395 { 458 {
396 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 459 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)); 460 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
398 exit (1); 461 exit (EXIT_FAILURE);
399 } 462 }
400 463
401 RSA_blinding_on (rsa_key, 0); 464 require (RSA_blinding_on (rsa_key, 0));
402 465
403 fclose (f); 466 fclose (f);
404 } 467 }
405 else 468 else
406 { 469 {
407 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 470 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
408 471
409 if (need_keys) 472 if (need_keys)
410 exit (1); 473 exit (EXIT_FAILURE);
411 } 474 }
475
476 if (need_keys && ::thisnode
477 && rsa_key && thisnode && thisnode->rsa_key)
478 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
479 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
480 {
481 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
482 exit (EXIT_FAILURE);
483 }
412 484
413 free (fname); 485 free (fname);
414} 486}
415 487
416char *configuration::config_filename (const char *name, const char *dflt) 488char *configuration::config_filename (const char *name, const char *dflt)
… …
438 printf (_("MTU: %d\n"), mtu); 510 printf (_("MTU: %d\n"), mtu);
439 printf (_("rekeying interval: %d\n"), rekey); 511 printf (_("rekeying interval: %d\n"), rekey);
440 printf (_("keepalive interval: %d\n"), keepalive); 512 printf (_("keepalive interval: %d\n"), keepalive);
441 printf (_("interface: %s\n"), ifname); 513 printf (_("interface: %s\n"), ifname);
442 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 514 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
443 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 515 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
444 printf ("\n"); 516 printf ("\n");
445 517
446 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 518 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
447 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 519 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
448 520
… …
452 printf ("\n"); 524 printf ("\n");
453} 525}
454 526
455configuration::configuration () 527configuration::configuration ()
456{ 528{
529 asprintf (&confbase, "%s/gvpe", CONFDIR);
530
457 init (); 531 init ();
458} 532}
459 533
460configuration::~configuration () 534configuration::~configuration ()
461{ 535{

Diff Legend

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