diff options
author | unknown <msvensson@shellback.(none)> | 2006-05-22 15:49:57 +0200 |
---|---|---|
committer | unknown <msvensson@shellback.(none)> | 2006-05-22 15:49:57 +0200 |
commit | b959d36bce2c71b45b65ae86b730feb108951760 (patch) | |
tree | 435cf1e3d081d3837f4215a39c9b798e621de571 /extra/yassl/include/socket_wrapper.hpp | |
parent | 07188950aefdebe5d55af86b14fe8179e52b5987 (diff) | |
download | mariadb-git-b959d36bce2c71b45b65ae86b730feb108951760.tar.gz |
Import from yaSSL
Fixes for HPUX etc.
Don't define exceptions operator new on hpux as the linker will look for the function
extra/yassl/examples/echoserver/echoserver.cpp:
Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
Import patch yassl.diff
extra/yassl/include/socket_wrapper.hpp:
Import patch yassl.diff
extra/yassl/src/handshake.cpp:
Import patch yassl.diff
extra/yassl/src/socket_wrapper.cpp:
Import patch yassl.diff
extra/yassl/src/ssl.cpp:
Import patch yassl.diff
extra/yassl/src/template_instnt.cpp:
Import patch yassl.diff
extra/yassl/src/timer.cpp:
Import patch yassl.diff
extra/yassl/src/yassl_error.cpp:
Import patch yassl.diff
extra/yassl/src/yassl_int.cpp:
Import patch yassl.diff
extra/yassl/taocrypt/include/block.hpp:
Import patch yassl.diff
extra/yassl/taocrypt/include/md4.hpp:
Import patch yassl.diff
extra/yassl/taocrypt/include/runtime.hpp:
Import patch yassl.diff
extra/yassl/taocrypt/src/md4.cpp:
Import patch yassl.diff
extra/yassl/taocrypt/src/template_instnt.cpp:
Import patch yassl.diff
extra/yassl/taocrypt/taocrypt.dsp:
Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
Import patch yassl.diff
extra/yassl/testsuite/test.hpp:
Import patch yassl.diff
extra/yassl/mySTL/stdexcept.hpp:
Don't define exceptions operator new on hpux as the linker will look for the function
extra/yassl/taocrypt/src/Makefile.am:
Add md4.cpp to Makefile.am
Diffstat (limited to 'extra/yassl/include/socket_wrapper.hpp')
-rw-r--r-- | extra/yassl/include/socket_wrapper.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extra/yassl/include/socket_wrapper.hpp b/extra/yassl/include/socket_wrapper.hpp index d2258a93723..16db142b3a2 100644 --- a/extra/yassl/include/socket_wrapper.hpp +++ b/extra/yassl/include/socket_wrapper.hpp @@ -66,6 +66,7 @@ typedef unsigned char byte; // Wraps Windows Sockets and BSD Sockets class Socket { socket_t socket_; // underlying socket descriptor + bool wouldBlock_; // for non-blocking data public: explicit Socket(socket_t s = INVALID_SOCKET); ~Socket(); @@ -75,9 +76,10 @@ public: socket_t get_fd() const; uint send(const byte* buf, unsigned int len, int flags = 0) const; - uint receive(byte* buf, unsigned int len, int flags = 0) const; + uint receive(byte* buf, unsigned int len, int flags = 0); - bool wait() const; + bool wait(); + bool WouldBlock() const; void closeSocket(); void shutDown(int how = SD_SEND); |