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.27 by pcg, Fri Jun 11 15:56:31 2004 UTC vs.
Revision 1.37 by pcg, Wed Mar 23 14:33:34 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
… …
34#include <openssl/err.h> 36#include <openssl/err.h>
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
40#include "gettext.h"
41 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
… …
93 if (rsa_key) 93 if (rsa_key)
94 RSA_free (rsa_key); 94 RSA_free (rsa_key);
95 95
96 free (nodename); 96 free (nodename);
97 free (hostname); 97 free (hostname);
98#if ENABLE_DNS
99 free (domain);
100 free (dns_hostname);
101#endif
98} 102}
99 103
100void configuration::init () 104void configuration::init ()
101{ 105{
102 memset (this, 0, sizeof (*this)); 106 memset (this, 0, sizeof (*this));
… …
112 116
113 default_node.udp_port = DEFAULT_UDPPORT; 117 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
115 default_node.connectmode = conf_node::C_ALWAYS; 119 default_node.connectmode = conf_node::C_ALWAYS;
116 default_node.compress = true; 120 default_node.compress = true;
117 default_node.protocols = PROT_UDPv4; 121 default_node.protocols = 0;
118 default_node.max_retry = DEFAULT_MAX_RETRY; 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
119 129
120 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 130 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
121} 131}
122 132
123void configuration::cleanup() 133void configuration::cleanup()
… …
125 if (rsa_key) 135 if (rsa_key)
126 RSA_free (rsa_key); 136 RSA_free (rsa_key);
127 137
128 rsa_key = 0; 138 rsa_key = 0;
129 139
130 free (pidfilename); pidfilename = 0; 140 free (pidfilename); pidfilename = 0;
131 free (ifname); ifname = 0; 141 free (ifname); ifname = 0;
132#if ENABLE_HTTP_PROXY 142#if ENABLE_HTTP_PROXY
133 free (proxy_host); proxy_host = 0; 143 free (proxy_host); proxy_host = 0;
134 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;
135#endif 148#endif
136} 149}
137 150
138void 151void
139configuration::clear_config () 152configuration::clear_config ()
… …
145 158
146 cleanup (); 159 cleanup ();
147 init (); 160 init ();
148} 161}
149 162
150#define parse_bool(target,name,trueval,falseval) \ 163#define parse_bool(target,name,trueval,falseval) do { \
151 if (!strcmp (val, "yes")) target = trueval; \ 164 if (!strcmp (val, "yes")) target = trueval; \
152 else if (!strcmp (val, "no")) target = falseval; \ 165 else if (!strcmp (val, "no")) target = falseval; \
153 else if (!strcmp (val, "true")) target = trueval; \ 166 else if (!strcmp (val, "true")) target = trueval; \
154 else if (!strcmp (val, "false")) target = falseval; \ 167 else if (!strcmp (val, "false")) target = falseval; \
155 else if (!strcmp (val, "on")) target = trueval; \ 168 else if (!strcmp (val, "on")) target = trueval; \
156 else if (!strcmp (val, "off")) target = falseval; \ 169 else if (!strcmp (val, "off")) target = falseval; \
157 else \ 170 else \
158 slog (L_WARN, \ 171 slog (L_WARN, \
159 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 172 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
160 name, var, fname, lineno); 173 name, var, fname, lineno); \
174} while (0)
161 175
162void configuration::read_config (bool need_keys) 176void configuration::read_config (bool need_keys)
163{ 177{
164 char *fname; 178 char *fname;
165 FILE *f; 179 FILE *f;
… …
204 val = strtok (NULL, "\t\n\r ="); 218 val = strtok (NULL, "\t\n\r =");
205 219
206 if (!val || val[0] == '#') 220 if (!val || val[0] == '#')
207 { 221 {
208 slog (L_WARN, 222 slog (L_WARN,
209 _("no value for variable `%s', at '%s' line %d"), 223 _("no value for variable `%s', at '%s' line %d, skipping."),
210 var, fname, lineno); 224 var, fname, lineno);
211 break; 225 continue;
212 } 226 }
213 227
214 if (!strcmp (var, "on")) 228 if (!strcmp (var, "on"))
215 { 229 {
216 if (!::thisnode 230 if (!::thisnode
… …
288 thisnode = node; 302 thisnode = node;
289 } 303 }
290 else if (!strcmp (var, "private-key")) 304 else if (!strcmp (var, "private-key"))
291 free (prikeyfile), prikeyfile = strdup (val); 305 free (prikeyfile), prikeyfile = strdup (val);
292 else if (!strcmp (var, "ifpersist")) 306 else if (!strcmp (var, "ifpersist"))
293 {
294 parse_bool (ifpersist, "ifpersist", true, false); 307 parse_bool (ifpersist, "ifpersist", true, false);
295 }
296 else if (!strcmp (var, "ifname")) 308 else if (!strcmp (var, "ifname"))
297 free (ifname), ifname = strdup (val); 309 free (ifname), ifname = strdup (val);
298 else if (!strcmp (var, "rekey")) 310 else if (!strcmp (var, "rekey"))
299 rekey = atoi (val); 311 rekey = atoi (val);
300 else if (!strcmp (var, "keepalive")) 312 else if (!strcmp (var, "keepalive"))
… …
307 free (script_node_up), script_node_up = strdup (val); 319 free (script_node_up), script_node_up = strdup (val);
308 else if (!strcmp (var, "node-down")) 320 else if (!strcmp (var, "node-down"))
309 free (script_node_down), script_node_down = strdup (val); 321 free (script_node_down), script_node_down = strdup (val);
310 else if (!strcmp (var, "pid-file")) 322 else if (!strcmp (var, "pid-file"))
311 free (pidfilename), pidfilename = strdup (val); 323 free (pidfilename), pidfilename = strdup (val);
324 else if (!strcmp (var, "dns-forw-host"))
325 {
326#if ENABLE_DNS
327 free (dns_forw_host), dns_forw_host = strdup (val);
328#endif
329 }
330 else if (!strcmp (var, "dns-forw-port"))
331 {
332#if ENABLE_DNS
333 dns_forw_port = atoi (val);
334#endif
335 }
312 else if (!strcmp (var, "http-proxy-host")) 336 else if (!strcmp (var, "http-proxy-host"))
313 { 337 {
314#if ENABLE_HTTP_PROXY 338#if ENABLE_HTTP_PROXY
315 free (proxy_host), proxy_host = strdup (val); 339 free (proxy_host), proxy_host = strdup (val);
316#endif 340#endif
… …
335 /* node-specific, defaultable */ 359 /* node-specific, defaultable */
336 else if (!strcmp (var, "udp-port")) 360 else if (!strcmp (var, "udp-port"))
337 node->udp_port = atoi (val); 361 node->udp_port = atoi (val);
338 else if (!strcmp (var, "tcp-port")) 362 else if (!strcmp (var, "tcp-port"))
339 node->tcp_port = atoi (val); 363 node->tcp_port = atoi (val);
364 else if (!strcmp (var, "dns-hostname"))
365 {
366#if ENABLE_DNS
367 free (node->dns_hostname), node->dns_hostname = strdup (val);
368#endif
369 }
340 else if (!strcmp (var, "dns-port")) 370 else if (!strcmp (var, "dns-port"))
371 {
372#if ENABLE_DNS
341 node->dns_port = atoi (val); 373 node->dns_port = atoi (val);
374#endif
375 }
376 else if (!strcmp (var, "dns-domain"))
377 {
378#if ENABLE_DNS
379 free (node->domain), node->domain = strdup (val);
380#endif
381 }
342 else if (!strcmp (var, "router-priority")) 382 else if (!strcmp (var, "router-priority"))
343 node->routerprio = atoi (val); 383 node->routerprio = atoi (val);
344 else if (!strcmp (var, "max-retry")) 384 else if (!strcmp (var, "max-retry"))
345 node->max_retry = atoi (val); 385 node->max_retry = atoi (val);
346 else if (!strcmp (var, "connect")) 386 else if (!strcmp (var, "connect"))
… …
353 node->connectmode = conf_node::C_ALWAYS; 393 node->connectmode = conf_node::C_ALWAYS;
354 else if (!strcmp (val, "disabled")) 394 else if (!strcmp (val, "disabled"))
355 node->connectmode = conf_node::C_DISABLED; 395 node->connectmode = conf_node::C_DISABLED;
356 else 396 else
357 slog (L_WARN, 397 slog (L_WARN,
358 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 398 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d, ignoring."),
359 var, fname, lineno); 399 var, fname, lineno);
360 } 400 }
361 else if (!strcmp (var, "inherit-tos")) 401 else if (!strcmp (var, "inherit-tos"))
362 {
363 parse_bool (node->inherit_tos, "inherit-tos", true, false); 402 parse_bool (node->inherit_tos, "inherit-tos", true, false);
364 }
365 else if (!strcmp (var, "compress")) 403 else if (!strcmp (var, "compress"))
366 {
367 parse_bool (node->compress, "compress", true, false); 404 parse_bool (node->compress, "compress", true, false);
368 }
369 // all these bool options really really cost a lot of executable size! 405 // all these bool options really really cost a lot of executable size!
370 else if (!strcmp (var, "enable-tcp")) 406 else if (!strcmp (var, "enable-tcp"))
371 { 407 {
372#if ENABLE_TCP 408#if ENABLE_TCP
373 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 409 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
… …
388 else if (!strcmp (var, "enable-udp")) 424 else if (!strcmp (var, "enable-udp"))
389 { 425 {
390 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 426 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
391 } 427 }
392 else if (!strcmp (var, "enable-rawip")) 428 else if (!strcmp (var, "enable-rawip"))
393 {; 429 {
394 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 430 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
395 } 431 }
396 432
397 // unknown or misplaced 433 // unknown or misplaced
398 else 434 else
399 slog (L_WARN, 435 slog (L_WARN,
400 _("unknown or misplaced variable `%s', at '%s' line %d"), 436 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
401 var, fname, lineno); 437 var, fname, lineno);
402 } 438 }
403 439
404 fclose (f); 440 fclose (f);
405 } 441 }

Diff Legend

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