| … | |
… | |
| 51 | char *identname; |
51 | char *identname; |
| 52 | char *pidfilename; |
52 | char *pidfilename; |
| 53 | |
53 | |
| 54 | struct configuration conf; |
54 | struct configuration conf; |
| 55 | |
55 | |
|
|
56 | u8 best_protocol (u8 protset) |
|
|
57 | { |
|
|
58 | if (protset & PROT_IPv4 ) return PROT_IPv4; |
|
|
59 | if (protset & PROT_UDPv4) return PROT_UDPv4; |
|
|
60 | if (protset & PROT_TCPv4) return PROT_TCPv4; |
|
|
61 | |
|
|
62 | return 0; |
|
|
63 | } |
|
|
64 | |
|
|
65 | const char *strprotocol (u8 protocol) |
|
|
66 | { |
|
|
67 | if (protocol & PROT_IPv4 ) return "rawip"; |
|
|
68 | if (protocol & PROT_UDPv4) return "udp"; |
|
|
69 | if (protocol & PROT_TCPv4) return "tcp"; |
|
|
70 | |
|
|
71 | return "<unknown>"; |
|
|
72 | } |
|
|
73 | |
| 56 | configuration::configuration () |
74 | configuration::configuration () |
| 57 | { |
75 | { |
| 58 | init (); |
76 | init (); |
| 59 | } |
77 | } |
| 60 | |
78 | |
| … | |
… | |
| 71 | keepalive = DEFAULT_KEEPALIVE; |
89 | keepalive = DEFAULT_KEEPALIVE; |
| 72 | llevel = L_INFO; |
90 | llevel = L_INFO; |
| 73 | ip_proto = IPPROTO_GRE; |
91 | ip_proto = IPPROTO_GRE; |
| 74 | |
92 | |
| 75 | default_node.udp_port = DEFAULT_UDPPORT; |
93 | default_node.udp_port = DEFAULT_UDPPORT; |
|
|
94 | default_node.tcp_port = DEFAULT_UDPPORT; |
| 76 | default_node.connectmode = conf_node::C_ALWAYS; |
95 | default_node.connectmode = conf_node::C_ALWAYS; |
| 77 | default_node.compress = true; |
96 | default_node.compress = true; |
| 78 | default_node.protocols = PROT_UDPv4; |
97 | default_node.protocols = PROT_UDPv4; |
| 79 | } |
98 | } |
| 80 | |
99 | |
| … | |
… | |
| 264 | } |
283 | } |
| 265 | |
284 | |
| 266 | /* node-specific, defaultable */ |
285 | /* node-specific, defaultable */ |
| 267 | else if (!strcmp (var, "udp-port")) |
286 | else if (!strcmp (var, "udp-port")) |
| 268 | node->udp_port = atoi (val); |
287 | node->udp_port = atoi (val); |
|
|
288 | else if (!strcmp (var, "tcp-port")) |
|
|
289 | node->tcp_port = atoi (val); |
| 269 | else if (!strcmp (var, "router-priority")) |
290 | else if (!strcmp (var, "router-priority")) |
| 270 | node->routerprio = atoi (val); |
291 | node->routerprio = atoi (val); |
| 271 | else if (!strcmp (var, "connect")) |
292 | else if (!strcmp (var, "connect")) |
| 272 | { |
293 | { |
| 273 | if (!strcmp (val, "ondemand")) |
294 | if (!strcmp (val, "ondemand")) |
| … | |
… | |
| 290 | else if (!strcmp (var, "compress")) |
311 | else if (!strcmp (var, "compress")) |
| 291 | { |
312 | { |
| 292 | parse_bool (node->compress, "compress", true, false); |
313 | parse_bool (node->compress, "compress", true, false); |
| 293 | } |
314 | } |
| 294 | // all these bool options really really cost a lot of executable size! |
315 | // all these bool options really really cost a lot of executable size! |
|
|
316 | else if (!strcmp (var, "enable-tcp")) |
|
|
317 | { |
|
|
318 | u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v; |
|
|
319 | } |
| 295 | else if (!strcmp (var, "enable-udp")) |
320 | else if (!strcmp (var, "enable-udp")) |
| 296 | { |
321 | { |
| 297 | u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; |
322 | u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v; |
| 298 | } |
323 | } |
| 299 | else if (!strcmp (var, "enable-rawip")) |
324 | else if (!strcmp (var, "enable-rawip")) |
