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.23 by pcg, Thu Jan 29 19:30:08 2004 UTC vs.
Revision 1.39 by pcg, Sat Mar 26 03:16:24 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
… …
87 ); 88 );
88} 89}
89 90
90conf_node::~conf_node () 91conf_node::~conf_node ()
91{ 92{
93#if 0
94 // does not work, because string pointers etc. are shared
95 // is not called, however
92 if (rsa_key) 96 if (rsa_key)
93 RSA_free (rsa_key); 97 RSA_free (rsa_key);
94 98
95 free (nodename); 99 free (nodename);
96 free (hostname); 100 free (hostname);
101 free (if_up_data);
102#if ENABLE_DNS
103 free (domain);
104 free (dns_hostname);
105#endif
106#endif
97} 107}
98 108
99void configuration::init () 109void configuration::init ()
100{ 110{
101 memset (this, 0, sizeof (*this)); 111 memset (this, 0, sizeof (*this));
… …
108#if ENABLE_ICMP 118#if ENABLE_ICMP
109 icmp_type = ICMP_ECHOREPLY; 119 icmp_type = ICMP_ECHOREPLY;
110#endif 120#endif
111 121
112 default_node.udp_port = DEFAULT_UDPPORT; 122 default_node.udp_port = DEFAULT_UDPPORT;
113 default_node.tcp_port = DEFAULT_UDPPORT; 123 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
114 default_node.connectmode = conf_node::C_ALWAYS; 124 default_node.connectmode = conf_node::C_ALWAYS;
115 default_node.compress = true; 125 default_node.compress = true;
116 default_node.protocols = PROT_UDPv4; 126 default_node.protocols = 0;
127 default_node.max_retry = DEFAULT_MAX_RETRY;
128 default_node.if_up_data = strdup ("");
129
130#if ENABLE_DNS
131 default_node.dns_port = 0; // default is 0 == client
132
133 dns_forw_host = strdup ("127.0.0.1");
134 dns_forw_port = 53;
135 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
136 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
137 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
138 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
139#endif
140
141 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
117} 142}
118 143
119void configuration::cleanup() 144void configuration::cleanup()
120{ 145{
121 if (rsa_key) 146 if (rsa_key)
122 RSA_free (rsa_key); 147 RSA_free (rsa_key);
123 148
124 rsa_key = 0; 149 rsa_key = 0;
125 150
151 free (pidfilename); pidfilename = 0;
126 free (ifname); ifname = 0; 152 free (ifname); ifname = 0;
127#if ENABLE_HTTP_PROXY 153#if ENABLE_HTTP_PROXY
128 free (proxy_host); proxy_host = 0; 154 free (proxy_host); proxy_host = 0;
129 free (proxy_auth); proxy_auth = 0; 155 free (proxy_auth); proxy_auth = 0;
156#endif
157#if ENABLE_DNS
158 free (dns_forw_host); dns_forw_host = 0;
130#endif 159#endif
131} 160}
132 161
133void 162void
134configuration::clear_config () 163configuration::clear_config ()
… …
140 169
141 cleanup (); 170 cleanup ();
142 init (); 171 init ();
143} 172}
144 173
145#define parse_bool(target,name,trueval,falseval) \ 174#define parse_bool(target,name,trueval,falseval) do { \
146 if (!strcmp (val, "yes")) target = trueval; \ 175 if (!strcmp (val, "yes")) target = trueval; \
147 else if (!strcmp (val, "no")) target = falseval; \ 176 else if (!strcmp (val, "no")) target = falseval; \
148 else if (!strcmp (val, "true")) target = trueval; \ 177 else if (!strcmp (val, "true")) target = trueval; \
149 else if (!strcmp (val, "false")) target = falseval; \ 178 else if (!strcmp (val, "false")) target = falseval; \
150 else if (!strcmp (val, "on")) target = trueval; \ 179 else if (!strcmp (val, "on")) target = trueval; \
151 else if (!strcmp (val, "off")) target = falseval; \ 180 else if (!strcmp (val, "off")) target = falseval; \
152 else \ 181 else \
153 slog (L_WARN, \ 182 slog (L_WARN, \
154 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 183 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
155 name, var, fname, lineno); 184 name, var, fname, lineno); \
185} while (0)
156 186
157void configuration::read_config (bool need_keys) 187void configuration::read_config (bool need_keys)
158{ 188{
159 char *fname; 189 char *fname;
160 FILE *f; 190 FILE *f;
161 191
162 clear_config (); 192 clear_config ();
163 193
164 asprintf (&fname, "%s/vped.conf", confbase); 194 asprintf (&fname, "%s/gvpe.conf", confbase);
165 f = fopen (fname, "r"); 195 f = fopen (fname, "r");
166 196
167 if (f) 197 if (f)
168 { 198 {
169 char line[16384]; 199 char line[16384];
… …
199 val = strtok (NULL, "\t\n\r ="); 229 val = strtok (NULL, "\t\n\r =");
200 230
201 if (!val || val[0] == '#') 231 if (!val || val[0] == '#')
202 { 232 {
203 slog (L_WARN, 233 slog (L_WARN,
204 _("no value for variable `%s', at '%s' line %d"), 234 _("no value for variable `%s', at '%s' line %d, skipping."),
205 var, fname, lineno); 235 var, fname, lineno);
206 break; 236 continue;
207 } 237 }
208 238
209 if (!strcmp (var, "on")) 239 if (!strcmp (var, "on"))
210 { 240 {
211 if (!::thisnode 241 if (!::thisnode
… …
281 311
282 if (::thisnode && !strcmp (node->nodename, ::thisnode)) 312 if (::thisnode && !strcmp (node->nodename, ::thisnode))
283 thisnode = node; 313 thisnode = node;
284 } 314 }
285 else if (!strcmp (var, "private-key")) 315 else if (!strcmp (var, "private-key"))
286 prikeyfile = strdup (val); 316 free (prikeyfile), prikeyfile = strdup (val);
287 else if (!strcmp (var, "ifpersist")) 317 else if (!strcmp (var, "ifpersist"))
288 {
289 parse_bool (ifpersist, "ifpersist", true, false); 318 parse_bool (ifpersist, "ifpersist", true, false);
290 }
291 else if (!strcmp (var, "ifname")) 319 else if (!strcmp (var, "ifname"))
292 ifname = strdup (val); 320 free (ifname), ifname = strdup (val);
293 else if (!strcmp (var, "rekey")) 321 else if (!strcmp (var, "rekey"))
294 rekey = atoi (val); 322 rekey = atoi (val);
295 else if (!strcmp (var, "keepalive")) 323 else if (!strcmp (var, "keepalive"))
296 keepalive = atoi (val); 324 keepalive = atoi (val);
297 else if (!strcmp (var, "mtu")) 325 else if (!strcmp (var, "mtu"))
298 mtu = atoi (val); 326 mtu = atoi (val);
299 else if (!strcmp (var, "if-up")) 327 else if (!strcmp (var, "if-up"))
300 script_if_up = strdup (val); 328 free (script_if_up), script_if_up = strdup (val);
301 else if (!strcmp (var, "node-up")) 329 else if (!strcmp (var, "node-up"))
302 script_node_up = strdup (val); 330 free (script_node_up), script_node_up = strdup (val);
303 else if (!strcmp (var, "node-down")) 331 else if (!strcmp (var, "node-down"))
304 script_node_down = strdup (val); 332 free (script_node_down), script_node_down = strdup (val);
333 else if (!strcmp (var, "pid-file"))
334 free (pidfilename), pidfilename = strdup (val);
335 else if (!strcmp (var, "dns-forw-host"))
336 {
337#if ENABLE_DNS
338 free (dns_forw_host), dns_forw_host = strdup (val);
339#endif
340 }
341 else if (!strcmp (var, "dns-forw-port"))
342 {
343#if ENABLE_DNS
344 dns_forw_port = atoi (val);
345#endif
346 }
347 else if (!strcmp (var, "dns-timeout-factor"))
348 {
349#if ENABLE_DNS
350 dns_timeout_factor = atof (val);
351#endif
352 }
353 else if (!strcmp (var, "dns-send-interval"))
354 {
355#if ENABLE_DNS
356 dns_send_interval = atoi (val);
357#endif
358 }
359 else if (!strcmp (var, "dns-overlap-factor"))
360 {
361#if ENABLE_DNS
362 dns_overlap_factor = atof (val);
363#endif
364 }
365 else if (!strcmp (var, "dns-max-outstanding"))
366 {
367#if ENABLE_DNS
368 dns_max_outstanding = atoi (val);
369#endif
370 }
305 else if (!strcmp (var, "http-proxy-host")) 371 else if (!strcmp (var, "http-proxy-host"))
306 { 372 {
307#if ENABLE_HTTP_PROXY 373#if ENABLE_HTTP_PROXY
308 proxy_host = strdup (val); 374 free (proxy_host), proxy_host = strdup (val);
309#endif 375#endif
310 } 376 }
311 else if (!strcmp (var, "http-proxy-port")) 377 else if (!strcmp (var, "http-proxy-port"))
312 { 378 {
313#if ENABLE_HTTP_PROXY 379#if ENABLE_HTTP_PROXY
… …
321#endif 387#endif
322 } 388 }
323 389
324 /* node-specific, non-defaultable */ 390 /* node-specific, non-defaultable */
325 else if (node != &default_node && !strcmp (var, "hostname")) 391 else if (node != &default_node && !strcmp (var, "hostname"))
326 {
327 free (node->hostname);
328 node->hostname = strdup (val); 392 free (node->hostname), node->hostname = strdup (val);
329 }
330 393
331 /* node-specific, defaultable */ 394 /* node-specific, defaultable */
332 else if (!strcmp (var, "udp-port")) 395 else if (!strcmp (var, "udp-port"))
333 node->udp_port = atoi (val); 396 node->udp_port = atoi (val);
334 else if (!strcmp (var, "tcp-port")) 397 else if (!strcmp (var, "tcp-port"))
335 node->tcp_port = atoi (val); 398 node->tcp_port = atoi (val);
399 else if (!strcmp (var, "dns-hostname"))
400 {
401#if ENABLE_DNS
402 free (node->dns_hostname), node->dns_hostname = strdup (val);
403#endif
404 }
405 else if (!strcmp (var, "dns-port"))
406 {
407#if ENABLE_DNS
408 node->dns_port = atoi (val);
409#endif
410 }
411 else if (!strcmp (var, "dns-domain"))
412 {
413#if ENABLE_DNS
414 free (node->domain), node->domain = strdup (val);
415#endif
416 }
417 else if (!strcmp (var, "if-up-data"))
418 free (node->if_up_data), node->if_up_data = strdup (val);
336 else if (!strcmp (var, "router-priority")) 419 else if (!strcmp (var, "router-priority"))
337 node->routerprio = atoi (val); 420 node->routerprio = atoi (val);
421 else if (!strcmp (var, "max-retry"))
422 node->max_retry = atoi (val);
338 else if (!strcmp (var, "connect")) 423 else if (!strcmp (var, "connect"))
339 { 424 {
340 if (!strcmp (val, "ondemand")) 425 if (!strcmp (val, "ondemand"))
341 node->connectmode = conf_node::C_ONDEMAND; 426 node->connectmode = conf_node::C_ONDEMAND;
342 else if (!strcmp (val, "never")) 427 else if (!strcmp (val, "never"))
… …
345 node->connectmode = conf_node::C_ALWAYS; 430 node->connectmode = conf_node::C_ALWAYS;
346 else if (!strcmp (val, "disabled")) 431 else if (!strcmp (val, "disabled"))
347 node->connectmode = conf_node::C_DISABLED; 432 node->connectmode = conf_node::C_DISABLED;
348 else 433 else
349 slog (L_WARN, 434 slog (L_WARN,
350 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 435 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
351 var, fname, lineno); 436 var, fname, lineno);
352 } 437 }
353 else if (!strcmp (var, "inherit-tos")) 438 else if (!strcmp (var, "inherit-tos"))
354 {
355 parse_bool (node->inherit_tos, "inherit-tos", true, false); 439 parse_bool (node->inherit_tos, "inherit-tos", true, false);
356 }
357 else if (!strcmp (var, "compress")) 440 else if (!strcmp (var, "compress"))
358 {
359 parse_bool (node->compress, "compress", true, false); 441 parse_bool (node->compress, "compress", true, false);
360 }
361 // all these bool options really really cost a lot of executable size! 442 // all these bool options really really cost a lot of executable size!
362 else if (!strcmp (var, "enable-tcp")) 443 else if (!strcmp (var, "enable-tcp"))
363 { 444 {
364#if ENABLE_TCP 445#if ENABLE_TCP
365 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 446 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
367 } 448 }
368 else if (!strcmp (var, "enable-icmp")) 449 else if (!strcmp (var, "enable-icmp"))
369 { 450 {
370#if ENABLE_ICMP 451#if ENABLE_ICMP
371 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 452 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
453#endif
454 }
455 else if (!strcmp (var, "enable-dns"))
456 {
457#if ENABLE_DNS
458 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
372#endif 459#endif
373 } 460 }
374 else if (!strcmp (var, "enable-udp")) 461 else if (!strcmp (var, "enable-udp"))
375 { 462 {
376 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 463 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
381 } 468 }
382 469
383 // unknown or misplaced 470 // unknown or misplaced
384 else 471 else
385 slog (L_WARN, 472 slog (L_WARN,
386 _("unknown or misplaced variable `%s', at '%s' line %d"), 473 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
387 var, fname, lineno); 474 var, fname, lineno);
388 } 475 }
389 476
390 fclose (f); 477 fclose (f);
391 } 478 }
… …
474 printf ("\n"); 561 printf ("\n");
475} 562}
476 563
477configuration::configuration () 564configuration::configuration ()
478{ 565{
566 asprintf (&confbase, "%s/gvpe", CONFDIR);
567
479 init (); 568 init ();
480} 569}
481 570
482configuration::~configuration () 571configuration::~configuration ()
483{ 572{

Diff Legend

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