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.19 by pcg, Thu Oct 16 20:35:14 2003 UTC vs.
Revision 1.25 by pcg, Mon May 10 20:13:09 2004 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-2004 Marc Lehmann <pcg@goof.com>
4 4
5 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
6 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
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
33 33
34#include <openssl/err.h> 34#include <openssl/err.h>
35#include <openssl/pem.h> 35#include <openssl/pem.h>
36#include <openssl/rsa.h> 36#include <openssl/rsa.h>
37#include <openssl/rand.h> 37#include <openssl/rand.h>
38#include <openssl/bn.h>
38 39
39#include "gettext.h" 40#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
… …
95 free (hostname); 97 free (hostname);
96} 98}
97 99
98void configuration::init () 100void configuration::init ()
99{ 101{
102 asprintf (&confbase, "%s/vpe", CONFDIR);
103
100 memset (this, 0, sizeof (*this)); 104 memset (this, 0, sizeof (*this));
101 105
102 mtu = DEFAULT_MTU; 106 mtu = DEFAULT_MTU;
103 rekey = DEFAULT_REKEY; 107 rekey = DEFAULT_REKEY;
104 keepalive = DEFAULT_KEEPALIVE; 108 keepalive = DEFAULT_KEEPALIVE;
… …
107#if ENABLE_ICMP 111#if ENABLE_ICMP
108 icmp_type = ICMP_ECHOREPLY; 112 icmp_type = ICMP_ECHOREPLY;
109#endif 113#endif
110 114
111 default_node.udp_port = DEFAULT_UDPPORT; 115 default_node.udp_port = DEFAULT_UDPPORT;
112 default_node.tcp_port = DEFAULT_UDPPORT; 116 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
113 default_node.connectmode = conf_node::C_ALWAYS; 117 default_node.connectmode = conf_node::C_ALWAYS;
114 default_node.compress = true; 118 default_node.compress = true;
115 default_node.protocols = PROT_UDPv4; 119 default_node.protocols = PROT_UDPv4;
120
121 conf.pidfilename = strdup (LOCALSTATEDIR "/run/vped.pid");
116} 122}
117 123
118void configuration::cleanup() 124void configuration::cleanup()
119{ 125{
120 if (rsa_key) 126 if (rsa_key)
121 RSA_free (rsa_key); 127 RSA_free (rsa_key);
122 128
123 rsa_key = 0; 129 rsa_key = 0;
124 130
131 free (pidfilename); pidfilename = 0;
125 free (ifname); ifname = 0; 132 free (ifname); ifname = 0;
126#if ENABLE_HTTP_PROXY 133#if ENABLE_HTTP_PROXY
127 free (proxy_host); proxy_host = 0; 134 free (proxy_host); proxy_host = 0;
128 free (proxy_auth); proxy_auth = 0; 135 free (proxy_auth); proxy_auth = 0;
129#endif 136#endif
130} 137}
131 138
132void 139void
133configuration::clear_config () 140configuration::clear_config ()
… …
225 else 232 else
226 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 233 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
227 } 234 }
228 else if (!strcmp (var, "ip-proto")) 235 else if (!strcmp (var, "ip-proto"))
229 ip_proto = atoi (val); 236 ip_proto = atoi (val);
237 else if (!strcmp (var, "icmp-type"))
238 {
230#if ENABLE_ICMP 239#if ENABLE_ICMP
231 //TODO: error message
232 else if (!strcmp (var, "icmp-type"))
233 icmp_type = atoi (val); 240 icmp_type = atoi (val);
234#endif 241#endif
242 }
235 243
236 // per config 244 // per config
237 else if (!strcmp (var, "node")) 245 else if (!strcmp (var, "node"))
238 { 246 {
239 default_node.id++; 247 default_node.id++;
… …
257 265
258 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 266 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
259 { 267 {
260 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 268 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
261 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 269 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
262 exit (1); 270 exit (EXIT_FAILURE);
263 } 271 }
264 272
265 RSA_blinding_on (node->rsa_key, 0); 273 require (RSA_blinding_on (node->rsa_key, 0));
266 274
267 fclose (f); 275 fclose (f);
268 } 276 }
269 else 277 else
270 { 278 {
271 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 279 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
272 280
273 if (need_keys) 281 if (need_keys)
274 exit (1); 282 exit (EXIT_FAILURE);
275 } 283 }
276 284
277 free (fname); 285 free (fname);
278 } 286 }
279 287
280 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 288 if (::thisnode && !strcmp (node->nodename, ::thisnode))
281 thisnode = node; 289 thisnode = node;
282 } 290 }
283 else if (!strcmp (var, "private-key")) 291 else if (!strcmp (var, "private-key"))
284 prikeyfile = strdup (val); 292 free (prikeyfile), prikeyfile = strdup (val);
285 else if (!strcmp (var, "ifpersist")) 293 else if (!strcmp (var, "ifpersist"))
286 { 294 {
287 parse_bool (ifpersist, "ifpersist", true, false); 295 parse_bool (ifpersist, "ifpersist", true, false);
288 } 296 }
289 else if (!strcmp (var, "ifname")) 297 else if (!strcmp (var, "ifname"))
290 ifname = strdup (val); 298 free (ifname), ifname = strdup (val);
291 else if (!strcmp (var, "rekey")) 299 else if (!strcmp (var, "rekey"))
292 rekey = atoi (val); 300 rekey = atoi (val);
293 else if (!strcmp (var, "keepalive")) 301 else if (!strcmp (var, "keepalive"))
294 keepalive = atoi (val); 302 keepalive = atoi (val);
295 else if (!strcmp (var, "mtu")) 303 else if (!strcmp (var, "mtu"))
296 mtu = atoi (val); 304 mtu = atoi (val);
297 else if (!strcmp (var, "if-up")) 305 else if (!strcmp (var, "if-up"))
298 script_if_up = strdup (val); 306 free (script_if_up), script_if_up = strdup (val);
299 else if (!strcmp (var, "node-up")) 307 else if (!strcmp (var, "node-up"))
300 script_node_up = strdup (val); 308 free (script_node_up), script_node_up = strdup (val);
301 else if (!strcmp (var, "node-down")) 309 else if (!strcmp (var, "node-down"))
302 script_node_down = strdup (val); 310 free (script_node_down), script_node_down = strdup (val);
311 else if (!strcmp (var, "pid-file"))
312 free (pidfilename), pidfilename = strdup (val);
313 else if (!strcmp (var, "http-proxy-host"))
314 {
303#if ENABLE_HTTP_PROXY 315#if ENABLE_HTTP_PROXY
304 else if (!strcmp (var, "http-proxy-host"))
305 proxy_host = strdup (val); 316 free (proxy_host), proxy_host = strdup (val);
317#endif
318 }
306 else if (!strcmp (var, "http-proxy-port")) 319 else if (!strcmp (var, "http-proxy-port"))
320 {
321#if ENABLE_HTTP_PROXY
307 proxy_port = atoi (val); 322 proxy_port = atoi (val);
323#endif
324 }
308 else if (!strcmp (var, "http-proxy-auth")) 325 else if (!strcmp (var, "http-proxy-auth"))
326 {
327#if ENABLE_HTTP_PROXY
309 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 328 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
310#endif 329#endif
330 }
311 331
312 /* node-specific, non-defaultable */ 332 /* node-specific, non-defaultable */
313 else if (node != &default_node && !strcmp (var, "hostname")) 333 else if (node != &default_node && !strcmp (var, "hostname"))
314 {
315 free (node->hostname);
316 node->hostname = strdup (val); 334 free (node->hostname), node->hostname = strdup (val);
317 }
318 335
319 /* node-specific, defaultable */ 336 /* node-specific, defaultable */
320 else if (!strcmp (var, "udp-port")) 337 else if (!strcmp (var, "udp-port"))
321 node->udp_port = atoi (val); 338 node->udp_port = atoi (val);
322 else if (!strcmp (var, "tcp-port")) 339 else if (!strcmp (var, "tcp-port"))
323 node->tcp_port = atoi (val); 340 node->tcp_port = atoi (val);
341 else if (!strcmp (var, "dns-port"))
342 node->dns_port = atoi (val);
324 else if (!strcmp (var, "router-priority")) 343 else if (!strcmp (var, "router-priority"))
325 node->routerprio = atoi (val); 344 node->routerprio = atoi (val);
326 else if (!strcmp (var, "connect")) 345 else if (!strcmp (var, "connect"))
327 { 346 {
328 if (!strcmp (val, "ondemand")) 347 if (!strcmp (val, "ondemand"))
… …
357 { 376 {
358#if ENABLE_ICMP 377#if ENABLE_ICMP
359 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 378 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
360#endif 379#endif
361 } 380 }
381 else if (!strcmp (var, "enable-dns"))
382 {
383#if ENABLE_DNS
384 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
385#endif
386 }
362 else if (!strcmp (var, "enable-udp")) 387 else if (!strcmp (var, "enable-udp"))
363 { 388 {
364 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 389 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
365 } 390 }
366 else if (!strcmp (var, "enable-rawip")) 391 else if (!strcmp (var, "enable-rawip"))
367 { 392 {;
368 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 393 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
369 } 394 }
370 395
371 // unknown or misplaced 396 // unknown or misplaced
372 else 397 else
… …
378 fclose (f); 403 fclose (f);
379 } 404 }
380 else 405 else
381 { 406 {
382 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 407 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
383 exit (1); 408 exit (EXIT_FAILURE);
384 } 409 }
385 410
386 free (fname); 411 free (fname);
387 412
388 fname = config_filename (prikeyfile, "hostkey"); 413 fname = config_filename (prikeyfile, "hostkey");
… …
394 419
395 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 420 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
396 { 421 {
397 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 422 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
398 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 423 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
399 exit (1); 424 exit (EXIT_FAILURE);
400 } 425 }
401 426
402 RSA_blinding_on (rsa_key, 0); 427 require (RSA_blinding_on (rsa_key, 0));
403 428
404 fclose (f); 429 fclose (f);
405 } 430 }
406 else 431 else
407 { 432 {
408 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 433 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
409 434
410 if (need_keys) 435 if (need_keys)
411 exit (1); 436 exit (EXIT_FAILURE);
412 } 437 }
438
439 if (need_keys && ::thisnode
440 && rsa_key && thisnode && thisnode->rsa_key)
441 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
442 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
443 {
444 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
445 exit (EXIT_FAILURE);
446 }
413 447
414 free (fname); 448 free (fname);
415} 449}
416 450
417char *configuration::config_filename (const char *name, const char *dflt) 451char *configuration::config_filename (const char *name, const char *dflt)

Diff Legend

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