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.57 by root, Sat Dec 17 22:05:34 2011 UTC vs.
Revision 1.58 by root, Tue Jan 17 21:38:10 2012 UTC

… …
60struct configuration conf; 60struct configuration conf;
61 61
62u8 62u8
63best_protocol (u8 protset) 63best_protocol (u8 protset)
64{ 64{
65#if 1//D2
66 if (protset & PROT_IPv42 ) return PROT_IPv42;
67#endif
68 if (protset & PROT_IPv4 ) return PROT_IPv4; 65 if (protset & PROT_IPv4 ) return PROT_IPv4;
69 if (protset & PROT_ICMPv4) return PROT_ICMPv4; 66 if (protset & PROT_ICMPv4) return PROT_ICMPv4;
70 if (protset & PROT_UDPv4 ) return PROT_UDPv4; 67 if (protset & PROT_UDPv4 ) return PROT_UDPv4;
71 if (protset & PROT_TCPv4 ) return PROT_TCPv4; 68 if (protset & PROT_TCPv4 ) return PROT_TCPv4;
72 if (protset & PROT_DNSv4 ) return PROT_DNSv4; 69 if (protset & PROT_DNSv4 ) return PROT_DNSv4;
… …
75} 72}
76 73
77const char * 74const char *
78strprotocol (u8 protocol) 75strprotocol (u8 protocol)
79{ 76{
80#if 1//D2
81 if (protocol & PROT_IPv42 ) return "rawip2";
82#endif
83 if (protocol & PROT_IPv4 ) return "rawip"; 77 if (protocol & PROT_IPv4 ) return "rawip";
84 if (protocol & PROT_ICMPv4) return "icmp"; 78 if (protocol & PROT_ICMPv4) return "icmp";
85 if (protocol & PROT_UDPv4 ) return "udp"; 79 if (protocol & PROT_UDPv4 ) return "udp";
86 if (protocol & PROT_TCPv4 ) return "tcp"; 80 if (protocol & PROT_TCPv4 ) return "tcp";
87 if (protocol & PROT_DNSv4 ) return "dns"; 81 if (protocol & PROT_DNSv4 ) return "dns";
… …
140 nfmark = 0; 134 nfmark = 0;
141 rekey = DEFAULT_REKEY; 135 rekey = DEFAULT_REKEY;
142 keepalive = DEFAULT_KEEPALIVE; 136 keepalive = DEFAULT_KEEPALIVE;
143 llevel = L_INFO; 137 llevel = L_INFO;
144 ip_proto = IPPROTO_GRE; 138 ip_proto = IPPROTO_GRE;
145#if 1 //D2
146 ip2_proto = 7;
147#endif
148#if ENABLE_ICMP 139#if ENABLE_ICMP
149 icmp_type = ICMP_ECHOREPLY; 140 icmp_type = ICMP_ECHOREPLY;
150#endif 141#endif
151 142
152 default_node.udp_port = DEFAULT_UDPPORT; 143 default_node.udp_port = DEFAULT_UDPPORT;
… …
276 if (l == L_NONE) 267 if (l == L_NONE)
277 return _("unknown loglevel, ignored"); 268 return _("unknown loglevel, ignored");
278 } 269 }
279 else if (!strcmp (var, "ip-proto")) 270 else if (!strcmp (var, "ip-proto"))
280 conf.ip_proto = atoi (val); 271 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")) 272 else if (!strcmp (var, "icmp-type"))
286 { 273 {
287#if ENABLE_ICMP 274#if ENABLE_ICMP
288 conf.icmp_type = atoi (val); 275 conf.icmp_type = atoi (val);
289#endif 276#endif
… …
495 } 482 }
496 else if (!strcmp (var, "enable-rawip")) 483 else if (!strcmp (var, "enable-rawip"))
497 { 484 {
498 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v; 485 u8 v; parse_bool (v, "enable-rawip", PROT_IPv4, 0); node->protocols = (node->protocols & ~PROT_IPv4 ) | v;
499 } 486 }
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")) 487 else if (!strcmp (var, "allow-direct"))
507 node->allow_direct.push_back (strdup (val)); 488 node->allow_direct.push_back (strdup (val));
508 else if (!strcmp (var, "deny-direct")) 489 else if (!strcmp (var, "deny-direct"))
509 node->deny_direct.push_back (strdup (val)); 490 node->deny_direct.push_back (strdup (val));
510 else if (!strcmp (var, "max-ttl")) 491 else if (!strcmp (var, "max-ttl"))

Diff Legend

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