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.30 by pcg, Thu Mar 3 07:24:57 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-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
… …
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 = 53;
126 dns_forw_port = 53;
127#endif
128
129 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
115} 130}
116 131
117void configuration::cleanup() 132void configuration::cleanup()
118{ 133{
119 if (rsa_key) 134 if (rsa_key)
120 RSA_free (rsa_key); 135 RSA_free (rsa_key);
121 136
122 rsa_key = 0; 137 rsa_key = 0;
123 138
139 free (pidfilename); pidfilename = 0;
124 free (ifname); ifname = 0; 140 free (ifname); ifname = 0;
125#if ENABLE_HTTP_PROXY 141#if ENABLE_HTTP_PROXY
126 free (proxy_host); proxy_host = 0; 142 free (proxy_host); proxy_host = 0;
127 free (proxy_auth); proxy_auth = 0; 143 free (proxy_auth); proxy_auth = 0;
144#endif
145#if ENABLE_DNS
146 free (dns_forw_host); dns_forw_host = 0;
128#endif 147#endif
129} 148}
130 149
131void 150void
132configuration::clear_config () 151configuration::clear_config ()
… …
157 char *fname; 176 char *fname;
158 FILE *f; 177 FILE *f;
159 178
160 clear_config (); 179 clear_config ();
161 180
162 asprintf (&fname, "%s/vped.conf", confbase); 181 asprintf (&fname, "%s/gvpe.conf", confbase);
163 f = fopen (fname, "r"); 182 f = fopen (fname, "r");
164 183
165 if (f) 184 if (f)
166 { 185 {
167 char line[16384]; 186 char line[16384];
… …
224 else 243 else
225 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 244 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
226 } 245 }
227 else if (!strcmp (var, "ip-proto")) 246 else if (!strcmp (var, "ip-proto"))
228 ip_proto = atoi (val); 247 ip_proto = atoi (val);
248 else if (!strcmp (var, "icmp-type"))
249 {
229#if ENABLE_ICMP 250#if ENABLE_ICMP
230 //TODO: error message
231 else if (!strcmp (var, "icmp-type"))
232 icmp_type = atoi (val); 251 icmp_type = atoi (val);
233#endif 252#endif
253 }
234 254
235 // per config 255 // per config
236 else if (!strcmp (var, "node")) 256 else if (!strcmp (var, "node"))
237 { 257 {
238 default_node.id++; 258 default_node.id++;
… …
256 276
257 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 277 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
258 { 278 {
259 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 279 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)); 280 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
261 exit (1); 281 exit (EXIT_FAILURE);
262 } 282 }
263 283
264 RSA_blinding_on (node->rsa_key, 0); 284 require (RSA_blinding_on (node->rsa_key, 0));
265 285
266 fclose (f); 286 fclose (f);
267 } 287 }
268 else 288 else
269 { 289 {
270 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 290 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
271 291
272 if (need_keys) 292 if (need_keys)
273 exit (1); 293 exit (EXIT_FAILURE);
274 } 294 }
275 295
276 free (fname); 296 free (fname);
277 } 297 }
278 298
279 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 299 if (::thisnode && !strcmp (node->nodename, ::thisnode))
280 thisnode = node; 300 thisnode = node;
281 } 301 }
282 else if (!strcmp (var, "private-key")) 302 else if (!strcmp (var, "private-key"))
283 prikeyfile = strdup (val); 303 free (prikeyfile), prikeyfile = strdup (val);
284 else if (!strcmp (var, "ifpersist")) 304 else if (!strcmp (var, "ifpersist"))
285 { 305 {
286 parse_bool (ifpersist, "ifpersist", true, false); 306 parse_bool (ifpersist, "ifpersist", true, false);
287 } 307 }
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#if ENABLE_DNS
325 else if (!strcmp (var, "dns-forw-host"))
326 free (dns_forw_host), dns_forw_host = strdup (val);
327 else if (!strcmp (var, "dns-forw-port"))
328 dns_forw_port = atoi (val);
329#endif
330 else if (!strcmp (var, "http-proxy-host"))
331 {
302#if ENABLE_HTTP_PROXY 332#if ENABLE_HTTP_PROXY
303 else if (!strcmp (var, "http-proxy-host"))
304 proxy_host = strdup (val); 333 free (proxy_host), proxy_host = strdup (val);
334#endif
335 }
305 else if (!strcmp (var, "http-proxy-port")) 336 else if (!strcmp (var, "http-proxy-port"))
337 {
338#if ENABLE_HTTP_PROXY
306 proxy_port = atoi (val); 339 proxy_port = atoi (val);
340#endif
341 }
307 else if (!strcmp (var, "http-proxy-auth")) 342 else if (!strcmp (var, "http-proxy-auth"))
343 {
344#if ENABLE_HTTP_PROXY
308 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 345 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
309#endif 346#endif
347 }
310 348
311 /* node-specific, non-defaultable */ 349 /* node-specific, non-defaultable */
312 else if (node != &default_node && !strcmp (var, "hostname")) 350 else if (node != &default_node && !strcmp (var, "hostname"))
313 {
314 free (node->hostname);
315 node->hostname = strdup (val); 351 free (node->hostname), node->hostname = strdup (val);
316 }
317 352
318 /* node-specific, defaultable */ 353 /* node-specific, defaultable */
319 else if (!strcmp (var, "udp-port")) 354 else if (!strcmp (var, "udp-port"))
320 node->udp_port = atoi (val); 355 node->udp_port = atoi (val);
321 else if (!strcmp (var, "tcp-port")) 356 else if (!strcmp (var, "tcp-port"))
322 node->tcp_port = atoi (val); 357 node->tcp_port = atoi (val);
358#if ENABLE_DNS
359 else if (!strcmp (var, "dns-hostname"))
360 free (node->dns_hostname), node->dns_hostname = strdup (val);
361 else if (!strcmp (var, "dns-port"))
362 node->dns_port = atoi (val);
363#endif
364 else if (!strcmp (var, "dns-domain"))
365 {
366#if ENABLE_DNS
367 free (node->domain), node->domain = strdup (val);
368#endif
369 }
323 else if (!strcmp (var, "router-priority")) 370 else if (!strcmp (var, "router-priority"))
324 node->routerprio = atoi (val); 371 node->routerprio = atoi (val);
372 else if (!strcmp (var, "max-retry"))
373 node->max_retry = atoi (val);
325 else if (!strcmp (var, "connect")) 374 else if (!strcmp (var, "connect"))
326 { 375 {
327 if (!strcmp (val, "ondemand")) 376 if (!strcmp (val, "ondemand"))
328 node->connectmode = conf_node::C_ONDEMAND; 377 node->connectmode = conf_node::C_ONDEMAND;
329 else if (!strcmp (val, "never")) 378 else if (!strcmp (val, "never"))
… …
332 node->connectmode = conf_node::C_ALWAYS; 381 node->connectmode = conf_node::C_ALWAYS;
333 else if (!strcmp (val, "disabled")) 382 else if (!strcmp (val, "disabled"))
334 node->connectmode = conf_node::C_DISABLED; 383 node->connectmode = conf_node::C_DISABLED;
335 else 384 else
336 slog (L_WARN, 385 slog (L_WARN,
337 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 386 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
338 var, fname, lineno); 387 var, fname, lineno);
339 } 388 }
340 else if (!strcmp (var, "inherit-tos")) 389 else if (!strcmp (var, "inherit-tos"))
341 { 390 {
342 parse_bool (node->inherit_tos, "inherit-tos", true, false); 391 parse_bool (node->inherit_tos, "inherit-tos", true, false);
343 } 392 }
… …
354 } 403 }
355 else if (!strcmp (var, "enable-icmp")) 404 else if (!strcmp (var, "enable-icmp"))
356 { 405 {
357#if ENABLE_ICMP 406#if ENABLE_ICMP
358 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 407 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
408#endif
409 }
410 else if (!strcmp (var, "enable-dns"))
411 {
412#if ENABLE_DNS
413 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
359#endif 414#endif
360 } 415 }
361 else if (!strcmp (var, "enable-udp")) 416 else if (!strcmp (var, "enable-udp"))
362 { 417 {
363 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 418 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
377 fclose (f); 432 fclose (f);
378 } 433 }
379 else 434 else
380 { 435 {
381 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 436 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
382 exit (1); 437 exit (EXIT_FAILURE);
383 } 438 }
384 439
385 free (fname); 440 free (fname);
386 441
387 fname = config_filename (prikeyfile, "hostkey"); 442 fname = config_filename (prikeyfile, "hostkey");
… …
393 448
394 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 449 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
395 { 450 {
396 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 451 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)); 452 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
398 exit (1); 453 exit (EXIT_FAILURE);
399 } 454 }
400 455
401 RSA_blinding_on (rsa_key, 0); 456 require (RSA_blinding_on (rsa_key, 0));
402 457
403 fclose (f); 458 fclose (f);
404 } 459 }
405 else 460 else
406 { 461 {
407 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 462 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
408 463
409 if (need_keys) 464 if (need_keys)
410 exit (1); 465 exit (EXIT_FAILURE);
411 } 466 }
467
468 if (need_keys && ::thisnode
469 && rsa_key && thisnode && thisnode->rsa_key)
470 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
471 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
472 {
473 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
474 exit (EXIT_FAILURE);
475 }
412 476
413 free (fname); 477 free (fname);
414} 478}
415 479
416char *configuration::config_filename (const char *name, const char *dflt) 480char *configuration::config_filename (const char *name, const char *dflt)
… …
452 printf ("\n"); 516 printf ("\n");
453} 517}
454 518
455configuration::configuration () 519configuration::configuration ()
456{ 520{
521 asprintf (&confbase, "%s/gvpe", CONFDIR);
522
457 init (); 523 init ();
458} 524}
459 525
460configuration::~configuration () 526configuration::~configuration ()
461{ 527{

Diff Legend

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