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.3 by pcg, Sun Mar 9 12:40:18 2003 UTC vs.
Revision 1.8 by pcg, Wed Apr 2 03:25:17 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;
92 default_node.tcp_port = DEFAULT_UDPPORT;
73 default_node.connectmode = conf_node::C_ALWAYS; 93 default_node.connectmode = conf_node::C_ALWAYS;
74 default_node.compress = true; 94 default_node.compress = true;
95 default_node.protocols = PROT_UDPv4;
75} 96}
76 97
77void configuration::cleanup() 98void configuration::cleanup()
78{ 99{
79 if (rsa_key) 100 if (rsa_key)
… …
94 nodes.clear (); 115 nodes.clear ();
95 116
96 cleanup (); 117 cleanup ();
97 init (); 118 init ();
98} 119}
120
121#define parse_bool(target,name,trueval,falseval) \
122 if (!strcmp (val, "yes")) target = trueval; \
123 else if (!strcmp (val, "no")) target = falseval; \
124 else if (!strcmp (val, "true")) target = trueval; \
125 else if (!strcmp (val, "false")) target = falseval; \
126 else if (!strcmp (val, "on")) target = trueval; \
127 else if (!strcmp (val, "off")) target = falseval; \
128 else \
129 slog (L_WARN, \
130 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \
131 name, var, fname, lineno);
99 132
100void configuration::read_config (bool need_keys) 133void configuration::read_config (bool need_keys)
101{ 134{
102 char *fname; 135 char *fname;
103 FILE *f; 136 FILE *f;
… …
167 if (l != L_NONE) 200 if (l != L_NONE)
168 llevel = l; 201 llevel = l;
169 else 202 else
170 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); 203 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
171 } 204 }
205 else if (!strcmp (var, "ip-proto"))
206 ip_proto = atoi (val);
172 207
173 // per config 208 // per config
174 else if (!strcmp (var, "node")) 209 else if (!strcmp (var, "node"))
175 { 210 {
176 default_node.id++; 211 default_node.id++;
… …
219 } 254 }
220 else if (!strcmp (var, "private-key")) 255 else if (!strcmp (var, "private-key"))
221 prikeyfile = strdup (val); 256 prikeyfile = strdup (val);
222 else if (!strcmp (var, "ifpersist")) 257 else if (!strcmp (var, "ifpersist"))
223 { 258 {
224 if (!strcmp (val, "yes")) 259 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 } 260 }
233 else if (!strcmp (var, "ifname")) 261 else if (!strcmp (var, "ifname"))
234 ifname = strdup (val); 262 ifname = strdup (val);
235 else if (!strcmp (var, "rekey")) 263 else if (!strcmp (var, "rekey"))
236 rekey = atoi (val); 264 rekey = atoi (val);
… …
251 free (node->hostname); 279 free (node->hostname);
252 node->hostname = strdup (val); 280 node->hostname = strdup (val);
253 } 281 }
254 282
255 /* node-specific, defaultable */ 283 /* node-specific, defaultable */
256 else if (!strcmp (var, "port")) 284 else if (!strcmp (var, "udp-port"))
257 node->port = atoi (val); 285 node->udp_port = atoi (val);
286 else if (!strcmp (var, "tcp-port"))
287 node->tcp_port = atoi (val);
258 else if (!strcmp (var, "router-priority")) 288 else if (!strcmp (var, "router-priority"))
259 node->routerprio = atoi (val); 289 node->routerprio = atoi (val);
260 else if (!strcmp (var, "connect")) 290 else if (!strcmp (var, "connect"))
261 { 291 {
262 if (!strcmp (val, "ondemand")) 292 if (!strcmp (val, "ondemand"))
263 node->connectmode = conf_node::C_ONDEMAND; 293 node->connectmode = conf_node::C_ONDEMAND;
264 else if (!strcmp (val, "never")) 294 else if (!strcmp (val, "never"))
265 node->connectmode = conf_node::C_NEVER; 295 node->connectmode = conf_node::C_NEVER;
266 else if (!strcmp (val, "always")) 296 else if (!strcmp (val, "always"))
267 node->connectmode = conf_node::C_ALWAYS; 297 node->connectmode = conf_node::C_ALWAYS;
298 else if (!strcmp (val, "disabled"))
299 node->connectmode = conf_node::C_DISABLED;
268 else 300 else
269 slog (L_WARN, 301 slog (L_WARN,
270 _("illegal value for 'connectmode', use one of 'ondemand', 'never' or 'always', at '%s' line %d"), 302 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
271 var, fname, lineno); 303 var, fname, lineno);
272 } 304 }
273 else if (!strcmp (var, "inherit-tos")) 305 else if (!strcmp (var, "inherit-tos"))
274 { 306 {
275 if (!strcmp (val, "yes")) 307 parse_bool (node->inherit_tos, "inherit-tos", true, false);
276 node->inherit_tos = true;
277 else if (!strcmp (val, "no"))
278 node->inherit_tos = false;
279 else 308 }
280 slog (L_WARN,
281 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"),
282 var, fname, lineno);
283 }
284
285 else if (!strcmp (var, "compress")) 309 else if (!strcmp (var, "compress"))
286 { 310 {
287 if (!strcmp (val, "yes")) 311 parse_bool (node->compress, "compress", true, false);
288 node->compress = true;
289 else if (!strcmp (val, "no"))
290 node->compress = false;
291 else 312 }
292 slog (L_WARN, 313 // all these bool options really really cost a lot of executable size!
293 _("illegal value for 'compress', only 'yes' or 'no' allowed, at '%s' line %d"), 314 else if (!strcmp (var, "enable-tcp"))
294 var, fname, lineno); 315 {
316 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
317 }
318 else if (!strcmp (var, "enable-udp"))
319 {
320 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
321 }
322 else if (!strcmp (var, "enable-rawip"))
323 {
324 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
295 } 325 }
296 326
297 // unknown or misplaced 327 // unknown or misplaced
298 else 328 else
299 { 329 {
… …
392 connectmode == C_NEVER ? "never" : 422 connectmode == C_NEVER ? "never" :
393 connectmode == C_ALWAYS ? "always" : "", 423 connectmode == C_ALWAYS ? "always" : "",
394 nodename, 424 nodename,
395 hostname ? hostname : "", 425 hostname ? hostname : "",
396 hostname ? ":" : "", 426 hostname ? ":" : "",
397 hostname ? port : 0 427 hostname ? udp_port : 0
398 ); 428 );
399} 429}
400 430

Diff Legend

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