[ViewVC] Diff of: cvs/gvpe/src/vpn.C

Comparing gvpe/src/vpn.C (file contents):
Revision 1.29 by pcg, Fri Mar 4 04:52:38 2005 UTC vs.
Revision 1.32 by pcg, Mon Mar 7 01:31:26 2005 UTC

       dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
       if (dnsv4_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 (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
+      }
+#endif
       // standard daemon practise...
       {
         int oval = 1;
-        setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
+        setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
       }
-      sockinfo si (THISNODE, PROT_DNSv4);
+      sockinfo si (THISNODE->dns_hostname,
+                   THISNODE->dns_hostname ? THISNODE->dns_port : 0,
+                   PROT_DNSv4);
       if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
         {
           slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
           exit (EXIT_FAILURE);
       else
         c->recv_vpn_packet (pkt, rsi);
     }
 }
+bool
+vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
+{
+  switch (si.prot)
+    {
+      case PROT_IPv4:
+        return send_ipv4_packet (pkt, si, tos);
+      case PROT_UDPv4:
+        return send_udpv4_packet (pkt, si, tos);
+#if ENABLE_TCP
+      case PROT_TCPv4:
+        return send_tcpv4_packet (pkt, si, tos);
+#endif
+#if ENABLE_ICMP
+      case PROT_ICMPv4:
+        return send_icmpv4_packet (pkt, si, tos);
+#endif
+#if ENABLE_DNS
+      case PROT_DNSv4:
+        return send_dnsv4_packet (pkt, si, tos);
+#endif
+      default:
+        slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
+    }
+  return false;
+}
 void
 vpn::ipv4_ev (io_watcher &w, short revents)
 {
   if (revents & EVENT_READ)
     {
       if (len > 0)
         {
           pkt->len = len;
-          // raw sockets deliver the ipv4, but don't expect it on sends
+          // raw sockets deliver the ipv4 header, but don't expect it on sends
-          // this is slow, but...
           pkt->skip_hdr (IP_OVERHEAD);
           recv_vpn_packet (pkt, si);
         }
       else
       delete pkt;
     }
   else
     {
       slog (L_ERR,
-              _("FATAL: unknown revents %08x in socket, terminating\n"),
+            _("FATAL: unknown revents %08x in socket, terminating\n"),
-              revents);
+            revents);
       exit (EXIT_FAILURE);
     }
 }
 #if ENABLE_ICMP
           int dst = mac2id (pkt->dst);
           int src = mac2id (pkt->src);
           if (src != THISNODE->id)
             {
-              slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
+              slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
               exit (EXIT_FAILURE);
             }
           if (dst == THISNODE->id)
             {

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing gvpe/src/vpn.C (file contents): Revision 1.29 by pcg, Fri Mar 4 04:52:38 2005 UTC vs. Revision 1.32 by pcg, Mon Mar 7 01:31:26 2005 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.29 by pcg, Fri Mar 4 04:52:38 2005 UTC vs.
Revision 1.32 by pcg, Mon Mar 7 01:31:26 2005 UTC