From 27594eeae6f40a402bc3110f06d57975168e74e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 19:20:15 +0200 Subject: ics-openvpn as a submodule! beautiful ics-openvpn is now officially on GitHub, and they track openssl and openvpn as submodules, so it's easier to update everything. Just a git submodule update --recursive. I've also set up soft links to native modules from ics-openvpn in app, so that we don't copy files in Gradle (which was causing problems with the submodules .git* files, not being copied). That makes the repo cleaner. --- app/openvpn/src/compat/compat-gettimeofday.c | 131 --------------------------- 1 file changed, 131 deletions(-) delete mode 100644 app/openvpn/src/compat/compat-gettimeofday.c (limited to 'app/openvpn/src/compat/compat-gettimeofday.c') diff --git a/app/openvpn/src/compat/compat-gettimeofday.c b/app/openvpn/src/compat/compat-gettimeofday.c deleted file mode 100644 index 0f32d5d1..00000000 --- a/app/openvpn/src/compat/compat-gettimeofday.c +++ /dev/null @@ -1,131 +0,0 @@ -/* - * 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-2010 OpenVPN Technologies, Inc. - * - * 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 HAVE_CONFIG_H -#include "config.h" -#elif defined(_MSC_VER) -#include "config-msvc.h" -#endif - -#ifndef HAVE_GETTIMEOFDAY - -#include "compat.h" - -#ifdef WIN32 -/* - * NOTICE: mingw has much faster gettimeofday! - * autoconf will set HAVE_GETTIMEOFDAY - */ - -#include -#include - -static time_t gtc_base = 0; -static DWORD gtc_last = 0; -static time_t last_sec = 0; -static unsigned int last_msec = 0; -static int bt_last = 0; - -static void -gettimeofday_calibrate (void) -{ - const time_t t = time(NULL); - const DWORD gtc = GetTickCount(); - gtc_base = t - gtc/1000; - gtc_last = gtc; -} - -/* - * Rewritten by JY for OpenVPN 2.1, after I realized that - * QueryPerformanceCounter takes nearly 2 orders of magnitude - * more processor cycles than GetTickCount. - */ -int -gettimeofday (struct timeval *tv, void *tz) -{ - const DWORD gtc = GetTickCount(); - int bt = 0; - time_t sec; - unsigned int msec; - const int backtrack_hold_seconds = 10; - - (void)tz; - - /* recalibrate at the dreaded 49.7 day mark */ - if (!gtc_base || gtc < gtc_last) - gettimeofday_calibrate (); - gtc_last = gtc; - - sec = gtc_base + gtc / 1000; - msec = gtc % 1000; - - if (sec == last_sec) - { - if (msec < last_msec) - { - msec = last_msec; - bt = 1; - } - } - else if (sec < last_sec) - { - /* We try to dampen out backtracks of less than backtrack_hold_seconds. - Larger backtracks will be passed through and dealt with by the - TIME_BACKTRACK_PROTECTION code (if enabled) */ - if (sec > last_sec - backtrack_hold_seconds) - { - sec = last_sec; - msec = last_msec; - } - bt = 1; - } - - tv->tv_sec = (long)last_sec = (long)sec; - tv->tv_usec = (last_msec = msec) * 1000; - - if (bt && !bt_last) - gettimeofday_calibrate (); - bt_last = bt; - - return 0; -} - -#else - -#ifdef HAVE_TIME_H -#include -#endif - -int -gettimeofday (struct timeval *tv, void *tz) -{ - (void)tz; - tv->tv_sec = time(NULL); - tv->tv_usec = 0; - return 0; -} - -#endif /* WIN32 */ - -#endif /* HAVE_GETTIMEOFDAY */ -- cgit v1.2.3