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.4 by pcg, Sun Mar 23 14:49:16 2003 UTC vs.
Revision 1.16 by pcg, Tue Oct 14 03:22:09 2003 UTC

… …
31#include <netdb.h> 31#include <netdb.h>
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>
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
47
36#include <openssl/err.h> 48#include <openssl/err.h>
37#include <openssl/pem.h> 49#include <openssl/pem.h>
38#include <openssl/rsa.h> 50#include <openssl/rsa.h>
39#include <openssl/rand.h> 51#include <openssl/rand.h>
40 52
… …
49char *identname; 61char *identname;
50char *pidfilename; 62char *pidfilename;
51 63
52struct configuration conf; 64struct configuration conf;
53 65
54configuration::configuration () 66u8 best_protocol (u8 protset)
55{ 67{
56 init (); 68 if (protset & PROT_IPv4 ) return PROT_IPv4;
57} 69 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
70 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
71 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 72
59configuration::~configuration () 73 return 0;
74}
75
76const char *strprotocol (u8 protocol)
60{ 77{
61 cleanup (); 78 if (protocol & PROT_IPv4 ) return "rawip";
79 if (protocol & PROT_ICMPv4) return "icmp";
80 if (protocol & PROT_UDPv4 ) return "udp";
81 if (protocol & PROT_TCPv4 ) return "tcp";
82
83 return "<unknown>";
84}
85
86void
87conf_node::print ()
88{
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 );
101}
102
103conf_node::~conf_node ()
104{
105 if (rsa_key)
106 RSA_free (rsa_key);
107
108 free (nodename);
109 free (hostname);
62} 110}
63 111
64void configuration::init () 112void configuration::init ()
65{ 113{
66 memset (this, 0, sizeof (*this)); 114 memset (this, 0, sizeof (*this));
67 115
68 rekey = DEFAULT_REKEY; 116 rekey = DEFAULT_REKEY;
69 keepalive = DEFAULT_KEEPALIVE; 117 keepalive = DEFAULT_KEEPALIVE;
70 llevel = L_INFO; 118 llevel = L_INFO;
119 ip_proto = IPPROTO_GRE;
120#if ENABLE_ICMP
121 icmp_type = ICMP_ECHOREPLY;
122#endif
71 123
72 default_node.port = DEFAULT_PORT; 124 default_node.udp_port = DEFAULT_UDPPORT;
125 default_node.tcp_port = DEFAULT_UDPPORT;
73 default_node.connectmode = conf_node::C_ALWAYS; 126 default_node.connectmode = conf_node::C_ALWAYS;
74 default_node.compress = true; 127 default_node.compress = true;
128 default_node.protocols = PROT_UDPv4;
75} 129}
76 130
77void configuration::cleanup() 131void configuration::cleanup()
78{ 132{
79 if (rsa_key) 133 if (rsa_key)
80 RSA_free (rsa_key); 134 RSA_free (rsa_key);
81 135
82 free (ifname);
83
84 rsa_key = 0; 136 rsa_key = 0;
85 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
86} 143}
87 144
88void 145void
89configuration::clear_config () 146configuration::clear_config ()
90{ 147{
… …
94 nodes.clear (); 151 nodes.clear ();
95 152
96 cleanup (); 153 cleanup ();
97 init (); 154 init ();
98} 155}
156
157#define parse_bool(target,name,trueval,falseval) \
158 if (!strcmp (val, "yes")) target = trueval; \
159 else if (!strcmp (val, "no")) target = falseval; \
160 else if (!strcmp (val, "true")) target = trueval; \
161 else if (!strcmp (val, "false")) target = falseval; \
162 else if (!strcmp (val, "on")) target = trueval; \
163 else if (!strcmp (val, "off")) target = falseval; \
164 else \
165 slog (L_WARN, \
166 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
167 name, var, fname, lineno);
99 168
100void configuration::read_config (bool need_keys) 169void configuration::read_config (bool need_keys)
101{ 170{
102 char *fname; 171 char *fname;
103 FILE *f; 172 FILE *f;
… …
167 if (l != L_NONE) 236 if (l != L_NONE)
168 llevel = l; 237 llevel = l;
169 else 238 else
170 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);
171 } 240 }
241 else if (!strcmp (var, "ip-proto"))
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
172 248
173 // per config 249 // per config
174 else if (!strcmp (var, "node")) 250 else if (!strcmp (var, "node"))
175 { 251 {
176 default_node.id++; 252 default_node.id++;
… …
219 } 295 }
220 else if (!strcmp (var, "private-key")) 296 else if (!strcmp (var, "private-key"))
221 prikeyfile = strdup (val); 297 prikeyfile = strdup (val);
222 else if (!strcmp (var, "ifpersist")) 298 else if (!strcmp (var, "ifpersist"))
223 { 299 {
224 if (!strcmp (val, "yes")) 300 parse_bool (ifpersist, "ifpersist", true, false);
225 ifpersist = true;
226 else if (!strcmp (val, "no"))
227 ifpersist = false;
228 else
229 slog (L_WARN,
230 _("illegal value for 'ifpersist', only 'yes' or 'no' allowed, at '%s' line %d"),
231 var, fname, lineno);
232 } 301 }
233 else if (!strcmp (var, "ifname")) 302 else if (!strcmp (var, "ifname"))
234 ifname = strdup (val); 303 ifname = strdup (val);
235 else if (!strcmp (var, "rekey")) 304 else if (!strcmp (var, "rekey"))
236 rekey = atoi (val); 305 rekey = atoi (val);
… …
242 script_if_up = strdup (val); 311 script_if_up = strdup (val);
243 else if (!strcmp (var, "node-up")) 312 else if (!strcmp (var, "node-up"))
244 script_node_up = strdup (val); 313 script_node_up = strdup (val);
245 else if (!strcmp (var, "node-down")) 314 else if (!strcmp (var, "node-down"))
246 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
247 324
248 /* node-specific, non-defaultable */ 325 /* node-specific, non-defaultable */
249 else if (node != &default_node && !strcmp (var, "hostname")) 326 else if (node != &default_node && !strcmp (var, "hostname"))
250 { 327 {
251 free (node->hostname); 328 free (node->hostname);
252 node->hostname = strdup (val); 329 node->hostname = strdup (val);
253 } 330 }
254 331
255 /* node-specific, defaultable */ 332 /* node-specific, defaultable */
256 else if (!strcmp (var, "udp-port")) 333 else if (!strcmp (var, "udp-port"))
257 node->port = atoi (val); 334 node->udp_port = atoi (val);
258 else if (!strcmp (var, "port")) //deprecated 335 else if (!strcmp (var, "tcp-port"))
259 node->port = atoi (val); 336 node->tcp_port = atoi (val);
260 else if (!strcmp (var, "router-priority")) 337 else if (!strcmp (var, "router-priority"))
261 node->routerprio = atoi (val); 338 node->routerprio = atoi (val);
262 else if (!strcmp (var, "connect")) 339 else if (!strcmp (var, "connect"))
263 { 340 {
264 if (!strcmp (val, "ondemand")) 341 if (!strcmp (val, "ondemand"))
… …
274 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 351 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
275 var, fname, lineno); 352 var, fname, lineno);
276 } 353 }
277 else if (!strcmp (var, "inherit-tos")) 354 else if (!strcmp (var, "inherit-tos"))
278 { 355 {
279 if (!strcmp (val, "yes")) 356 parse_bool (node->inherit_tos, "inherit-tos", true, false);
280 node->inherit_tos = true;
281 else if (!strcmp (val, "no"))
282 node->inherit_tos = false;
283 else 357 }
284 slog (L_WARN,
285 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),
286 var, fname, lineno);
287 }
288
289 else if (!strcmp (var, "compress")) 358 else if (!strcmp (var, "compress"))
290 { 359 {
291 if (!strcmp (val, "yes")) 360 parse_bool (node->compress, "compress", true, false);
292 node->compress = true;
293 else if (!strcmp (val, "no"))
294 node->compress = false;
295 else 361 }
296 slog (L_WARN, 362 // all these bool options really really cost a lot of executable size!
297 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"), 363 else if (!strcmp (var, "enable-tcp"))
298 var, fname, lineno); 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 }
375 else if (!strcmp (var, "enable-udp"))
376 {
377 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
378 }
379 else if (!strcmp (var, "enable-rawip"))
380 {
381 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
299 } 382 }
300 383
301 // unknown or misplaced 384 // unknown or misplaced
302 else 385 else
303 {
304 slog (L_WARN, 386 slog (L_WARN,
305 _("unknown or misplaced variable `%s', at '%s' line %d"), 387 _("unknown or misplaced variable `%s', at '%s' line %d"),
306 var, fname, lineno); 388 var, fname, lineno);
307 }
308 } 389 }
309 390
310 fclose (f); 391 fclose (f);
311 } 392 }
312 else 393 else
… …
371 printf (_("MTU: %d\n"), mtu); 452 printf (_("MTU: %d\n"), mtu);
372 printf (_("rekeying interval: %d\n"), rekey); 453 printf (_("rekeying interval: %d\n"), rekey);
373 printf (_("keepalive interval: %d\n"), keepalive); 454 printf (_("keepalive interval: %d\n"), keepalive);
374 printf (_("interface: %s\n"), ifname); 455 printf (_("interface: %s\n"), ifname);
375 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 456 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
376 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);
377 printf ("\n"); 458 printf ("\n");
378 459
379 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 460 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
380 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 461 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
381 462
… …
383 (*i)->print (); 464 (*i)->print ();
384 465
385 printf ("\n"); 466 printf ("\n");
386} 467}
387 468
388void 469configuration::configuration ()
389conf_node::print ()
390{ 470{
391 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 471 init ();
392 id,
393 id >> 8, id & 0xff,
394 compress ? 'Y' : 'N',
395 connectmode == C_ONDEMAND ? "ondemand" :
396 connectmode == C_NEVER ? "never" :
397 connectmode == C_ALWAYS ? "always" : "",
398 nodename,
399 hostname ? hostname : "",
400 hostname ? ":" : "",
401 hostname ? port : 0
402 );
403} 472}
404 473
474configuration::~configuration ()
475{
476 cleanup ();
477}
478
479

Diff Legend

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