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

Diff Legend

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