struct timeval include guards

[openssl.git] / test / ossl_shim / packeted_bio.h

diff --git a/test/ossl_shim/packeted_bio.h b/test/ossl_shim/packeted_bio.h
index df7650610514db475a0f9d1c05308b5282e6d846..9b4fb1d4d28c7c7b26fd6534c7e06d5eb7c94e29 100644 (file)
--- a/test/ossl_shim/packeted_bio.h
+++ b/test/ossl_shim/packeted_bio.h
@@ -1,44 +1,36 @@
-/* Copyright (c) 2014, Google Inc.
+/*
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

  *
  *

- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */

 
 #ifndef HEADER_PACKETED_BIO
 #define HEADER_PACKETED_BIO
 
 
 #ifndef HEADER_PACKETED_BIO
 #define HEADER_PACKETED_BIO
 

-#include <openssl/e_os2.h>
+#include "e_os.h"
+#include <openssl/base.h>

 #include <openssl/bio.h>
 
 #include <openssl/bio.h>
 

-#include "crypto/scoped_types.h"
-
-#if defined(OPENSSL_SYS_WINDOWS)
-#pragma warning(push, 3)
-#include <winsock2.h>
-#pragma warning(pop)
-#else
-#include <sys/time.h>
-#endif
-
-

 // PacketedBioCreate creates a filter BIO which implements a reliable in-order
 // PacketedBioCreate creates a filter BIO which implements a reliable in-order

-// blocking datagram socket. The resulting BIO, on |BIO_read|, may simulate a
-// timeout which sets |*out_timeout| to the timeout and fails the read.
-// |*out_timeout| must be zero on entry to |BIO_read|; it is an error to not
-// apply the timeout before the next |BIO_read|.
+// blocking datagram socket. It internally maintains a clock and honors
+// |BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT| based on it.

 //
 //

-// Note: The read timeout simulation is intended to be used with the async BIO
-// wrapper. It doesn't simulate BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT, used in DTLS's
-// blocking mode.
-ScopedBIO PacketedBioCreate(timeval *out_timeout);
+// During a |BIO_read|, the peer may signal the filter BIO to simulate a
+// timeout. If |advance_clock| is true, it automatically advances the clock and
+// continues reading, subject to the read deadline. Otherwise, it fails
+// immediately. The caller must then call |PacketedBioAdvanceClock| before
+// retrying |BIO_read|.
+bssl::UniquePtr<BIO> PacketedBioCreate(bool advance_clock);
+
+// PacketedBioGetClock returns the current time for |bio|.
+timeval PacketedBioGetClock(const BIO *bio);
+
+// PacketedBioAdvanceClock advances |bio|'s internal clock and returns true if
+// there is a pending timeout. Otherwise, it returns false.
+bool PacketedBioAdvanceClock(BIO *bio);

 
 
 #endif  // HEADER_PACKETED_BIO
 
 
 #endif  // HEADER_PACKETED_BIO