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.17 by pcg, Tue Oct 14 15:48:15 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 "netcompat.h"
37
36#include <openssl/err.h> 38#include <openssl/err.h>
37#include <openssl/pem.h> 39#include <openssl/pem.h>
38#include <openssl/rsa.h> 40#include <openssl/rsa.h>
39#include <openssl/rand.h> 41#include <openssl/rand.h>
40 42
… …
49char *identname; 51char *identname;
50char *pidfilename; 52char *pidfilename;
51 53
52struct configuration conf; 54struct configuration conf;
53 55
54configuration::configuration () 56u8 best_protocol (u8 protset)
55{ 57{
56 init (); 58 if (protset & PROT_IPv4 ) return PROT_IPv4;
57} 59 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
60 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
61 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
58 62
59configuration::~configuration () 63 return 0;
64}
65
66const char *strprotocol (u8 protocol)
60{ 67{
61 cleanup (); 68 if (protocol & PROT_IPv4 ) return "rawip";
69 if (protocol & PROT_ICMPv4) return "icmp";
70 if (protocol & PROT_UDPv4 ) return "udp";
71 if (protocol & PROT_TCPv4 ) return "tcp";
72
73 return "<unknown>";
74}
75
76void
77conf_node::print ()
78{
79 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n",
80 id,
81 id >> 8, id & 0xff,
82 compress ? 'Y' : 'N',
83 connectmode == C_ONDEMAND ? "ondemand" :
84 connectmode == C_NEVER ? "never" :
85 connectmode == C_ALWAYS ? "always" : "",
86 nodename,
87 hostname ? hostname : "",
88 hostname ? ":" : "",
89 hostname ? udp_port : 0
90 );
91}
92
93conf_node::~conf_node ()
94{
95 if (rsa_key)
96 RSA_free (rsa_key);
97
98 free (nodename);
99 free (hostname);
62} 100}
63 101
64void configuration::init () 102void configuration::init ()
65{ 103{
66 memset (this, 0, sizeof (*this)); 104 memset (this, 0, sizeof (*this));
67 105
68 rekey = DEFAULT_REKEY; 106 rekey = DEFAULT_REKEY;
69 keepalive = DEFAULT_KEEPALIVE; 107 keepalive = DEFAULT_KEEPALIVE;
70 llevel = L_INFO; 108 llevel = L_INFO;
109 ip_proto = IPPROTO_GRE;
110#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY;
112#endif
71 113
72 default_node.port = DEFAULT_PORT; 114 default_node.udp_port = DEFAULT_UDPPORT;
115 default_node.tcp_port = DEFAULT_UDPPORT;
73 default_node.connectmode = conf_node::C_ALWAYS; 116 default_node.connectmode = conf_node::C_ALWAYS;
74 default_node.compress = true; 117 default_node.compress = true;
118 default_node.protocols = PROT_UDPv4;
75} 119}
76 120
77void configuration::cleanup() 121void configuration::cleanup()
78{ 122{
79 if (rsa_key) 123 if (rsa_key)
80 RSA_free (rsa_key); 124 RSA_free (rsa_key);
81 125
82 free (ifname);
83
84 rsa_key = 0; 126 rsa_key = 0;
85 ifname = 0; 127
128 free (ifname); ifname = 0;
129#if ENABLE_HTTP_PROXY
130 free (proxy_host); proxy_host = 0;
131 free (proxy_auth); proxy_auth = 0;
132#endif
86} 133}
87 134
88void 135void
89configuration::clear_config () 136configuration::clear_config ()
90{ 137{
… …
94 nodes.clear (); 141 nodes.clear ();
95 142
96 cleanup (); 143 cleanup ();
97 init (); 144 init ();
98} 145}
146
147#define parse_bool(target,name,trueval,falseval) \
148 if (!strcmp (val, "yes")) target = trueval; \
149 else if (!strcmp (val, "no")) target = falseval; \
150 else if (!strcmp (val, "true")) target = trueval; \
151 else if (!strcmp (val, "false")) target = falseval; \
152 else if (!strcmp (val, "on")) target = trueval; \
153 else if (!strcmp (val, "off")) target = falseval; \
154 else \
155 slog (L_WARN, \
156 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
157 name, var, fname, lineno);
99 158
100void configuration::read_config (bool need_keys) 159void configuration::read_config (bool need_keys)
101{ 160{
102 char *fname; 161 char *fname;
103 FILE *f; 162 FILE *f;
… …
167 if (l != L_NONE) 226 if (l != L_NONE)
168 llevel = l; 227 llevel = l;
169 else 228 else
170 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 229 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
171 } 230 }
231 else if (!strcmp (var, "ip-proto"))
232 ip_proto = atoi (val);
233#if ENABLE_ICMP
234 //TODO: error message
235 else if (!strcmp (var, "icmp-type"))
236 icmp_type = atoi (val);
237#endif
172 238
173 // per config 239 // per config
174 else if (!strcmp (var, "node")) 240 else if (!strcmp (var, "node"))
175 { 241 {
176 default_node.id++; 242 default_node.id++;
… …
219 } 285 }
220 else if (!strcmp (var, "private-key")) 286 else if (!strcmp (var, "private-key"))
221 prikeyfile = strdup (val); 287 prikeyfile = strdup (val);
222 else if (!strcmp (var, "ifpersist")) 288 else if (!strcmp (var, "ifpersist"))
223 { 289 {
224 if (!strcmp (val, "yes")) 290 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 } 291 }
233 else if (!strcmp (var, "ifname")) 292 else if (!strcmp (var, "ifname"))
234 ifname = strdup (val); 293 ifname = strdup (val);
235 else if (!strcmp (var, "rekey")) 294 else if (!strcmp (var, "rekey"))
236 rekey = atoi (val); 295 rekey = atoi (val);
… …
242 script_if_up = strdup (val); 301 script_if_up = strdup (val);
243 else if (!strcmp (var, "node-up")) 302 else if (!strcmp (var, "node-up"))
244 script_node_up = strdup (val); 303 script_node_up = strdup (val);
245 else if (!strcmp (var, "node-down")) 304 else if (!strcmp (var, "node-down"))
246 script_node_down = strdup (val); 305 script_node_down = strdup (val);
306#if ENABLE_HTTP_PROXY
307 else if (!strcmp (var, "http-proxy-host"))
308 proxy_host = strdup (val);
309 else if (!strcmp (var, "http-proxy-port"))
310 proxy_port = atoi (val);
311 else if (!strcmp (var, "http-proxy-auth"))
312 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
313#endif
247 314
248 /* node-specific, non-defaultable */ 315 /* node-specific, non-defaultable */
249 else if (node != &default_node && !strcmp (var, "hostname")) 316 else if (node != &default_node && !strcmp (var, "hostname"))
250 { 317 {
251 free (node->hostname); 318 free (node->hostname);
252 node->hostname = strdup (val); 319 node->hostname = strdup (val);
253 } 320 }
254 321
255 /* node-specific, defaultable */ 322 /* node-specific, defaultable */
256 else if (!strcmp (var, "udp-port")) 323 else if (!strcmp (var, "udp-port"))
257 node->port = atoi (val); 324 node->udp_port = atoi (val);
258 else if (!strcmp (var, "port")) //deprecated 325 else if (!strcmp (var, "tcp-port"))
259 node->port = atoi (val); 326 node->tcp_port = atoi (val);
260 else if (!strcmp (var, "router-priority")) 327 else if (!strcmp (var, "router-priority"))
261 node->routerprio = atoi (val); 328 node->routerprio = atoi (val);
262 else if (!strcmp (var, "connect")) 329 else if (!strcmp (var, "connect"))
263 { 330 {
264 if (!strcmp (val, "ondemand")) 331 if (!strcmp (val, "ondemand"))
… …
274 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 341 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
275 var, fname, lineno); 342 var, fname, lineno);
276 } 343 }
277 else if (!strcmp (var, "inherit-tos")) 344 else if (!strcmp (var, "inherit-tos"))
278 { 345 {
279 if (!strcmp (val, "yes")) 346 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 347 }
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")) 348 else if (!strcmp (var, "compress"))
290 { 349 {
291 if (!strcmp (val, "yes")) 350 parse_bool (node->compress, "compress", true, false);
292 node->compress = true;
293 else if (!strcmp (val, "no"))
294 node->compress = false;
295 else 351 }
296 slog (L_WARN, 352 // 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"), 353 else if (!strcmp (var, "enable-tcp"))
298 var, fname, lineno); 354 {
355#if ENABLE_TCP
356 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
357#endif
358 }
359 else if (!strcmp (var, "enable-icmp"))
360 {
361#if ENABLE_ICMP
362 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
363#endif
364 }
365 else if (!strcmp (var, "enable-udp"))
366 {
367 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
368 }
369 else if (!strcmp (var, "enable-rawip"))
370 {
371 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
299 } 372 }
300 373
301 // unknown or misplaced 374 // unknown or misplaced
302 else 375 else
303 {
304 slog (L_WARN, 376 slog (L_WARN,
305 _("unknown or misplaced variable `%s', at '%s' line %d"), 377 _("unknown or misplaced variable `%s', at '%s' line %d"),
306 var, fname, lineno); 378 var, fname, lineno);
307 }
308 } 379 }
309 380
310 fclose (f); 381 fclose (f);
311 } 382 }
312 else 383 else
… …
371 printf (_("MTU: %d\n"), mtu); 442 printf (_("MTU: %d\n"), mtu);
372 printf (_("rekeying interval: %d\n"), rekey); 443 printf (_("rekeying interval: %d\n"), rekey);
373 printf (_("keepalive interval: %d\n"), keepalive); 444 printf (_("keepalive interval: %d\n"), keepalive);
374 printf (_("interface: %s\n"), ifname); 445 printf (_("interface: %s\n"), ifname);
375 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 446 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
376 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 447 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
377 printf ("\n"); 448 printf ("\n");
378 449
379 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 450 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
380 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 451 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
381 452
… …
383 (*i)->print (); 454 (*i)->print ();
384 455
385 printf ("\n"); 456 printf ("\n");
386} 457}
387 458
388void 459configuration::configuration ()
389conf_node::print ()
390{ 460{
391 printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", 461 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} 462}
404 463
464configuration::~configuration ()
465{
466 cleanup ();
467}
468
469

Diff Legend

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