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.19 by pcg, Thu Oct 16 20:35:14 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;
… …
227 else 225 else
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);
230#if ENABLE_ICMP
231 //TODO: error message
232 else if (!strcmp (var, "icmp-type")) 232 else if (!strcmp (var, "icmp-type"))
233 icmp_type = atoi (val); 233 icmp_type = atoi (val);
234#endif
234 235
235 // per config 236 // per config
236 else if (!strcmp (var, "node")) 237 else if (!strcmp (var, "node"))
237 { 238 {
238 default_node.id++; 239 default_node.id++;
… …
438 printf (_("MTU: %d\n"), mtu); 439 printf (_("MTU: %d\n"), mtu);
439 printf (_("rekeying interval: %d\n"), rekey); 440 printf (_("rekeying interval: %d\n"), rekey);
440 printf (_("keepalive interval: %d\n"), keepalive); 441 printf (_("keepalive interval: %d\n"), keepalive);
441 printf (_("interface: %s\n"), ifname); 442 printf (_("interface: %s\n"), ifname);
442 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 443 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
443 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 444 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
444 printf ("\n"); 445 printf ("\n");
445 446
446 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 447 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
447 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 448 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
448 449

Diff Legend

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