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.14 by pcg, Tue Apr 8 03:25:35 2003 UTC vs.
Revision 1.20 by pcg, Thu Oct 16 21:57:54 2003 UTC

1/* 1/*
2 conf.c -- configuration code 2 conf.c -- configuration code
3 Copyright (C) 1998 Robert van der Meulen 3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
4 1998-2002 Ivo Timmermans <ivo@o2w.nl>
5 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
6 2000 Cris van Pelt <tribbel@arise.dhs.org>
7 2003 Marc Lehmann <pcg@goof.com>
8 4
9 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version. 8 (at your option) any later version.
… …
31#include <netdb.h> 27#include <netdb.h>
32#include <sys/stat.h> 28#include <sys/stat.h>
33#include <sys/types.h> 29#include <sys/types.h>
34#include <unistd.h> 30#include <unistd.h>
35 31
36#include <netinet/in.h> 32#include "netcompat.h"
37#include <netinet/ip_icmp.h>
38 33
39#include <openssl/err.h> 34#include <openssl/err.h>
40#include <openssl/pem.h> 35#include <openssl/pem.h>
41#include <openssl/rsa.h> 36#include <openssl/rsa.h>
42#include <openssl/rand.h> 37#include <openssl/rand.h>
… …
102 97
103void configuration::init () 98void configuration::init ()
104{ 99{
105 memset (this, 0, sizeof (*this)); 100 memset (this, 0, sizeof (*this));
106 101
102 mtu = DEFAULT_MTU;
107 rekey = DEFAULT_REKEY; 103 rekey = DEFAULT_REKEY;
108 keepalive = DEFAULT_KEEPALIVE; 104 keepalive = DEFAULT_KEEPALIVE;
109 llevel = L_INFO; 105 llevel = L_INFO;
110 ip_proto = IPPROTO_GRE; 106 ip_proto = IPPROTO_GRE;
107#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY; 108 icmp_type = ICMP_ECHOREPLY;
109#endif
112 110
113 default_node.udp_port = DEFAULT_UDPPORT; 111 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; 112 default_node.tcp_port = DEFAULT_UDPPORT;
115 default_node.connectmode = conf_node::C_ALWAYS; 113 default_node.connectmode = conf_node::C_ALWAYS;
116 default_node.compress = true; 114 default_node.compress = true;
… …
228 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 226 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
229 } 227 }
230 else if (!strcmp (var, "ip-proto")) 228 else if (!strcmp (var, "ip-proto"))
231 ip_proto = atoi (val); 229 ip_proto = atoi (val);
232 else if (!strcmp (var, "icmp-type")) 230 else if (!strcmp (var, "icmp-type"))
231 {
232#if ENABLE_ICMP
233 icmp_type = atoi (val); 233 icmp_type = atoi (val);
234#endif
235 }
234 236
235 // per config 237 // per config
236 else if (!strcmp (var, "node")) 238 else if (!strcmp (var, "node"))
237 { 239 {
238 default_node.id++; 240 default_node.id++;
… …
297 script_if_up = strdup (val); 299 script_if_up = strdup (val);
298 else if (!strcmp (var, "node-up")) 300 else if (!strcmp (var, "node-up"))
299 script_node_up = strdup (val); 301 script_node_up = strdup (val);
300 else if (!strcmp (var, "node-down")) 302 else if (!strcmp (var, "node-down"))
301 script_node_down = strdup (val); 303 script_node_down = strdup (val);
304 else if (!strcmp (var, "http-proxy-host"))
305 {
302#if ENABLE_HTTP_PROXY 306#if ENABLE_HTTP_PROXY
303 else if (!strcmp (var, "http-proxy-host"))
304 proxy_host = strdup (val); 307 proxy_host = strdup (val);
308#endif
309 }
305 else if (!strcmp (var, "http-proxy-port")) 310 else if (!strcmp (var, "http-proxy-port"))
311 {
312#if ENABLE_HTTP_PROXY
306 proxy_port = atoi (val); 313 proxy_port = atoi (val);
314#endif
315 }
307 else if (!strcmp (var, "http-proxy-auth")) 316 else if (!strcmp (var, "http-proxy-auth"))
317 {
318#if ENABLE_HTTP_PROXY
308 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 319 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
309#endif 320#endif
321 }
310 322
311 /* node-specific, non-defaultable */ 323 /* node-specific, non-defaultable */
312 else if (node != &default_node && !strcmp (var, "hostname")) 324 else if (node != &default_node && !strcmp (var, "hostname"))
313 { 325 {
314 free (node->hostname); 326 free (node->hostname);
… …
438 printf (_("MTU: %d\n"), mtu); 450 printf (_("MTU: %d\n"), mtu);
439 printf (_("rekeying interval: %d\n"), rekey); 451 printf (_("rekeying interval: %d\n"), rekey);
440 printf (_("keepalive interval: %d\n"), keepalive); 452 printf (_("keepalive interval: %d\n"), keepalive);
441 printf (_("interface: %s\n"), ifname); 453 printf (_("interface: %s\n"), ifname);
442 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 454 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
443 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 455 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
444 printf ("\n"); 456 printf ("\n");
445 457
446 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 458 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
447 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 459 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
448 460

Diff Legend

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