This commit creates events and through poll_fd_wait_event() associates them with socket file descriptors to get woken up from poll_block().
Some other changes: * Windows does not have sys/fcntl.h but has a fcntl.h On Linux, there is fctnl.h too. * include <openssl/applink.c> to handle different C-Runtime linking of OVS and openssl libraries as suggested at https://www.openssl.org/support/faq.html#PROG2 The above include will not be needed if we compile Open vSwitch with /MD compiler option. * SHUT_RDWR is equivalent to SD_BOTH on Windows. * WSAEventSelect() function that associates 'fd' with events, does not understand POLLIN, POLLOUT etc. Instead the macros it understands are FD_READ, FD_WRITE, FD_ACCEPT, FD_CONNECT, FD_CLOSE etc. So we need to make that transition. Signed-off-by: Gurucharan Shetty <gshe...@nicira.com> --- lib/stream-ssl.c | 93 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 75 insertions(+), 18 deletions(-) diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c index 2ed5282..8b0448e 100644 --- a/lib/stream-ssl.c +++ b/lib/stream-ssl.c @@ -29,7 +29,7 @@ #include <openssl/ssl.h> #include <openssl/x509v3.h> #include <poll.h> -#include <sys/fcntl.h> +#include <fcntl.h> #include <sys/stat.h> #include <unistd.h> #include "coverage.h" @@ -47,6 +47,17 @@ #include "timeval.h" #include "vlog.h" +#ifdef _WIN32 +#include <openssl/applink.c> +#define SHUT_RDWR SD_BOTH +#define POLL_IN FD_READ | FD_ACCEPT | FD_CLOSE +#define POLL_OUT FD_WRITE | FD_CONNECT | FD_CLOSE +#else +#define POLL_IN POLLIN +#define POLL_OUT POLLOUT +#define closesocket close +#endif + VLOG_DEFINE_THIS_MODULE(stream_ssl); /* Active SSL. */ @@ -67,6 +78,7 @@ struct ssl_stream enum ssl_state state; enum session_type type; int fd; + HANDLE wevent; SSL *ssl; struct ofpbuf *txbuf; unsigned int session_nr; @@ -183,6 +195,8 @@ static void stream_ssl_set_ca_cert_file__(const char *file_name, static void ssl_protocol_cb(int write_p, int version, int content_type, const void *, size_t, SSL *, void *sslv_); static bool update_ssl_config(struct ssl_config_file *, const char *file_name); +static int sock_errno(void); +static void clear_handle(int fd, HANDLE wevent); static short int want_to_poll_events(int want) @@ -192,10 +206,10 @@ want_to_poll_events(int want) OVS_NOT_REACHED(); case SSL_READING: - return POLLIN; + return POLL_IN; case SSL_WRITING: - return POLLOUT; + return POLL_OUT; default: OVS_NOT_REACHED(); @@ -243,10 +257,12 @@ new_ssl_stream(const char *name, int fd, enum session_type type, } /* Disable Nagle. */ - retval = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof on); + retval = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (const void *)&on, + sizeof on); if (retval) { - VLOG_ERR("%s: setsockopt(TCP_NODELAY): %s", name, ovs_strerror(errno)); - retval = errno; + retval = sock_errno(); + VLOG_ERR("%s: setsockopt(TCP_NODELAY): %s", name, + sock_strerror(retval)); goto error; } @@ -272,6 +288,9 @@ new_ssl_stream(const char *name, int fd, enum session_type type, sslv->state = state; sslv->type = type; sslv->fd = fd; +#ifdef _WIN32 + sslv->wevent = CreateEvent(NULL, FALSE, FALSE, NULL); +#endif sslv->ssl = ssl; sslv->txbuf = NULL; sslv->rx_want = sslv->tx_want = SSL_NOTHING; @@ -290,7 +309,7 @@ error: if (ssl) { SSL_free(ssl); } - close(fd); + closesocket(fd); return retval; } @@ -500,7 +519,8 @@ ssl_close(struct stream *stream) ERR_clear_error(); SSL_free(sslv->ssl); - close(sslv->fd); + clear_handle(sslv->fd, sslv->wevent); + closesocket(sslv->fd); free(sslv); } @@ -691,7 +711,8 @@ ssl_run_wait(struct stream *stream) struct ssl_stream *sslv = ssl_stream_cast(stream); if (sslv->tx_want != SSL_NOTHING) { - poll_fd_wait(sslv->fd, want_to_poll_events(sslv->tx_want)); + poll_fd_wait_event(sslv->fd, sslv->wevent, + want_to_poll_events(sslv->tx_want)); } } @@ -707,14 +728,14 @@ ssl_wait(struct stream *stream, enum stream_wait_type wait) } else { switch (sslv->state) { case STATE_TCP_CONNECTING: - poll_fd_wait(sslv->fd, POLLOUT); + poll_fd_wait_event(sslv->fd, sslv->wevent, POLL_OUT); break; case STATE_SSL_CONNECTING: /* ssl_connect() called SSL_accept() or SSL_connect(), which * set up the status that we test here. */ - poll_fd_wait(sslv->fd, - want_to_poll_events(SSL_want(sslv->ssl))); + poll_fd_wait_event(sslv->fd, sslv->wevent, + want_to_poll_events(SSL_want(sslv->ssl))); break; default: @@ -725,7 +746,8 @@ ssl_wait(struct stream *stream, enum stream_wait_type wait) case STREAM_RECV: if (sslv->rx_want != SSL_NOTHING) { - poll_fd_wait(sslv->fd, want_to_poll_events(sslv->rx_want)); + poll_fd_wait_event(sslv->fd, sslv->wevent, + want_to_poll_events(sslv->rx_want)); } else { poll_immediate_wake(); } @@ -765,6 +787,7 @@ struct pssl_pstream { struct pstream pstream; int fd; + HANDLE wevent; }; const struct pstream_class pssl_pstream_class; @@ -802,6 +825,9 @@ pssl_open(const char *name OVS_UNUSED, char *suffix, struct pstream **pstreamp, pstream_init(&pssl->pstream, &pssl_pstream_class, bound_name); pstream_set_bound_port(&pssl->pstream, sin.sin_port); pssl->fd = fd; +#ifdef _WIN32 + pssl->wevent = CreateEvent(NULL, FALSE, FALSE, NULL); +#endif *pstreamp = &pssl->pstream; return 0; } @@ -810,7 +836,8 @@ static void pssl_close(struct pstream *pstream) { struct pssl_pstream *pssl = pssl_pstream_cast(pstream); - close(pssl->fd); + clear_handle(pssl->fd, pssl->wevent); + closesocket(pssl->fd); free(pssl); } @@ -826,16 +853,21 @@ pssl_accept(struct pstream *pstream, struct stream **new_streamp) new_fd = accept(pssl->fd, (struct sockaddr *) &sin, &sin_len); if (new_fd < 0) { - error = errno; + error = sock_errno(); +#ifdef _WIN32 + if (error == WSAEWOULDBLOCK) { + error = EAGAIN; + } +#endif if (error != EAGAIN) { - VLOG_DBG_RL(&rl, "accept: %s", ovs_strerror(error)); + VLOG_DBG_RL(&rl, "accept: %s", sock_strerror(error)); } return error; } error = set_nonblocking(new_fd); if (error) { - close(new_fd); + closesocket(new_fd); return error; } @@ -851,7 +883,7 @@ static void pssl_wait(struct pstream *pstream) { struct pssl_pstream *pssl = pssl_pstream_cast(pstream); - poll_fd_wait(pssl->fd, POLLIN); + poll_fd_wait_event(pssl->fd, pssl->wevent, POLL_IN); } static int @@ -1370,3 +1402,28 @@ ssl_protocol_cb(int write_p, int version OVS_UNUSED, int content_type, ds_destroy(&details); } + +/* In Windows platform, errno is not set for socket calls. + * The last error has to be gotten from WSAGetLastError(). */ +int +sock_errno(void) +{ +#ifdef _WIN32 + return WSAGetLastError(); +#else + return errno; +#endif +} + +static void +clear_handle(int fd OVS_UNUSED, HANDLE wevent OVS_UNUSED) +{ +#ifdef _WIN32 + if (fd) { + WSAEventSelect(fd, NULL, 0); + } + if (wevent) { + CloseHandle(wevent); + } +#endif +} -- 1.7.9.5 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
