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.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 37
38#include <openssl/err.h> 38#include <openssl/err.h>
39#include <openssl/pem.h> 39#include <openssl/pem.h>
40#include <openssl/rsa.h> 40#include <openssl/rsa.h>
41#include <openssl/rand.h> 41#include <openssl/rand.h>
… …
53 53
54struct configuration conf; 54struct configuration conf;
55 55
56u8 best_protocol (u8 protset) 56u8 best_protocol (u8 protset)
57{ 57{
58 if (protset & PROT_IPv4 ) return PROT_IPv4; 58 if (protset & PROT_IPv4 ) return PROT_IPv4;
59 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
59 if (protset & PROT_UDPv4) return PROT_UDPv4; 60 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
60 if (protset & PROT_TCPv4) return PROT_TCPv4; 61 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
61 62
62 return 0; 63 return 0;
63} 64}
64 65
65const char *strprotocol (u8 protocol) 66const char *strprotocol (u8 protocol)
66{ 67{
67 if (protocol & PROT_IPv4 ) return "rawip"; 68 if (protocol & PROT_IPv4 ) return "rawip";
69 if (protocol & PROT_ICMPv4) return "icmp";
68 if (protocol & PROT_UDPv4) return "udp"; 70 if (protocol & PROT_UDPv4 ) return "udp";
69 if (protocol & PROT_TCPv4) return "tcp"; 71 if (protocol & PROT_TCPv4 ) return "tcp";
70 72
71 return "<unknown>"; 73 return "<unknown>";
72} 74}
73 75
74void 76void
… …
103 105
104 rekey = DEFAULT_REKEY; 106 rekey = DEFAULT_REKEY;
105 keepalive = DEFAULT_KEEPALIVE; 107 keepalive = DEFAULT_KEEPALIVE;
106 llevel = L_INFO; 108 llevel = L_INFO;
107 ip_proto = IPPROTO_GRE; 109 ip_proto = IPPROTO_GRE;
110#if ENABLE_ICMP
111 icmp_type = ICMP_ECHOREPLY;
112#endif
108 113
109 default_node.udp_port = DEFAULT_UDPPORT; 114 default_node.udp_port = DEFAULT_UDPPORT;
110 default_node.tcp_port = DEFAULT_UDPPORT; 115 default_node.tcp_port = DEFAULT_UDPPORT;
111 default_node.connectmode = conf_node::C_ALWAYS; 116 default_node.connectmode = conf_node::C_ALWAYS;
112 default_node.compress = true; 117 default_node.compress = true;
… …
223 else 228 else
224 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);
225 } 230 }
226 else if (!strcmp (var, "ip-proto")) 231 else if (!strcmp (var, "ip-proto"))
227 ip_proto = atoi (val); 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
228 238
229 // per config 239 // per config
230 else if (!strcmp (var, "node")) 240 else if (!strcmp (var, "node"))
231 { 241 {
232 default_node.id++; 242 default_node.id++;
… …
344 { 354 {
345#if ENABLE_TCP 355#if ENABLE_TCP
346 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; 356 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
347#endif 357#endif
348 } 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 }
349 else if (!strcmp (var, "enable-udp")) 365 else if (!strcmp (var, "enable-udp"))
350 { 366 {
351 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; 367 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
352 } 368 }
353 else if (!strcmp (var, "enable-rawip")) 369 else if (!strcmp (var, "enable-rawip"))
… …
426 printf (_("MTU: %d\n"), mtu); 442 printf (_("MTU: %d\n"), mtu);
427 printf (_("rekeying interval: %d\n"), rekey); 443 printf (_("rekeying interval: %d\n"), rekey);
428 printf (_("keepalive interval: %d\n"), keepalive); 444 printf (_("keepalive interval: %d\n"), keepalive);
429 printf (_("interface: %s\n"), ifname); 445 printf (_("interface: %s\n"), ifname);
430 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); 446 printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>");
431 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);
432 printf ("\n"); 448 printf ("\n");
433 449
434 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", 450 printf ("%4s %-17s %s %-8.8s %-10.10s %s\n",
435 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); 451 _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port"));
436 452

Diff Legend

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