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.16 by pcg, Tue Oct 14 03:22:09 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 <arpa/inet.h>
38#ifdef ENABLE_ICMP
39# ifdef HAVE_NETINET_IN_SYSTM_H
40# include <netinet/in_systm.h>
41# endif
42# ifdef HAVE_NETINET_IP_H
43# include <netinet/ip.h>
44# endif
45# include <netinet/ip_icmp.h>
46#endif
47 33
48#include <openssl/err.h> 34#include <openssl/err.h>
49#include <openssl/pem.h> 35#include <openssl/pem.h>
50#include <openssl/rsa.h> 36#include <openssl/rsa.h>
51#include <openssl/rand.h> 37#include <openssl/rand.h>
… …
111 97
112void configuration::init () 98void configuration::init ()
113{ 99{
114 memset (this, 0, sizeof (*this)); 100 memset (this, 0, sizeof (*this));
115 101
102 mtu = DEFAULT_MTU;
116 rekey = DEFAULT_REKEY; 103 rekey = DEFAULT_REKEY;
117 keepalive = DEFAULT_KEEPALIVE; 104 keepalive = DEFAULT_KEEPALIVE;
118 llevel = L_INFO; 105 llevel = L_INFO;
119 ip_proto = IPPROTO_GRE; 106 ip_proto = IPPROTO_GRE;
120#if ENABLE_ICMP 107#if ENABLE_ICMP
… …
238 else 225 else
239 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);
240 } 227 }
241 else if (!strcmp (var, "ip-proto")) 228 else if (!strcmp (var, "ip-proto"))
242 ip_proto = atoi (val); 229 ip_proto = atoi (val);
230 else if (!strcmp (var, "icmp-type"))
231 {
243#if ENABLE_ICMP 232#if ENABLE_ICMP
244 //TODO: error message
245 else if (!strcmp (var, "icmp-type"))
246 icmp_type = atoi (val); 233 icmp_type = atoi (val);
247#endif 234#endif
235 }
248 236
249 // per config 237 // per config
250 else if (!strcmp (var, "node")) 238 else if (!strcmp (var, "node"))
251 { 239 {
252 default_node.id++; 240 default_node.id++;
… …
311 script_if_up = strdup (val); 299 script_if_up = strdup (val);
312 else if (!strcmp (var, "node-up")) 300 else if (!strcmp (var, "node-up"))
313 script_node_up = strdup (val); 301 script_node_up = strdup (val);
314 else if (!strcmp (var, "node-down")) 302 else if (!strcmp (var, "node-down"))
315 script_node_down = strdup (val); 303 script_node_down = strdup (val);
304 else if (!strcmp (var, "http-proxy-host"))
305 {
316#if ENABLE_HTTP_PROXY 306#if ENABLE_HTTP_PROXY
317 else if (!strcmp (var, "http-proxy-host"))
318 proxy_host = strdup (val); 307 proxy_host = strdup (val);
308#endif
309 }
319 else if (!strcmp (var, "http-proxy-port")) 310 else if (!strcmp (var, "http-proxy-port"))
311 {
312#if ENABLE_HTTP_PROXY
320 proxy_port = atoi (val); 313 proxy_port = atoi (val);
314#endif
315 }
321 else if (!strcmp (var, "http-proxy-auth")) 316 else if (!strcmp (var, "http-proxy-auth"))
317 {
318#if ENABLE_HTTP_PROXY
322 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); 319 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
323#endif 320#endif
321 }
324 322
325 /* node-specific, non-defaultable */ 323 /* node-specific, non-defaultable */
326 else if (node != &default_node && !strcmp (var, "hostname")) 324 else if (node != &default_node && !strcmp (var, "hostname"))
327 { 325 {
328 free (node->hostname); 326 free (node->hostname);

Diff Legend

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