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.36 by pcg, Sun Mar 20 02:34:16 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 dns_forw_host = strdup ("127.0.0.1");
127 dns_forw_port = 53;
128#endif
129
130 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
117} 131}
118 132
119void configuration::cleanup() 133void configuration::cleanup()
120{ 134{
121 if (rsa_key) 135 if (rsa_key)
122 RSA_free (rsa_key); 136 RSA_free (rsa_key);
123 137
124 rsa_key = 0; 138 rsa_key = 0;
125 139
140 free (pidfilename); pidfilename = 0;
126 free (ifname); ifname = 0; 141 free (ifname); ifname = 0;
127#if ENABLE_HTTP_PROXY 142#if ENABLE_HTTP_PROXY
128 free (proxy_host); proxy_host = 0; 143 free (proxy_host); proxy_host = 0;
129 free (proxy_auth); proxy_auth = 0; 144 free (proxy_auth); proxy_auth = 0;
145#endif
146#if ENABLE_DNS
147 free (dns_forw_host); dns_forw_host = 0;
130#endif 148#endif
131} 149}
132 150
133void 151void
134configuration::clear_config () 152configuration::clear_config ()
… …
159 char *fname; 177 char *fname;
160 FILE *f; 178 FILE *f;
161 179
162 clear_config (); 180 clear_config ();
163 181
164 asprintf (&fname, "%s/vped.conf", confbase); 182 asprintf (&fname, "%s/gvpe.conf", confbase);
165 f = fopen (fname, "r"); 183 f = fopen (fname, "r");
166 184
167 if (f) 185 if (f)
168 { 186 {
169 char line[16384]; 187 char line[16384];
… …
199 val = strtok (NULL, "\t\n\r ="); 217 val = strtok (NULL, "\t\n\r =");
200 218
201 if (!val || val[0] == '#') 219 if (!val || val[0] == '#')
202 { 220 {
203 slog (L_WARN, 221 slog (L_WARN,
204 _("no value for variable `%s', at '%s' line %d"), 222 _("no value for variable `%s', at '%s' line %d, skipping."),
205 var, fname, lineno); 223 var, fname, lineno);
206 break; 224 continue;
207 } 225 }
208 226
209 if (!strcmp (var, "on")) 227 if (!strcmp (var, "on"))
210 { 228 {
211 if (!::thisnode 229 if (!::thisnode
… …
281 299
282 if (::thisnode && !strcmp (node->nodename, ::thisnode)) 300 if (::thisnode && !strcmp (node->nodename, ::thisnode))
283 thisnode = node; 301 thisnode = node;
284 } 302 }
285 else if (!strcmp (var, "private-key")) 303 else if (!strcmp (var, "private-key"))
286 prikeyfile = strdup (val); 304 free (prikeyfile), prikeyfile = strdup (val);
287 else if (!strcmp (var, "ifpersist")) 305 else if (!strcmp (var, "ifpersist"))
288 {
289 parse_bool (ifpersist, "ifpersist", true, false); 306 parse_bool (ifpersist, "ifpersist", true, false);
290 }
291 else if (!strcmp (var, "ifname")) 307 else if (!strcmp (var, "ifname"))
292 ifname = strdup (val); 308 free (ifname), ifname = strdup (val);
293 else if (!strcmp (var, "rekey")) 309 else if (!strcmp (var, "rekey"))
294 rekey = atoi (val); 310 rekey = atoi (val);
295 else if (!strcmp (var, "keepalive")) 311 else if (!strcmp (var, "keepalive"))
296 keepalive = atoi (val); 312 keepalive = atoi (val);
297 else if (!strcmp (var, "mtu")) 313 else if (!strcmp (var, "mtu"))
298 mtu = atoi (val); 314 mtu = atoi (val);
299 else if (!strcmp (var, "if-up")) 315 else if (!strcmp (var, "if-up"))
300 script_if_up = strdup (val); 316 free (script_if_up), script_if_up = strdup (val);
301 else if (!strcmp (var, "node-up")) 317 else if (!strcmp (var, "node-up"))
302 script_node_up = strdup (val); 318 free (script_node_up), script_node_up = strdup (val);
303 else if (!strcmp (var, "node-down")) 319 else if (!strcmp (var, "node-down"))
304 script_node_down = strdup (val); 320 free (script_node_down), script_node_down = strdup (val);
321 else if (!strcmp (var, "pid-file"))
322 free (pidfilename), pidfilename = strdup (val);
323 else if (!strcmp (var, "dns-forw-host"))
324 {
325#if ENABLE_DNS
326 free (dns_forw_host), dns_forw_host = strdup (val);
327#endif
328 }
329 else if (!strcmp (var, "dns-forw-port"))
330 {
331#if ENABLE_DNS
332 dns_forw_port = atoi (val);
333#endif
334 }
305 else if (!strcmp (var, "http-proxy-host")) 335 else if (!strcmp (var, "http-proxy-host"))
306 { 336 {
307#if ENABLE_HTTP_PROXY 337#if ENABLE_HTTP_PROXY
308 proxy_host = strdup (val); 338 free (proxy_host), proxy_host = strdup (val);
309#endif 339#endif
310 } 340 }
311 else if (!strcmp (var, "http-proxy-port")) 341 else if (!strcmp (var, "http-proxy-port"))
312 { 342 {
313#if ENABLE_HTTP_PROXY 343#if ENABLE_HTTP_PROXY
… …
321#endif 351#endif
322 } 352 }
323 353
324 /* node-specific, non-defaultable */ 354 /* node-specific, non-defaultable */
325 else if (node != &default_node && !strcmp (var, "hostname")) 355 else if (node != &default_node && !strcmp (var, "hostname"))
326 {
327 free (node->hostname);
328 node->hostname = strdup (val); 356 free (node->hostname), node->hostname = strdup (val);
329 }
330 357
331 /* node-specific, defaultable */ 358 /* node-specific, defaultable */
332 else if (!strcmp (var, "udp-port")) 359 else if (!strcmp (var, "udp-port"))
333 node->udp_port = atoi (val); 360 node->udp_port = atoi (val);
334 else if (!strcmp (var, "tcp-port")) 361 else if (!strcmp (var, "tcp-port"))
335 node->tcp_port = atoi (val); 362 node->tcp_port = atoi (val);
363 else if (!strcmp (var, "dns-hostname"))
364 {
365#if ENABLE_DNS
366 free (node->dns_hostname), node->dns_hostname = strdup (val);
367#endif
368 }
369 else if (!strcmp (var, "dns-port"))
370 {
371#if ENABLE_DNS
372 node->dns_port = atoi (val);
373#endif
374 }
375 else if (!strcmp (var, "dns-domain"))
376 {
377#if ENABLE_DNS
378 free (node->domain), node->domain = strdup (val);
379#endif
380 }
336 else if (!strcmp (var, "router-priority")) 381 else if (!strcmp (var, "router-priority"))
337 node->routerprio = atoi (val); 382 node->routerprio = atoi (val);
383 else if (!strcmp (var, "max-retry"))
384 node->max_retry = atoi (val);
338 else if (!strcmp (var, "connect")) 385 else if (!strcmp (var, "connect"))
339 { 386 {
340 if (!strcmp (val, "ondemand")) 387 if (!strcmp (val, "ondemand"))
341 node->connectmode = conf_node::C_ONDEMAND; 388 node->connectmode = conf_node::C_ONDEMAND;
342 else if (!strcmp (val, "never")) 389 else if (!strcmp (val, "never"))
… …
345 node->connectmode = conf_node::C_ALWAYS; 392 node->connectmode = conf_node::C_ALWAYS;
346 else if (!strcmp (val, "disabled")) 393 else if (!strcmp (val, "disabled"))
347 node->connectmode = conf_node::C_DISABLED; 394 node->connectmode = conf_node::C_DISABLED;
348 else 395 else
349 slog (L_WARN, 396 slog (L_WARN,
350 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 397 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
351 var, fname, lineno); 398 var, fname, lineno);
352 } 399 }
353 else if (!strcmp (var, "inherit-tos")) 400 else if (!strcmp (var, "inherit-tos"))
354 {
355 parse_bool (node->inherit_tos, "inherit-tos", true, false); 401 parse_bool (node->inherit_tos, "inherit-tos", true, false);
356 }
357 else if (!strcmp (var, "compress")) 402 else if (!strcmp (var, "compress"))
358 {
359 parse_bool (node->compress, "compress", true, false); 403 parse_bool (node->compress, "compress", true, false);
360 }
361 // all these bool options really really cost a lot of executable size! 404 // all these bool options really really cost a lot of executable size!
362 else if (!strcmp (var, "enable-tcp")) 405 else if (!strcmp (var, "enable-tcp"))
363 { 406 {
364#if ENABLE_TCP 407#if ENABLE_TCP
365 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 408 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
367 } 410 }
368 else if (!strcmp (var, "enable-icmp")) 411 else if (!strcmp (var, "enable-icmp"))
369 { 412 {
370#if ENABLE_ICMP 413#if ENABLE_ICMP
371 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 414 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
415#endif
416 }
417 else if (!strcmp (var, "enable-dns"))
418 {
419#if ENABLE_DNS
420 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
372#endif 421#endif
373 } 422 }
374 else if (!strcmp (var, "enable-udp")) 423 else if (!strcmp (var, "enable-udp"))
375 { 424 {
376 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 425 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
381 } 430 }
382 431
383 // unknown or misplaced 432 // unknown or misplaced
384 else 433 else
385 slog (L_WARN, 434 slog (L_WARN,
386 _("unknown or misplaced variable `%s', at '%s' line %d"), 435 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
387 var, fname, lineno); 436 var, fname, lineno);
388 } 437 }
389 438
390 fclose (f); 439 fclose (f);
391 } 440 }
… …
474 printf ("\n"); 523 printf ("\n");
475} 524}
476 525
477configuration::configuration () 526configuration::configuration ()
478{ 527{
528 asprintf (&confbase, "%s/gvpe", CONFDIR);
529
479 init (); 530 init ();
480} 531}
481 532
482configuration::~configuration () 533configuration::~configuration ()
483{ 534{

Diff Legend

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