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.4 by pcg, Sun Mar 23 14:49:16 2003 UTC vs.
Revision 1.26 by pcg, Wed May 12 13:32:13 2004 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
32#include "netcompat.h"
33
36#include <openssl/err.h> 34#include <openssl/err.h>
37#include <openssl/pem.h> 35#include <openssl/pem.h>
38#include <openssl/rsa.h> 36#include <openssl/rsa.h>
39#include <openssl/rand.h> 37#include <openssl/rand.h>
38#include <openssl/bn.h>
40 39
41#include "gettext.h" 40#include "gettext.h"
42 41
43#include "conf.h" 42#include "conf.h"
44#include "slog.h" 43#include "slog.h"
45#include "util.h" 44#include "util.h"
46 45
47char *confbase; 46char *confbase;
48char *thisnode; 47char *thisnode;
49char *identname; 48char *identname;
50char *pidfilename;
51 49
52struct configuration conf; 50struct configuration conf;
53 51
54configuration::configuration () 52u8 best_protocol (u8 protset)
55{ 53{
56 init (); 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
57} 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
58 59
59configuration::~configuration () 60 return 0;
61}
62
63const char *strprotocol (u8 protocol)
60{ 64{
61 cleanup (); 65 if (protocol & PROT_IPv4 ) return "rawip";
66 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4 ) return "udp";
68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns";
70
71 return "<unknown>";
72}
73
74void
75conf_node::print ()
76{
77 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
78 id,
79 id >> 8, id & 0xff,
80 compress ? 'Y' : 'N',
81 connectmode == C_ONDEMAND ? "ondemand" :
82 connectmode == C_NEVER ? "never" :
83 connectmode == C_ALWAYS ? "always" : "",
84 nodename,
85 hostname ? hostname : "",
86 hostname ? ":" : "",
87 hostname ? udp_port : 0
88 );
89}
90
91conf_node::~conf_node ()
92{
93 if (rsa_key)
94 RSA_free (rsa_key);
95
96 free (nodename);
97 free (hostname);
62} 98}
63 99
64void configuration::init () 100void configuration::init ()
65{ 101{
66 memset (this, 0, sizeof (*this)); 102 memset (this, 0, sizeof (*this));
67 103
104 mtu = DEFAULT_MTU;
68 rekey = DEFAULT_REKEY; 105 rekey = DEFAULT_REKEY;
69 keepalive = DEFAULT_KEEPALIVE; 106 keepalive = DEFAULT_KEEPALIVE;
70 llevel = L_INFO; 107 llevel = L_INFO;
108 ip_proto = IPPROTO_GRE;
109#if ENABLE_ICMP
110 icmp_type = ICMP_ECHOREPLY;
111#endif
71 112
72 default_node.port = DEFAULT_PORT; 113 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
73 default_node.connectmode = conf_node::C_ALWAYS; 115 default_node.connectmode = conf_node::C_ALWAYS;
74 default_node.compress = true; 116 default_node.compress = true;
117 default_node.protocols = PROT_UDPv4;
118
119 conf.pidfilename = strdup (LOCALSTATEDIR "/run/vped.pid");
75} 120}
76 121
77void configuration::cleanup() 122void configuration::cleanup()
78{ 123{
79 if (rsa_key) 124 if (rsa_key)
80 RSA_free (rsa_key); 125 RSA_free (rsa_key);
81 126
82 free (ifname);
83
84 rsa_key = 0; 127 rsa_key = 0;
85 ifname = 0; 128
129 free (pidfilename); pidfilename = 0;
130 free (ifname); ifname = 0;
131#if ENABLE_HTTP_PROXY
132 free (proxy_host); proxy_host = 0;
133 free (proxy_auth); proxy_auth = 0;
134#endif
86} 135}
87 136
88void 137void
89configuration::clear_config () 138configuration::clear_config ()
90{ 139{
… …
94 nodes.clear (); 143 nodes.clear ();
95 144
96 cleanup (); 145 cleanup ();
97 init (); 146 init ();
98} 147}
148
149#define parse_bool(target,name,trueval,falseval) \
150 if (!strcmp (val, "yes")) target = trueval; \
151 else if (!strcmp (val, "no")) target = falseval; \
152 else if (!strcmp (val, "true")) target = trueval; \
153 else if (!strcmp (val, "false")) target = falseval; \
154 else if (!strcmp (val, "on")) target = trueval; \
155 else if (!strcmp (val, "off")) target = falseval; \
156 else \
157 slog (L_WARN, \
158 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
159 name, var, fname, lineno);
99 160
100void configuration::read_config (bool need_keys) 161void configuration::read_config (bool need_keys)
101{ 162{
102 char *fname; 163 char *fname;
103 FILE *f; 164 FILE *f;
… …
167 if (l != L_NONE) 228 if (l != L_NONE)
168 llevel = l; 229 llevel = l;
169 else 230 else
170 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 231 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
171 } 232 }
233 else if (!strcmp (var, "ip-proto"))
234 ip_proto = atoi (val);
235 else if (!strcmp (var, "icmp-type"))
236 {
237#if ENABLE_ICMP
238 icmp_type = atoi (val);
239#endif
240 }
172 241
173 // per config 242 // per config
174 else if (!strcmp (var, "node")) 243 else if (!strcmp (var, "node"))
175 { 244 {
176 default_node.id++; 245 default_node.id++;
… …
194 263
195 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) 264 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
196 { 265 {
197 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 266 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
198 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 267 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
199 exit (1); 268 exit (EXIT_FAILURE);
200 } 269 }
201 270
202 RSA_blinding_on (node->rsa_key, 0); 271 require (RSA_blinding_on (node->rsa_key, 0));
203 272
204 fclose (f); 273 fclose (f);
205 } 274 }
206 else 275 else
207 { 276 {
208 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); 277 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
209 278
210 if (need_keys) 279 if (need_keys)
211 exit (1); 280 exit (EXIT_FAILURE);
212 } 281 }
213 282
214 free (fname); 283 free (fname);
215 } 284 }
216 285
217 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 286 if (::thisnode && !strcmp (node->nodename, ::thisnode))
218 thisnode = node; 287 thisnode = node;
219 } 288 }
220 else if (!strcmp (var, "private-key")) 289 else if (!strcmp (var, "private-key"))
221 prikeyfile = strdup (val); 290 free (prikeyfile), prikeyfile = strdup (val);
222 else if (!strcmp (var, "ifpersist")) 291 else if (!strcmp (var, "ifpersist"))
223 { 292 {
224 if (!strcmp (val, "yes")) 293 parse_bool (ifpersist, "ifpersist", true, false);
225 ifpersist = true;
226 else if (!strcmp (val, "no"))
227 ifpersist = false;
228 else
229 slog (L_WARN,
230 _("illegal value for 'ifpersist', only 'yes' or 'no' allowed, at '%s' line %d"),
231 var, fname, lineno);
232 } 294 }
233 else if (!strcmp (var, "ifname")) 295 else if (!strcmp (var, "ifname"))
234 ifname = strdup (val); 296 free (ifname), ifname = strdup (val);
235 else if (!strcmp (var, "rekey")) 297 else if (!strcmp (var, "rekey"))
236 rekey = atoi (val); 298 rekey = atoi (val);
237 else if (!strcmp (var, "keepalive")) 299 else if (!strcmp (var, "keepalive"))
238 keepalive = atoi (val); 300 keepalive = atoi (val);
239 else if (!strcmp (var, "mtu")) 301 else if (!strcmp (var, "mtu"))
240 mtu = atoi (val); 302 mtu = atoi (val);
241 else if (!strcmp (var, "if-up")) 303 else if (!strcmp (var, "if-up"))
242 script_if_up = strdup (val); 304 free (script_if_up), script_if_up = strdup (val);
243 else if (!strcmp (var, "node-up")) 305 else if (!strcmp (var, "node-up"))
244 script_node_up = strdup (val); 306 free (script_node_up), script_node_up = strdup (val);
245 else if (!strcmp (var, "node-down")) 307 else if (!strcmp (var, "node-down"))
246 script_node_down = strdup (val); 308 free (script_node_down), script_node_down = strdup (val);
309 else if (!strcmp (var, "pid-file"))
310 free (pidfilename), pidfilename = strdup (val);
311 else if (!strcmp (var, "http-proxy-host"))
312 {
313#if ENABLE_HTTP_PROXY
314 free (proxy_host), proxy_host = strdup (val);
315#endif
316 }
317 else if (!strcmp (var, "http-proxy-port"))
318 {
319#if ENABLE_HTTP_PROXY
320 proxy_port = atoi (val);
321#endif
322 }
323 else if (!strcmp (var, "http-proxy-auth"))
324 {
325#if ENABLE_HTTP_PROXY
326 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
327#endif
328 }
247 329
248 /* node-specific, non-defaultable */ 330 /* node-specific, non-defaultable */
249 else if (node != &default_node && !strcmp (var, "hostname")) 331 else if (node != &default_node && !strcmp (var, "hostname"))
250 {
251 free (node->hostname);
252 node->hostname = strdup (val); 332 free (node->hostname), node->hostname = strdup (val);
253 }
254 333
255 /* node-specific, defaultable */ 334 /* node-specific, defaultable */
256 else if (!strcmp (var, "udp-port")) 335 else if (!strcmp (var, "udp-port"))
257 node->port = atoi (val); 336 node->udp_port = atoi (val);
258 else if (!strcmp (var, "port")) //deprecated 337 else if (!strcmp (var, "tcp-port"))
259 node->port = atoi (val); 338 node->tcp_port = atoi (val);
339 else if (!strcmp (var, "dns-port"))
340 node->dns_port = atoi (val);
260 else if (!strcmp (var, "router-priority")) 341 else if (!strcmp (var, "router-priority"))
261 node->routerprio = atoi (val); 342 node->routerprio = atoi (val);
262 else if (!strcmp (var, "connect")) 343 else if (!strcmp (var, "connect"))
263 { 344 {
264 if (!strcmp (val, "ondemand")) 345 if (!strcmp (val, "ondemand"))
… …
274 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 355 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
275 var, fname, lineno); 356 var, fname, lineno);
276 } 357 }
277 else if (!strcmp (var, "inherit-tos")) 358 else if (!strcmp (var, "inherit-tos"))
278 { 359 {
279 if (!strcmp (val, "yes")) 360 parse_bool (node->inherit_tos, "inherit-tos", true, false);
280 node->inherit_tos = true;
281 else if (!strcmp (val, "no"))
282 node->inherit_tos = false;
283 else 361 }
284 slog (L_WARN,
285 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),
286 var, fname, lineno);
287 }
288
289 else if (!strcmp (var, "compress")) 362 else if (!strcmp (var, "compress"))
290 { 363 {
291 if (!strcmp (val, "yes")) 364 parse_bool (node->compress, "compress", true, false);
292 node->compress = true; 365 }
366 // all these bool options really really cost a lot of executable size!
367 else if (!strcmp (var, "enable-tcp"))
368 {
369#if ENABLE_TCP
370 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
371#endif
372 }
373 else if (!strcmp (var, "enable-icmp"))
374 {
375#if ENABLE_ICMP
376 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
377#endif
378 }
293 else if (!strcmp (val, "no")) 379 else if (!strcmp (var, "enable-dns"))
294 node->compress = false;
295 else 380 {
296 slog (L_WARN, 381#if ENABLE_DNS
297 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"), 382 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
298 var, fname, lineno); 383#endif
384 }
385 else if (!strcmp (var, "enable-udp"))
386 {
387 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
388 }
389 else if (!strcmp (var, "enable-rawip"))
390 {;
391 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
299 } 392 }
300 393
301 // unknown or misplaced 394 // unknown or misplaced
302 else 395 else
303 {
304 slog (L_WARN, 396 slog (L_WARN,
305 _("unknown or misplaced variable `%s', at '%s' line %d"), 397 _("unknown or misplaced variable `%s', at '%s' line %d"),
306 var, fname, lineno); 398 var, fname, lineno);
307 }
308 } 399 }
309 400
310 fclose (f); 401 fclose (f);
311 } 402 }
312 else 403 else
313 { 404 {
314 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 405 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
315 exit (1); 406 exit (EXIT_FAILURE);
316 } 407 }
317 408
318 free (fname); 409 free (fname);
319 410
320 fname = config_filename (prikeyfile, "hostkey"); 411 fname = config_filename (prikeyfile, "hostkey");
… …
326 417
327 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 418 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL))
328 { 419 {
329 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 420 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
330 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 421 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
331 exit (1); 422 exit (EXIT_FAILURE);
332 } 423 }
333 424
334 RSA_blinding_on (rsa_key, 0); 425 require (RSA_blinding_on (rsa_key, 0));
335 426
336 fclose (f); 427 fclose (f);
337 } 428 }
338 else 429 else
339 { 430 {
340 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); 431 slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno));
341 432
342 if (need_keys) 433 if (need_keys)
343 exit (1); 434 exit (EXIT_FAILURE);
344 } 435 }
436
437 if (need_keys && ::thisnode
438 && rsa_key && thisnode && thisnode->rsa_key)
439 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
440 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
441 {
442 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
443 exit (EXIT_FAILURE);
444 }
345 445
346 free (fname); 446 free (fname);
347} 447}
348 448
349char *configuration::config_filename (const char *name, const char *dflt) 449char *configuration::config_filename (const char *name, const char *dflt)
… …
371 printf (_("MTU: %d\n"), mtu); 471 printf (_("MTU: %d\n"), mtu);
372 printf (_("rekeying interval: %d\n"), rekey); 472 printf (_("rekeying interval: %d\n"), rekey);
373 printf (_("keepalive interval: %d\n"), keepalive); 473 printf (_("keepalive interval: %d\n"), keepalive);
374 printf (_("interface: %s\n"), ifname); 474 printf (_("interface: %s\n"), ifname);
375 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 475 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
376 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 476 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
377 printf ("\n"); 477 printf ("\n");
378 478
379 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 479 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
380 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 480 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
381 481
… …
383 (*i)->print (); 483 (*i)->print ();
384 484
385 printf ("\n"); 485 printf ("\n");
386} 486}
387 487
388void 488configuration::configuration ()
389conf_node::print ()
390{ 489{
391 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 490 asprintf (&confbase, "%s/vpe", CONFDIR);
392 id,
393 id >> 8, id & 0xff,
394 compress ? 'Y' : 'N',
395 connectmode == C_ONDEMAND ? "ondemand" :
396 connectmode == C_NEVER ? "never" :
397 connectmode == C_ALWAYS ? "always" : "",
398 nodename,
399 hostname ? hostname : "",
400 hostname ? ":" : "",
401 hostname ? port : 0
402 );
403}
404 491
492 init ();
493}
494
495configuration::~configuration ()
496{
497 cleanup ();
498}
499
500

Diff Legend

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