--- gvpe/src/sockinfo.C 2012/01/17 21:25:50 1.27 +++ gvpe/src/sockinfo.C 2012/01/17 21:38:11 1.28 @@ -42,13 +42,13 @@ #include // all ipv4-based protocols -#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4 | PROT_IPv42) +#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4) void sockinfo::set (const sockaddr_in *sa, u8 prot_) { host = sa->sin_addr.s_addr; - port = prot_ & (PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42) ? 0 : sa->sin_port; + port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port; prot = prot_; } @@ -135,8 +135,8 @@ { u8 protocols = prot; - if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4 | PROT_IPv42)) - protocols |= PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42; + if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4)) + protocols |= PROT_IPv4 | PROT_ICMPv4; if (conf && prot & PROTv4) { @@ -162,7 +162,7 @@ if (prot & PROTv4 && prot_ & PROTv4) { - if (prot_ & (PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42)) + if (prot_ & (PROT_IPv4 | PROT_ICMPv4)) { prot = prot_; port = 0;