--- gvpe/src/sockinfo.C	2011/12/17 22:05:34	1.26
+++ gvpe/src/sockinfo.C	2012/01/17 21:38:11	1.28
@@ -42,13 +42,13 @@
 #include <cstdio>
 
 // 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_;
 }
 
@@ -115,6 +115,12 @@
   return hostport;
 }
 
+bool
+sockinfo::valid () const
+{
+  return (prot & THISNODE->protocols) && host;
+}
+
 sockinfo::operator const char *() const
 {
   in_addr ia = { host };
@@ -129,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)
     {
@@ -156,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;