FS-10150: [freeswitch-core] Reduce writes to closed ssl sockets -- same fix for non...

diff --git a/libs/libks/src/kws.c b/libs/libks/src/kws.c
index a9c5141d720d231e53370b51b9ab20db4c7cb16f..8994a674894da8c57a0c2e26417e5cd43b8afe10 100644 (file)
--- a/libs/libks/src/kws.c
+++ b/libs/libks/src/kws.c
@@ -482,7 +482,13 @@ KS_DECLARE(ks_ssize_t) kws_raw_write(kws_t *kws, void *data, ks_size_t bytes)
                        ks_sleep_ms(ms);
                }
                
-       } while (--sanity > 0 && ((r == -1 && ks_errno_is_blocking(ks_errno())) || (kws->block && wrote < bytes)));
+               if (r == -1) {
+                       if (!ks_errno_is_blocking(ks_errno())) {
+                               break;
+                       }
+               }
+
+       } while (--sanity > 0 && kws->block && wrote < bytes);
        
        //if (r<0) {
                //printf("wRITE FAIL: %s\n", strerror(errno));

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index c3cfd79ba3034a704147f8f6dc21b00bda64199b..cafd8c857cfb89545d152602af19fa57c4655f6f 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Thu Apr  6 17:08:51 CDT 2017
+Fri Apr 21 15:42:59 CDT 2017

diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
index 8d3db0a73e29fdbd59da13f678201fdae0f96dda..774c6946257f7065a581071b5df79fb6b4f7e5f6 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
@@ -476,7 +476,13 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
                        ms_sleep(ms);
                }
 
-       } while (--sanity > 0 && ((r == -1 && xp_is_blocking(xp_errno())) || (wsh->block && wrote < bytes)));
+               if (r == -1) {
+                       if (!ks_errno_is_blocking(ks_errno())) {
+                               break;
+                       }
+               }
+
+       } while (--sanity > 0 && kws->block && wrote < bytes);
 
        //if (r<0) {
                //printf("wRITE FAIL: %s\n", strerror(errno));

diff --git a/src/mod/endpoints/mod_verto/ws.c b/src/mod/endpoints/mod_verto/ws.c
index 8d3db0a73e29fdbd59da13f678201fdae0f96dda..774c6946257f7065a581071b5df79fb6b4f7e5f6 100644 (file)
--- a/src/mod/endpoints/mod_verto/ws.c
+++ b/src/mod/endpoints/mod_verto/ws.c
@@ -476,7 +476,13 @@ ssize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
                        ms_sleep(ms);
                }
 
-       } while (--sanity > 0 && ((r == -1 && xp_is_blocking(xp_errno())) || (wsh->block && wrote < bytes)));
+               if (r == -1) {
+                       if (!ks_errno_is_blocking(ks_errno())) {
+                               break;
+                       }
+               }
+
+       } while (--sanity > 0 && kws->block && wrote < bytes);
 
        //if (r<0) {
                //printf("wRITE FAIL: %s\n", strerror(errno));