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.28 by pcg, Tue Mar 1 04:38:21 2005 UTC vs.
Revision 1.35 by pcg, Fri Mar 18 01:53:05 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
98 free (domain); 99 free (domain);
100 free (dns_hostname);
101#endif
99} 102}
100 103
101void configuration::init () 104void configuration::init ()
102{ 105{
103 memset (this, 0, sizeof (*this)); 106 memset (this, 0, sizeof (*this));
… …
113 116
114 default_node.udp_port = DEFAULT_UDPPORT; 117 default_node.udp_port = DEFAULT_UDPPORT;
115 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 118 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
116 default_node.connectmode = conf_node::C_ALWAYS; 119 default_node.connectmode = conf_node::C_ALWAYS;
117 default_node.compress = true; 120 default_node.compress = true;
118 default_node.protocols = PROT_UDPv4; 121 default_node.protocols = 0;
119 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
120 129
121 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 130 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
122} 131}
123 132
124void configuration::cleanup() 133void configuration::cleanup()
… …
311 free (script_node_up), script_node_up = strdup (val); 320 free (script_node_up), script_node_up = strdup (val);
312 else if (!strcmp (var, "node-down")) 321 else if (!strcmp (var, "node-down"))
313 free (script_node_down), script_node_down = strdup (val); 322 free (script_node_down), script_node_down = strdup (val);
314 else if (!strcmp (var, "pid-file")) 323 else if (!strcmp (var, "pid-file"))
315 free (pidfilename), pidfilename = strdup (val); 324 free (pidfilename), pidfilename = strdup (val);
316 else if (!strcmp (var, "dns-forwarder-host")) 325 else if (!strcmp (var, "dns-forw-host"))
317 { 326 {
318#if ENABLE_DNS 327#if ENABLE_DNS
319 free (dns_forw_host), dns_forw_host = strdup (val); 328 free (dns_forw_host), dns_forw_host = strdup (val);
320#endif 329#endif
321 } 330 }
322 else if (!strcmp (var, "dns-forwarder-port")) 331 else if (!strcmp (var, "dns-forw-port"))
323 { 332 {
324#if ENABLE_DNS 333#if ENABLE_DNS
325 dns_forw_port = atoi (val); 334 dns_forw_port = atoi (val);
326#endif 335#endif
327 } 336 }
… …
351 /* node-specific, defaultable */ 360 /* node-specific, defaultable */
352 else if (!strcmp (var, "udp-port")) 361 else if (!strcmp (var, "udp-port"))
353 node->udp_port = atoi (val); 362 node->udp_port = atoi (val);
354 else if (!strcmp (var, "tcp-port")) 363 else if (!strcmp (var, "tcp-port"))
355 node->tcp_port = atoi (val); 364 node->tcp_port = atoi (val);
365 else if (!strcmp (var, "dns-hostname"))
366 {
367#if ENABLE_DNS
368 free (node->dns_hostname), node->dns_hostname = strdup (val);
369#endif
370 }
356 else if (!strcmp (var, "dns-port")) 371 else if (!strcmp (var, "dns-port"))
357 { 372 {
358#if ENABLE_DNS 373#if ENABLE_DNS
359 node->dns_port = atoi (val); 374 node->dns_port = atoi (val);
360#endif 375#endif

Diff Legend

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