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.24 by pcg, Fri Apr 2 14:42:45 2004 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
… …
108#if ENABLE_ICMP 109#if ENABLE_ICMP
109 icmp_type = ICMP_ECHOREPLY; 110 icmp_type = ICMP_ECHOREPLY;
110#endif 111#endif
111 112
112 default_node.udp_port = DEFAULT_UDPPORT; 113 default_node.udp_port = DEFAULT_UDPPORT;
113 default_node.tcp_port = DEFAULT_UDPPORT; 114 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
114 default_node.connectmode = conf_node::C_ALWAYS; 115 default_node.connectmode = conf_node::C_ALWAYS;
115 default_node.compress = true; 116 default_node.compress = true;
116 default_node.protocols = PROT_UDPv4; 117 default_node.protocols = PROT_UDPv4;
117} 118}
118 119
… …
121 if (rsa_key) 122 if (rsa_key)
122 RSA_free (rsa_key); 123 RSA_free (rsa_key);
123 124
124 rsa_key = 0; 125 rsa_key = 0;
125 126
127 free (pidfilename); pidfilename = 0;
126 free (ifname); ifname = 0; 128 free (ifname); ifname = 0;
127#if ENABLE_HTTP_PROXY 129#if ENABLE_HTTP_PROXY
128 free (proxy_host); proxy_host = 0; 130 free (proxy_host); proxy_host = 0;
129 free (proxy_auth); proxy_auth = 0; 131 free (proxy_auth); proxy_auth = 0;
130#endif 132#endif
131} 133}
132 134
133void 135void
134configuration::clear_config () 136configuration::clear_config ()
… …
281 283
282 if (::thisnode && !strcmp (node->nodename, ::thisnode)) 284 if (::thisnode && !strcmp (node->nodename, ::thisnode))
283 thisnode = node; 285 thisnode = node;
284 } 286 }
285 else if (!strcmp (var, "private-key")) 287 else if (!strcmp (var, "private-key"))
286 prikeyfile = strdup (val); 288 free (prikeyfile), prikeyfile = strdup (val);
287 else if (!strcmp (var, "ifpersist")) 289 else if (!strcmp (var, "ifpersist"))
288 { 290 {
289 parse_bool (ifpersist, "ifpersist", true, false); 291 parse_bool (ifpersist, "ifpersist", true, false);
290 } 292 }
291 else if (!strcmp (var, "ifname")) 293 else if (!strcmp (var, "ifname"))
292 ifname = strdup (val); 294 free (ifname), ifname = strdup (val);
293 else if (!strcmp (var, "rekey")) 295 else if (!strcmp (var, "rekey"))
294 rekey = atoi (val); 296 rekey = atoi (val);
295 else if (!strcmp (var, "keepalive")) 297 else if (!strcmp (var, "keepalive"))
296 keepalive = atoi (val); 298 keepalive = atoi (val);
297 else if (!strcmp (var, "mtu")) 299 else if (!strcmp (var, "mtu"))
298 mtu = atoi (val); 300 mtu = atoi (val);
299 else if (!strcmp (var, "if-up")) 301 else if (!strcmp (var, "if-up"))
300 script_if_up = strdup (val); 302 free (script_if_up), script_if_up = strdup (val);
301 else if (!strcmp (var, "node-up")) 303 else if (!strcmp (var, "node-up"))
302 script_node_up = strdup (val); 304 free (script_node_up), script_node_up = strdup (val);
303 else if (!strcmp (var, "node-down")) 305 else if (!strcmp (var, "node-down"))
304 script_node_down = strdup (val); 306 free (script_node_down), script_node_down = strdup (val);
307 else if (!strcmp (var, "pid-file"))
308 free (pidfilename), pidfilename = strdup (val);
305 else if (!strcmp (var, "http-proxy-host")) 309 else if (!strcmp (var, "http-proxy-host"))
306 { 310 {
307#if ENABLE_HTTP_PROXY 311#if ENABLE_HTTP_PROXY
308 proxy_host = strdup (val); 312 free (proxy_host), proxy_host = strdup (val);
309#endif 313#endif
310 } 314 }
311 else if (!strcmp (var, "http-proxy-port")) 315 else if (!strcmp (var, "http-proxy-port"))
312 { 316 {
313#if ENABLE_HTTP_PROXY 317#if ENABLE_HTTP_PROXY
… …
321#endif 325#endif
322 } 326 }
323 327
324 /* node-specific, non-defaultable */ 328 /* node-specific, non-defaultable */
325 else if (node != &default_node && !strcmp (var, "hostname")) 329 else if (node != &default_node && !strcmp (var, "hostname"))
326 {
327 free (node->hostname);
328 node->hostname = strdup (val); 330 free (node->hostname), node->hostname = strdup (val);
329 }
330 331
331 /* node-specific, defaultable */ 332 /* node-specific, defaultable */
332 else if (!strcmp (var, "udp-port")) 333 else if (!strcmp (var, "udp-port"))
333 node->udp_port = atoi (val); 334 node->udp_port = atoi (val);
334 else if (!strcmp (var, "tcp-port")) 335 else if (!strcmp (var, "tcp-port"))
335 node->tcp_port = atoi (val); 336 node->tcp_port = atoi (val);
337 else if (!strcmp (var, "dns-port"))
338 node->dns_port = atoi (val);
336 else if (!strcmp (var, "router-priority")) 339 else if (!strcmp (var, "router-priority"))
337 node->routerprio = atoi (val); 340 node->routerprio = atoi (val);
338 else if (!strcmp (var, "connect")) 341 else if (!strcmp (var, "connect"))
339 { 342 {
340 if (!strcmp (val, "ondemand")) 343 if (!strcmp (val, "ondemand"))
… …
369 { 372 {
370#if ENABLE_ICMP 373#if ENABLE_ICMP
371 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; 374 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
372#endif 375#endif
373 } 376 }
377 else if (!strcmp (var, "enable-dns"))
378 {
379#if ENABLE_DNS
380 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
381#endif
382 }
374 else if (!strcmp (var, "enable-udp")) 383 else if (!strcmp (var, "enable-udp"))
375 { 384 {
376 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 385 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
377 } 386 }
378 else if (!strcmp (var, "enable-rawip")) 387 else if (!strcmp (var, "enable-rawip"))
379 { 388 {;
380 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 389 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
381 } 390 }
382 391
383 // unknown or misplaced 392 // unknown or misplaced
384 else 393 else

Diff Legend

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