--- gvpe/src/sockinfo.C	2011/02/08 23:11:36	1.24
+++ gvpe/src/sockinfo.C	2011/12/17 22:05:34	1.26
@@ -42,13 +42,13 @@
 #include <cstdio>
 
 // all ipv4-based protocols
-#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
+#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4 | PROT_IPv42)
 
 void
 sockinfo::set (const sockaddr_in *sa, u8 prot_)
 {
   host = sa->sin_addr.s_addr;
-  port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
+  port = prot_ & (PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42) ? 0 : sa->sin_port;
   prot = prot_;
 }
 
@@ -129,26 +129,20 @@
 {
   u8 protocols = prot;
 
-  if (prot & (PROT_UDPv4 | PROT_TCPv4))
-    protocols |= PROT_IPv4 | PROT_ICMPv4;
+  if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4 | PROT_IPv42))
+    protocols |= PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42;
 
-  if (conf
-      && prot & PROTv4
-      && conf->protocols & PROT_UDPv4
-      && conf->udp_port)
-    protocols |= PROT_UDPv4;
-
-  if (conf
-      && prot & PROTv4
-      && conf->protocols & PROT_TCPv4
-      && conf->tcp_port)
-    protocols |= PROT_TCPv4;
-
-  if (conf
-      && prot & PROTv4
-      && conf->protocols & PROT_DNSv4
-      && conf->dns_port)
-    protocols |= PROT_DNSv4;
+  if (conf && prot & PROTv4)
+    {
+      if (conf->protocols & PROT_UDPv4 && conf->udp_port)
+        protocols |= PROT_UDPv4;
+
+      if (conf->protocols & PROT_TCPv4 && conf->tcp_port)
+        protocols |= PROT_TCPv4;
+
+      if (conf->protocols & PROT_DNSv4 && conf->dns_port)
+        protocols |= PROT_DNSv4;
+    }
 
   return protocols;
 }
@@ -162,7 +156,7 @@
   if (prot & PROTv4
       && prot_ & PROTv4)
     {
-      if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
+      if (prot_ & (PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42))
         {
           prot = prot_;
           port = 0;