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.33 by pcg, Sun Mar 6 18:34:46 2005 UTC vs.
Revision 1.42 by pcg, Mon Dec 5 12:58:08 2005 UTC

… …
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
18 along with gvpe; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20*/ 20*/
21 21
22#include "config.h" 22#include "config.h"
23 23
24#include <cstdio> 24#include <cstdio>
… …
37#include <openssl/pem.h> 37#include <openssl/pem.h>
38#include <openssl/rsa.h> 38#include <openssl/rsa.h>
39#include <openssl/rand.h> 39#include <openssl/rand.h>
40#include <openssl/bn.h> 40#include <openssl/bn.h>
41 41
42#include "gettext.h"
43
44#include "conf.h" 42#include "conf.h"
45#include "slog.h" 43#include "slog.h"
46#include "util.h" 44#include "util.h"
47 45
48char *confbase; 46char *confbase;
… …
69 if (protocol & PROT_UDPv4 ) return "udp"; 67 if (protocol & PROT_UDPv4 ) return "udp";
70 if (protocol & PROT_TCPv4 ) return "tcp"; 68 if (protocol & PROT_TCPv4 ) return "tcp";
71 if (protocol & PROT_DNSv4 ) return "dns"; 69 if (protocol & PROT_DNSv4 ) return "dns";
72 70
73 return "<unknown>"; 71 return "<unknown>";
72}
73
74static bool
75match_list (const vector<const char *> &list, const char *str)
76{
77 for (vector<const char *>::const_iterator i = list.end (); i-- > list.begin (); )
78 if ((*i)[0] == '*' && !(*i)[1])
79 return true;
80 else if (!strcmp (*i, str))
81 return true;
82
83 return false;
84}
85
86bool
87conf_node::can_direct (struct conf_node *other)
88{
89 if (match_list (allow_direct, other->nodename))
90 return true;
91
92 if (match_list (deny_direct, other->nodename))
93 return false;
94
95 return true;
74} 96}
75 97
76void 98void
77conf_node::print () 99conf_node::print ()
78{ 100{
… …
90 ); 112 );
91} 113}
92 114
93conf_node::~conf_node () 115conf_node::~conf_node ()
94{ 116{
117#if 0
118 // does not work, because string pointers etc. are shared
119 // is not called, however
95 if (rsa_key) 120 if (rsa_key)
96 RSA_free (rsa_key); 121 RSA_free (rsa_key);
97 122
98 free (nodename); 123 free (nodename);
99 free (hostname); 124 free (hostname);
125 free (if_up_data);
100#if ENABLE_DNS 126#if ENABLE_DNS
101 free (domain); 127 free (domain);
102 free (dns_hostname); 128 free (dns_hostname);
129#endif
103#endif 130#endif
104} 131}
105 132
106void configuration::init () 133void configuration::init ()
107{ 134{
… …
120 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm 147 default_node.tcp_port = DEFAULT_UDPPORT; // ehrm
121 default_node.connectmode = conf_node::C_ALWAYS; 148 default_node.connectmode = conf_node::C_ALWAYS;
122 default_node.compress = true; 149 default_node.compress = true;
123 default_node.protocols = 0; 150 default_node.protocols = 0;
124 default_node.max_retry = DEFAULT_MAX_RETRY; 151 default_node.max_retry = DEFAULT_MAX_RETRY;
152 default_node.if_up_data = strdup ("");
125 153
126#if ENABLE_DNS 154#if ENABLE_DNS
127 default_node.dns_port = 0; // default is 0 == client 155 default_node.dns_port = 0; // default is 0 == client
156
128 dns_forw_host = strdup ("127.0.0.1"); 157 dns_forw_host = strdup ("127.0.0.1");
129 dns_forw_port = 53; 158 dns_forw_port = 53;
159 dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR;
160 dns_send_interval = DEFAULT_DNS_SEND_INTERVAL;
161 dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR;
162 dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING;
130#endif 163#endif
131 164
132 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); 165 conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid");
133} 166}
134 167
… …
149 free (dns_forw_host); dns_forw_host = 0; 182 free (dns_forw_host); dns_forw_host = 0;
150#endif 183#endif
151} 184}
152 185
153void 186void
154configuration::clear_config () 187configuration::clear ()
155{ 188{
156 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i) 189 for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i)
157 delete *i; 190 delete *i;
158 191
159 nodes.clear (); 192 nodes.clear ();
160 193
161 cleanup (); 194 cleanup ();
162 init (); 195 init ();
163} 196}
164 197
165#define parse_bool(target,name,trueval,falseval) \ 198#define parse_bool(target,name,trueval,falseval) do { \
166 if (!strcmp (val, "yes")) target = trueval; \ 199 if (!strcmp (val, "yes")) target = trueval; \
167 else if (!strcmp (val, "no")) target = falseval; \ 200 else if (!strcmp (val, "no")) target = falseval; \
168 else if (!strcmp (val, "true")) target = trueval; \ 201 else if (!strcmp (val, "true")) target = trueval; \
169 else if (!strcmp (val, "false")) target = falseval; \ 202 else if (!strcmp (val, "false")) target = falseval; \
170 else if (!strcmp (val, "on")) target = trueval; \ 203 else if (!strcmp (val, "on")) target = trueval; \
171 else if (!strcmp (val, "off")) target = falseval; \ 204 else if (!strcmp (val, "off")) target = falseval; \
172 else \ 205 else \
173 slog (L_WARN, \ 206 return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed. (ignored)"); \
174 _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ 207} while (0)
175 name, var, fname, lineno);
176 208
177void configuration::read_config (bool need_keys) 209const char *
210configuration_parser::parse_line (char *line)
211{
212 {
213 char *end = line + strlen (line);
214
215 while (*end < ' ' && end >= line)
216 end--;
217
218 *++end = 0;
219 }
220
221 char *tok = line;
222 const char *var = strtok (tok, "\t =");
223 tok = 0;
224
225 if (!var || !var[0])
226 return 0; /* no tokens on this line */
227
228 if (var[0] == '#')
229 return 0; /* comment: ignore */
230
231 char *val = strtok (NULL, "\t\n\r =");
232
233 if (!val || val[0] == '#')
234 return _("no value given for variable. (ignored)");
235
236 if (!strcmp (var, "on"))
237 {
238 if (!::thisnode
239 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
240 || !strcmp (val, ::thisnode))
241 return parse_line (strtok (NULL, "\n\r"));
242 else
243 return 0;
244 }
245
246 // truly global
247 if (!strcmp (var, "loglevel"))
248 {
249 loglevel l = string_to_loglevel (val);
250
251 if (l == L_NONE)
252 return _("unknown loglevel. (skipping)");
253 }
254 else if (!strcmp (var, "ip-proto"))
255 conf.ip_proto = atoi (val);
256 else if (!strcmp (var, "icmp-type"))
257 {
258#if ENABLE_ICMP
259 conf.icmp_type = atoi (val);
260#endif
261 }
262
263 // per config
264 else if (!strcmp (var, "node"))
265 {
266 parse_argv ();
267
268 conf.default_node.id++;
269 node = new conf_node (conf.default_node);
270 conf.nodes.push_back (node);
271 node->nodename = strdup (val);
272
273 {
274 char *fname;
275 FILE *f;
276
277 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
278
279 f = fopen (fname, "r");
280 if (f)
281 {
282 node->rsa_key = RSA_new ();
283
284 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
285 {
286 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
287 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
288 exit (EXIT_FAILURE);
289 }
290
291 require (RSA_blinding_on (node->rsa_key, 0));
292
293 fclose (f);
294 }
295 else
296 {
297 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
298
299 if (need_keys)
300 exit (EXIT_FAILURE);
301 }
302
303 free (fname);
304 }
305
306 if (::thisnode && !strcmp (node->nodename, ::thisnode))
307 conf.thisnode = node;
308 }
309 else if (!strcmp (var, "private-key"))
310 free (conf.prikeyfile), conf.prikeyfile = strdup (val);
311 else if (!strcmp (var, "ifpersist"))
312 parse_bool (conf.ifpersist, "ifpersist", true, false);
313 else if (!strcmp (var, "ifname"))
314 free (conf.ifname), conf.ifname = strdup (val);
315 else if (!strcmp (var, "rekey"))
316 conf.rekey = atoi (val);
317 else if (!strcmp (var, "keepalive"))
318 conf.keepalive = atoi (val);
319 else if (!strcmp (var, "mtu"))
320 conf.mtu = atoi (val);
321 else if (!strcmp (var, "if-up"))
322 free (conf.script_if_up), conf.script_if_up = strdup (val);
323 else if (!strcmp (var, "node-up"))
324 free (conf.script_node_up), conf.script_node_up = strdup (val);
325 else if (!strcmp (var, "node-down"))
326 free (conf.script_node_down), conf.script_node_down = strdup (val);
327 else if (!strcmp (var, "pid-file"))
328 free (conf.pidfilename), conf.pidfilename = strdup (val);
329 else if (!strcmp (var, "dns-forw-host"))
330 {
331#if ENABLE_DNS
332 free (conf.dns_forw_host), conf.dns_forw_host = strdup (val);
333#endif
334 }
335 else if (!strcmp (var, "dns-forw-port"))
336 {
337#if ENABLE_DNS
338 conf.dns_forw_port = atoi (val);
339#endif
340 }
341 else if (!strcmp (var, "dns-timeout-factor"))
342 {
343#if ENABLE_DNS
344 conf.dns_timeout_factor = atof (val);
345#endif
346 }
347 else if (!strcmp (var, "dns-send-interval"))
348 {
349#if ENABLE_DNS
350 conf.dns_send_interval = atoi (val);
351#endif
352 }
353 else if (!strcmp (var, "dns-overlap-factor"))
354 {
355#if ENABLE_DNS
356 conf.dns_overlap_factor = atof (val);
357#endif
358 }
359 else if (!strcmp (var, "dns-max-outstanding"))
360 {
361#if ENABLE_DNS
362 conf.dns_max_outstanding = atoi (val);
363#endif
364 }
365 else if (!strcmp (var, "http-proxy-host"))
366 {
367#if ENABLE_HTTP_PROXY
368 free (conf.proxy_host), conf.proxy_host = strdup (val);
369#endif
370 }
371 else if (!strcmp (var, "http-proxy-port"))
372 {
373#if ENABLE_HTTP_PROXY
374 conf.proxy_port = atoi (val);
375#endif
376 }
377 else if (!strcmp (var, "http-proxy-auth"))
378 {
379#if ENABLE_HTTP_PROXY
380 conf.proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
381#endif
382 }
383
384 /* node-specific, non-defaultable */
385 else if (node != &conf.default_node && !strcmp (var, "hostname"))
386 free (node->hostname), node->hostname = strdup (val);
387
388 /* node-specific, defaultable */
389 else if (!strcmp (var, "udp-port"))
390 node->udp_port = atoi (val);
391 else if (!strcmp (var, "tcp-port"))
392 node->tcp_port = atoi (val);
393 else if (!strcmp (var, "dns-hostname"))
394 {
395#if ENABLE_DNS
396 free (node->dns_hostname), node->dns_hostname = strdup (val);
397#endif
398 }
399 else if (!strcmp (var, "dns-port"))
400 {
401#if ENABLE_DNS
402 node->dns_port = atoi (val);
403#endif
404 }
405 else if (!strcmp (var, "dns-domain"))
406 {
407#if ENABLE_DNS
408 free (node->domain), node->domain = strdup (val);
409#endif
410 }
411 else if (!strcmp (var, "if-up-data"))
412 free (node->if_up_data), node->if_up_data = strdup (val);
413 else if (!strcmp (var, "router-priority"))
414 node->routerprio = atoi (val);
415 else if (!strcmp (var, "max-retry"))
416 node->max_retry = atoi (val);
417 else if (!strcmp (var, "connect"))
418 {
419 if (!strcmp (val, "ondemand"))
420 node->connectmode = conf_node::C_ONDEMAND;
421 else if (!strcmp (val, "never"))
422 node->connectmode = conf_node::C_NEVER;
423 else if (!strcmp (val, "always"))
424 node->connectmode = conf_node::C_ALWAYS;
425 else if (!strcmp (val, "disabled"))
426 node->connectmode = conf_node::C_DISABLED;
427 else
428 return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled'. (ignored)");
429 }
430 else if (!strcmp (var, "inherit-tos"))
431 parse_bool (node->inherit_tos, "inherit-tos", true, false);
432 else if (!strcmp (var, "compress"))
433 parse_bool (node->compress, "compress", true, false);
434 // all these bool options really really cost a lot of executable size!
435 else if (!strcmp (var, "enable-tcp"))
436 {
437#if ENABLE_TCP
438 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
439#endif
440 }
441 else if (!strcmp (var, "enable-icmp"))
442 {
443#if ENABLE_ICMP
444 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
445#endif
446 }
447 else if (!strcmp (var, "enable-dns"))
448 {
449#if ENABLE_DNS
450 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
451#endif
452 }
453 else if (!strcmp (var, "enable-udp"))
454 {
455 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
456 }
457 else if (!strcmp (var, "enable-rawip"))
458 {
459 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
460 }
461 else if (!strcmp (var, "allow-direct"))
462 node->allow_direct.push_back (strdup (val));
463 else if (!strcmp (var, "deny-direct"))
464 node->deny_direct.push_back (strdup (val));
465
466 // unknown or misplaced
467 else
468 return _("unknown configuration directive. (ignored)");
469
470 return 0;
471}
472
473void configuration_parser::parse_argv ()
474{
475 for (int i = 0; i < argc; ++i)
476 {
477 char *v = argv [i];
478
479 if (!*v)
480 continue;
481
482 char *enode = v;
483
484 while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode)
485 enode++;
486
487 if (*enode != '.')
488 enode = 0;
489
490 char *wnode = node == &conf.default_node
491 ? 0
492 : node->nodename;
493
494 if ((!wnode && !enode)
495 || (wnode && enode && !strncmp (wnode, v, enode - v)))
496 {
497 const char *warn = parse_line (enode ? enode + 1 : v);
498
499 if (warn)
500 slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v);
501
502 *v = 0;
503 }
504 }
505}
506
507configuration_parser::configuration_parser (configuration &conf,
508 bool need_keys,
509 int argc,
510 char **argv)
511: conf (conf),need_keys (need_keys), argc (argc), argv (argv)
178{ 512{
179 char *fname; 513 char *fname;
180 FILE *f; 514 FILE *f;
181 515
182 clear_config (); 516 conf.clear ();
183 517
184 asprintf (&fname, "%s/gvpe.conf", confbase); 518 asprintf (&fname, "%s/gvpe.conf", confbase);
185 f = fopen (fname, "r"); 519 f = fopen (fname, "r");
186 520
187 if (f) 521 if (f)
188 { 522 {
189 char line[16384]; 523 char line[16384];
190 int lineno = 0; 524 int lineno = 0;
191 char *var, *val; 525 node = &conf.default_node;
192 conf_node *node = &default_node;
193 526
194 while (fgets (line, sizeof (line), f)) 527 while (fgets (line, sizeof (line), f))
195 { 528 {
196 lineno++; 529 lineno++;
197 530
198 { 531 const char *warn = parse_line (line);
199 char *end = line + strlen (line);
200 532
201 while (*end < ' ' && end >= line) 533 if (warn)
202 end--; 534 slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno);
203
204 *++end = 0;
205 }
206
207 char *tok = line;
208
209retry:
210 var = strtok (tok, "\t =");
211 tok = 0;
212
213 if (!var || !var[0])
214 continue; /* no tokens on this line */
215
216 if (var[0] == '#')
217 continue; /* comment: ignore */
218
219 val = strtok (NULL, "\t\n\r =");
220
221 if (!val || val[0] == '#')
222 {
223 slog (L_WARN,
224 _("no value for variable `%s', at '%s' line %d"),
225 var, fname, lineno);
226 break;
227 }
228
229 if (!strcmp (var, "on"))
230 {
231 if (!::thisnode
232 || (val[0] == '!' && strcmp (val + 1, ::thisnode))
233 || !strcmp (val, ::thisnode))
234 goto retry;
235
236 continue;
237 }
238
239 // truly global
240 if (!strcmp (var, "loglevel"))
241 {
242 loglevel l = string_to_loglevel (val);
243
244 if (l != L_NONE)
245 llevel = l;
246 else
247 slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line);
248 }
249 else if (!strcmp (var, "ip-proto"))
250 ip_proto = atoi (val);
251 else if (!strcmp (var, "icmp-type"))
252 {
253#if ENABLE_ICMP
254 icmp_type = atoi (val);
255#endif
256 }
257
258 // per config
259 else if (!strcmp (var, "node"))
260 {
261 default_node.id++;
262
263 node = new conf_node (default_node);
264
265 nodes.push_back (node);
266
267 node->nodename = strdup (val);
268
269 {
270 char *fname;
271 FILE *f;
272
273 asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename);
274
275 f = fopen (fname, "r");
276 if (f)
277 {
278 node->rsa_key = RSA_new ();
279
280 if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL))
281 {
282 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
283 slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
284 exit (EXIT_FAILURE);
285 }
286
287 require (RSA_blinding_on (node->rsa_key, 0));
288
289 fclose (f);
290 }
291 else
292 {
293 slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno));
294
295 if (need_keys)
296 exit (EXIT_FAILURE);
297 }
298
299 free (fname);
300 }
301
302 if (::thisnode && !strcmp (node->nodename, ::thisnode))
303 thisnode = node;
304 }
305 else if (!strcmp (var, "private-key"))
306 free (prikeyfile), prikeyfile = strdup (val);
307 else if (!strcmp (var, "ifpersist"))
308 {
309 parse_bool (ifpersist, "ifpersist", true, false);
310 }
311 else if (!strcmp (var, "ifname"))
312 free (ifname), ifname = strdup (val);
313 else if (!strcmp (var, "rekey"))
314 rekey = atoi (val);
315 else if (!strcmp (var, "keepalive"))
316 keepalive = atoi (val);
317 else if (!strcmp (var, "mtu"))
318 mtu = atoi (val);
319 else if (!strcmp (var, "if-up"))
320 free (script_if_up), script_if_up = strdup (val);
321 else if (!strcmp (var, "node-up"))
322 free (script_node_up), script_node_up = strdup (val);
323 else if (!strcmp (var, "node-down"))
324 free (script_node_down), script_node_down = strdup (val);
325 else if (!strcmp (var, "pid-file"))
326 free (pidfilename), pidfilename = strdup (val);
327#if ENABLE_DNS
328 else if (!strcmp (var, "dns-forw-host"))
329 free (dns_forw_host), dns_forw_host = strdup (val);
330 else if (!strcmp (var, "dns-forw-port"))
331 dns_forw_port = atoi (val);
332#endif
333 else if (!strcmp (var, "http-proxy-host"))
334 {
335#if ENABLE_HTTP_PROXY
336 free (proxy_host), proxy_host = strdup (val);
337#endif
338 }
339 else if (!strcmp (var, "http-proxy-port"))
340 {
341#if ENABLE_HTTP_PROXY
342 proxy_port = atoi (val);
343#endif
344 }
345 else if (!strcmp (var, "http-proxy-auth"))
346 {
347#if ENABLE_HTTP_PROXY
348 proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val));
349#endif
350 }
351
352 /* node-specific, non-defaultable */
353 else if (node != &default_node && !strcmp (var, "hostname"))
354 free (node->hostname), node->hostname = strdup (val);
355
356 /* node-specific, defaultable */
357 else if (!strcmp (var, "udp-port"))
358 node->udp_port = atoi (val);
359 else if (!strcmp (var, "tcp-port"))
360 node->tcp_port = atoi (val);
361#if ENABLE_DNS
362 else if (!strcmp (var, "dns-hostname"))
363 free (node->dns_hostname), node->dns_hostname = strdup (val);
364 else if (!strcmp (var, "dns-port"))
365 node->dns_port = atoi (val);
366 else if (!strcmp (var, "dns-domain"))
367 free (node->domain), node->domain = strdup (val);
368#endif
369 else if (!strcmp (var, "router-priority"))
370 node->routerprio = atoi (val);
371 else if (!strcmp (var, "max-retry"))
372 node->max_retry = atoi (val);
373 else if (!strcmp (var, "connect"))
374 {
375 if (!strcmp (val, "ondemand"))
376 node->connectmode = conf_node::C_ONDEMAND;
377 else if (!strcmp (val, "never"))
378 node->connectmode = conf_node::C_NEVER;
379 else if (!strcmp (val, "always"))
380 node->connectmode = conf_node::C_ALWAYS;
381 else if (!strcmp (val, "disabled"))
382 node->connectmode = conf_node::C_DISABLED;
383 else
384 slog (L_WARN,
385 _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"),
386 var, fname, lineno);
387 }
388 else if (!strcmp (var, "inherit-tos"))
389 {
390 parse_bool (node->inherit_tos, "inherit-tos", true, false);
391 }
392 else if (!strcmp (var, "compress"))
393 {
394 parse_bool (node->compress, "compress", true, false);
395 }
396 // all these bool options really really cost a lot of executable size!
397 else if (!strcmp (var, "enable-tcp"))
398 {
399#if ENABLE_TCP
400 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
401#endif
402 }
403 else if (!strcmp (var, "enable-icmp"))
404 {
405#if ENABLE_ICMP
406 u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v;
407#endif
408 }
409 else if (!strcmp (var, "enable-dns"))
410 {
411#if ENABLE_DNS
412 u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v;
413#endif
414 }
415 else if (!strcmp (var, "enable-udp"))
416 {
417 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
418 }
419 else if (!strcmp (var, "enable-rawip"))
420 {
421 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
422 }
423
424 // unknown or misplaced
425 else
426 slog (L_WARN,
427 _("unknown or misplaced variable `%s', at '%s' line %d"),
428 var, fname, lineno);
429 } 535 }
430 536
431 fclose (f); 537 fclose (f);
538
539 parse_argv ();
432 } 540 }
433 else 541 else
434 { 542 {
435 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); 543 slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno));
436 exit (EXIT_FAILURE); 544 exit (EXIT_FAILURE);
437 } 545 }
438 546
439 free (fname); 547 free (fname);
440 548
441 fname = config_filename (prikeyfile, "hostkey"); 549 fname = conf.config_filename (conf.prikeyfile, "hostkey");
442 550
443 f = fopen (fname, "r"); 551 f = fopen (fname, "r");
444 if (f) 552 if (f)
445 { 553 {
446 rsa_key = RSA_new (); 554 conf.rsa_key = RSA_new ();
447 555
448 if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) 556 if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL))
449 { 557 {
450 ERR_load_RSA_strings (); ERR_load_PEM_strings (); 558 ERR_load_RSA_strings (); ERR_load_PEM_strings ();
451 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); 559 slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0));
452 exit (EXIT_FAILURE); 560 exit (EXIT_FAILURE);
453 } 561 }
454 562
455 require (RSA_blinding_on (rsa_key, 0)); 563 require (RSA_blinding_on (conf.rsa_key, 0));
456 564
457 fclose (f); 565 fclose (f);
458 } 566 }
459 else 567 else
460 { 568 {
… …
463 if (need_keys) 571 if (need_keys)
464 exit (EXIT_FAILURE); 572 exit (EXIT_FAILURE);
465 } 573 }
466 574
467 if (need_keys && ::thisnode 575 if (need_keys && ::thisnode
468 && rsa_key && thisnode && thisnode->rsa_key) 576 && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key)
469 if (BN_cmp (rsa_key->n, thisnode->rsa_key->n) != 0 577 if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0
470 || BN_cmp (rsa_key->e, thisnode->rsa_key->e) != 0) 578 || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0)
471 { 579 {
472 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); 580 slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode);
473 exit (EXIT_FAILURE); 581 exit (EXIT_FAILURE);
474 } 582 }
475 583

Diff Legend

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