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.7 by pcg, Fri Mar 28 16:21:09 2003 UTC vs.
Revision 1.16 by pcg, Tue Oct 14 03:22:09 2003 UTC

… …
32#include <sys/stat.h> 32#include <sys/stat.h>
33#include <sys/types.h> 33#include <sys/types.h>
34#include <unistd.h> 34#include <unistd.h>
35 35
36#include <netinet/in.h> 36#include <netinet/in.h>
37#include <arpa/inet.h>
38#ifdef ENABLE_ICMP
39# ifdef HAVE_NETINET_IN_SYSTM_H
40# include <netinet/in_systm.h>
41# endif
42# ifdef HAVE_NETINET_IP_H
43# include <netinet/ip.h>
44# endif
45# include <netinet/ip_icmp.h>
46#endif
37 47
38#include <openssl/err.h> 48#include <openssl/err.h>
39#include <openssl/pem.h> 49#include <openssl/pem.h>
40#include <openssl/rsa.h> 50#include <openssl/rsa.h>
41#include <openssl/rand.h> 51#include <openssl/rand.h>
… …
53 63
54struct configuration conf; 64struct configuration conf;
55 65
56u8 best_protocol (u8 protset) 66u8 best_protocol (u8 protset)
57{ 67{
58 if (protset & PROT_IPv4) 68 if (protset & PROT_IPv4 ) return PROT_IPv4;
59 return PROT_IPv4; 69 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
70 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
71 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
60 72
61 return PROT_UDPv4; 73 return 0;
62} 74}
63 75
64const char *strprotocol (u8 protocol) 76const char *strprotocol (u8 protocol)
65{ 77{
66 if (protocol & PROT_IPv4 ) return "rawip"; 78 if (protocol & PROT_IPv4 ) return "rawip";
79 if (protocol & PROT_ICMPv4) return "icmp";
67 if (protocol & PROT_UDPv4) return "udp"; 80 if (protocol & PROT_UDPv4 ) return "udp";
81 if (protocol & PROT_TCPv4 ) return "tcp";
68 82
69 return "<unknown>"; 83 return "<unknown>";
70} 84}
71 85
72configuration::configuration () 86void
87conf_node::print ()
73{ 88{
74 init (); 89 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
90 id,
91 id >> 8, id & 0xff,
92 compress ? 'Y' : 'N',
93 connectmode == C_ONDEMAND ? "ondemand" :
94 connectmode == C_NEVER ? "never" :
95 connectmode == C_ALWAYS ? "always" : "",
96 nodename,
97 hostname ? hostname : "",
98 hostname ? ":" : "",
99 hostname ? udp_port : 0
100 );
75} 101}
76 102
77configuration::~configuration () 103conf_node::~conf_node ()
78{ 104{
79 cleanup (); 105 if (rsa_key)
106 RSA_free (rsa_key);
107
108 free (nodename);
109 free (hostname);
80} 110}
81 111
82void configuration::init () 112void configuration::init ()
83{ 113{
84 memset (this, 0, sizeof (*this)); 114 memset (this, 0, sizeof (*this));
85 115
86 rekey = DEFAULT_REKEY; 116 rekey = DEFAULT_REKEY;
87 keepalive = DEFAULT_KEEPALIVE; 117 keepalive = DEFAULT_KEEPALIVE;
88 llevel = L_INFO; 118 llevel = L_INFO;
89 ip_proto = IPPROTO_GRE; 119 ip_proto = IPPROTO_GRE;
120#if ENABLE_ICMP
121 icmp_type = ICMP_ECHOREPLY;
122#endif
90 123
91 default_node.udp_port = DEFAULT_UDPPORT; 124 default_node.udp_port = DEFAULT_UDPPORT;
125 default_node.tcp_port = DEFAULT_UDPPORT;
92 default_node.connectmode = conf_node::C_ALWAYS; 126 default_node.connectmode = conf_node::C_ALWAYS;
93 default_node.compress = true; 127 default_node.compress = true;
94 default_node.protocols = PROT_UDPv4; 128 default_node.protocols = PROT_UDPv4;
95} 129}
96 130
97void configuration::cleanup() 131void configuration::cleanup()
98{ 132{
99 if (rsa_key) 133 if (rsa_key)
100 RSA_free (rsa_key); 134 RSA_free (rsa_key);
101 135
102 free (ifname);
103
104 rsa_key = 0; 136 rsa_key = 0;
105 ifname = 0; 137
138 free (ifname); ifname = 0;
139#if ENABLE_HTTP_PROXY
140 free (proxy_host); proxy_host = 0;
141 free (proxy_auth); proxy_auth = 0;
142#endif
106} 143}
107 144
108void 145void
109configuration::clear_config () 146configuration::clear_config ()
110{ 147{
… …
201 else 238 else
202 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 239 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
203 } 240 }
204 else if (!strcmp (var, "ip-proto")) 241 else if (!strcmp (var, "ip-proto"))
205 ip_proto = atoi (val); 242 ip_proto = atoi (val);
243#if ENABLE_ICMP
244 //TODO: error message
245 else if (!strcmp (var, "icmp-type"))
246 icmp_type = atoi (val);
247#endif
206 248
207 // per config 249 // per config
208 else if (!strcmp (var, "node")) 250 else if (!strcmp (var, "node"))
209 { 251 {
210 default_node.id++; 252 default_node.id++;
… …
269 script_if_up = strdup (val); 311 script_if_up = strdup (val);
270 else if (!strcmp (var, "node-up")) 312 else if (!strcmp (var, "node-up"))
271 script_node_up = strdup (val); 313 script_node_up = strdup (val);
272 else if (!strcmp (var, "node-down")) 314 else if (!strcmp (var, "node-down"))
273 script_node_down = strdup (val); 315 script_node_down = strdup (val);
316#if ENABLE_HTTP_PROXY
317 else if (!strcmp (var, "http-proxy-host"))
318 proxy_host = strdup (val);
319 else if (!strcmp (var, "http-proxy-port"))
320 proxy_port = atoi (val);
321 else if (!strcmp (var, "http-proxy-auth"))
322 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
323#endif
274 324
275 /* node-specific, non-defaultable */ 325 /* node-specific, non-defaultable */
276 else if (node != &default_node && !strcmp (var, "hostname")) 326 else if (node != &default_node && !strcmp (var, "hostname"))
277 { 327 {
278 free (node->hostname); 328 free (node->hostname);
… …
280 } 330 }
281 331
282 /* node-specific, defaultable */ 332 /* node-specific, defaultable */
283 else if (!strcmp (var, "udp-port")) 333 else if (!strcmp (var, "udp-port"))
284 node->udp_port = atoi (val); 334 node->udp_port = atoi (val);
335 else if (!strcmp (var, "tcp-port"))
336 node->tcp_port = atoi (val);
285 else if (!strcmp (var, "router-priority")) 337 else if (!strcmp (var, "router-priority"))
286 node->routerprio = atoi (val); 338 node->routerprio = atoi (val);
287 else if (!strcmp (var, "connect")) 339 else if (!strcmp (var, "connect"))
288 { 340 {
289 if (!strcmp (val, "ondemand")) 341 if (!strcmp (val, "ondemand"))
… …
306 else if (!strcmp (var, "compress")) 358 else if (!strcmp (var, "compress"))
307 { 359 {
308 parse_bool (node->compress, "compress", true, false); 360 parse_bool (node->compress, "compress", true, false);
309 } 361 }
310 // all these bool options really really cost a lot of executable size! 362 // all these bool options really really cost a lot of executable size!
363 else if (!strcmp (var, "enable-tcp"))
364 {
365#if ENABLE_TCP
366 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
367#endif
368 }
369 else if (!strcmp (var, "enable-icmp"))
370 {
371#if ENABLE_ICMP
372 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
373#endif
374 }
311 else if (!strcmp (var, "enable-udp")) 375 else if (!strcmp (var, "enable-udp"))
312 { 376 {
313 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 377 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
314 } 378 }
315 else if (!strcmp (var, "enable-rawip")) 379 else if (!strcmp (var, "enable-rawip"))
… …
317 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 381 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
318 } 382 }
319 383
320 // unknown or misplaced 384 // unknown or misplaced
321 else 385 else
322 {
323 slog (L_WARN, 386 slog (L_WARN,
324 _("unknown or misplaced variable `%s', at '%s' line %d"), 387 _("unknown or misplaced variable `%s', at '%s' line %d"),
325 var, fname, lineno); 388 var, fname, lineno);
326 }
327 } 389 }
328 390
329 fclose (f); 391 fclose (f);
330 } 392 }
331 else 393 else
… …
390 printf (_("MTU: %d\n"), mtu); 452 printf (_("MTU: %d\n"), mtu);
391 printf (_("rekeying interval: %d\n"), rekey); 453 printf (_("rekeying interval: %d\n"), rekey);
392 printf (_("keepalive interval: %d\n"), keepalive); 454 printf (_("keepalive interval: %d\n"), keepalive);
393 printf (_("interface: %s\n"), ifname); 455 printf (_("interface: %s\n"), ifname);
394 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 456 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
395 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 457 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
396 printf ("\n"); 458 printf ("\n");
397 459
398 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 460 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
399 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 461 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
400 462
… …
402 (*i)->print (); 464 (*i)->print ();
403 465
404 printf ("\n"); 466 printf ("\n");
405} 467}
406 468
407void 469configuration::configuration ()
408conf_node::print ()
409{ 470{
410 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 471 init ();
411 id,
412 id >> 8, id & 0xff,
413 compress ? 'Y' : 'N',
414 connectmode == C_ONDEMAND ? "ondemand" :
415 connectmode == C_NEVER ? "never" :
416 connectmode == C_ALWAYS ? "always" : "",
417 nodename,
418 hostname ? hostname : "",
419 hostname ? ":" : "",
420 hostname ? udp_port : 0
421 );
422} 472}
423 473
474configuration::~configuration ()
475{
476 cleanup ();
477}
478
479

Diff Legend

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