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.4 by pcg, Sun Mar 23 14:49:16 2003 UTC vs.
Revision 1.6 by pcg, Fri Mar 28 16:14:40 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>
37
36#include <openssl/err.h> 38#include <openssl/err.h>
37#include <openssl/pem.h> 39#include <openssl/pem.h>
38#include <openssl/rsa.h> 40#include <openssl/rsa.h>
39#include <openssl/rand.h> 41#include <openssl/rand.h>
40 42
… …
66 memset (this, 0, sizeof (*this)); 68 memset (this, 0, sizeof (*this));
67 69
68 rekey = DEFAULT_REKEY; 70 rekey = DEFAULT_REKEY;
69 keepalive = DEFAULT_KEEPALIVE; 71 keepalive = DEFAULT_KEEPALIVE;
70 llevel = L_INFO; 72 llevel = L_INFO;
73 ip_proto = IPPROTO_GRE;
71 74
72 default_node.port = DEFAULT_PORT; 75 default_node.udp_port = DEFAULT_UDPPORT;
73 default_node.connectmode = conf_node::C_ALWAYS; 76 default_node.connectmode = conf_node::C_ALWAYS;
74 default_node.compress = true; 77 default_node.compress = true;
78 default_node.protocols = PROT_UDPv4;
75} 79}
76 80
77void configuration::cleanup() 81void configuration::cleanup()
78{ 82{
79 if (rsa_key) 83 if (rsa_key)
… …
94 nodes.clear (); 98 nodes.clear ();
95 99
96 cleanup (); 100 cleanup ();
97 init (); 101 init ();
98} 102}
103
104#define parse_bool(target,name,trueval,falseval) \
105 if (!strcmp (val, "yes")) target = trueval; \
106 else if (!strcmp (val, "no")) target = falseval; \
107 else if (!strcmp (val, "true")) target = trueval; \
108 else if (!strcmp (val, "false")) target = falseval; \
109 else if (!strcmp (val, "on")) target = trueval; \
110 else if (!strcmp (val, "off")) target = falseval; \
111 else \
112 slog (L_WARN, \
113 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
114 name, var, fname, lineno);
99 115
100void configuration::read_config (bool need_keys) 116void configuration::read_config (bool need_keys)
101{ 117{
102 char *fname; 118 char *fname;
103 FILE *f; 119 FILE *f;
… …
167 if (l != L_NONE) 183 if (l != L_NONE)
168 llevel = l; 184 llevel = l;
169 else 185 else
170 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 186 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
171 } 187 }
188 else if (!strcmp (var, "ip-proto"))
189 ip_proto = atoi (val);
172 190
173 // per config 191 // per config
174 else if (!strcmp (var, "node")) 192 else if (!strcmp (var, "node"))
175 { 193 {
176 default_node.id++; 194 default_node.id++;
… …
219 } 237 }
220 else if (!strcmp (var, "private-key")) 238 else if (!strcmp (var, "private-key"))
221 prikeyfile = strdup (val); 239 prikeyfile = strdup (val);
222 else if (!strcmp (var, "ifpersist")) 240 else if (!strcmp (var, "ifpersist"))
223 { 241 {
224 if (!strcmp (val, "yes")) 242 parse_bool (ifpersist, "ifpersist", true, false);
225 ifpersist = true;
226 else if (!strcmp (val, "no"))
227 ifpersist = false;
228 else
229 slog (L_WARN,
230 _("illegal value for 'ifpersist', only 'yes' or 'no' allowed, at '%s' line %d"),
231 var, fname, lineno);
232 } 243 }
233 else if (!strcmp (var, "ifname")) 244 else if (!strcmp (var, "ifname"))
234 ifname = strdup (val); 245 ifname = strdup (val);
235 else if (!strcmp (var, "rekey")) 246 else if (!strcmp (var, "rekey"))
236 rekey = atoi (val); 247 rekey = atoi (val);
… …
252 node->hostname = strdup (val); 263 node->hostname = strdup (val);
253 } 264 }
254 265
255 /* node-specific, defaultable */ 266 /* node-specific, defaultable */
256 else if (!strcmp (var, "udp-port")) 267 else if (!strcmp (var, "udp-port"))
257 node->port = atoi (val); 268 node->udp_port = atoi (val);
258 else if (!strcmp (var, "port")) //deprecated
259 node->port = atoi (val);
260 else if (!strcmp (var, "router-priority")) 269 else if (!strcmp (var, "router-priority"))
261 node->routerprio = atoi (val); 270 node->routerprio = atoi (val);
262 else if (!strcmp (var, "connect")) 271 else if (!strcmp (var, "connect"))
263 { 272 {
264 if (!strcmp (val, "ondemand")) 273 if (!strcmp (val, "ondemand"))
… …
274 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), 283 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
275 var, fname, lineno); 284 var, fname, lineno);
276 } 285 }
277 else if (!strcmp (var, "inherit-tos")) 286 else if (!strcmp (var, "inherit-tos"))
278 { 287 {
279 if (!strcmp (val, "yes")) 288 parse_bool (node->inherit_tos, "inherit-tos", true, false);
280 node->inherit_tos = true;
281 else if (!strcmp (val, "no"))
282 node->inherit_tos = false;
283 else 289 }
284 slog (L_WARN,
285 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),
286 var, fname, lineno);
287 }
288
289 else if (!strcmp (var, "compress")) 290 else if (!strcmp (var, "compress"))
290 { 291 {
291 if (!strcmp (val, "yes")) 292 parse_bool (node->compress, "compress", true, false);
292 node->compress = true;
293 else if (!strcmp (val, "no"))
294 node->compress = false;
295 else 293 }
296 slog (L_WARN, 294 // all these bool options really really cost a lot of executable size!
297 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"), 295 else if (!strcmp (var, "enable-udp"))
298 var, fname, lineno); 296 {
297 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
298 }
299 else if (!strcmp (var, "enable-rawip"))
300 {
301 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
299 } 302 }
300 303
301 // unknown or misplaced 304 // unknown or misplaced
302 else 305 else
303 { 306 {
… …
396 connectmode == C_NEVER ? "never" : 399 connectmode == C_NEVER ? "never" :
397 connectmode == C_ALWAYS ? "always" : "", 400 connectmode == C_ALWAYS ? "always" : "",
398 nodename, 401 nodename,
399 hostname ? hostname : "", 402 hostname ? hostname : "",
400 hostname ? ":" : "", 403 hostname ? ":" : "",
401 hostname ? port : 0 404 hostname ? udp_port : 0
402 ); 405 );
403} 406}
404 407

Diff Legend

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