--- gvpe/src/vpn.C	2005/03/04 20:26:50	1.30
+++ gvpe/src/vpn.C	2005/03/23 21:55:39	1.33
@@ -48,7 +48,8 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-const char *vpn::script_if_up ()
+void
+vpn::script_init_env ()
 {
   // the tunnel device mtu should be the physical mtu - overhead
   // the tricky part is rounding to the cipher key blocksize
@@ -67,10 +68,29 @@
   asprintf (&env, "MTU=%d", mtu); putenv (env);
   asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
             0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
-            THISNODE->id & 0xff);
-  putenv (env);
+            THISNODE->id & 0xff); putenv (env);
+
+  // TODO: info for other nodes, maybe?
+}
+
+const char *vpn::script_if_init ()
+{
+  script_init_env ();
+
+  return tap->if_up ();
+}
+
+const char *vpn::script_if_up ()
+{
+  script_init_env ();
 
-  return ::conf.script_if_up ? ::conf.script_if_up : "if-up";
+  char *filename;
+  asprintf (&filename,
+            "%s/%s",
+            confbase,
+            ::conf.script_if_up ? ::conf.script_if_up : "if-up");
+
+  return filename;
 }
 
 int
@@ -237,13 +257,25 @@
       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 ()))
         {
@@ -262,7 +294,19 @@
       exit (EXIT_FAILURE);
     }
   
-  run_script (run_script_cb (this, &vpn::script_if_up), true);
+  if (tap->if_up () &&
+      !run_script (run_script_cb (this, &vpn::script_if_init), true))
+    {
+      slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
+            tap->if_up ());
+      exit (EXIT_FAILURE);
+    }
+
+  if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
+    {
+      slog (L_ERR, _("if-up command execution failed, exiting."));
+      exit (EXIT_FAILURE);
+    }
 
   tap_ev_watcher.start (tap->fd, EVENT_READ);
 
@@ -397,6 +441,35 @@
     }
 }
 
+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)
 {