--- gvpe/src/vpn.C	2011/12/17 22:05:34	1.62
+++ gvpe/src/vpn.C	2012/01/17 21:38:11	1.63
@@ -149,42 +149,6 @@
 {
   int success = 0;
 
-#if 1//D2
-  ipv42_tos = -1;
-  ipv42_fd  = -1;
-
-  if (THISNODE->protocols & PROT_IPv42 && ::conf.ip_proto)
-    {
-      ipv42_fd = setup_socket (PROT_IPv42, PF_INET, SOCK_RAW, ::conf.ip2_proto);
-
-      if (ipv42_fd < 0)
-        return -1;
-
-#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
-      // this I really consider a linux bug. I am neither connected
-      // nor do I fragment myself. Linux still sets DF and doesn't
-      // fragment for me sometimes.
-      {
-        int oval = IP_PMTUDISC_DONT;
-        setsockopt (ipv42_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
-      }
-#endif
-
-      sockinfo si (THISNODE, PROT_IPv42);
-
-      if (bind (ipv42_fd, si.sav4 (), si.salenv4 ()))
-        {
-          slog (L_ERR, _("can't bind ipv42 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
-          return -1;
-        }
-
-      ipv42_ev_watcher.start (ipv42_fd, EV_READ);
-      ++success;
-    }
-  else
-    THISNODE->protocols &= ~PROT_IPv42;
-#endif
-
   ipv4_tos = -1;
   ipv4_fd  = -1;
 
@@ -438,17 +402,6 @@
   return true;
 }
 
-#if 1 //D
-bool
-vpn::send_ipv42_packet (vpn_packet *pkt, const sockinfo &si, int tos)
-{
-  set_tos (ipv42_fd, ipv42_tos, tos);
-  sendto (ipv42_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
-
-  return true;
-}
-#endif
-
 static u16
 ipv4_checksum (u16 *data, unsigned int len)
 {
@@ -561,20 +514,15 @@
 {
   switch (si.prot)
     {
-#if 1//D2
-      case PROT_IPv42:
-        return send_ipv42_packet (pkt, si, tos);
-#endif
-
       case PROT_IPv4:
-        return send_ipv4_packet (pkt, si, tos);
+        return send_ipv4_packet   (pkt, si, tos);
 
       case PROT_UDPv4:
-        return send_udpv4_packet (pkt, si, tos);
+        return send_udpv4_packet  (pkt, si, tos);
 
 #if ENABLE_TCP
       case PROT_TCPv4:
-        return send_tcpv4_packet (pkt, si, tos);
+        return send_tcpv4_packet  (pkt, si, tos);
 #endif
 #if ENABLE_ICMP
       case PROT_ICMPv4:
@@ -582,7 +530,7 @@
 #endif
 #if ENABLE_DNS
       case PROT_DNSv4:
-        return send_dnsv4_packet (pkt, si, tos);
+        return send_dnsv4_packet  (pkt, si, tos);
 #endif
       default:
         slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol."), (const char *)si);
@@ -591,48 +539,6 @@
   return false;
 }
 
-#if 1//D2
-inline void
-vpn::ipv42_ev (ev::io &w, int revents)
-{
-  if (revents & EV_READ)
-    {
-      vpn_packet *pkt = new vpn_packet;
-      struct sockaddr_in sa;
-      socklen_t sa_len = sizeof (sa);
-      int len;
-
-      len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
-
-      sockinfo si(sa, PROT_IPv42);
-
-      if (len > 0)
-        {
-          pkt->len = len;
-
-          // raw sockets deliver the ipv4 header, but don't expect it on sends
-          pkt->skip_hdr (pkt->ipv4_hdr_len ());
-
-          recv_vpn_packet (pkt, si);
-        }
-      else
-        {
-          // probably ECONNRESET or somesuch
-          slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
-        }
-
-      delete pkt;
-    }
-  else
-    {
-      slog (L_ERR,
-            _("FATAL: unknown revents %08x in socket, exiting.\n"),
-            revents);
-      exit (EXIT_FAILURE);
-    }
-}
-#endif
-
 inline void
 vpn::ipv4_ev (ev::io &w, int revents)
 {
@@ -974,9 +880,6 @@
   event            .set<vpn, &vpn::event_cb > (this);
   udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
   ipv4_ev_watcher  .set<vpn, &vpn::ipv4_ev  > (this);
-#if 1//D2
-  ipv42_ev_watcher .set<vpn, &vpn::ipv42_ev > (this);
-#endif
 #if ENABLE_TCP
   tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
 #endif