This is the start of the BETA21 branch.

It includes the --topology feature, and
TAP-Win32 driver changes to allow
non-admin access.



git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@580 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 100 insertions, 0 deletions

diff --git a/shaper.c b/shaper.c
new file mode 100644
index 0000000..f3b06cb
--- /dev/null
+++ b/shaper.c
@@ -0,0 +1,100 @@
+/*
+ *  OpenVPN -- An application to securely tunnel IP networks
+ *             over a single UDP port, with support for SSL/TLS-based
+ *             session authentication and key exchange,
+ *             packet encryption, packet authentication, and
+ *             packet compression.
+ *
+ *  Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program (see the file COPYING included with this
+ *  distribution); if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifdef WIN32
+#include "config-win32.h"
+#else
+#include "config.h"
+#endif
+#include "syshead.h"
+#include "shaper.h"
+#include "memdbg.h"
+
+#ifdef HAVE_GETTIMEOFDAY
+
+/*
+ * We want to wake up in delay microseconds.  If timeval is larger
+ * than delay, set timeval to delay.
+ */
+bool
+shaper_soonest_event (struct timeval *tv, int delay)
+{
+  bool ret = false;
+  if (delay < 1000000)
+    {
+      if (tv->tv_sec)
+	{
+	  tv->tv_sec = 0;
+	  tv->tv_usec = delay;
+	  ret = true;
+	}
+      else if (delay < tv->tv_usec)
+	{
+	  tv->tv_usec = delay;
+	  ret = true;
+	}
+    }
+  else
+    {
+      const int sec = delay / 1000000;
+      const int usec = delay % 1000000;
+
+      if (sec < tv->tv_sec)
+	{
+	  tv->tv_sec = sec;
+	  tv->tv_usec = usec;
+	  ret = true;
+	}
+      else if (sec == tv->tv_sec)
+	{
+	  if (usec < tv->tv_usec)
+	    {
+	      tv->tv_usec = usec;
+	      ret = true;
+	    }
+	}
+    }
+#ifdef SHAPER_DEBUG
+  dmsg (D_SHAPER_DEBUG, "SHAPER shaper_soonest_event sec=%d usec=%d ret=%d",
+       (int)tv->tv_sec, (int)tv->tv_usec, (int)ret);
+#endif
+  return ret;
+}
+
+void
+shaper_reset_wakeup (struct shaper *s)
+{
+  CLEAR (s->wakeup);
+}
+
+void
+shaper_msg (struct shaper *s)
+{
+  msg (M_INFO, "Output Traffic Shaping initialized at %d bytes per second",
+       s->bytes_per_second);
+}
+
+#else
+static void dummy(void) {}
+#endif /* HAVE_GETTIMEOFDAY */