1 | /* |
1 | /* |
2 | conf.c -- configuration code |
2 | conf.C -- configuration code |
3 | Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> |
3 | Copyright (C) 2003-2008,2011 Marc Lehmann <gvpe@schmorp.de> |
4 | |
4 | |
|
|
5 | This file is part of GVPE. |
|
|
6 | |
5 | This program is free software; you can redistribute it and/or modify |
7 | GVPE is free software; you can redistribute it and/or modify it |
6 | it under the terms of the GNU General Public License as published by |
8 | under the terms of the GNU General Public License as published by the |
7 | the Free Software Foundation; either version 2 of the License, or |
9 | Free Software Foundation; either version 3 of the License, or (at your |
8 | (at your option) any later version. |
10 | option) any later version. |
9 | |
11 | |
10 | This program is distributed in the hope that it will be useful, |
12 | This program is distributed in the hope that it will be useful, but |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
13 | GNU General Public License for more details. |
15 | Public License for more details. |
14 | |
16 | |
15 | 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 along |
16 | along with this program; if not, write to the Free Software |
18 | with this program; if not, see <http://www.gnu.org/licenses/>. |
17 | Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | |
|
|
20 | Additional permission under GNU GPL version 3 section 7 |
|
|
21 | |
|
|
22 | If you modify this Program, or any covered work, by linking or |
|
|
23 | combining it with the OpenSSL project's OpenSSL library (or a modified |
|
|
24 | version of that library), containing parts covered by the terms of the |
|
|
25 | OpenSSL or SSLeay licenses, the licensors of this Program grant you |
|
|
26 | additional permission to convey the resulting work. Corresponding |
|
|
27 | Source for a non-source form of such a combination shall include the |
|
|
28 | source code for the parts of OpenSSL used as well as that of the |
|
|
29 | covered work. |
18 | */ |
30 | */ |
19 | |
31 | |
20 | #include "config.h" |
32 | #include "config.h" |
21 | |
33 | |
22 | #include <cstdio> |
34 | #include <cstdio> |
… | |
… | |
33 | |
45 | |
34 | #include <openssl/err.h> |
46 | #include <openssl/err.h> |
35 | #include <openssl/pem.h> |
47 | #include <openssl/pem.h> |
36 | #include <openssl/rsa.h> |
48 | #include <openssl/rsa.h> |
37 | #include <openssl/rand.h> |
49 | #include <openssl/rand.h> |
38 | |
50 | #include <openssl/bn.h> |
39 | #include "gettext.h" |
|
|
40 | |
51 | |
41 | #include "conf.h" |
52 | #include "conf.h" |
42 | #include "slog.h" |
53 | #include "slog.h" |
43 | #include "util.h" |
54 | #include "util.h" |
44 | |
55 | |
45 | char *confbase; |
56 | char *confbase; |
46 | char *thisnode; |
57 | char *thisnode; |
47 | char *identname; |
58 | char *identname; |
48 | char *pidfilename; |
|
|
49 | |
59 | |
50 | struct configuration conf; |
60 | struct configuration conf; |
51 | |
61 | |
|
|
62 | u8 |
52 | u8 best_protocol (u8 protset) |
63 | best_protocol (u8 protset) |
53 | { |
64 | { |
|
|
65 | #if 1//D2 |
|
|
66 | if (protset & PROT_IPv42 ) return PROT_IPv42; |
|
|
67 | #endif |
54 | if (protset & PROT_IPv4 ) return PROT_IPv4; |
68 | if (protset & PROT_IPv4 ) return PROT_IPv4; |
55 | if (protset & PROT_ICMPv4) return PROT_ICMPv4; |
69 | if (protset & PROT_ICMPv4) return PROT_ICMPv4; |
56 | if (protset & PROT_UDPv4 ) return PROT_UDPv4; |
70 | if (protset & PROT_UDPv4 ) return PROT_UDPv4; |
57 | if (protset & PROT_TCPv4 ) return PROT_TCPv4; |
71 | if (protset & PROT_TCPv4 ) return PROT_TCPv4; |
|
|
72 | if (protset & PROT_DNSv4 ) return PROT_DNSv4; |
58 | |
73 | |
59 | return 0; |
74 | return 0; |
60 | } |
75 | } |
61 | |
76 | |
|
|
77 | const char * |
62 | const char *strprotocol (u8 protocol) |
78 | strprotocol (u8 protocol) |
63 | { |
79 | { |
|
|
80 | #if 1//D2 |
|
|
81 | if (protocol & PROT_IPv42 ) return "rawip2"; |
|
|
82 | #endif |
64 | if (protocol & PROT_IPv4 ) return "rawip"; |
83 | if (protocol & PROT_IPv4 ) return "rawip"; |
65 | if (protocol & PROT_ICMPv4) return "icmp"; |
84 | if (protocol & PROT_ICMPv4) return "icmp"; |
66 | if (protocol & PROT_UDPv4 ) return "udp"; |
85 | if (protocol & PROT_UDPv4 ) return "udp"; |
67 | if (protocol & PROT_TCPv4 ) return "tcp"; |
86 | if (protocol & PROT_TCPv4 ) return "tcp"; |
|
|
87 | if (protocol & PROT_DNSv4 ) return "dns"; |
68 | |
88 | |
69 | return "<unknown>"; |
89 | return "<unknown>"; |
70 | } |
90 | } |
71 | |
91 | |
72 | void |
92 | static bool |
73 | conf_node::print () |
93 | match_list (const vector<const char *> &list, const char *str) |
74 | { |
94 | { |
75 | printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %s%s%d\n", |
95 | for (vector<const char *>::const_iterator i = list.end (); i-- > list.begin (); ) |
76 | id, |
96 | if ((*i)[0] == '*' && !(*i)[1]) |
77 | id >> 8, id & 0xff, |
97 | return true; |
78 | compress ? 'Y' : 'N', |
98 | else if (!strcmp (*i, str)) |
79 | connectmode == C_ONDEMAND ? "ondemand" : |
99 | return true; |
80 | connectmode == C_NEVER ? "never" : |
100 | |
81 | connectmode == C_ALWAYS ? "always" : "", |
101 | return false; |
82 | nodename, |
102 | } |
83 | hostname ? hostname : "", |
103 | |
84 | hostname ? ":" : "", |
104 | bool |
85 | hostname ? udp_port : 0 |
105 | conf_node::may_direct (struct conf_node *other) |
86 | ); |
106 | { |
|
|
107 | if (match_list (allow_direct, other->nodename)) |
|
|
108 | return true; |
|
|
109 | |
|
|
110 | if (match_list (deny_direct, other->nodename)) |
|
|
111 | return false; |
|
|
112 | |
|
|
113 | return true; |
87 | } |
114 | } |
88 | |
115 | |
89 | conf_node::~conf_node () |
116 | conf_node::~conf_node () |
90 | { |
117 | { |
|
|
118 | #if 0 |
|
|
119 | // does not work, because string pointers etc. are shared |
|
|
120 | // is not called, however |
91 | if (rsa_key) |
121 | if (rsa_key) |
92 | RSA_free (rsa_key); |
122 | RSA_free (rsa_key); |
93 | |
123 | |
94 | free (nodename); |
124 | free (nodename); |
95 | free (hostname); |
125 | free (hostname); |
|
|
126 | free (if_up_data); |
|
|
127 | #if ENABLE_DNS |
|
|
128 | free (domain); |
|
|
129 | free (dns_hostname); |
|
|
130 | #endif |
|
|
131 | #endif |
96 | } |
132 | } |
97 | |
133 | |
|
|
134 | void |
98 | void configuration::init () |
135 | configuration::init () |
99 | { |
136 | { |
100 | memset (this, 0, sizeof (*this)); |
137 | memset (this, 0, sizeof (*this)); |
101 | |
138 | |
102 | mtu = DEFAULT_MTU; |
139 | mtu = DEFAULT_MTU; |
|
|
140 | nfmark = 0; |
103 | rekey = DEFAULT_REKEY; |
141 | rekey = DEFAULT_REKEY; |
104 | keepalive = DEFAULT_KEEPALIVE; |
142 | keepalive = DEFAULT_KEEPALIVE; |
105 | llevel = L_INFO; |
143 | llevel = L_INFO; |
106 | ip_proto = IPPROTO_GRE; |
144 | ip_proto = IPPROTO_GRE; |
|
|
145 | #if 1 //D2 |
|
|
146 | ip2_proto = 7; |
|
|
147 | #endif |
107 | #if ENABLE_ICMP |
148 | #if ENABLE_ICMP |
108 | icmp_type = ICMP_ECHOREPLY; |
149 | icmp_type = ICMP_ECHOREPLY; |
109 | #endif |
150 | #endif |
110 | |
151 | |
111 | default_node.udp_port = DEFAULT_UDPPORT; |
152 | default_node.udp_port = DEFAULT_UDPPORT; |
112 | default_node.tcp_port = DEFAULT_UDPPORT; |
153 | default_node.tcp_port = DEFAULT_UDPPORT; // ehrm |
113 | default_node.connectmode = conf_node::C_ALWAYS; |
154 | default_node.connectmode = conf_node::C_ALWAYS; |
114 | default_node.compress = true; |
155 | default_node.compress = true; |
115 | default_node.protocols = PROT_UDPv4; |
156 | default_node.protocols = 0; |
116 | } |
157 | default_node.max_retry = DEFAULT_MAX_RETRY; |
|
|
158 | default_node.max_ttl = DEFAULT_MAX_TTL; |
|
|
159 | default_node.max_queue = DEFAULT_MAX_QUEUE; |
|
|
160 | default_node.if_up_data = strdup (""); |
117 | |
161 | |
|
|
162 | #if ENABLE_DNS |
|
|
163 | default_node.dns_port = 0; // default is 0 == client |
|
|
164 | |
|
|
165 | dns_case_preserving = true; |
|
|
166 | dns_forw_host = strdup ("127.0.0.1"); |
|
|
167 | dns_forw_port = 53; |
|
|
168 | dns_timeout_factor = DEFAULT_DNS_TIMEOUT_FACTOR; |
|
|
169 | dns_send_interval = DEFAULT_DNS_SEND_INTERVAL; |
|
|
170 | dns_overlap_factor = DEFAULT_DNS_OVERLAP_FACTOR; |
|
|
171 | dns_max_outstanding = DEFAULT_DNS_MAX_OUTSTANDING; |
|
|
172 | #endif |
|
|
173 | |
|
|
174 | conf.pidfilename = strdup (LOCALSTATEDIR "/run/gvpe.pid"); |
|
|
175 | } |
|
|
176 | |
|
|
177 | void |
118 | void configuration::cleanup() |
178 | configuration::cleanup () |
119 | { |
179 | { |
120 | if (rsa_key) |
180 | if (rsa_key) |
121 | RSA_free (rsa_key); |
181 | RSA_free (rsa_key); |
122 | |
182 | |
123 | rsa_key = 0; |
183 | rsa_key = 0; |
124 | |
184 | |
125 | free (ifname); ifname = 0; |
185 | free (pidfilename); pidfilename = 0; |
|
|
186 | free (ifname); ifname = 0; |
126 | #if ENABLE_HTTP_PROXY |
187 | #if ENABLE_HTTP_PROXY |
127 | free (proxy_host); proxy_host = 0; |
188 | free (proxy_host); proxy_host = 0; |
128 | free (proxy_auth); proxy_auth = 0; |
189 | free (proxy_auth); proxy_auth = 0; |
129 | #endif |
190 | #endif |
|
|
191 | #if ENABLE_DNS |
|
|
192 | free (dns_forw_host); dns_forw_host = 0; |
|
|
193 | #endif |
|
|
194 | free (script_if_up); script_if_up = 0; |
|
|
195 | free (script_node_up); script_node_up = 0; |
|
|
196 | free (script_node_change); script_node_change = 0; |
|
|
197 | free (script_node_down); script_node_down = 0; |
130 | } |
198 | } |
131 | |
199 | |
132 | void |
200 | void |
133 | configuration::clear_config () |
201 | configuration::clear () |
134 | { |
202 | { |
135 | for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i) |
203 | for (configuration::node_vector::iterator i = nodes.begin(); i != nodes.end(); ++i) |
136 | delete *i; |
204 | delete *i; |
137 | |
205 | |
138 | nodes.clear (); |
206 | nodes.clear (); |
139 | |
207 | |
140 | cleanup (); |
208 | cleanup (); |
141 | init (); |
209 | init (); |
142 | } |
210 | } |
143 | |
211 | |
|
|
212 | //static bool |
|
|
213 | //is_true (const char *name) |
|
|
214 | //{ |
|
|
215 | //re |
|
|
216 | //} |
|
|
217 | |
144 | #define parse_bool(target,name,trueval,falseval) \ |
218 | #define parse_bool(target,name,trueval,falseval) do { \ |
145 | if (!strcmp (val, "yes")) target = trueval; \ |
219 | if (!strcmp (val, "yes")) target = trueval; \ |
146 | else if (!strcmp (val, "no")) target = falseval; \ |
220 | else if (!strcmp (val, "no")) target = falseval; \ |
147 | else if (!strcmp (val, "true")) target = trueval; \ |
221 | else if (!strcmp (val, "true")) target = trueval; \ |
148 | else if (!strcmp (val, "false")) target = falseval; \ |
222 | else if (!strcmp (val, "false")) target = falseval; \ |
149 | else if (!strcmp (val, "on")) target = trueval; \ |
223 | else if (!strcmp (val, "on")) target = trueval; \ |
150 | else if (!strcmp (val, "off")) target = falseval; \ |
224 | else if (!strcmp (val, "off")) target = falseval; \ |
151 | else \ |
225 | else \ |
152 | slog (L_WARN, \ |
|
|
153 | _("illegal value for '%s', only 'yes|true|on' or 'no|false|off' allowed, at '%s' line %d"), \ |
226 | return _("illegal boolean value, only 'yes|true|on' or 'no|false|off' allowed, ignored"); \ |
154 | name, var, fname, lineno); |
227 | } while (0) |
155 | |
228 | |
156 | void configuration::read_config (bool need_keys) |
229 | const char * |
|
|
230 | configuration_parser::parse_line (char *line) |
157 | { |
231 | { |
|
|
232 | { |
|
|
233 | char *end = line + strlen (line); |
|
|
234 | |
|
|
235 | while (*end < ' ' && end >= line) |
|
|
236 | end--; |
|
|
237 | |
|
|
238 | *++end = 0; |
|
|
239 | } |
|
|
240 | |
|
|
241 | char *tok = line; |
|
|
242 | const char *var = strtok (tok, "\t ="); |
|
|
243 | tok = 0; |
|
|
244 | |
|
|
245 | if (!var || !var[0]) |
|
|
246 | return 0; /* no tokens on this line */ |
|
|
247 | |
|
|
248 | if (var[0] == '#') |
|
|
249 | return 0; /* comment: ignore */ |
|
|
250 | |
|
|
251 | char *val = strtok (NULL, "\t\n\r ="); |
|
|
252 | |
|
|
253 | if (!val || val[0] == '#') |
|
|
254 | return _("no value given for variable, ignored"); |
|
|
255 | |
|
|
256 | else if (!strcmp (var, "on")) |
|
|
257 | { |
|
|
258 | if (::thisnode |
|
|
259 | && ((val[0] == '!' && strcmp (val + 1, ::thisnode)) |
|
|
260 | || !strcmp (val, ::thisnode))) |
|
|
261 | return parse_line (strtok (NULL, "\n\r")); |
|
|
262 | } |
|
|
263 | |
|
|
264 | else if (!strcmp (var, "include")) |
|
|
265 | { |
|
|
266 | char *fname = conf.config_filename (val); |
|
|
267 | parse_file (fname); |
|
|
268 | free (fname); |
|
|
269 | } |
|
|
270 | |
|
|
271 | // truly global |
|
|
272 | else if (!strcmp (var, "loglevel")) |
|
|
273 | { |
|
|
274 | loglevel l = string_to_loglevel (val); |
|
|
275 | |
|
|
276 | if (l == L_NONE) |
|
|
277 | return _("unknown loglevel, ignored"); |
|
|
278 | } |
|
|
279 | else if (!strcmp (var, "ip-proto")) |
|
|
280 | conf.ip_proto = atoi (val); |
|
|
281 | #if 1 //D2 |
|
|
282 | else if (!strcmp (var, "ip2-proto")) |
|
|
283 | conf.ip2_proto = atoi (val); |
|
|
284 | #endif |
|
|
285 | else if (!strcmp (var, "icmp-type")) |
|
|
286 | { |
|
|
287 | #if ENABLE_ICMP |
|
|
288 | conf.icmp_type = atoi (val); |
|
|
289 | #endif |
|
|
290 | } |
|
|
291 | |
|
|
292 | // per config |
|
|
293 | else if (!strcmp (var, "node")) |
|
|
294 | { |
|
|
295 | parse_argv (); |
|
|
296 | |
|
|
297 | conf.default_node.id++; |
|
|
298 | node = new conf_node (conf.default_node); |
|
|
299 | conf.nodes.push_back (node); |
|
|
300 | node->nodename = strdup (val); |
|
|
301 | |
|
|
302 | { |
158 | char *fname; |
303 | char *fname; |
159 | FILE *f; |
304 | FILE *f; |
160 | |
305 | |
161 | clear_config (); |
306 | asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename); |
162 | |
307 | |
163 | asprintf (&fname, "%s/vped.conf", confbase); |
|
|
164 | f = fopen (fname, "r"); |
308 | f = fopen (fname, "r"); |
|
|
309 | if (f) |
|
|
310 | { |
|
|
311 | node->rsa_key = RSA_new (); |
165 | |
312 | |
166 | if (f) |
313 | if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) |
|
|
314 | { |
|
|
315 | ERR_load_RSA_strings (); ERR_load_PEM_strings (); |
|
|
316 | slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); |
|
|
317 | exit (EXIT_FAILURE); |
|
|
318 | } |
|
|
319 | |
|
|
320 | require (RSA_blinding_on (node->rsa_key, 0)); |
|
|
321 | |
|
|
322 | fclose (f); |
|
|
323 | } |
|
|
324 | else |
|
|
325 | { |
|
|
326 | slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); |
|
|
327 | |
|
|
328 | if (need_keys) |
|
|
329 | exit (EXIT_FAILURE); |
|
|
330 | } |
|
|
331 | |
|
|
332 | free (fname); |
|
|
333 | } |
|
|
334 | |
|
|
335 | if (::thisnode && !strcmp (node->nodename, ::thisnode)) |
|
|
336 | conf.thisnode = node; |
167 | { |
337 | } |
|
|
338 | else if (!strcmp (var, "private-key")) |
|
|
339 | free (conf.prikeyfile), conf.prikeyfile = strdup (val); |
|
|
340 | else if (!strcmp (var, "ifpersist")) |
|
|
341 | parse_bool (conf.ifpersist, "ifpersist", true, false); |
|
|
342 | else if (!strcmp (var, "ifname")) |
|
|
343 | free (conf.ifname), conf.ifname = strdup (val); |
|
|
344 | else if (!strcmp (var, "rekey")) |
|
|
345 | conf.rekey = atoi (val); |
|
|
346 | else if (!strcmp (var, "keepalive")) |
|
|
347 | conf.keepalive = atoi (val); |
|
|
348 | else if (!strcmp (var, "mtu")) |
|
|
349 | conf.mtu = atoi (val); |
|
|
350 | else if (!strcmp (var, "nfmark")) |
|
|
351 | conf.nfmark = atoi (val); |
|
|
352 | else if (!strcmp (var, "if-up")) |
|
|
353 | free (conf.script_if_up), conf.script_if_up = strdup (val); |
|
|
354 | else if (!strcmp (var, "node-up")) |
|
|
355 | free (conf.script_node_up), conf.script_node_up = strdup (val); |
|
|
356 | else if (!strcmp (var, "node-change")) |
|
|
357 | free (conf.script_node_change), conf.script_node_change = strdup (val); |
|
|
358 | else if (!strcmp (var, "node-down")) |
|
|
359 | free (conf.script_node_down), conf.script_node_down = strdup (val); |
|
|
360 | else if (!strcmp (var, "pid-file")) |
|
|
361 | free (conf.pidfilename), conf.pidfilename = strdup (val); |
|
|
362 | else if (!strcmp (var, "dns-forw-host")) |
|
|
363 | { |
|
|
364 | #if ENABLE_DNS |
|
|
365 | free (conf.dns_forw_host), conf.dns_forw_host = strdup (val); |
|
|
366 | #endif |
|
|
367 | } |
|
|
368 | else if (!strcmp (var, "dns-forw-port")) |
|
|
369 | { |
|
|
370 | #if ENABLE_DNS |
|
|
371 | conf.dns_forw_port = atoi (val); |
|
|
372 | #endif |
|
|
373 | } |
|
|
374 | else if (!strcmp (var, "dns-timeout-factor")) |
|
|
375 | { |
|
|
376 | #if ENABLE_DNS |
|
|
377 | conf.dns_timeout_factor = atof (val); |
|
|
378 | #endif |
|
|
379 | } |
|
|
380 | else if (!strcmp (var, "dns-send-interval")) |
|
|
381 | { |
|
|
382 | #if ENABLE_DNS |
|
|
383 | conf.dns_send_interval = atoi (val); |
|
|
384 | #endif |
|
|
385 | } |
|
|
386 | else if (!strcmp (var, "dns-overlap-factor")) |
|
|
387 | { |
|
|
388 | #if ENABLE_DNS |
|
|
389 | conf.dns_overlap_factor = atof (val); |
|
|
390 | #endif |
|
|
391 | } |
|
|
392 | else if (!strcmp (var, "dns-max-outstanding")) |
|
|
393 | { |
|
|
394 | #if ENABLE_DNS |
|
|
395 | conf.dns_max_outstanding = atoi (val); |
|
|
396 | #endif |
|
|
397 | } |
|
|
398 | else if (!strcmp (var, "dns-case-preserving")) |
|
|
399 | { |
|
|
400 | #if ENABLE_DNS |
|
|
401 | parse_bool (conf.dns_case_preserving, "dns-case-preserving", true, false); |
|
|
402 | #endif |
|
|
403 | } |
|
|
404 | else if (!strcmp (var, "http-proxy-host")) |
|
|
405 | { |
|
|
406 | #if ENABLE_HTTP_PROXY |
|
|
407 | free (conf.proxy_host), conf.proxy_host = strdup (val); |
|
|
408 | #endif |
|
|
409 | } |
|
|
410 | else if (!strcmp (var, "http-proxy-port")) |
|
|
411 | { |
|
|
412 | #if ENABLE_HTTP_PROXY |
|
|
413 | conf.proxy_port = atoi (val); |
|
|
414 | #endif |
|
|
415 | } |
|
|
416 | else if (!strcmp (var, "http-proxy-auth")) |
|
|
417 | { |
|
|
418 | #if ENABLE_HTTP_PROXY |
|
|
419 | conf.proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); |
|
|
420 | #endif |
|
|
421 | } |
|
|
422 | |
|
|
423 | /* node-specific, non-defaultable */ |
|
|
424 | else if (node != &conf.default_node && !strcmp (var, "hostname")) |
|
|
425 | free (node->hostname), node->hostname = strdup (val); |
|
|
426 | |
|
|
427 | /* node-specific, defaultable */ |
|
|
428 | else if (!strcmp (var, "udp-port")) |
|
|
429 | node->udp_port = atoi (val); |
|
|
430 | else if (!strcmp (var, "tcp-port")) |
|
|
431 | node->tcp_port = atoi (val); |
|
|
432 | else if (!strcmp (var, "dns-hostname")) |
|
|
433 | { |
|
|
434 | #if ENABLE_DNS |
|
|
435 | free (node->dns_hostname), node->dns_hostname = strdup (val); |
|
|
436 | #endif |
|
|
437 | } |
|
|
438 | else if (!strcmp (var, "dns-port")) |
|
|
439 | { |
|
|
440 | #if ENABLE_DNS |
|
|
441 | node->dns_port = atoi (val); |
|
|
442 | #endif |
|
|
443 | } |
|
|
444 | else if (!strcmp (var, "dns-domain")) |
|
|
445 | { |
|
|
446 | #if ENABLE_DNS |
|
|
447 | free (node->domain), node->domain = strdup (val); |
|
|
448 | #endif |
|
|
449 | } |
|
|
450 | else if (!strcmp (var, "if-up-data")) |
|
|
451 | free (node->if_up_data), node->if_up_data = strdup (val); |
|
|
452 | else if (!strcmp (var, "router-priority")) |
|
|
453 | node->routerprio = atoi (val); |
|
|
454 | else if (!strcmp (var, "max-retry")) |
|
|
455 | node->max_retry = atoi (val); |
|
|
456 | else if (!strcmp (var, "connect")) |
|
|
457 | { |
|
|
458 | if (!strcmp (val, "ondemand")) |
|
|
459 | node->connectmode = conf_node::C_ONDEMAND; |
|
|
460 | else if (!strcmp (val, "never")) |
|
|
461 | node->connectmode = conf_node::C_NEVER; |
|
|
462 | else if (!strcmp (val, "always")) |
|
|
463 | node->connectmode = conf_node::C_ALWAYS; |
|
|
464 | else if (!strcmp (val, "disabled")) |
|
|
465 | node->connectmode = conf_node::C_DISABLED; |
|
|
466 | else |
|
|
467 | return _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', ignored"); |
|
|
468 | } |
|
|
469 | else if (!strcmp (var, "inherit-tos")) |
|
|
470 | parse_bool (node->inherit_tos, "inherit-tos", true, false); |
|
|
471 | else if (!strcmp (var, "compress")) |
|
|
472 | parse_bool (node->compress, "compress", true, false); |
|
|
473 | // all these bool options really really cost a lot of executable size! |
|
|
474 | else if (!strcmp (var, "enable-tcp")) |
|
|
475 | { |
|
|
476 | #if ENABLE_TCP |
|
|
477 | u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; |
|
|
478 | #endif |
|
|
479 | } |
|
|
480 | else if (!strcmp (var, "enable-icmp")) |
|
|
481 | { |
|
|
482 | #if ENABLE_ICMP |
|
|
483 | u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; |
|
|
484 | #endif |
|
|
485 | } |
|
|
486 | else if (!strcmp (var, "enable-dns")) |
|
|
487 | { |
|
|
488 | #if ENABLE_DNS |
|
|
489 | u8 v; parse_bool (v, "enable-dns" , PROT_DNSv4, 0); node->protocols = (node->protocols & ~PROT_DNSv4) | v; |
|
|
490 | #endif |
|
|
491 | } |
|
|
492 | else if (!strcmp (var, "enable-udp")) |
|
|
493 | { |
|
|
494 | u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; |
|
|
495 | } |
|
|
496 | else if (!strcmp (var, "enable-rawip")) |
|
|
497 | { |
|
|
498 | u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; |
|
|
499 | } |
|
|
500 | #if 1//D2 |
|
|
501 | else if (!strcmp (var, "enable-rawip2")) |
|
|
502 | { |
|
|
503 | u8 v; parse_bool (v, "enable-rawip2", PROT_IPv42, 0); node->protocols = (node->protocols & ~PROT_IPv42 ) | v; |
|
|
504 | } |
|
|
505 | #endif |
|
|
506 | else if (!strcmp (var, "allow-direct")) |
|
|
507 | node->allow_direct.push_back (strdup (val)); |
|
|
508 | else if (!strcmp (var, "deny-direct")) |
|
|
509 | node->deny_direct.push_back (strdup (val)); |
|
|
510 | else if (!strcmp (var, "max-ttl")) |
|
|
511 | node->max_ttl = atof (val); |
|
|
512 | else if (!strcmp (var, "max-queue")) |
|
|
513 | node->max_queue = atoi (val); |
|
|
514 | |
|
|
515 | // unknown or misplaced |
|
|
516 | else |
|
|
517 | return _("unknown configuration directive - ignored"); |
|
|
518 | |
|
|
519 | return 0; |
|
|
520 | } |
|
|
521 | |
|
|
522 | void |
|
|
523 | conf_node::finalise () |
|
|
524 | { |
|
|
525 | if (max_queue < 1) |
|
|
526 | { |
|
|
527 | slog (L_WARN, _("%s: max-queue value invalid, setting it to 1."), nodename); |
|
|
528 | max_queue = 1; |
|
|
529 | } |
|
|
530 | |
|
|
531 | if (routerprio > 1 && (connectmode != C_ALWAYS && connectmode != C_DISABLED)) |
|
|
532 | { |
|
|
533 | //slog (L_WARN, _("%s: has non-zero router-priority but either 'never' or 'ondemand' as connectmode, setting it to 'always'."), nodename); |
|
|
534 | connectmode = C_ALWAYS; |
|
|
535 | } |
|
|
536 | } |
|
|
537 | |
|
|
538 | void |
|
|
539 | configuration_parser::parse_argv () |
|
|
540 | { |
|
|
541 | for (int i = 0; i < argc; ++i) |
|
|
542 | { |
|
|
543 | char *v = argv [i]; |
|
|
544 | |
|
|
545 | if (!*v) |
|
|
546 | continue; |
|
|
547 | |
|
|
548 | char *enode = v; |
|
|
549 | |
|
|
550 | while (*enode != '.' && *enode > ' ' && *enode != '=' && *enode) |
|
|
551 | enode++; |
|
|
552 | |
|
|
553 | if (*enode != '.') |
|
|
554 | enode = 0; |
|
|
555 | |
|
|
556 | char *wnode = node == &conf.default_node |
|
|
557 | ? 0 |
|
|
558 | : node->nodename; |
|
|
559 | |
|
|
560 | if ((!wnode && !enode) |
|
|
561 | || (wnode && enode && !strncmp (wnode, v, enode - v))) |
|
|
562 | { |
|
|
563 | const char *warn = parse_line (enode ? enode + 1 : v); |
|
|
564 | |
|
|
565 | if (warn) |
|
|
566 | slog (L_WARN, _("%s, while parsing command line option '%s'."), warn, v); |
|
|
567 | |
|
|
568 | *v = 0; |
|
|
569 | } |
|
|
570 | } |
|
|
571 | } |
|
|
572 | |
|
|
573 | void |
|
|
574 | configuration_parser::parse_file (const char *fname) |
|
|
575 | { |
|
|
576 | if (FILE *f = fopen (fname, "r")) |
|
|
577 | { |
168 | char line[16384]; |
578 | char line [2048]; |
169 | int lineno = 0; |
579 | int lineno = 0; |
170 | char *var, *val; |
|
|
171 | conf_node *node = &default_node; |
|
|
172 | |
580 | |
173 | while (fgets (line, sizeof (line), f)) |
581 | while (fgets (line, sizeof (line), f)) |
174 | { |
582 | { |
175 | lineno++; |
583 | lineno++; |
176 | |
584 | |
177 | { |
585 | const char *warn = parse_line (line); |
178 | char *end = line + strlen (line); |
|
|
179 | |
586 | |
180 | while (*end < ' ' && end >= line) |
587 | if (warn) |
181 | end--; |
588 | slog (L_WARN, _("%s, at '%s', line %d."), warn, fname, lineno); |
182 | |
|
|
183 | *++end = 0; |
|
|
184 | } |
|
|
185 | |
|
|
186 | char *tok = line; |
|
|
187 | |
|
|
188 | retry: |
|
|
189 | var = strtok (tok, "\t ="); |
|
|
190 | tok = 0; |
|
|
191 | |
|
|
192 | if (!var || !var[0]) |
|
|
193 | continue; /* no tokens on this line */ |
|
|
194 | |
|
|
195 | if (var[0] == '#') |
|
|
196 | continue; /* comment: ignore */ |
|
|
197 | |
|
|
198 | val = strtok (NULL, "\t\n\r ="); |
|
|
199 | |
|
|
200 | if (!val || val[0] == '#') |
|
|
201 | { |
|
|
202 | slog (L_WARN, |
|
|
203 | _("no value for variable `%s', at '%s' line %d"), |
|
|
204 | var, fname, lineno); |
|
|
205 | break; |
|
|
206 | } |
|
|
207 | |
|
|
208 | if (!strcmp (var, "on")) |
|
|
209 | { |
|
|
210 | if (!::thisnode |
|
|
211 | || (val[0] == '!' && strcmp (val + 1, ::thisnode)) |
|
|
212 | || !strcmp (val, ::thisnode)) |
|
|
213 | goto retry; |
|
|
214 | |
|
|
215 | continue; |
|
|
216 | } |
|
|
217 | |
|
|
218 | // truly global |
|
|
219 | if (!strcmp (var, "loglevel")) |
|
|
220 | { |
|
|
221 | loglevel l = string_to_loglevel (val); |
|
|
222 | |
|
|
223 | if (l != L_NONE) |
|
|
224 | llevel = l; |
|
|
225 | else |
|
|
226 | slog (L_WARN, "'%s': %s, at '%s' line %d", val, UNKNOWN_LOGLEVEL, fname, line); |
|
|
227 | } |
|
|
228 | else if (!strcmp (var, "ip-proto")) |
|
|
229 | ip_proto = atoi (val); |
|
|
230 | else if (!strcmp (var, "icmp-type")) |
|
|
231 | { |
|
|
232 | #if ENABLE_ICMP |
|
|
233 | icmp_type = atoi (val); |
|
|
234 | #endif |
|
|
235 | } |
|
|
236 | |
|
|
237 | // per config |
|
|
238 | else if (!strcmp (var, "node")) |
|
|
239 | { |
|
|
240 | default_node.id++; |
|
|
241 | |
|
|
242 | node = new conf_node (default_node); |
|
|
243 | |
|
|
244 | nodes.push_back (node); |
|
|
245 | |
|
|
246 | node->nodename = strdup (val); |
|
|
247 | |
|
|
248 | { |
|
|
249 | char *fname; |
|
|
250 | FILE *f; |
|
|
251 | |
|
|
252 | asprintf (&fname, "%s/pubkey/%s", confbase, node->nodename); |
|
|
253 | |
|
|
254 | f = fopen (fname, "r"); |
|
|
255 | if (f) |
|
|
256 | { |
|
|
257 | node->rsa_key = RSA_new (); |
|
|
258 | |
|
|
259 | if (!PEM_read_RSAPublicKey(f, &node->rsa_key, NULL, NULL)) |
|
|
260 | { |
|
|
261 | ERR_load_RSA_strings (); ERR_load_PEM_strings (); |
|
|
262 | slog (L_ERR, _("unable to open public rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); |
|
|
263 | exit (1); |
|
|
264 | } |
|
|
265 | |
|
|
266 | RSA_blinding_on (node->rsa_key, 0); |
|
|
267 | |
|
|
268 | fclose (f); |
|
|
269 | } |
|
|
270 | else |
|
|
271 | { |
|
|
272 | slog (need_keys ? L_ERR : L_NOTICE, _("unable to read public rsa key file '%s': %s"), fname, strerror (errno)); |
|
|
273 | |
|
|
274 | if (need_keys) |
|
|
275 | exit (1); |
|
|
276 | } |
|
|
277 | |
|
|
278 | free (fname); |
|
|
279 | } |
|
|
280 | |
|
|
281 | if (!::thisnode || !strcmp (node->nodename, ::thisnode)) |
|
|
282 | thisnode = node; |
|
|
283 | } |
|
|
284 | else if (!strcmp (var, "private-key")) |
|
|
285 | prikeyfile = strdup (val); |
|
|
286 | else if (!strcmp (var, "ifpersist")) |
|
|
287 | { |
|
|
288 | parse_bool (ifpersist, "ifpersist", true, false); |
|
|
289 | } |
|
|
290 | else if (!strcmp (var, "ifname")) |
|
|
291 | ifname = strdup (val); |
|
|
292 | else if (!strcmp (var, "rekey")) |
|
|
293 | rekey = atoi (val); |
|
|
294 | else if (!strcmp (var, "keepalive")) |
|
|
295 | keepalive = atoi (val); |
|
|
296 | else if (!strcmp (var, "mtu")) |
|
|
297 | mtu = atoi (val); |
|
|
298 | else if (!strcmp (var, "if-up")) |
|
|
299 | script_if_up = strdup (val); |
|
|
300 | else if (!strcmp (var, "node-up")) |
|
|
301 | script_node_up = strdup (val); |
|
|
302 | else if (!strcmp (var, "node-down")) |
|
|
303 | script_node_down = strdup (val); |
|
|
304 | else if (!strcmp (var, "http-proxy-host")) |
|
|
305 | { |
|
|
306 | #if ENABLE_HTTP_PROXY |
|
|
307 | proxy_host = strdup (val); |
|
|
308 | #endif |
|
|
309 | } |
|
|
310 | else if (!strcmp (var, "http-proxy-port")) |
|
|
311 | { |
|
|
312 | #if ENABLE_HTTP_PROXY |
|
|
313 | proxy_port = atoi (val); |
|
|
314 | #endif |
|
|
315 | } |
|
|
316 | else if (!strcmp (var, "http-proxy-auth")) |
|
|
317 | { |
|
|
318 | #if ENABLE_HTTP_PROXY |
|
|
319 | proxy_auth = (char *)base64_encode ((const u8 *)val, strlen (val)); |
|
|
320 | #endif |
|
|
321 | } |
|
|
322 | |
|
|
323 | /* node-specific, non-defaultable */ |
|
|
324 | else if (node != &default_node && !strcmp (var, "hostname")) |
|
|
325 | { |
|
|
326 | free (node->hostname); |
|
|
327 | node->hostname = strdup (val); |
|
|
328 | } |
|
|
329 | |
|
|
330 | /* node-specific, defaultable */ |
|
|
331 | else if (!strcmp (var, "udp-port")) |
|
|
332 | node->udp_port = atoi (val); |
|
|
333 | else if (!strcmp (var, "tcp-port")) |
|
|
334 | node->tcp_port = atoi (val); |
|
|
335 | else if (!strcmp (var, "router-priority")) |
|
|
336 | node->routerprio = atoi (val); |
|
|
337 | else if (!strcmp (var, "connect")) |
|
|
338 | { |
|
|
339 | if (!strcmp (val, "ondemand")) |
|
|
340 | node->connectmode = conf_node::C_ONDEMAND; |
|
|
341 | else if (!strcmp (val, "never")) |
|
|
342 | node->connectmode = conf_node::C_NEVER; |
|
|
343 | else if (!strcmp (val, "always")) |
|
|
344 | node->connectmode = conf_node::C_ALWAYS; |
|
|
345 | else if (!strcmp (val, "disabled")) |
|
|
346 | node->connectmode = conf_node::C_DISABLED; |
|
|
347 | else |
|
|
348 | slog (L_WARN, |
|
|
349 | _("illegal value for 'connectmode', use one of 'ondemand', 'never', 'always' or 'disabled', at '%s' line %d"), |
|
|
350 | var, fname, lineno); |
|
|
351 | } |
|
|
352 | else if (!strcmp (var, "inherit-tos")) |
|
|
353 | { |
|
|
354 | parse_bool (node->inherit_tos, "inherit-tos", true, false); |
|
|
355 | } |
|
|
356 | else if (!strcmp (var, "compress")) |
|
|
357 | { |
|
|
358 | parse_bool (node->compress, "compress", true, false); |
|
|
359 | } |
|
|
360 | // all these bool options really really cost a lot of executable size! |
|
|
361 | else if (!strcmp (var, "enable-tcp")) |
|
|
362 | { |
|
|
363 | #if ENABLE_TCP |
|
|
364 | u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; |
|
|
365 | #endif |
|
|
366 | } |
|
|
367 | else if (!strcmp (var, "enable-icmp")) |
|
|
368 | { |
|
|
369 | #if ENABLE_ICMP |
|
|
370 | u8 v; parse_bool (v, "enable-icmp" , PROT_ICMPv4, 0); node->protocols = (node->protocols & ~PROT_ICMPv4) | v; |
|
|
371 | #endif |
|
|
372 | } |
|
|
373 | else if (!strcmp (var, "enable-udp")) |
|
|
374 | { |
|
|
375 | u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; |
|
|
376 | } |
|
|
377 | else if (!strcmp (var, "enable-rawip")) |
|
|
378 | { |
|
|
379 | u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; |
|
|
380 | } |
|
|
381 | |
|
|
382 | // unknown or misplaced |
|
|
383 | else |
|
|
384 | slog (L_WARN, |
|
|
385 | _("unknown or misplaced variable `%s', at '%s' line %d"), |
|
|
386 | var, fname, lineno); |
|
|
387 | } |
589 | } |
388 | |
590 | |
389 | fclose (f); |
591 | fclose (f); |
|
|
592 | |
|
|
593 | parse_argv (); |
390 | } |
594 | } |
391 | else |
595 | else |
392 | { |
596 | { |
393 | slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); |
597 | slog (L_ERR, _("unable to read config file '%s': %s"), fname, strerror (errno)); |
394 | exit (1); |
598 | exit (EXIT_FAILURE); |
395 | } |
599 | } |
|
|
600 | } |
396 | |
601 | |
|
|
602 | configuration_parser::configuration_parser (configuration &conf, |
|
|
603 | bool need_keys, |
|
|
604 | int argc, |
|
|
605 | char **argv) |
|
|
606 | : conf (conf),need_keys (need_keys), argc (argc), argv (argv) |
|
|
607 | { |
|
|
608 | char *fname; |
|
|
609 | |
|
|
610 | conf.clear (); |
|
|
611 | node = &conf.default_node; |
|
|
612 | |
|
|
613 | asprintf (&fname, "%s/gvpe.conf", confbase); |
|
|
614 | parse_file (fname); |
397 | free (fname); |
615 | free (fname); |
398 | |
616 | |
399 | fname = config_filename (prikeyfile, "hostkey"); |
617 | fname = conf.config_filename (conf.prikeyfile, "hostkey"); |
400 | |
618 | |
401 | f = fopen (fname, "r"); |
619 | if (FILE *f = fopen (fname, "r")) |
402 | if (f) |
|
|
403 | { |
620 | { |
404 | rsa_key = RSA_new (); |
621 | conf.rsa_key = RSA_new (); |
405 | |
622 | |
406 | if (!PEM_read_RSAPrivateKey (f, &rsa_key, NULL, NULL)) |
623 | if (!PEM_read_RSAPrivateKey (f, &conf.rsa_key, NULL, NULL)) |
407 | { |
624 | { |
408 | ERR_load_RSA_strings (); ERR_load_PEM_strings (); |
625 | ERR_load_RSA_strings (); ERR_load_PEM_strings (); |
409 | slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); |
626 | slog (L_ERR, _("unable to read private rsa key file '%s': %s"), fname, ERR_error_string (ERR_get_error (), 0)); |
410 | exit (1); |
627 | exit (EXIT_FAILURE); |
411 | } |
628 | } |
412 | |
629 | |
413 | RSA_blinding_on (rsa_key, 0); |
630 | require (RSA_blinding_on (conf.rsa_key, 0)); |
414 | |
631 | |
415 | fclose (f); |
632 | fclose (f); |
416 | } |
633 | } |
417 | else |
634 | else |
418 | { |
635 | { |
419 | slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); |
636 | slog (need_keys ? L_ERR : L_NOTICE, _("unable to open private rsa key file '%s': %s"), fname, strerror (errno)); |
420 | |
637 | |
421 | if (need_keys) |
638 | if (need_keys) |
422 | exit (1); |
639 | exit (EXIT_FAILURE); |
423 | } |
640 | } |
424 | |
641 | |
425 | free (fname); |
642 | free (fname); |
426 | } |
|
|
427 | |
643 | |
|
|
644 | if (need_keys && ::thisnode |
|
|
645 | && conf.rsa_key && conf.thisnode && conf.thisnode->rsa_key) |
|
|
646 | if (BN_cmp (conf.rsa_key->n, conf.thisnode->rsa_key->n) != 0 |
|
|
647 | || BN_cmp (conf.rsa_key->e, conf.thisnode->rsa_key->e) != 0) |
|
|
648 | { |
|
|
649 | slog (L_NOTICE, _("private hostkey and public node key mismatch: is '%s' the correct node?"), ::thisnode); |
|
|
650 | exit (EXIT_FAILURE); |
|
|
651 | } |
|
|
652 | |
|
|
653 | for (configuration::node_vector::iterator i = conf.nodes.begin(); i != conf.nodes.end(); ++i) |
|
|
654 | (*i)->finalise (); |
|
|
655 | } |
|
|
656 | |
|
|
657 | char * |
428 | char *configuration::config_filename (const char *name, const char *dflt) |
658 | configuration::config_filename (const char *name, const char *dflt) |
429 | { |
659 | { |
430 | char *fname; |
660 | char *fname; |
431 | |
661 | |
432 | asprintf (&fname, name ? name : dflt, ::thisnode); |
662 | asprintf (&fname, name ? name : dflt, ::thisnode); |
433 | |
663 | |
… | |
… | |
437 | asprintf (&fname, "%s/%s", confbase, rname); |
667 | asprintf (&fname, "%s/%s", confbase, rname); |
438 | free (rname); |
668 | free (rname); |
439 | } |
669 | } |
440 | |
670 | |
441 | return fname; |
671 | return fname; |
|
|
672 | } |
|
|
673 | |
|
|
674 | void |
|
|
675 | conf_node::print () |
|
|
676 | { |
|
|
677 | printf ("%4d fe:fd:80:00:0%1x:%02x %c %-8.8s %-10.10s %02x %s%s%d\n", |
|
|
678 | id, |
|
|
679 | id >> 8, id & 0xff, |
|
|
680 | compress ? 'Y' : 'N', |
|
|
681 | connectmode == C_ONDEMAND ? "ondemand" |
|
|
682 | : connectmode == C_NEVER ? "never" |
|
|
683 | : connectmode == C_ALWAYS ? "always" |
|
|
684 | : connectmode == C_DISABLED ? "disabled" |
|
|
685 | : "", |
|
|
686 | nodename, |
|
|
687 | protocols, |
|
|
688 | hostname ? hostname : "", |
|
|
689 | hostname ? ":" : "", |
|
|
690 | hostname ? udp_port : 0 |
|
|
691 | ); |
442 | } |
692 | } |
443 | |
693 | |
444 | void |
694 | void |
445 | configuration::print () |
695 | configuration::print () |
446 | { |
696 | { |
… | |
… | |
453 | printf (_("interface: %s\n"), ifname); |
703 | printf (_("interface: %s\n"), ifname); |
454 | printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); |
704 | printf (_("primary rsa key: %s\n"), prikeyfile ? prikeyfile : "<default>"); |
455 | printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); |
705 | printf (_("rsa key size: %d\n"), rsa_key ? RSA_size (rsa_key) * 8 : -1); |
456 | printf ("\n"); |
706 | printf ("\n"); |
457 | |
707 | |
458 | printf ("%4s %-17s %s %-8.8s %-10.10s %s\n", |
708 | printf ("%4s %-17s %s %-8.8s %-10.10s %04s %s\n", |
459 | _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Host:Port")); |
709 | _("ID#"), _("MAC"), _("Com"), _("Conmode"), _("Node"), _("Prot"), _("Host:Port")); |
460 | |
710 | |
461 | for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) |
711 | for (node_vector::iterator i = nodes.begin (); i != nodes.end (); ++i) |
462 | (*i)->print (); |
712 | (*i)->print (); |
463 | |
713 | |
464 | printf ("\n"); |
714 | printf ("\n"); |
465 | } |
715 | } |
466 | |
716 | |
467 | configuration::configuration () |
717 | configuration::configuration () |
468 | { |
718 | { |
|
|
719 | asprintf (&confbase, "%s/gvpe", CONFDIR); |
|
|
720 | |
469 | init (); |
721 | init (); |
470 | } |
722 | } |
471 | |
723 | |
472 | configuration::~configuration () |
724 | configuration::~configuration () |
473 | { |
725 | { |
474 | cleanup (); |
726 | cleanup (); |
475 | } |
727 | } |
476 | |
728 | |
477 | |
|
|