Changeset 5298

Timestamp:

May 17, 2016 8:51:14 AM (8 years ago)

Author:

nanang

Message:

Re #1900: Various fixes in sock_uwp.cpp, mostly about error/exception handlings.

File:

• pjproject/branches/projects/uwp/pjlib/src/pj/sock_uwp.cpp (modified) (7 diffs)

pjproject/branches/projects/uwp/pjlib/src/pj/sock_uwp.cpp

@@ -395 +395 @@
         concurrency::create_task(listener_sock->CancelIOAsync()).wait();
     }
+    while (has_pending_recv) pj_thread_sleep(10);
+
     stream_sock = nullptr;
     datagram_sock = nullptr;
@@ -434 +436 @@
 
     HRESULT err = 0;
-    try {
-        concurrency::create_task([this, addr]() {
-            HostName ^host;
-            int port;
+    concurrency::create_task([this, addr, &err]() {
+        HostName ^host;
+        int port;
+
+        try {
             sockaddr_to_hostname_port(addr, host, &port);
             if (pj_sockaddr_has_addr(addr)) {
@@ -450 +453 @@
                     return listener_sock->BindServiceNameAsync(port.ToString());
             }
-        }).then([this, &err](concurrency::task<void> t)
-        {
-            try {
+        } catch (Exception^ e) {
+            err = e->HResult;
+        }
+    }).then([this, &err](concurrency::task<void> t)
+    {
+        try {
+            if (!err)
                 t.get();
-            } catch (Exception^ e) {
-                err = e->HResult;
-            }
-        }).get();
-    } catch (Exception^ e) {
-        err = e->HResult;
-    }
+        } catch (Exception^ e) {
+            err = e->HResult;
+        }
+    }).get();
 
     return (err? PJ_RETURN_OS_ERROR(err) : PJ_SUCCESS);
@@ -643 +647 @@
         auto cts_token = cts.get_token();
         auto t = concurrency::create_task(socket_reader->LoadAsync(*len),
-                                            cts_token);
+                                          cts_token);
         *len = cancel_after_timeout(t, cts, READ_TIMEOUT)
             .then([this, len, buf, cts_token, &status]
@@ -668 +672 @@
     /* Non-blocking version */
 
+    concurrency::cancellation_token_source cts;
+    auto cts_token = cts.get_token();
+
     has_pending_recv = PJ_TRUE;
-    concurrency::create_task(socket_reader->LoadAsync(*len))
-        .then([this](concurrency::task<unsigned int> t_)
+    concurrency::create_task(socket_reader->LoadAsync(*len), cts_token)
+        .then([this, cts_token](concurrency::task<unsigned int> t_)
     {
         try {
-            // catch any exception
+            if (cts_token.is_canceled()) {
+                has_pending_recv = PJ_FALSE;
+
+                // invoke callback
+                if (cb.on_read) {
+                    (*cb.on_read)(this, -PJ_EUNKNOWN);
+                }
+                return;
+            }
+
             t_.get();
             has_pending_recv = PJ_FALSE;
@@ -682 +698 @@
                 (*cb.on_read)(this, read_len);
             }
-        } catch (Exception^ e) {
+        } catch (...) {
             has_pending_recv = PJ_FALSE;
 
@@ -1479 +1495 @@
 
     *newsock = (pj_sock_t)new_uwp_sock;
-    pj_sockaddr_cp(addr, new_uwp_sock->GetRemoteAddr());
-    *addrlen = pj_sockaddr_get_len(addr);
+
+    if (addr)
+        pj_sockaddr_cp(addr, new_uwp_sock->GetRemoteAddr());
+
+    if (addrlen)
+        *addrlen = pj_sockaddr_get_len(addr);
 
     return PJ_SUCCESS;