From c68f4f687800d66a114dd2989093fc75bf4fadd1 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Wed, 5 Oct 2011 21:30:50 +0000 Subject: [PATCH] Add krb5int_gettimeofday to k5sprt for platforms w/o native gettimeofday Microsecond accuracy on _WIN32, but only one second accuracy on other, AFAIK purely hypothetical, platforms that lack native gettimeofday. Shamelessly cribbed from Heimdal. Signed-off-by: Kevin Wasserman git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25310 dc483132-0cff-0310-8789-dd5450dbe970 --- src/configure.in | 11 ++++ src/include/k5-platform.h | 5 ++ src/util/support/Makefile.in | 10 +++- src/util/support/gettimeofday.c | 102 ++++++++++++++++++++++++++++++++ 4 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 src/util/support/gettimeofday.c diff --git a/src/configure.in b/src/configure.in index 6c3eebcc4..7bb1a6cbd 100644 --- a/src/configure.in +++ b/src/configure.in @@ -229,6 +229,17 @@ MKSTEMP_OBJ='$(OUTPRE)mkstemp.$(OBJEXT)' EXTRA_SUPPORT_SYMS="$EXTRA_SUPPORT_SYMS krb5int_mkstemp"]) AC_SUBST(MKSTEMP_OBJ) AC_SUBST(MKSTEMP_ST_OBJ) + +AC_CHECK_FUNC(gettimeofday, + [GETTIMEOFDAY_ST_OBJ= + GETTIMEOFDAY_OBJ= + AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [Have the gettimeofday function]) +], + [GETTIMEOFDAY_ST_OBJ='gettimeofday.o' + GETTIMEOFDAY_OBJ='$(OUTPRE)gettimeofday.$(OBJEXT)' + EXTRA_SUPPORT_SYMS="$EXTRA_SUPPORT_SYMS krb5int_gettimeofday"]) +AC_SUBST(GETTIMEOFDAY_OBJ) +AC_SUBST(GETTIMEOFDAY_ST_OBJ) AC_SUBST(EXTRA_SUPPORT_SYMS) DECLARE_SYS_ERRLIST diff --git a/src/include/k5-platform.h b/src/include/k5-platform.h index e9155cefb..77d710b49 100644 --- a/src/include/k5-platform.h +++ b/src/include/k5-platform.h @@ -1031,6 +1031,11 @@ extern int krb5int_mkstemp(char *); #define mkstemp krb5int_mkstemp #endif +#ifndef HAVE_GETTIMEOFDAY +extern int krb5int_gettimeofday(struct timeval *tp, void *ignore); +#define gettimeofday krb5int_gettimeofday +#endif + extern void krb5int_zap(void *ptr, size_t len); /* diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in index b3dc4fcfc..6c059c07d 100644 --- a/src/util/support/Makefile.in +++ b/src/util/support/Makefile.in @@ -23,6 +23,11 @@ LIBMINOR=1 LIBINITFUNC=krb5int_thread_support_init LIBFINIFUNC=krb5int_thread_support_fini +GETTIMEOFDAY_ST_OBJ= @GETTIMEOFDAY_ST_OBJ@ +GETTIMEOFDAY_OBJ= @GETTIMEOFDAY_OBJ@ +##DOS##GETTIMEOFDAY_ST_OBJ= gettimeofday.o +##DOS##GETTIMEOFDAY_OBJ= $(OUTPRE)gettimeofday.$(OBJEXT) + MKSTEMP_ST_OBJ= @MKSTEMP_ST_OBJ@ MKSTEMP_OBJ= @MKSTEMP_OBJ@ ##DOS##MKSTEMP_ST_OBJ= mkstemp.o @@ -69,6 +74,7 @@ STLIBOBJS= \ utf8_conv.o \ zap.o \ path.o \ + $(GETTIMEOFDAY_ST_OBJ) \ $(IPC_ST_OBJ) \ $(STRLCPY_ST_OBJ) \ $(FNMATCH_ST_OBJ) \ @@ -87,6 +93,7 @@ LIBOBJS= \ $(OUTPRE)utf8_conv.$(OBJEXT) \ $(OUTPRE)zap.$(OBJEXT) \ $(OUTPRE)path.$(OBJEXT) \ + $(GETTIMEOFDAY_OBJ) \ $(IPC_OBJ) \ $(STRLCPY_OBJ) \ $(FNMATCH_OBJ) \ @@ -108,6 +115,7 @@ SRCS=\ $(srcdir)/fake-addrinfo.c \ $(srcdir)/utf8.c \ $(srcdir)/utf8_conv.c \ + $(srcdir)/gettimeofday.c \ $(srcdir)/strlcpy.c \ $(srcdir)/fnmatch.c \ $(srcdir)/printf.c \ @@ -145,7 +153,7 @@ SHLIB_EXPORT_FILE=libkrb5support.exports EXTRA_SUPPORT_SYMS= @EXTRA_SUPPORT_SYMS@ ##DOS##EXTRA_SUPPORT_SYMS= krb5int_mkstemp krb5int_strlcpy krb5int_strlcat \ -##DOS## krb5int_vasprintf krb5int_asprintf $(IPC_SYMS) +##DOS## krb5int_vasprintf krb5int_asprintf krb5int_gettimeofday $(IPC_SYMS) ##DOS##!if 0 libkrb5support.exports: $(srcdir)/libkrb5support-fixed.exports Makefile diff --git a/src/util/support/gettimeofday.c b/src/util/support/gettimeofday.c new file mode 100644 index 000000000..e31f38b9c --- /dev/null +++ b/src/util/support/gettimeofday.c @@ -0,0 +1,102 @@ +/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* util/support/gettimeofday.c */ +/* + * Copyright (C) 2011 by the Massachusetts Institute of Technology. + * All rights reserved. + * + * Export of this software from the United States of America may + * require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. + * + * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and + * distribute this software and its documentation for any purpose and + * without fee is hereby granted, provided that the above copyright + * notice appear in all copies and that both that copyright notice and + * this permission notice appear in supporting documentation, and that + * the name of M.I.T. not be used in advertising or publicity pertaining + * to distribution of the software without specific, written prior + * permission. Furthermore if you modify this software you must label + * your software as modified software and not distribute it in such a + * fashion that it might be confused with the original M.I.T. software. + * M.I.T. makes no representations about the suitability of + * this software for any purpose. It is provided "as is" without express + * or implied warranty. + */ +/* + * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "k5-platform.h" + +#ifdef _WIN32 + +#include + +int +krb5int_gettimeofday (struct timeval *tp, void *ignore) +{ + FILETIME ft; + ULARGE_INTEGER li; + ULONGLONG ull; + + GetSystemTimeAsFileTime(&ft); + li.LowPart = ft.dwLowDateTime; + li.HighPart = ft.dwHighDateTime; + ull = li.QuadPart; + + ull -= 116444736000000000i64; + ull /= 10i64; /* ull is now in microseconds */ + + tp->tv_usec = (long)(ull % 1000000i64); + tp->tv_sec = (long)(ull / 1000000i64); + + return 0; +} + +#else + +/* + * Simple gettimeofday that only returns seconds. + */ +int +krb5int_gettimeofday (struct timeval *tp, void *ignore) +{ + time_t t; + + t = time(NULL); + tp->tv_sec = (long) t; + tp->tv_usec = 0; + return 0; +} + +#endif /* !_WIN32 */ -- 2.26.2