--- gvpe/src/connection.C	2005/07/09 02:35:42	1.58
+++ gvpe/src/connection.C	2005/12/05 12:58:09	1.59
@@ -466,6 +466,9 @@
 #if ENABLE_ROHC
     f |= FEATURE_ROHC;
 #endif
+#if ENABLE_BRIDGING
+    f |= FEATURE_BRIDGING;
+#endif
     return f;
   }
 };
@@ -625,6 +628,14 @@
   if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
   if (!conf->dns_port) protocol &= ~PROT_DNSv4;
 
+  if (protocol
+      && (!conf->can_direct (THISNODE)
+          || !THISNODE->can_direct (conf)))
+    {
+      slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
+      protocol = 0;
+    }
+
   si.set (conf, protocol);
 }