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.22 by pcg, Thu Jan 29 18:55:10 2004 UTC vs.
Revision 1.38 by pcg, Wed Mar 23 17:03:58 2005 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.c -- configuration code
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 8 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 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
… …
35#include <openssl/pem.h> 37#include <openssl/pem.h>
36#include <openssl/rsa.h> 38#include <openssl/rsa.h>
37#include <openssl/rand.h> 39#include <openssl/rand.h>
38#include <openssl/bn.h> 40#include <openssl/bn.h>
39 41
40#include "gettext.h"
41
42#include "conf.h" 42#include "conf.h"
43#include "slog.h" 43#include "slog.h"
44#include "util.h" 44#include "util.h"
45 45
46char *confbase; 46char *confbase;
47char *thisnode; 47char *thisnode;
48char *identname; 48char *identname;
49char *pidfilename;
50 49
51struct configuration conf; 50struct configuration conf;
52 51
53u8 best_protocol (u8 protset) 52u8 best_protocol (u8 protset)
54{ 53{
55 if (protset & PROT_IPv4 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
56 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
57 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
58 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
59 59
60 return 0; 60 return 0;
61} 61}
62 62
63const char *strprotocol (u8 protocol) 63const char *strprotocol (u8 protocol)
64{ 64{
65 if (protocol & PROT_IPv4 ) return "rawip"; 65 if (protocol & PROT_IPv4 ) return "rawip";
66 if (protocol & PROT_ICMPv4) return "icmp"; 66 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4 ) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
68 if (protocol & PROT_TCPv4 ) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
69 if (protocol & PROT_DNSv4 ) return "dns";
69 70
70 return "<unknown>"; 71 return "<unknown>";
71} 72}
72 73
73void 74void
… …
92 if (rsa_key) 93 if (rsa_key)
93 RSA_free (rsa_key); 94 RSA_free (rsa_key);
94 95
95 free (nodename); 96 free (nodename);
96 free (hostname); 97 free (hostname);
98#if ENABLE_DNS
99 free (domain);
100 free (dns_hostname);
101#endif
97} 102}
98 103
99void configuration::init () 104void configuration::init ()
100{ 105{
101 memset (this, 0, sizeof (*this)); 106 memset (this, 0, sizeof (*this));
… …
108#if ENABLE_ICMP 113#if ENABLE_ICMP
109 icmp_type = ICMP_ECHOREPLY; 114 icmp_type = ICMP_ECHOREPLY;
110#endif 115#endif
111 116
112 default_node.udp_port = DEFAULT_UDPPORT; 117 default_node.udp_port = DEFAULT_UDPPORT;
113 default_node.tcp_port = DEFAULT_UDPPORT; 118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
114 default_node.connectmode = conf_node::C_ALWAYS; 119 default_node.connectmode = conf_node::C_ALWAYS;
115 default_node.compress = true; 120 default_node.compress = true;
116 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 = 0; // default is 0 == client
126
127 dns_forw_host = strdup ("127.0.0.1");
128 dns_forw_port = 53;
129 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
130 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
131 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
132 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
133#endif
134
135 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
117} 136}
118 137
119void configuration::cleanup() 138void configuration::cleanup()
120{ 139{
121 if (rsa_key) 140 if (rsa_key)
122 RSA_free (rsa_key); 141 RSA_free (rsa_key);
123 142
124 rsa_key = 0; 143 rsa_key = 0;
125 144
145 free (pidfilename); pidfilename = 0;
126 free (ifname); ifname = 0; 146 free (ifname); ifname = 0;
127#if ENABLE_HTTP_PROXY 147#if ENABLE_HTTP_PROXY
128 free (proxy_host); proxy_host = 0; 148 free (proxy_host); proxy_host = 0;
129 free (proxy_auth); proxy_auth = 0; 149 free (proxy_auth); proxy_auth = 0;
150#endif
151#if ENABLE_DNS
152 free (dns_forw_host); dns_forw_host = 0;
130#endif 153#endif
131} 154}
132 155
133void 156void
134configuration::clear_config () 157configuration::clear_config ()
… …
140 163
141 cleanup (); 164 cleanup ();
142 init (); 165 init ();
143} 166}
144 167
145#define parse_bool(target,name,trueval,falseval) \ 168#define parse_bool(target,name,trueval,falseval) do { \
146 if (!strcmp (val, "yes")) target = trueval; \ 169 if (!strcmp (val, "yes")) target = trueval; \
147 else if (!strcmp (val, "no")) target = falseval; \ 170 else if (!strcmp (val, "no")) target = falseval; \
148 else if (!strcmp (val, "true")) target = trueval; \ 171 else if (!strcmp (val, "true")) target = trueval; \
149 else if (!strcmp (val, "false")) target = falseval; \ 172 else if (!strcmp (val, "false")) target = falseval; \
150 else if (!strcmp (val, "on")) target = trueval; \ 173 else if (!strcmp (val, "on")) target = trueval; \
151 else if (!strcmp (val, "off")) target = falseval; \ 174 else if (!strcmp (val, "off")) target = falseval; \
152 else \ 175 else \
153 slog (L_WARN, \ 176 slog (L_WARN, \
154 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 177 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
155 name, var, fname, lineno); 178 name, var, fname, lineno); \
179} while (0)
156 180
157void configuration::read_config (bool need_keys) 181void configuration::read_config (bool need_keys)
158{ 182{
159 char *fname; 183 char *fname;
160 FILE *f; 184 FILE *f;
161 185
162 clear_config (); 186 clear_config ();
163 187
164 asprintf (&fname, "%s/vped.conf", confbase); 188 asprintf (&fname, "%s/gvpe.conf", confbase);
165 f = fopen (fname, "r"); 189 f = fopen (fname, "r");
166 190
167 if (f) 191 if (f)
168 { 192 {
169 char line[16384]; 193 char line[16384];
… …
199 val = strtok (NULL, "\t\n\r ="); 223 val = strtok (NULL, "\t\n\r =");
200 224
201 if (!val || val[0] == '#') 225 if (!val || val[0] == '#')
202 { 226 {
203 slog (L_WARN, 227 slog (L_WARN,
204 _("no value for variable `%s', at '%s' line %d"), 228 _("no value for variable `%s', at '%s' line %d, skipping."),
205 var, fname, lineno); 229 var, fname, lineno);
206 break; 230 continue;
207 } 231 }
208 232
209 if (!strcmp (var, "on")) 233 if (!strcmp (var, "on"))
210 { 234 {
211 if (!::thisnode 235 if (!::thisnode
… …
277 } 301 }
278 302
279 free (fname); 303 free (fname);
280 } 304 }
281 305
282 if (!::thisnode || !strcmp (node->nodename, ::thisnode)) 306 if (::thisnode && !strcmp (node->nodename, ::thisnode))
283 thisnode = node; 307 thisnode = node;
284 } 308 }
285 else if (!strcmp (var, "private-key")) 309 else if (!strcmp (var, "private-key"))
286 prikeyfile = strdup (val); 310 free (prikeyfile), prikeyfile = strdup (val);
287 else if (!strcmp (var, "ifpersist")) 311 else if (!strcmp (var, "ifpersist"))
288 {
289 parse_bool (ifpersist, "ifpersist", true, false); 312 parse_bool (ifpersist, "ifpersist", true, false);
290 }
291 else if (!strcmp (var, "ifname")) 313 else if (!strcmp (var, "ifname"))
292 ifname = strdup (val); 314 free (ifname), ifname = strdup (val);
293 else if (!strcmp (var, "rekey")) 315 else if (!strcmp (var, "rekey"))
294 rekey = atoi (val); 316 rekey = atoi (val);
295 else if (!strcmp (var, "keepalive")) 317 else if (!strcmp (var, "keepalive"))
296 keepalive = atoi (val); 318 keepalive = atoi (val);
297 else if (!strcmp (var, "mtu")) 319 else if (!strcmp (var, "mtu"))
298 mtu = atoi (val); 320 mtu = atoi (val);
299 else if (!strcmp (var, "if-up")) 321 else if (!strcmp (var, "if-up"))
300 script_if_up = strdup (val); 322 free (script_if_up), script_if_up = strdup (val);
301 else if (!strcmp (var, "node-up")) 323 else if (!strcmp (var, "node-up"))
302 script_node_up = strdup (val); 324 free (script_node_up), script_node_up = strdup (val);
303 else if (!strcmp (var, "node-down")) 325 else if (!strcmp (var, "node-down"))
304 script_node_down = strdup (val); 326 free (script_node_down), script_node_down = strdup (val);
327 else if (!strcmp (var, "pid-file"))
328 free (pidfilename), pidfilename = strdup (val);
329 else if (!strcmp (var, "dns-forw-host"))
330 {
331#if ENABLE_DNS
332 free (dns_forw_host), dns_forw_host = strdup (val);
333#endif
334 }
335 else if (!strcmp (var, "dns-forw-port"))
336 {
337#if ENABLE_DNS
338 dns_forw_port = atoi (val);
339#endif
340 }
341 else if (!strcmp (var, "dns-timeout-factor"))
342 {
343#if ENABLE_DNS
344 dns_timeout_factor = atof (val);
345#endif
346 }
347 else if (!strcmp (var, "dns-send-interval"))
348 {
349#if ENABLE_DNS
350 dns_send_interval = atoi (val);
351#endif
352 }
353 else if (!strcmp (var, "dns-overlap-factor"))
354 {
355#if ENABLE_DNS
356 dns_overlap_factor = atof (val);
357#endif
358 }
359 else if (!strcmp (var, "dns-max-outstanding"))
360 {
361#if ENABLE_DNS
362 dns_max_outstanding = atoi (val);
363#endif
364 }
305 else if (!strcmp (var, "http-proxy-host")) 365 else if (!strcmp (var, "http-proxy-host"))
306 { 366 {
307#if ENABLE_HTTP_PROXY 367#if ENABLE_HTTP_PROXY
308 proxy_host = strdup (val); 368 free (proxy_host), proxy_host = strdup (val);
309#endif 369#endif
310 } 370 }
311 else if (!strcmp (var, "http-proxy-port")) 371 else if (!strcmp (var, "http-proxy-port"))
312 { 372 {
313#if ENABLE_HTTP_PROXY 373#if ENABLE_HTTP_PROXY
… …
321#endif 381#endif
322 } 382 }
323 383
324 /* node-specific, non-defaultable */ 384 /* node-specific, non-defaultable */
325 else if (node != &default_node && !strcmp (var, "hostname")) 385 else if (node != &default_node && !strcmp (var, "hostname"))
326 {
327 free (node->hostname);
328 node->hostname = strdup (val); 386 free (node->hostname), node->hostname = strdup (val);
329 }
330 387
331 /* node-specific, defaultable */ 388 /* node-specific, defaultable */
332 else if (!strcmp (var, "udp-port")) 389 else if (!strcmp (var, "udp-port"))
333 node->udp_port = atoi (val); 390 node->udp_port = atoi (val);
334 else if (!strcmp (var, "tcp-port")) 391 else if (!strcmp (var, "tcp-port"))
335 node->tcp_port = atoi (val); 392 node->tcp_port = atoi (val);
393 else if (!strcmp (var, "dns-hostname"))
394 {
395#if ENABLE_DNS
396 free (node->dns_hostname), node->dns_hostname = strdup (val);
397#endif
398 }
399 else if (!strcmp (var, "dns-port"))
400 {
401#if ENABLE_DNS
402 node->dns_port = atoi (val);
403#endif
404 }
405 else if (!strcmp (var, "dns-domain"))
406 {
407#if ENABLE_DNS
408 free (node->domain), node->domain = strdup (val);
409#endif
410 }
336 else if (!strcmp (var, "router-priority")) 411 else if (!strcmp (var, "router-priority"))
337 node->routerprio = atoi (val); 412 node->routerprio = atoi (val);
413 else if (!strcmp (var, "max-retry"))
414 node->max_retry = atoi (val);
338 else if (!strcmp (var, "connect")) 415 else if (!strcmp (var, "connect"))
339 { 416 {
340 if (!strcmp (val, "ondemand")) 417 if (!strcmp (val, "ondemand"))
341 node->connectmode = conf_node::C_ONDEMAND; 418 node->connectmode = conf_node::C_ONDEMAND;
342 else if (!strcmp (val, "never")) 419 else if (!strcmp (val, "never"))
… …
345 node->connectmode = conf_node::C_ALWAYS; 422 node->connectmode = conf_node::C_ALWAYS;
346 else if (!strcmp (val, "disabled")) 423 else if (!strcmp (val, "disabled"))
347 node->connectmode = conf_node::C_DISABLED; 424 node->connectmode = conf_node::C_DISABLED;
348 else 425 else
349 slog (L_WARN, 426 slog (L_WARN,
350 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 427 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
351 var, fname, lineno); 428 var, fname, lineno);
352 } 429 }
353 else if (!strcmp (var, "inherit-tos")) 430 else if (!strcmp (var, "inherit-tos"))
354 {
355 parse_bool (node->inherit_tos, "inherit-tos", true, false); 431 parse_bool (node->inherit_tos, "inherit-tos", true, false);
356 }
357 else if (!strcmp (var, "compress")) 432 else if (!strcmp (var, "compress"))
358 {
359 parse_bool (node->compress, "compress", true, false); 433 parse_bool (node->compress, "compress", true, false);
360 }
361 // all these bool options really really cost a lot of executable size! 434 // all these bool options really really cost a lot of executable size!
362 else if (!strcmp (var, "enable-tcp")) 435 else if (!strcmp (var, "enable-tcp"))
363 { 436 {
364#if ENABLE_TCP 437#if ENABLE_TCP
365 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 438 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
367 } 440 }
368 else if (!strcmp (var, "enable-icmp")) 441 else if (!strcmp (var, "enable-icmp"))
369 { 442 {
370#if ENABLE_ICMP 443#if ENABLE_ICMP
371 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 444 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
445#endif
446 }
447 else if (!strcmp (var, "enable-dns"))
448 {
449#if ENABLE_DNS
450 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
372#endif 451#endif
373 } 452 }
374 else if (!strcmp (var, "enable-udp")) 453 else if (!strcmp (var, "enable-udp"))
375 { 454 {
376 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 455 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
381 } 460 }
382 461
383 // unknown or misplaced 462 // unknown or misplaced
384 else 463 else
385 slog (L_WARN, 464 slog (L_WARN,
386 _("unknown or misplaced variable `%s', at '%s' line %d"), 465 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
387 var, fname, lineno); 466 var, fname, lineno);
388 } 467 }
389 468
390 fclose (f); 469 fclose (f);
391 } 470 }
… …
421 500
422 if (need_keys) 501 if (need_keys)
423 exit (EXIT_FAILURE); 502 exit (EXIT_FAILURE);
424 } 503 }
425 504
505 if (need_keys && ::thisnode
426 if (need_keys && rsa_key && thisnode && thisnode->rsa_key) 506 && rsa_key && thisnode && thisnode->rsa_key)
427 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0 507 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0
428 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) 508 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0)
429 { 509 {
430 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 510 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
431 exit (EXIT_FAILURE); 511 exit (EXIT_FAILURE);
… …
473 printf ("\n"); 553 printf ("\n");
474} 554}
475 555
476configuration::configuration () 556configuration::configuration ()
477{ 557{
558 asprintf (&confbase, "%s/gvpe", CONFDIR);
559
478 init (); 560 init ();
479} 561}
480 562
481configuration::~configuration () 563configuration::~configuration ()
482{ 564{

Diff Legend

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