summaryrefslogtreecommitdiff
path: root/src/openvpn/shaper.c
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2016-12-27 18:25:47 +0100
committerAlberto Gonzalez Iniesta <agi@inittab.org>2016-12-27 18:25:47 +0100
commit79f3537f69e125f19f59c36aa090120a63186a54 (patch)
tree2089a3b7dac990841dbc2e4d9b2f535b82dbb0af /src/openvpn/shaper.c
parentf2137fedb30cb87448eb03b2f288920df6187571 (diff)
parent3a2bbdb05ca6a6996e424c9fb225cb0d53804125 (diff)
Merge tag 'upstream/2.4.0'
Upstream version 2.4.0
Diffstat (limited to 'src/openvpn/shaper.c')
-rw-r--r--src/openvpn/shaper.c86
1 files changed, 44 insertions, 42 deletions
diff --git a/src/openvpn/shaper.c b/src/openvpn/shaper.c
index c8a7d38..eb459ef 100644
--- a/src/openvpn/shaper.c
+++ b/src/openvpn/shaper.c
@@ -5,7 +5,7 @@
* packet encryption, packet authentication, and
* packet compression.
*
- * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+ * Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@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
@@ -39,63 +39,65 @@
* than delay, set timeval to delay.
*/
bool
-shaper_soonest_event (struct timeval *tv, int delay)
+shaper_soonest_event(struct timeval *tv, int delay)
{
- bool ret = false;
- if (delay < 1000000)
+ 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;
- }
+ 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
+ else
{
- const int sec = delay / 1000000;
- const int usec = delay % 1000000;
+ 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;
- }
- }
+ 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);
+ 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;
+ return ret;
}
void
-shaper_reset_wakeup (struct shaper *s)
+shaper_reset_wakeup(struct shaper *s)
{
- CLEAR (s->wakeup);
+ CLEAR(s->wakeup);
}
void
-shaper_msg (struct shaper *s)
+shaper_msg(struct shaper *s)
{
- msg (M_INFO, "Output Traffic Shaping initialized at %d bytes per second",
- s->bytes_per_second);
+ msg(M_INFO, "Output Traffic Shaping initialized at %d bytes per second",
+ s->bytes_per_second);
}
-#else
-static void dummy(void) {}
+#else /* ifdef ENABLE_FEATURE_SHAPER */
+static void
+dummy(void) {
+}
#endif /* ENABLE_FEATURE_SHAPER */