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.12 by pcg, Mon Apr 7 01:12:56 2003 UTC vs.
Revision 1.18 by pcg, Thu Oct 16 02:41:21 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 33
38#include <openssl/err.h> 34#include <openssl/err.h>
39#include <openssl/pem.h> 35#include <openssl/pem.h>
40#include <openssl/rsa.h> 36#include <openssl/rsa.h>
41#include <openssl/rand.h> 37#include <openssl/rand.h>
… …
53 49
54struct configuration conf; 50struct configuration conf;
55 51
56u8 best_protocol (u8 protset) 52u8 best_protocol (u8 protset)
57{ 53{
58 if (protset & PROT_IPv4 ) return PROT_IPv4; 54 if (protset & PROT_IPv4 ) return PROT_IPv4;
55 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
59 if (protset & PROT_UDPv4) return PROT_UDPv4; 56 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
60 if (protset & PROT_TCPv4) return PROT_TCPv4; 57 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
61 58
62 return 0; 59 return 0;
63} 60}
64 61
65const char *strprotocol (u8 protocol) 62const char *strprotocol (u8 protocol)
66{ 63{
67 if (protocol & PROT_IPv4 ) return "rawip"; 64 if (protocol & PROT_IPv4 ) return "rawip";
65 if (protocol & PROT_ICMPv4) return "icmp";
68 if (protocol & PROT_UDPv4) return "udp"; 66 if (protocol & PROT_UDPv4 ) return "udp";
69 if (protocol & PROT_TCPv4) return "tcp"; 67 if (protocol & PROT_TCPv4 ) return "tcp";
70 68
71 return "<unknown>"; 69 return "<unknown>";
72} 70}
73 71
74void 72void
… …
103 101
104 rekey = DEFAULT_REKEY; 102 rekey = DEFAULT_REKEY;
105 keepalive = DEFAULT_KEEPALIVE; 103 keepalive = DEFAULT_KEEPALIVE;
106 llevel = L_INFO; 104 llevel = L_INFO;
107 ip_proto = IPPROTO_GRE; 105 ip_proto = IPPROTO_GRE;
106#if ENABLE_ICMP
107 icmp_type = ICMP_ECHOREPLY;
108#endif
108 109
109 default_node.udp_port = DEFAULT_UDPPORT; 110 default_node.udp_port = DEFAULT_UDPPORT;
110 default_node.tcp_port = DEFAULT_UDPPORT; 111 default_node.tcp_port = DEFAULT_UDPPORT;
111 default_node.connectmode = conf_node::C_ALWAYS; 112 default_node.connectmode = conf_node::C_ALWAYS;
112 default_node.compress = true; 113 default_node.compress = true;
… …
223 else 224 else
224 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 225 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
225 } 226 }
226 else if (!strcmp (var, "ip-proto")) 227 else if (!strcmp (var, "ip-proto"))
227 ip_proto = atoi (val); 228 ip_proto = atoi (val);
229#if ENABLE_ICMP
230 //TODO: error message
231 else if (!strcmp (var, "icmp-type"))
232 icmp_type = atoi (val);
233#endif
228 234
229 // per config 235 // per config
230 else if (!strcmp (var, "node")) 236 else if (!strcmp (var, "node"))
231 { 237 {
232 default_node.id++; 238 default_node.id++;
… …
344 { 350 {
345#if ENABLE_TCP 351#if ENABLE_TCP
346 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 352 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
347#endif 353#endif
348 } 354 }
355 else if (!strcmp (var, "enable-icmp"))
356 {
357#if ENABLE_ICMP
358 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
359#endif
360 }
349 else if (!strcmp (var, "enable-udp")) 361 else if (!strcmp (var, "enable-udp"))
350 { 362 {
351 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 363 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
352 } 364 }
353 else if (!strcmp (var, "enable-rawip")) 365 else if (!strcmp (var, "enable-rawip"))
… …
426 printf (_("MTU: %d\n"), mtu); 438 printf (_("MTU: %d\n"), mtu);
427 printf (_("rekeying interval: %d\n"), rekey); 439 printf (_("rekeying interval: %d\n"), rekey);
428 printf (_("keepalive interval: %d\n"), keepalive); 440 printf (_("keepalive interval: %d\n"), keepalive);
429 printf (_("interface: %s\n"), ifname); 441 printf (_("interface: %s\n"), ifname);
430 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 442 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
431 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) : -1); 443 printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1);
432 printf ("\n"); 444 printf ("\n");
433 445
434 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 446 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
435 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 447 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
436 448

Diff Legend

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