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.32 by pcg, Sat Mar 5 15:48:54 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
127 dns_forw_host = strdup ("127.0.0.1");
128 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;
129#endif 133#endif
130 134
131 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 135 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
132} 136}
133 137
… …
159 163
160 cleanup (); 164 cleanup ();
161 init (); 165 init ();
162} 166}
163 167
164#define parse_bool(target,name,trueval,falseval) \ 168#define parse_bool(target,name,trueval,falseval) do { \
165 if (!strcmp (val, "yes")) target = trueval; \ 169 if (!strcmp (val, "yes")) target = trueval; \
166 else if (!strcmp (val, "no")) target = falseval; \ 170 else if (!strcmp (val, "no")) target = falseval; \
167 else if (!strcmp (val, "true")) target = trueval; \ 171 else if (!strcmp (val, "true")) target = trueval; \
168 else if (!strcmp (val, "false")) target = falseval; \ 172 else if (!strcmp (val, "false")) target = falseval; \
169 else if (!strcmp (val, "on")) target = trueval; \ 173 else if (!strcmp (val, "on")) target = trueval; \
170 else if (!strcmp (val, "off")) target = falseval; \ 174 else if (!strcmp (val, "off")) target = falseval; \
171 else \ 175 else \
172 slog (L_WARN, \ 176 slog (L_WARN, \
173 _("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"), \
174 name, var, fname, lineno); 178 name, var, fname, lineno); \
179} while (0)
175 180
176void configuration::read_config (bool need_keys) 181void configuration::read_config (bool need_keys)
177{ 182{
178 char *fname; 183 char *fname;
179 FILE *f; 184 FILE *f;
… …
218 val = strtok (NULL, "\t\n\r ="); 223 val = strtok (NULL, "\t\n\r =");
219 224
220 if (!val || val[0] == '#') 225 if (!val || val[0] == '#')
221 { 226 {
222 slog (L_WARN, 227 slog (L_WARN,
223 _("no value for variable `%s', at '%s' line %d"), 228 _("no value for variable `%s', at '%s' line %d, skipping."),
224 var, fname, lineno); 229 var, fname, lineno);
225 break; 230 continue;
226 } 231 }
227 232
228 if (!strcmp (var, "on")) 233 if (!strcmp (var, "on"))
229 { 234 {
230 if (!::thisnode 235 if (!::thisnode
… …
302 thisnode = node; 307 thisnode = node;
303 } 308 }
304 else if (!strcmp (var, "private-key")) 309 else if (!strcmp (var, "private-key"))
305 free (prikeyfile), prikeyfile = strdup (val); 310 free (prikeyfile), prikeyfile = strdup (val);
306 else if (!strcmp (var, "ifpersist")) 311 else if (!strcmp (var, "ifpersist"))
307 {
308 parse_bool (ifpersist, "ifpersist", true, false); 312 parse_bool (ifpersist, "ifpersist", true, false);
309 }
310 else if (!strcmp (var, "ifname")) 313 else if (!strcmp (var, "ifname"))
311 free (ifname), ifname = strdup (val); 314 free (ifname), ifname = strdup (val);
312 else if (!strcmp (var, "rekey")) 315 else if (!strcmp (var, "rekey"))
313 rekey = atoi (val); 316 rekey = atoi (val);
314 else if (!strcmp (var, "keepalive")) 317 else if (!strcmp (var, "keepalive"))
… …
321 free (script_node_up), script_node_up = strdup (val); 324 free (script_node_up), script_node_up = strdup (val);
322 else if (!strcmp (var, "node-down")) 325 else if (!strcmp (var, "node-down"))
323 free (script_node_down), script_node_down = strdup (val); 326 free (script_node_down), script_node_down = strdup (val);
324 else if (!strcmp (var, "pid-file")) 327 else if (!strcmp (var, "pid-file"))
325 free (pidfilename), pidfilename = strdup (val); 328 free (pidfilename), pidfilename = strdup (val);
326#if ENABLE_DNS
327 else if (!strcmp (var, "dns-forw-host")) 329 else if (!strcmp (var, "dns-forw-host"))
330 {
331#if ENABLE_DNS
328 free (dns_forw_host), dns_forw_host = strdup (val); 332 free (dns_forw_host), dns_forw_host = strdup (val);
333#endif
334 }
329 else if (!strcmp (var, "dns-forw-port")) 335 else if (!strcmp (var, "dns-forw-port"))
336 {
337#if ENABLE_DNS
330 dns_forw_port = atoi (val); 338 dns_forw_port = atoi (val);
331#endif 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 }
332 else if (!strcmp (var, "http-proxy-host")) 365 else if (!strcmp (var, "http-proxy-host"))
333 { 366 {
334#if ENABLE_HTTP_PROXY 367#if ENABLE_HTTP_PROXY
335 free (proxy_host), proxy_host = strdup (val); 368 free (proxy_host), proxy_host = strdup (val);
336#endif 369#endif
… …
355 /* node-specific, defaultable */ 388 /* node-specific, defaultable */
356 else if (!strcmp (var, "udp-port")) 389 else if (!strcmp (var, "udp-port"))
357 node->udp_port = atoi (val); 390 node->udp_port = atoi (val);
358 else if (!strcmp (var, "tcp-port")) 391 else if (!strcmp (var, "tcp-port"))
359 node->tcp_port = atoi (val); 392 node->tcp_port = atoi (val);
360#if ENABLE_DNS
361 else if (!strcmp (var, "dns-hostname")) 393 else if (!strcmp (var, "dns-hostname"))
394 {
395#if ENABLE_DNS
362 free (node->dns_hostname), node->dns_hostname = strdup (val); 396 free (node->dns_hostname), node->dns_hostname = strdup (val);
397#endif
398 }
363 else if (!strcmp (var, "dns-port")) 399 else if (!strcmp (var, "dns-port"))
400 {
401#if ENABLE_DNS
364 node->dns_port = atoi (val); 402 node->dns_port = atoi (val);
365#endif 403#endif
404 }
366 else if (!strcmp (var, "dns-domain")) 405 else if (!strcmp (var, "dns-domain"))
367 { 406 {
368#if ENABLE_DNS 407#if ENABLE_DNS
369 free (node->domain), node->domain = strdup (val); 408 free (node->domain), node->domain = strdup (val);
370#endif 409#endif
… …
383 node->connectmode = conf_node::C_ALWAYS; 422 node->connectmode = conf_node::C_ALWAYS;
384 else if (!strcmp (val, "disabled")) 423 else if (!strcmp (val, "disabled"))
385 node->connectmode = conf_node::C_DISABLED; 424 node->connectmode = conf_node::C_DISABLED;
386 else 425 else
387 slog (L_WARN, 426 slog (L_WARN,
388 _("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."),
389 var, fname, lineno); 428 var, fname, lineno);
390 } 429 }
391 else if (!strcmp (var, "inherit-tos")) 430 else if (!strcmp (var, "inherit-tos"))
392 {
393 parse_bool (node->inherit_tos, "inherit-tos", true, false); 431 parse_bool (node->inherit_tos, "inherit-tos", true, false);
394 }
395 else if (!strcmp (var, "compress")) 432 else if (!strcmp (var, "compress"))
396 {
397 parse_bool (node->compress, "compress", true, false); 433 parse_bool (node->compress, "compress", true, false);
398 }
399 // 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!
400 else if (!strcmp (var, "enable-tcp")) 435 else if (!strcmp (var, "enable-tcp"))
401 { 436 {
402#if ENABLE_TCP 437#if ENABLE_TCP
403 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;
… …
425 } 460 }
426 461
427 // unknown or misplaced 462 // unknown or misplaced
428 else 463 else
429 slog (L_WARN, 464 slog (L_WARN,
430 _("unknown or misplaced variable `%s', at '%s' line %d"), 465 _("unknown or misplaced variable `%s', at '%s' line %d, skipping."),
431 var, fname, lineno); 466 var, fname, lineno);
432 } 467 }
433 468
434 fclose (f); 469 fclose (f);
435 } 470 }

Diff Legend

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