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.15 by pcg, Sun Apr 13 00:35:46 2003 UTC vs.
Revision 1.29 by pcg, Tue Mar 1 06:27:20 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-2004 Marc Lehmann <pcg@goof.com>
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
9 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by 6 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 7 the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version. 8 (at your option) any later version.
… …
31#include <netdb.h> 27#include <netdb.h>
32#include <sys/stat.h> 28#include <sys/stat.h>
33#include <sys/types.h> 29#include <sys/types.h>
34#include <unistd.h> 30#include <unistd.h>
35 31
36#include <netinet/in.h> 32#include "netcompat.h"
37#include <netinet/ip_icmp.h>
38 33
39#include <openssl/err.h> 34#include <openssl/err.h>
40#include <openssl/pem.h> 35#include <openssl/pem.h>
41#include <openssl/rsa.h> 36#include <openssl/rsa.h>
42#include <openssl/rand.h> 37#include <openssl/rand.h>
38#include <openssl/bn.h>
43 39
44#include "gettext.h" 40#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 free (domain);
101} 99}
102 100
103void configuration::init () 101void configuration::init ()
104{ 102{
105 memset (this, 0, sizeof (*this)); 103 memset (this, 0, sizeof (*this));
106 104
105 mtu = DEFAULT_MTU;
107 rekey = DEFAULT_REKEY; 106 rekey = DEFAULT_REKEY;
108 keepalive = DEFAULT_KEEPALIVE; 107 keepalive = DEFAULT_KEEPALIVE;
109 llevel = L_INFO; 108 llevel = L_INFO;
110 ip_proto = IPPROTO_GRE; 109 ip_proto = IPPROTO_GRE;
110#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY; 111 icmp_type = ICMP_ECHOREPLY;
112#endif
112 113
113 default_node.udp_port = DEFAULT_UDPPORT; 114 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; 115 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
115 default_node.connectmode = conf_node::C_ALWAYS; 116 default_node.connectmode = conf_node::C_ALWAYS;
116 default_node.compress = true; 117 default_node.compress = true;
117 default_node.protocols = PROT_UDPv4; 118 default_node.protocols = 0;
119 default_node.max_retry = DEFAULT_MAX_RETRY;
120
121 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
118} 122}
119 123
120void configuration::cleanup() 124void configuration::cleanup()
121{ 125{
122 if (rsa_key) 126 if (rsa_key)
123 RSA_free (rsa_key); 127 RSA_free (rsa_key);
124 128
125 rsa_key = 0; 129 rsa_key = 0;
126 130
131 free (pidfilename); pidfilename = 0;
127 free (ifname); ifname = 0; 132 free (ifname); ifname = 0;
128#if ENABLE_HTTP_PROXY 133#if ENABLE_HTTP_PROXY
129 free (proxy_host); proxy_host = 0; 134 free (proxy_host); proxy_host = 0;
130 free (proxy_auth); proxy_auth = 0; 135 free (proxy_auth); proxy_auth = 0;
136#endif
137#if ENABLE_DNS
138 free (dns_forw_host); dns_forw_host = 0;
131#endif 139#endif
132} 140}
133 141
134void 142void
135configuration::clear_config () 143configuration::clear_config ()
… …
160 char *fname; 168 char *fname;
161 FILE *f; 169 FILE *f;
162 170
163 clear_config (); 171 clear_config ();
164 172
165 asprintf (&fname, "%s/vped.conf", confbase); 173 asprintf (&fname, "%s/gvpe.conf", confbase);
166 f = fopen (fname, "r"); 174 f = fopen (fname, "r");
167 175
168 if (f) 176 if (f)
169 { 177 {
170 char line[16384]; 178 char line[16384];
… …
228 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 236 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
229 } 237 }
230 else if (!strcmp (var, "ip-proto")) 238 else if (!strcmp (var, "ip-proto"))
231 ip_proto = atoi (val); 239 ip_proto = atoi (val);
232 else if (!strcmp (var, "icmp-type")) 240 else if (!strcmp (var, "icmp-type"))
241 {
242#if ENABLE_ICMP
233 icmp_type = atoi (val); 243 icmp_type = atoi (val);
244#endif
245 }
234 246
235 // per config 247 // per config
236 else if (!strcmp (var, "node")) 248 else if (!strcmp (var, "node"))
237 { 249 {
238 default_node.id++; 250 default_node.id++;
… …
256 268
257 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 269 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
258 { 270 {
259 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 271 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)); 272 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
261 exit (1); 273 exit (EXIT_FAILURE);
262 } 274 }
263 275
264 RSA_blinding_on (node->rsa_key, 0); 276 require (RSA_blinding_on (node->rsa_key, 0));
265 277
266 fclose (f); 278 fclose (f);
267 } 279 }
268 else 280 else
269 { 281 {
270 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 282 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
271 283
272 if (need_keys) 284 if (need_keys)
273 exit (1); 285 exit (EXIT_FAILURE);
274 } 286 }
275 287
276 free (fname); 288 free (fname);
277 } 289 }
278 290
279 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 291 if (::thisnode && !strcmp (node->nodename, ::thisnode))
280 thisnode = node; 292 thisnode = node;
281 } 293 }
282 else if (!strcmp (var, "private-key")) 294 else if (!strcmp (var, "private-key"))
283 prikeyfile = strdup (val); 295 free (prikeyfile), prikeyfile = strdup (val);
284 else if (!strcmp (var, "ifpersist")) 296 else if (!strcmp (var, "ifpersist"))
285 { 297 {
286 parse_bool (ifpersist, "ifpersist", true, false); 298 parse_bool (ifpersist, "ifpersist", true, false);
287 } 299 }
288 else if (!strcmp (var, "ifname")) 300 else if (!strcmp (var, "ifname"))
289 ifname = strdup (val); 301 free (ifname), ifname = strdup (val);
290 else if (!strcmp (var, "rekey")) 302 else if (!strcmp (var, "rekey"))
291 rekey = atoi (val); 303 rekey = atoi (val);
292 else if (!strcmp (var, "keepalive")) 304 else if (!strcmp (var, "keepalive"))
293 keepalive = atoi (val); 305 keepalive = atoi (val);
294 else if (!strcmp (var, "mtu")) 306 else if (!strcmp (var, "mtu"))
295 mtu = atoi (val); 307 mtu = atoi (val);
296 else if (!strcmp (var, "if-up")) 308 else if (!strcmp (var, "if-up"))
297 script_if_up = strdup (val); 309 free (script_if_up), script_if_up = strdup (val);
298 else if (!strcmp (var, "node-up")) 310 else if (!strcmp (var, "node-up"))
299 script_node_up = strdup (val); 311 free (script_node_up), script_node_up = strdup (val);
300 else if (!strcmp (var, "node-down")) 312 else if (!strcmp (var, "node-down"))
301 script_node_down = strdup (val); 313 free (script_node_down), script_node_down = strdup (val);
314 else if (!strcmp (var, "pid-file"))
315 free (pidfilename), pidfilename = strdup (val);
316 else if (!strcmp (var, "dns-forw-host"))
317 {
318#if ENABLE_DNS
319 free (dns_forw_host), dns_forw_host = strdup (val);
320#endif
321 }
322 else if (!strcmp (var, "dns-forw-port"))
323 {
324#if ENABLE_DNS
325 dns_forw_port = atoi (val);
326#endif
327 }
328 else if (!strcmp (var, "http-proxy-host"))
329 {
302#if ENABLE_HTTP_PROXY 330#if ENABLE_HTTP_PROXY
303 else if (!strcmp (var, "http-proxy-host"))
304 proxy_host = strdup (val); 331 free (proxy_host), proxy_host = strdup (val);
332#endif
333 }
305 else if (!strcmp (var, "http-proxy-port")) 334 else if (!strcmp (var, "http-proxy-port"))
335 {
336#if ENABLE_HTTP_PROXY
306 proxy_port = atoi (val); 337 proxy_port = atoi (val);
338#endif
339 }
307 else if (!strcmp (var, "http-proxy-auth")) 340 else if (!strcmp (var, "http-proxy-auth"))
341 {
342#if ENABLE_HTTP_PROXY
308 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 343 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
309#endif 344#endif
345 }
310 346
311 /* node-specific, non-defaultable */ 347 /* node-specific, non-defaultable */
312 else if (node != &default_node && !strcmp (var, "hostname")) 348 else if (node != &default_node && !strcmp (var, "hostname"))
313 {
314 free (node->hostname);
315 node->hostname = strdup (val); 349 free (node->hostname), node->hostname = strdup (val);
316 }
317 350
318 /* node-specific, defaultable */ 351 /* node-specific, defaultable */
319 else if (!strcmp (var, "udp-port")) 352 else if (!strcmp (var, "udp-port"))
320 node->udp_port = atoi (val); 353 node->udp_port = atoi (val);
321 else if (!strcmp (var, "tcp-port")) 354 else if (!strcmp (var, "tcp-port"))
322 node->tcp_port = atoi (val); 355 node->tcp_port = atoi (val);
356 else if (!strcmp (var, "dns-port"))
357 {
358#if ENABLE_DNS
359 node->dns_port = atoi (val);
360#endif
361 }
362 else if (!strcmp (var, "dns-domain"))
363 {
364#if ENABLE_DNS
365 free (node->domain), node->domain = strdup (val);
366#endif
367 }
323 else if (!strcmp (var, "router-priority")) 368 else if (!strcmp (var, "router-priority"))
324 node->routerprio = atoi (val); 369 node->routerprio = atoi (val);
370 else if (!strcmp (var, "max-retry"))
371 node->max_retry = atoi (val);
325 else if (!strcmp (var, "connect")) 372 else if (!strcmp (var, "connect"))
326 { 373 {
327 if (!strcmp (val, "ondemand")) 374 if (!strcmp (val, "ondemand"))
328 node->connectmode = conf_node::C_ONDEMAND; 375 node->connectmode = conf_node::C_ONDEMAND;
329 else if (!strcmp (val, "never")) 376 else if (!strcmp (val, "never"))
… …
332 node->connectmode = conf_node::C_ALWAYS; 379 node->connectmode = conf_node::C_ALWAYS;
333 else if (!strcmp (val, "disabled")) 380 else if (!strcmp (val, "disabled"))
334 node->connectmode = conf_node::C_DISABLED; 381 node->connectmode = conf_node::C_DISABLED;
335 else 382 else
336 slog (L_WARN, 383 slog (L_WARN,
337 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 384 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
338 var, fname, lineno); 385 var, fname, lineno);
339 } 386 }
340 else if (!strcmp (var, "inherit-tos")) 387 else if (!strcmp (var, "inherit-tos"))
341 { 388 {
342 parse_bool (node->inherit_tos, "inherit-tos", true, false); 389 parse_bool (node->inherit_tos, "inherit-tos", true, false);
343 } 390 }
… …
354 } 401 }
355 else if (!strcmp (var, "enable-icmp")) 402 else if (!strcmp (var, "enable-icmp"))
356 { 403 {
357#if ENABLE_ICMP 404#if ENABLE_ICMP
358 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 405 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
406#endif
407 }
408 else if (!strcmp (var, "enable-dns"))
409 {
410#if ENABLE_DNS
411 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
359#endif 412#endif
360 } 413 }
361 else if (!strcmp (var, "enable-udp")) 414 else if (!strcmp (var, "enable-udp"))
362 { 415 {
363 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 416 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
377 fclose (f); 430 fclose (f);
378 } 431 }
379 else 432 else
380 { 433 {
381 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 434 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
382 exit (1); 435 exit (EXIT_FAILURE);
383 } 436 }
384 437
385 free (fname); 438 free (fname);
386 439
387 fname = config_filename (prikeyfile, "hostkey"); 440 fname = config_filename (prikeyfile, "hostkey");
… …
393 446
394 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 447 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
395 { 448 {
396 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 449 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)); 450 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
398 exit (1); 451 exit (EXIT_FAILURE);
399 } 452 }
400 453
401 RSA_blinding_on (rsa_key, 0); 454 require (RSA_blinding_on (rsa_key, 0));
402 455
403 fclose (f); 456 fclose (f);
404 } 457 }
405 else 458 else
406 { 459 {
407 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 460 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
408 461
409 if (need_keys) 462 if (need_keys)
410 exit (1); 463 exit (EXIT_FAILURE);
411 } 464 }
465
466 if (need_keys && ::thisnode
467 && rsa_key && thisnode && thisnode->rsa_key)
468 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
469 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
470 {
471 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
472 exit (EXIT_FAILURE);
473 }
412 474
413 free (fname); 475 free (fname);
414} 476}
415 477
416char *configuration::config_filename (const char *name, const char *dflt) 478char *configuration::config_filename (const char *name, const char *dflt)
… …
452 printf ("\n"); 514 printf ("\n");
453} 515}
454 516
455configuration::configuration () 517configuration::configuration ()
456{ 518{
519 asprintf (&confbase, "%s/gvpe", CONFDIR);
520
457 init (); 521 init ();
458} 522}
459 523
460configuration::~configuration () 524configuration::~configuration ()
461{ 525{

Diff Legend

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