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.26 by pcg, Wed May 12 13:32:13 2004 UTC vs.
Revision 1.34 by pcg, Thu Mar 17 23:59:37 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
… …
93 if (rsa_key) 95 if (rsa_key)
94 RSA_free (rsa_key); 96 RSA_free (rsa_key);
95 97
96 free (nodename); 98 free (nodename);
97 free (hostname); 99 free (hostname);
100#if ENABLE_DNS
101 free (domain);
102 free (dns_hostname);
103#endif
98} 104}
99 105
100void configuration::init () 106void configuration::init ()
101{ 107{
102 memset (this, 0, sizeof (*this)); 108 memset (this, 0, sizeof (*this));
… …
112 118
113 default_node.udp_port = DEFAULT_UDPPORT; 119 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 120 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
115 default_node.connectmode = conf_node::C_ALWAYS; 121 default_node.connectmode = conf_node::C_ALWAYS;
116 default_node.compress = true; 122 default_node.compress = true;
117 default_node.protocols = PROT_UDPv4; 123 default_node.protocols = 0;
124 default_node.max_retry = DEFAULT_MAX_RETRY;
118 125
126#if ENABLE_DNS
127 default_node.dns_port = 0; // default is 0 == client
128 dns_forw_host = strdup ("127.0.0.1");
129 dns_forw_port = 53;
130#endif
131
119 conf.pidfilename = strdup (LOCALSTATEDIR "/run/vped.pid"); 132 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
120} 133}
121 134
122void configuration::cleanup() 135void configuration::cleanup()
123{ 136{
124 if (rsa_key) 137 if (rsa_key)
125 RSA_free (rsa_key); 138 RSA_free (rsa_key);
126 139
127 rsa_key = 0; 140 rsa_key = 0;
128 141
129 free (pidfilename); pidfilename = 0; 142 free (pidfilename); pidfilename = 0;
130 free (ifname); ifname = 0; 143 free (ifname); ifname = 0;
131#if ENABLE_HTTP_PROXY 144#if ENABLE_HTTP_PROXY
132 free (proxy_host); proxy_host = 0; 145 free (proxy_host); proxy_host = 0;
133 free (proxy_auth); proxy_auth = 0; 146 free (proxy_auth); proxy_auth = 0;
147#endif
148#if ENABLE_DNS
149 free (dns_forw_host); dns_forw_host = 0;
134#endif 150#endif
135} 151}
136 152
137void 153void
138configuration::clear_config () 154configuration::clear_config ()
… …
163 char *fname; 179 char *fname;
164 FILE *f; 180 FILE *f;
165 181
166 clear_config (); 182 clear_config ();
167 183
168 asprintf (&fname, "%s/vped.conf", confbase); 184 asprintf (&fname, "%s/gvpe.conf", confbase);
169 f = fopen (fname, "r"); 185 f = fopen (fname, "r");
170 186
171 if (f) 187 if (f)
172 { 188 {
173 char line[16384]; 189 char line[16384];
… …
306 free (script_node_up), script_node_up = strdup (val); 322 free (script_node_up), script_node_up = strdup (val);
307 else if (!strcmp (var, "node-down")) 323 else if (!strcmp (var, "node-down"))
308 free (script_node_down), script_node_down = strdup (val); 324 free (script_node_down), script_node_down = strdup (val);
309 else if (!strcmp (var, "pid-file")) 325 else if (!strcmp (var, "pid-file"))
310 free (pidfilename), pidfilename = strdup (val); 326 free (pidfilename), pidfilename = strdup (val);
327 else if (!strcmp (var, "dns-forw-host"))
328 {
329#if ENABLE_DNS
330 free (dns_forw_host), dns_forw_host = strdup (val);
331#endif
332 }
333 else if (!strcmp (var, "dns-forw-port"))
334 {
335#if ENABLE_DNS
336 dns_forw_port = atoi (val);
337#endif
338 }
311 else if (!strcmp (var, "http-proxy-host")) 339 else if (!strcmp (var, "http-proxy-host"))
312 { 340 {
313#if ENABLE_HTTP_PROXY 341#if ENABLE_HTTP_PROXY
314 free (proxy_host), proxy_host = strdup (val); 342 free (proxy_host), proxy_host = strdup (val);
315#endif 343#endif
… …
334 /* node-specific, defaultable */ 362 /* node-specific, defaultable */
335 else if (!strcmp (var, "udp-port")) 363 else if (!strcmp (var, "udp-port"))
336 node->udp_port = atoi (val); 364 node->udp_port = atoi (val);
337 else if (!strcmp (var, "tcp-port")) 365 else if (!strcmp (var, "tcp-port"))
338 node->tcp_port = atoi (val); 366 node->tcp_port = atoi (val);
367 else if (!strcmp (var, "dns-hostname"))
368 {
369#if ENABLE_DNS
370 free (node->dns_hostname), node->dns_hostname = strdup (val);
371#endif
372 }
339 else if (!strcmp (var, "dns-port")) 373 else if (!strcmp (var, "dns-port"))
374 {
375#if ENABLE_DNS
340 node->dns_port = atoi (val); 376 node->dns_port = atoi (val);
377#endif
378 }
379 else if (!strcmp (var, "dns-domain"))
380 {
381#if ENABLE_DNS
382 free (node->domain), node->domain = strdup (val);
383#endif
384 }
341 else if (!strcmp (var, "router-priority")) 385 else if (!strcmp (var, "router-priority"))
342 node->routerprio = atoi (val); 386 node->routerprio = atoi (val);
387 else if (!strcmp (var, "max-retry"))
388 node->max_retry = atoi (val);
343 else if (!strcmp (var, "connect")) 389 else if (!strcmp (var, "connect"))
344 { 390 {
345 if (!strcmp (val, "ondemand")) 391 if (!strcmp (val, "ondemand"))
346 node->connectmode = conf_node::C_ONDEMAND; 392 node->connectmode = conf_node::C_ONDEMAND;
347 else if (!strcmp (val, "never")) 393 else if (!strcmp (val, "never"))
… …
350 node->connectmode = conf_node::C_ALWAYS; 396 node->connectmode = conf_node::C_ALWAYS;
351 else if (!strcmp (val, "disabled")) 397 else if (!strcmp (val, "disabled"))
352 node->connectmode = conf_node::C_DISABLED; 398 node->connectmode = conf_node::C_DISABLED;
353 else 399 else
354 slog (L_WARN, 400 slog (L_WARN,
355 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 401 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
356 var, fname, lineno); 402 var, fname, lineno);
357 } 403 }
358 else if (!strcmp (var, "inherit-tos")) 404 else if (!strcmp (var, "inherit-tos"))
359 { 405 {
360 parse_bool (node->inherit_tos, "inherit-tos", true, false); 406 parse_bool (node->inherit_tos, "inherit-tos", true, false);
361 } 407 }
… …
385 else if (!strcmp (var, "enable-udp")) 431 else if (!strcmp (var, "enable-udp"))
386 { 432 {
387 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 433 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
388 } 434 }
389 else if (!strcmp (var, "enable-rawip")) 435 else if (!strcmp (var, "enable-rawip"))
390 {; 436 {
391 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 437 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
392 } 438 }
393 439
394 // unknown or misplaced 440 // unknown or misplaced
395 else 441 else
… …
485 printf ("\n"); 531 printf ("\n");
486} 532}
487 533
488configuration::configuration () 534configuration::configuration ()
489{ 535{
490 asprintf (&confbase, "%s/vpe", CONFDIR); 536 asprintf (&confbase, "%s/gvpe", CONFDIR);
491 537
492 init (); 538 init ();
493} 539}
494 540
495configuration::~configuration () 541configuration::~configuration ()

Diff Legend

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