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.23 by pcg, Thu Jan 29 19:30:08 2004 UTC vs.
Revision 1.33 by pcg, Sun Mar 6 18:34:46 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
… …
44#include "util.h" 46#include "util.h"
45 47
46char *confbase; 48char *confbase;
47char *thisnode; 49char *thisnode;
48char *identname; 50char *identname;
49char *pidfilename;
50 51
51struct configuration conf; 52struct configuration conf;
52 53
53u8 best_protocol (u8 protset) 54u8 best_protocol (u8 protset)
54{ 55{
55 if (protset & PROT_IPv4 ) return PROT_IPv4; 56 if (protset & PROT_IPv4 ) return PROT_IPv4;
56 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 57 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
57 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 58 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
58 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 59 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
60 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
59 61
60 return 0; 62 return 0;
61} 63}
62 64
63const char *strprotocol (u8 protocol) 65const char *strprotocol (u8 protocol)
64{ 66{
65 if (protocol & PROT_IPv4 ) return "rawip"; 67 if (protocol & PROT_IPv4 ) return "rawip";
66 if (protocol & PROT_ICMPv4) return "icmp"; 68 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4 ) return "udp"; 69 if (protocol & PROT_UDPv4 ) return "udp";
68 if (protocol & PROT_TCPv4 ) return "tcp"; 70 if (protocol & PROT_TCPv4 ) return "tcp";
71 if (protocol & PROT_DNSv4 ) return "dns";
69 72
70 return "<unknown>"; 73 return "<unknown>";
71} 74}
72 75
73void 76void
… …
92 if (rsa_key) 95 if (rsa_key)
93 RSA_free (rsa_key); 96 RSA_free (rsa_key);
94 97
95 free (nodename); 98 free (nodename);
96 free (hostname); 99 free (hostname);
100#if ENABLE_DNS
101 free (domain);
102 free (dns_hostname);
103#endif
97} 104}
98 105
99void configuration::init () 106void configuration::init ()
100{ 107{
101 memset (this, 0, sizeof (*this)); 108 memset (this, 0, sizeof (*this));
… …
108#if ENABLE_ICMP 115#if ENABLE_ICMP
109 icmp_type = ICMP_ECHOREPLY; 116 icmp_type = ICMP_ECHOREPLY;
110#endif 117#endif
111 118
112 default_node.udp_port = DEFAULT_UDPPORT; 119 default_node.udp_port = DEFAULT_UDPPORT;
113 default_node.tcp_port = DEFAULT_UDPPORT; 120 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
114 default_node.connectmode = conf_node::C_ALWAYS; 121 default_node.connectmode = conf_node::C_ALWAYS;
115 default_node.compress = true; 122 default_node.compress = true;
116 default_node.protocols = PROT_UDPv4; 123 default_node.protocols = 0;
124 default_node.max_retry = DEFAULT_MAX_RETRY;
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
132 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
117} 133}
118 134
119void configuration::cleanup() 135void configuration::cleanup()
120{ 136{
121 if (rsa_key) 137 if (rsa_key)
122 RSA_free (rsa_key); 138 RSA_free (rsa_key);
123 139
124 rsa_key = 0; 140 rsa_key = 0;
125 141
142 free (pidfilename); pidfilename = 0;
126 free (ifname); ifname = 0; 143 free (ifname); ifname = 0;
127#if ENABLE_HTTP_PROXY 144#if ENABLE_HTTP_PROXY
128 free (proxy_host); proxy_host = 0; 145 free (proxy_host); proxy_host = 0;
129 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;
130#endif 150#endif
131} 151}
132 152
133void 153void
134configuration::clear_config () 154configuration::clear_config ()
… …
159 char *fname; 179 char *fname;
160 FILE *f; 180 FILE *f;
161 181
162 clear_config (); 182 clear_config ();
163 183
164 asprintf (&fname, "%s/vped.conf", confbase); 184 asprintf (&fname, "%s/gvpe.conf", confbase);
165 f = fopen (fname, "r"); 185 f = fopen (fname, "r");
166 186
167 if (f) 187 if (f)
168 { 188 {
169 char line[16384]; 189 char line[16384];
… …
281 301
282 if (::thisnode && !strcmp (node->nodename, ::thisnode)) 302 if (::thisnode && !strcmp (node->nodename, ::thisnode))
283 thisnode = node; 303 thisnode = node;
284 } 304 }
285 else if (!strcmp (var, "private-key")) 305 else if (!strcmp (var, "private-key"))
286 prikeyfile = strdup (val); 306 free (prikeyfile), prikeyfile = strdup (val);
287 else if (!strcmp (var, "ifpersist")) 307 else if (!strcmp (var, "ifpersist"))
288 { 308 {
289 parse_bool (ifpersist, "ifpersist", true, false); 309 parse_bool (ifpersist, "ifpersist", true, false);
290 } 310 }
291 else if (!strcmp (var, "ifname")) 311 else if (!strcmp (var, "ifname"))
292 ifname = strdup (val); 312 free (ifname), ifname = strdup (val);
293 else if (!strcmp (var, "rekey")) 313 else if (!strcmp (var, "rekey"))
294 rekey = atoi (val); 314 rekey = atoi (val);
295 else if (!strcmp (var, "keepalive")) 315 else if (!strcmp (var, "keepalive"))
296 keepalive = atoi (val); 316 keepalive = atoi (val);
297 else if (!strcmp (var, "mtu")) 317 else if (!strcmp (var, "mtu"))
298 mtu = atoi (val); 318 mtu = atoi (val);
299 else if (!strcmp (var, "if-up")) 319 else if (!strcmp (var, "if-up"))
300 script_if_up = strdup (val); 320 free (script_if_up), script_if_up = strdup (val);
301 else if (!strcmp (var, "node-up")) 321 else if (!strcmp (var, "node-up"))
302 script_node_up = strdup (val); 322 free (script_node_up), script_node_up = strdup (val);
303 else if (!strcmp (var, "node-down")) 323 else if (!strcmp (var, "node-down"))
304 script_node_down = strdup (val); 324 free (script_node_down), script_node_down = strdup (val);
325 else if (!strcmp (var, "pid-file"))
326 free (pidfilename), pidfilename = strdup (val);
327#if ENABLE_DNS
328 else if (!strcmp (var, "dns-forw-host"))
329 free (dns_forw_host), dns_forw_host = strdup (val);
330 else if (!strcmp (var, "dns-forw-port"))
331 dns_forw_port = atoi (val);
332#endif
305 else if (!strcmp (var, "http-proxy-host")) 333 else if (!strcmp (var, "http-proxy-host"))
306 { 334 {
307#if ENABLE_HTTP_PROXY 335#if ENABLE_HTTP_PROXY
308 proxy_host = strdup (val); 336 free (proxy_host), proxy_host = strdup (val);
309#endif 337#endif
310 } 338 }
311 else if (!strcmp (var, "http-proxy-port")) 339 else if (!strcmp (var, "http-proxy-port"))
312 { 340 {
313#if ENABLE_HTTP_PROXY 341#if ENABLE_HTTP_PROXY
… …
321#endif 349#endif
322 } 350 }
323 351
324 /* node-specific, non-defaultable */ 352 /* node-specific, non-defaultable */
325 else if (node != &default_node && !strcmp (var, "hostname")) 353 else if (node != &default_node && !strcmp (var, "hostname"))
326 {
327 free (node->hostname);
328 node->hostname = strdup (val); 354 free (node->hostname), node->hostname = strdup (val);
329 }
330 355
331 /* node-specific, defaultable */ 356 /* node-specific, defaultable */
332 else if (!strcmp (var, "udp-port")) 357 else if (!strcmp (var, "udp-port"))
333 node->udp_port = atoi (val); 358 node->udp_port = atoi (val);
334 else if (!strcmp (var, "tcp-port")) 359 else if (!strcmp (var, "tcp-port"))
335 node->tcp_port = atoi (val); 360 node->tcp_port = atoi (val);
361#if ENABLE_DNS
362 else if (!strcmp (var, "dns-hostname"))
363 free (node->dns_hostname), node->dns_hostname = strdup (val);
364 else if (!strcmp (var, "dns-port"))
365 node->dns_port = atoi (val);
366 else if (!strcmp (var, "dns-domain"))
367 free (node->domain), node->domain = strdup (val);
368#endif
336 else if (!strcmp (var, "router-priority")) 369 else if (!strcmp (var, "router-priority"))
337 node->routerprio = atoi (val); 370 node->routerprio = atoi (val);
371 else if (!strcmp (var, "max-retry"))
372 node->max_retry = atoi (val);
338 else if (!strcmp (var, "connect")) 373 else if (!strcmp (var, "connect"))
339 { 374 {
340 if (!strcmp (val, "ondemand")) 375 if (!strcmp (val, "ondemand"))
341 node->connectmode = conf_node::C_ONDEMAND; 376 node->connectmode = conf_node::C_ONDEMAND;
342 else if (!strcmp (val, "never")) 377 else if (!strcmp (val, "never"))
… …
345 node->connectmode = conf_node::C_ALWAYS; 380 node->connectmode = conf_node::C_ALWAYS;
346 else if (!strcmp (val, "disabled")) 381 else if (!strcmp (val, "disabled"))
347 node->connectmode = conf_node::C_DISABLED; 382 node->connectmode = conf_node::C_DISABLED;
348 else 383 else
349 slog (L_WARN, 384 slog (L_WARN,
350 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 385 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
351 var, fname, lineno); 386 var, fname, lineno);
352 } 387 }
353 else if (!strcmp (var, "inherit-tos")) 388 else if (!strcmp (var, "inherit-tos"))
354 { 389 {
355 parse_bool (node->inherit_tos, "inherit-tos", true, false); 390 parse_bool (node->inherit_tos, "inherit-tos", true, false);
356 } 391 }
… …
367 } 402 }
368 else if (!strcmp (var, "enable-icmp")) 403 else if (!strcmp (var, "enable-icmp"))
369 { 404 {
370#if ENABLE_ICMP 405#if ENABLE_ICMP
371 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 406 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
407#endif
408 }
409 else if (!strcmp (var, "enable-dns"))
410 {
411#if ENABLE_DNS
412 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
372#endif 413#endif
373 } 414 }
374 else if (!strcmp (var, "enable-udp")) 415 else if (!strcmp (var, "enable-udp"))
375 { 416 {
376 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 417 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
… …
474 printf ("\n"); 515 printf ("\n");
475} 516}
476 517
477configuration::configuration () 518configuration::configuration ()
478{ 519{
520 asprintf (&confbase, "%s/gvpe", CONFDIR);
521
479 init (); 522 init ();
480} 523}
481 524
482configuration::~configuration () 525configuration::~configuration ()
483{ 526{

Diff Legend

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