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.34 by pcg, Thu Mar 17 23:59:37 2005 UTC vs.
Revision 1.38 by pcg, Wed Mar 23 17:03:58 2005 UTC

… …
37#include <openssl/pem.h> 37#include <openssl/pem.h>
38#include <openssl/rsa.h> 38#include <openssl/rsa.h>
39#include <openssl/rand.h> 39#include <openssl/rand.h>
40#include <openssl/bn.h> 40#include <openssl/bn.h>
41 41
42#include "gettext.h"
43
44#include "conf.h" 42#include "conf.h"
45#include "slog.h" 43#include "slog.h"
46#include "util.h" 44#include "util.h"
47 45
48char *confbase; 46char *confbase;
… …
123 default_node.protocols = 0; 121 default_node.protocols = 0;
124 default_node.max_retry = DEFAULT_MAX_RETRY; 122 default_node.max_retry = DEFAULT_MAX_RETRY;
125 123
126#if ENABLE_DNS 124#if ENABLE_DNS
127 default_node.dns_port = 0; // default is 0 == client 125 default_node.dns_port = 0; // default is 0 == client
126
128 dns_forw_host = strdup ("127.0.0.1"); 127 dns_forw_host = strdup ("127.0.0.1");
129 dns_forw_port = 53; 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;
130#endif 133#endif
131 134
132 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 135 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
133} 136}
134 137
… …
160 163
161 cleanup (); 164 cleanup ();
162 init (); 165 init ();
163} 166}
164 167
165#define parse_bool(target,name,trueval,falseval) \ 168#define parse_bool(target,name,trueval,falseval) do { \
166 if (!strcmp (val, "yes")) target = trueval; \ 169 if (!strcmp (val, "yes")) target = trueval; \
167 else if (!strcmp (val, "no")) target = falseval; \ 170 else if (!strcmp (val, "no")) target = falseval; \
168 else if (!strcmp (val, "true")) target = trueval; \ 171 else if (!strcmp (val, "true")) target = trueval; \
169 else if (!strcmp (val, "false")) target = falseval; \ 172 else if (!strcmp (val, "false")) target = falseval; \
170 else if (!strcmp (val, "on")) target = trueval; \ 173 else if (!strcmp (val, "on")) target = trueval; \
171 else if (!strcmp (val, "off")) target = falseval; \ 174 else if (!strcmp (val, "off")) target = falseval; \
172 else \ 175 else \
173 slog (L_WARN, \ 176 slog (L_WARN, \
174 _("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"), \
175 name, var, fname, lineno); 178 name, var, fname, lineno); \
179} while (0)
176 180
177void configuration::read_config (bool need_keys) 181void configuration::read_config (bool need_keys)
178{ 182{
179 char *fname; 183 char *fname;
180 FILE *f; 184 FILE *f;
… …
219 val = strtok (NULL, "\t\n\r ="); 223 val = strtok (NULL, "\t\n\r =");
220 224
221 if (!val || val[0] == '#') 225 if (!val || val[0] == '#')
222 { 226 {
223 slog (L_WARN, 227 slog (L_WARN,
224 _("no value for variable `%s', at '%s' line %d"), 228 _("no value for variable `%s', at '%s' line %d, skipping."),
225 var, fname, lineno); 229 var, fname, lineno);
226 break; 230 continue;
227 } 231 }
228 232
229 if (!strcmp (var, "on")) 233 if (!strcmp (var, "on"))
230 { 234 {
231 if (!::thisnode 235 if (!::thisnode
… …
303 thisnode = node; 307 thisnode = node;
304 } 308 }
305 else if (!strcmp (var, "private-key")) 309 else if (!strcmp (var, "private-key"))
306 free (prikeyfile), prikeyfile = strdup (val); 310 free (prikeyfile), prikeyfile = strdup (val);
307 else if (!strcmp (var, "ifpersist")) 311 else if (!strcmp (var, "ifpersist"))
308 {
309 parse_bool (ifpersist, "ifpersist", true, false); 312 parse_bool (ifpersist, "ifpersist", true, false);
310 }
311 else if (!strcmp (var, "ifname")) 313 else if (!strcmp (var, "ifname"))
312 free (ifname), ifname = strdup (val); 314 free (ifname), ifname = strdup (val);
313 else if (!strcmp (var, "rekey")) 315 else if (!strcmp (var, "rekey"))
314 rekey = atoi (val); 316 rekey = atoi (val);
315 else if (!strcmp (var, "keepalive")) 317 else if (!strcmp (var, "keepalive"))
… …
334 { 336 {
335#if ENABLE_DNS 337#if ENABLE_DNS
336 dns_forw_port = atoi (val); 338 dns_forw_port = atoi (val);
337#endif 339#endif
338 } 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 }
339 else if (!strcmp (var, "http-proxy-host")) 365 else if (!strcmp (var, "http-proxy-host"))
340 { 366 {
341#if ENABLE_HTTP_PROXY 367#if ENABLE_HTTP_PROXY
342 free (proxy_host), proxy_host = strdup (val); 368 free (proxy_host), proxy_host = strdup (val);
343#endif 369#endif
… …
396 node->connectmode = conf_node::C_ALWAYS; 422 node->connectmode = conf_node::C_ALWAYS;
397 else if (!strcmp (val, "disabled")) 423 else if (!strcmp (val, "disabled"))
398 node->connectmode = conf_node::C_DISABLED; 424 node->connectmode = conf_node::C_DISABLED;
399 else 425 else
400 slog (L_WARN, 426 slog (L_WARN,
401 _("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."),
402 var, fname, lineno); 428 var, fname, lineno);
403 } 429 }
404 else if (!strcmp (var, "inherit-tos")) 430 else if (!strcmp (var, "inherit-tos"))
405 {
406 parse_bool (node->inherit_tos, "inherit-tos", true, false); 431 parse_bool (node->inherit_tos, "inherit-tos", true, false);
407 }
408 else if (!strcmp (var, "compress")) 432 else if (!strcmp (var, "compress"))
409 {
410 parse_bool (node->compress, "compress", true, false); 433 parse_bool (node->compress, "compress", true, false);
411 }
412 // 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!
413 else if (!strcmp (var, "enable-tcp")) 435 else if (!strcmp (var, "enable-tcp"))
414 { 436 {
415#if ENABLE_TCP 437#if ENABLE_TCP
416 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;
… …
438 } 460 }
439 461
440 // unknown or misplaced 462 // unknown or misplaced
441 else 463 else
442 slog (L_WARN, 464 slog (L_WARN,
443 _("unknown or misplaced variable `%s', at '%s' line %d"), 465 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
444 var, fname, lineno); 466 var, fname, lineno);
445 } 467 }
446 468
447 fclose (f); 469 fclose (f);
448 } 470 }

Diff Legend

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