qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cliffjan...@apache.org
Subject qpid-proton git commit: PROTON-1349: Windows iocp proactor ssl fix, defer IO until bind on outbound connections
Date Thu, 05 Oct 2017 01:53:33 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 7b4c09e65 -> 38ae5917f


PROTON-1349: Windows iocp proactor ssl fix, defer IO until bind on outbound connections


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/38ae5917
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/38ae5917
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/38ae5917

Branch: refs/heads/master
Commit: 38ae5917fcd1a8ccb953fbc5de3e57f1807d917c
Parents: 7b4c09e
Author: Clifford Jansen <cliffjansen@apache.org>
Authored: Wed Oct 4 18:53:24 2017 -0700
Committer: Clifford Jansen <cliffjansen@apache.org>
Committed: Wed Oct 4 18:53:24 2017 -0700

----------------------------------------------------------------------
 examples/cpp/CMakeLists.txt      |  6 -----
 proton-c/src/proactor/win_iocp.c | 46 +++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38ae5917/examples/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
index 0c548af..5584201 100644
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@ -75,12 +75,6 @@ endif()
 
 add_cpp_test(cpp-example-container ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example_test.py
-v ContainerExampleTest)
 
-# windows exclusion only for 0.18 beta 
-if (NOT WIN32)
 if (NOT SSL_IMPL STREQUAL none)
 add_cpp_test(cpp-example-container-ssl ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/example_test.py
-v ContainerExampleSSLTest)
 endif()
-endif()
-
-
-

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38ae5917/proton-c/src/proactor/win_iocp.c
----------------------------------------------------------------------
diff --git a/proton-c/src/proactor/win_iocp.c b/proton-c/src/proactor/win_iocp.c
index 885081e..9a27ae6 100644
--- a/proton-c/src/proactor/win_iocp.c
+++ b/proton-c/src/proactor/win_iocp.c
@@ -1710,6 +1710,7 @@ typedef struct pconnection_t {
   int wake_count;
   int hog_count; // thread hogging limiter
   bool server;                /* accept, not connect */
+  bool started;
   bool connecting;
   bool tick_pending;
   bool queued_disconnect;     /* deferred from pn_proactor_disconnect() */
@@ -2109,7 +2110,7 @@ static const char *pconnection_setup(pconnection_t *pc, pn_proactor_t
*p, pn_con
   return NULL;
 }
 
-// Either stops a timer before firing or returns after the callback has 
+// Either stops a timer before firing or returns after the callback has
 // completed (in the threadpool thread).  Never "in doubt".
 static bool stop_timer(HANDLE tqueue, HANDLE *timer) {
   if (!*timer) return true;
@@ -2225,6 +2226,8 @@ static bool pconnection_cleanup(pconnection_t *pc) {
 static inline bool pconnection_work_pending(pconnection_t *pc) {
   if (pc->completion_queue->size() || pc->wake_count || pc->tick_pending || pc->queued_disconnect)
     return true;
+  if (!pc->started)
+    return false;
   pn_bytes_t wbuf = pn_connection_driver_write_buffer(&pc->driver);
   return (wbuf.size > 0 && (pc->psocket.iocpd->events & PN_WRITABLE));
 }
@@ -2274,7 +2277,7 @@ static pn_event_batch_t *pconnection_process(pconnection_t *pc, iocp_result_t
*r
             return NULL;
           pc->context.working = true;
         }
-        open = !pc->connecting && !pc->context.closing;
+        open = pc->started && !pc->connecting && !pc->context.closing;
       }
       else {
         // Just re-acquired lock after processing IO and engine work
@@ -2341,9 +2344,11 @@ static pn_event_batch_t *pconnection_process(pconnection_t *pc, iocp_result_t
*r
         }
         else if (is_connect_result(result)) {
           connect_step_done(pc, (connect_result_t *) result);
-          open = pc->psocket.iocpd && (pc->psocket.iocpd->events & PN_WRITABLE);
-          if (open)
+          if (pc->psocket.iocpd && (pc->psocket.iocpd->events & PN_WRITABLE))
{
             pc->connecting = false;
+            if (pc->started)
+              open = true;
+          }
         }
         else do_complete(result);
       }
@@ -2417,6 +2422,8 @@ static pn_event_t *pconnection_batch_next(pn_event_batch_t *batch) {
     pconnection_process(pc, NULL, true);  // top up
     e = pn_connection_driver_next_event(&pc->driver);
   }
+  if (e && !pc->started && pn_event_type(e) == PN_CONNECTION_BOUND)
+    pc->started = true; // SSL will be set up on return and safe to do IO with correct
transport layers
   return e;
 }
 
@@ -2766,6 +2773,7 @@ void pn_proactor_listen(pn_proactor_t *p, pn_listener_t *l, const char
*addr, in
 
   struct addrinfo *addrinfo = NULL;
   int gai_err = pgetaddrinfo(host, port, AI_PASSIVE | AI_ALL, &addrinfo);
+  int wsa_err = 0;
   if (!gai_err) {
     /* Count addresses, allocate enough space for sockets */
     size_t len = 0;
@@ -2778,24 +2786,25 @@ void pn_proactor_listen(pn_proactor_t *p, pn_listener_t *l, const
char *addr, in
     l->psockets_size = 0;
     /* Find working listen addresses */
     for (struct addrinfo *ai = addrinfo; ai; ai = ai->ai_next) {
+      // Note fd destructor can clear WSAGetLastError()
       unique_socket fd(::socket(ai->ai_family, SOCK_STREAM, ai->ai_protocol));
       if (fd != INVALID_SOCKET) {
         bool yes = 1;
-        if (!::setsockopt(fd, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (const char *) &yes, sizeof(yes)))
-          if (!::bind(fd, ai->ai_addr, ai->ai_addrlen))
-            if (!::listen(fd, backlog)) {
-              iocpdesc_t *iocpd = pni_iocpdesc_create(p->iocp, fd);
-              if (iocpd) {
-                fd.release();
-                psocket_t *ps = &l->psockets[l->psockets_size++];
-                psocket_init(ps, l, false, addr);
-                ps->iocpd = iocpd;
-                iocpd->is_mp = true;
-                iocpd->active_completer = ps;
-                pni_iocpdesc_start(ps->iocpd);
-              }
+        if (!::bind(fd, ai->ai_addr, ai->ai_addrlen))
+          if (!::listen(fd, backlog)) {
+            iocpdesc_t *iocpd = pni_iocpdesc_create(p->iocp, fd);
+            if (iocpd) {
+              fd.release();
+              psocket_t *ps = &l->psockets[l->psockets_size++];
+              psocket_init(ps, l, false, addr);
+              ps->iocpd = iocpd;
+              iocpd->is_mp = true;
+              iocpd->active_completer = ps;
+              pni_iocpdesc_start(ps->iocpd);
             }
+          }
       }
+      wsa_err = WSAGetLastError();  // save it
     }
   }
   if (addrinfo) {
@@ -2810,7 +2819,7 @@ void pn_proactor_listen(pn_proactor_t *p, pn_listener_t *l, const char
*addr, in
     if (gai_err) {
       psocket_error(l->psockets, gai_err, "listen on");
     } else {
-      psocket_error(l->psockets, WSAGetLastError(), "listen on");
+      psocket_error(l->psockets, wsa_err, "listen on");
     }
   }
   wakeup(l->psockets);
@@ -3176,6 +3185,7 @@ void pn_listener_accept(pn_listener_t *l, pn_connection_t *c) {
       pc->psocket.iocpd = conn_iocpd;
       conn_iocpd->active_completer =&pc->psocket;
       set_sock_names(pc);
+      pc->started = true;
       pni_iocpdesc_start(conn_iocpd);
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message