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.5 by pcg, Fri Mar 28 04:05:10 2003 UTC vs.
Revision 1.10 by pcg, Wed Apr 2 21:02:25 2003 UTC

… …
51char *identname; 51char *identname;
52char *pidfilename; 52char *pidfilename;
53 53
54struct configuration conf; 54struct configuration conf;
55 55
56u8 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
65const 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
56configuration::configuration () 74configuration::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.can_send = PROT_UDPv4; 97 default_node.protocols = PROT_UDPv4;
79 default_node.can_recv = PROT_IPv4;
80} 98}
81 99
82void configuration::cleanup() 100void configuration::cleanup()
83{ 101{
84 if (rsa_key) 102 if (rsa_key)
… …
265 } 283 }
266 284
267 /* node-specific, defaultable */ 285 /* node-specific, defaultable */
268 else if (!strcmp (var, "udp-port")) 286 else if (!strcmp (var, "udp-port"))
269 node->udp_port = atoi (val); 287 node->udp_port = atoi (val);
288 else if (!strcmp (var, "tcp-port"))
289 node->tcp_port = atoi (val);
270 else if (!strcmp (var, "router-priority")) 290 else if (!strcmp (var, "router-priority"))
271 node->routerprio = atoi (val); 291 node->routerprio = atoi (val);
272 else if (!strcmp (var, "connect")) 292 else if (!strcmp (var, "connect"))
273 { 293 {
274 if (!strcmp (val, "ondemand")) 294 if (!strcmp (val, "ondemand"))
… …
291 else if (!strcmp (var, "compress")) 311 else if (!strcmp (var, "compress"))
292 { 312 {
293 parse_bool (node->compress, "compress", true, false); 313 parse_bool (node->compress, "compress", true, false);
294 } 314 }
295 // 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!
296 else if (!strcmp (var, "can-send-udp")) 316 else if (!strcmp (var, "enable-tcp"))
297 {
298 u8 v; parse_bool (v, "can-send-udp", PROT_UDPv4, 0); node->can_send = (node->can_send & ~PROT_UDPv4) | v;
299 } 317 {
300 else if (!strcmp (var, "can-recv-udp")) 318 u8 v; parse_bool (v, "enable-tcp" , PROT_TCPv4, 0); node->protocols = (node->protocols & ~PROT_TCPv4) | v;
301 { 319 }
302 u8 v; parse_bool (v, "can-recv-udp", PROT_UDPv4, 0); node->can_recv = (node->can_recv & ~PROT_UDPv4) | v; 320 else if (!strcmp (var, "enable-udp"))
303 } 321 {
304 else if (!strcmp (var, "can-send-rawip")) 322 u8 v; parse_bool (v, "enable-udp" , PROT_UDPv4, 0); node->protocols = (node->protocols & ~PROT_UDPv4) | v;
305 { 323 }
306 u8 v; parse_bool (v, "can-send-rawip", PROT_IPv4, 0); node->can_send = (node->can_send & ~PROT_IPv4) | v; 324 else if (!strcmp (var, "enable-rawip"))
307 } 325 {
308 else if (!strcmp (var, "can-recv-rawip"))
309 {
310 u8 v; parse_bool (v, "can-recv-rawip", PROT_IPv4, 0); node->can_recv = (node->can_recv & ~PROT_IPv4) | v; 326 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
311 } 327 }
312 328
313 // unknown or misplaced 329 // unknown or misplaced
314 else 330 else
315 { 331 {

Diff Legend

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