Ticket #284: openvpn-2.3.1-up-pre.patch

openvpn-2.3.1

@@ -1 +1 @@
 OpenVPN Change Log
 Copyright (C) 2002-2012 OpenVPN Technologies, Inc. <sales@openvpn.net>
 
+Simon Matter (1):
+      Add --up-pre flag to cause --up script to be called before TUN/TAP open (rather than after).
+
 2013.03.29 -- Version 2.3.1
 Arne Schwabe (4):
       Remove dead code path and putenv functionality

doc/openvpn.8

@@ -1800 +1800 @@
 .B route add -net 10.0.0.0 netmask 255.255.255.0 gw $5
 .\"*********************************************************
 .TP
+.B \-\-up-pre
+Call
+.B \-\-up
+cmd/script before, rather than after, TUN/TAP open.
+.\"*********************************************************
+.TP
 .B \-\-up-delay
 Delay TUN/TAP open and possible
 .B \-\-up

src/openvpn/init.c

@@ -1404 +1404 @@
 
   if (!c->c1.tuntap)
     {
+      /* actually run the up script based on --up-pre flag */
+      if (c->options.up_pre)
+        run_up_down (c->options.up_script,
+                     c->plugins,
+                     OPENVPN_PLUGIN_UP,
+                     "[unknown-dev]",
+                     dev_type_string (c->options.dev, c->options.dev_type),
+                     TUN_MTU_SIZE (&c->c2.frame),
+                     EXPANDED_SIZE (&c->c2.frame),
+                     NULL,
+                     NULL,
+                     "init",
+                     NULL,
+                     "up",
+                     c->c2.es);
+
       /* initialize (but do not open) tun/tap object */
       do_init_tun (c);
 
@@ -1444 +1460 @@
           do_ifconfig (c->c1.tuntap, c->c1.tuntap->actual_name, TUN_MTU_SIZE (&c->c2.frame), c->c2.es);
         }
 
-      /* run the up script */
-      run_up_down (c->options.up_script,
-                   c->plugins,
-                   OPENVPN_PLUGIN_UP,
-                   c->c1.tuntap->actual_name,
-                   dev_type_string (c->options.dev, c->options.dev_type),
-                   TUN_MTU_SIZE (&c->c2.frame),
-                   EXPANDED_SIZE (&c->c2.frame),
-                   print_in_addr_t (c->c1.tuntap->local, IA_EMPTY_IF_UNDEF, &gc),
-                   print_in_addr_t (c->c1.tuntap->remote_netmask, IA_EMPTY_IF_UNDEF, &gc),
-                   "init",
-                   NULL,
-                   "up",
-                   c->c2.es);
+      /* actually run the up script based on --up-pre flag */
+      if (!c->options.up_pre)
+        run_up_down (c->options.up_script,
+                     c->plugins,
+                     OPENVPN_PLUGIN_UP,
+                     c->c1.tuntap->actual_name,
+                     dev_type_string (c->options.dev, c->options.dev_type),
+                     TUN_MTU_SIZE (&c->c2.frame),
+                     EXPANDED_SIZE (&c->c2.frame),
+                     print_in_addr_t (c->c1.tuntap->local, IA_EMPTY_IF_UNDEF, &gc),
+                     print_in_addr_t (c->c1.tuntap->remote_netmask, IA_EMPTY_IF_UNDEF, &gc),
+                     "init",
+                     NULL,
+                     "up",
+                     c->c2.es);
 
       /* possibly add routes */
       if (!c->options.route_delay_defined)

src/openvpn/options.c

@@ -313 +313 @@
   "                  Execute as: cmd tun/tap-dev tun-mtu link-mtu \\\n"
   "                              ifconfig-local-ip ifconfig-remote-ip\n"
   "                  (pre --user or --group UID/GID change)\n"
+  "--up-pre        : Run --up command before TUN/TAP open.\n"
   "--up-delay      : Delay tun/tap open and possible --up script execution\n"
   "                  until after TCP/UDP connection establishment with peer.\n"
   "--down cmd      : Run command cmd after tun device close.\n"
@@ -1481 +1482 @@
   SHOW_STR (up_script);
   SHOW_STR (down_script);
   SHOW_BOOL (down_pre);
+  SHOW_BOOL (up_pre);
   SHOW_BOOL (up_restart);
   SHOW_BOOL (up_delay);
   SHOW_BOOL (daemon);
@@ -4543 +4545 @@
       VERIFY_PERMISSION (OPT_P_GENERAL);
       options->down_pre = true;
     }
+  else if (streq (p[0], "up-pre"))
+    {
+      VERIFY_PERMISSION (OPT_P_GENERAL);
+      options->up_pre = true;
+    }
   else if (streq (p[0], "up-delay"))
     {
       VERIFY_PERMISSION (OPT_P_GENERAL);

src/openvpn/options.h

@@ -286 +286 @@
   const char *up_script;
   const char *down_script;
   bool down_pre;
+  bool up_pre;
   bool up_delay;
   bool up_restart;
   bool daemon;