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.30 by pcg, Thu Mar 3 07:24:57 2005 UTC

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

Diff Legend

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