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.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 <netinet/in.h> 36#include "netcompat.h"
37#include <netinet/ip_icmp.h>
38 37
39#include <openssl/err.h> 38#include <openssl/err.h>
40#include <openssl/pem.h> 39#include <openssl/pem.h>
41#include <openssl/rsa.h> 40#include <openssl/rsa.h>
42#include <openssl/rand.h> 41#include <openssl/rand.h>
106 105
107 rekey = DEFAULT_REKEY; 106 rekey = DEFAULT_REKEY;
108 keepalive = DEFAULT_KEEPALIVE; 107 keepalive = DEFAULT_KEEPALIVE;
109 llevel = L_INFO; 108 llevel = L_INFO;
110 ip_proto = IPPROTO_GRE; 109 ip_proto = IPPROTO_GRE;
110#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY; 111 icmp_type = ICMP_ECHOREPLY;
112#endif
112 113
113 default_node.udp_port = DEFAULT_UDPPORT; 114 default_node.udp_port = DEFAULT_UDPPORT;
114 default_node.tcp_port = DEFAULT_UDPPORT; 115 default_node.tcp_port = DEFAULT_UDPPORT;
115 default_node.connectmode = conf_node::C_ALWAYS; 116 default_node.connectmode = conf_node::C_ALWAYS;
116 default_node.compress = true; 117 default_node.compress = true;
227 else 228 else
228 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);
229 } 230 }
230 else if (!strcmp (var, "ip-proto")) 231 else if (!strcmp (var, "ip-proto"))
231 ip_proto = atoi (val); 232 ip_proto = atoi (val);
233#if ENABLE_ICMP
234 //TODO: error message
232 else if (!strcmp (var, "icmp-type")) 235 else if (!strcmp (var, "icmp-type"))
233 icmp_type = atoi (val); 236 icmp_type = atoi (val);
237#endif
234 238
235 // per config 239 // per config
236 else if (!strcmp (var, "node")) 240 else if (!strcmp (var, "node"))
237 { 241 {
238 default_node.id++; 242 default_node.id++;
438 printf (_("MTU: %d\n"), mtu); 442 printf (_("MTU: %d\n"), mtu);
439 printf (_("rekeying interval: %d\n"), rekey); 443 printf (_("rekeying interval: %d\n"), rekey);
440 printf (_("keepalive interval: %d\n"), keepalive); 444 printf (_("keepalive interval: %d\n"), keepalive);
441 printf (_("interface: %s\n"), ifname); 445 printf (_("interface: %s\n"), ifname);
442 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 446 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
443 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);
444 printf ("\n"); 448 printf ("\n");
445 449
446 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 450 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
447 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 451 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
448 452

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines