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.2 by pcg, Thu Mar 6 18:43:07 2003 UTC vs.
Revision 1.7 by pcg, Fri Mar 28 16:21:09 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
… …
49char *identname; 51char *identname;
50char *pidfilename; 52char *pidfilename;
51 53
52struct configuration conf; 54struct configuration conf;
53 55
56u8 best_protocol (u8 protset)
57{
58 if (protset & PROT_IPv4)
59 return PROT_IPv4;
60
61 return PROT_UDPv4;
62}
63
64const char *strprotocol (u8 protocol)
65{
66 if (protocol & PROT_IPv4 ) return "rawip";
67 if (protocol & PROT_UDPv4) return "udp";
68
69 return "<unknown>";
70}
71
54configuration::configuration () 72configuration::configuration ()
55{ 73{
56 init (); 74 init ();
57} 75}
58 76
… …
66 memset (this, 0, sizeof (*this)); 84 memset (this, 0, sizeof (*this));
67 85
68 rekey = DEFAULT_REKEY; 86 rekey = DEFAULT_REKEY;
69 keepalive = DEFAULT_KEEPALIVE; 87 keepalive = DEFAULT_KEEPALIVE;
70 llevel = L_INFO; 88 llevel = L_INFO;
89 ip_proto = IPPROTO_GRE;
71 90
72 default_node.port = DEFAULT_PORT; 91 default_node.udp_port = DEFAULT_UDPPORT;
73 default_node.connectmode = conf_node::C_ALWAYS; 92 default_node.connectmode = conf_node::C_ALWAYS;
74 default_node.compress = true; 93 default_node.compress = true;
94 default_node.protocols = PROT_UDPv4;
75} 95}
76 96
77void configuration::cleanup() 97void configuration::cleanup()
78{ 98{
79 if (rsa_key) 99 if (rsa_key)
… …
94 nodes.clear (); 114 nodes.clear ();
95 115
96 cleanup (); 116 cleanup ();
97 init (); 117 init ();
98} 118}
119
120#define parse_bool(target,name,trueval,falseval) \
121 if (!strcmp (val, "yes")) target = trueval; \
122 else if (!strcmp (val, "no")) target = falseval; \
123 else if (!strcmp (val, "true")) target = trueval; \
124 else if (!strcmp (val, "false")) target = falseval; \
125 else if (!strcmp (val, "on")) target = trueval; \
126 else if (!strcmp (val, "off")) target = falseval; \
127 else \
128 slog (L_WARN, \
129 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
130 name, var, fname, lineno);
99 131
100void configuration::read_config (bool need_keys) 132void configuration::read_config (bool need_keys)
101{ 133{
102 char *fname; 134 char *fname;
103 FILE *f; 135 FILE *f;
… …
167 if (l != L_NONE) 199 if (l != L_NONE)
168 llevel = l; 200 llevel = l;
169 else 201 else
170 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 202 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
171 } 203 }
204 else if (!strcmp (var, "ip-proto"))
205 ip_proto = atoi (val);
172 206
173 // per config 207 // per config
174 else if (!strcmp (var, "node")) 208 else if (!strcmp (var, "node"))
175 { 209 {
176 default_node.id++; 210 default_node.id++;
… …
219 } 253 }
220 else if (!strcmp (var, "private-key")) 254 else if (!strcmp (var, "private-key"))
221 prikeyfile = strdup (val); 255 prikeyfile = strdup (val);
222 else if (!strcmp (var, "ifpersist")) 256 else if (!strcmp (var, "ifpersist"))
223 { 257 {
224 if (!strcmp (val, "yes")) 258 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 } 259 }
233 else if (!strcmp (var, "ifname")) 260 else if (!strcmp (var, "ifname"))
234 ifname = strdup (val); 261 ifname = strdup (val);
235 else if (!strcmp (var, "rekey")) 262 else if (!strcmp (var, "rekey"))
236 rekey = atoi (val); 263 rekey = atoi (val);
… …
251 free (node->hostname); 278 free (node->hostname);
252 node->hostname = strdup (val); 279 node->hostname = strdup (val);
253 } 280 }
254 281
255 /* node-specific, defaultable */ 282 /* node-specific, defaultable */
256 else if (!strcmp (var, "port")) 283 else if (!strcmp (var, "udp-port"))
257 node->port = atoi (val); 284 node->udp_port = atoi (val);
258 else if (!strcmp (var, "router-priority")) 285 else if (!strcmp (var, "router-priority"))
259 node->routerprio = atoi (val); 286 node->routerprio = atoi (val);
260 else if (!strcmp (var, "connect")) 287 else if (!strcmp (var, "connect"))
261 { 288 {
262 if (!strcmp (val, "ondemand")) 289 if (!strcmp (val, "ondemand"))
263 node->connectmode = conf_node::C_ONDEMAND; 290 node->connectmode = conf_node::C_ONDEMAND;
264 else if (!strcmp (val, "never")) 291 else if (!strcmp (val, "never"))
265 node->connectmode = conf_node::C_NEVER; 292 node->connectmode = conf_node::C_NEVER;
266 else if (!strcmp (val, "always")) 293 else if (!strcmp (val, "always"))
267 node->connectmode = conf_node::C_ALWAYS; 294 node->connectmode = conf_node::C_ALWAYS;
295 else if (!strcmp (val, "disabled"))
296 node->connectmode = conf_node::C_DISABLED;
268 else 297 else
269 slog (L_WARN, 298 slog (L_WARN,
270 _("illegal value for 'connectmode', use one of 'ondemand', 'never' or 'always', at '%s' line %d"), 299 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
271 var, fname, lineno); 300 var, fname, lineno);
272 } 301 }
302 else if (!strcmp (var, "inherit-tos"))
303 {
304 parse_bool (node->inherit_tos, "inherit-tos", true, false);
305 }
273 else if (!strcmp (var, "compress")) 306 else if (!strcmp (var, "compress"))
274 { 307 {
275 if (!strcmp (val, "yes")) 308 parse_bool (node->compress, "compress", true, false);
276 node->compress = true;
277 else if (!strcmp (val, "no"))
278 node->compress = false;
279 else 309 }
280 slog (L_WARN, 310 // all these bool options really really cost a lot of executable size!
281 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"), 311 else if (!strcmp (var, "enable-udp"))
282 var, fname, lineno); 312 {
313 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
314 }
315 else if (!strcmp (var, "enable-rawip"))
316 {
317 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
283 } 318 }
284 319
285 // unknown or misplaced 320 // unknown or misplaced
286 else 321 else
287 { 322 {
… …
380 connectmode == C_NEVER ? "never" : 415 connectmode == C_NEVER ? "never" :
381 connectmode == C_ALWAYS ? "always" : "", 416 connectmode == C_ALWAYS ? "always" : "",
382 nodename, 417 nodename,
383 hostname ? hostname : "", 418 hostname ? hostname : "",
384 hostname ? ":" : "", 419 hostname ? ":" : "",
385 hostname ? port : 0 420 hostname ? udp_port : 0
386 ); 421 );
387} 422}
388 423

Diff Legend

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