Changeset 3408 for pjproject/trunk

Timestamp:

Jan 21, 2011 7:15:22 AM (14 years ago)

Author:

bennylp

Message:

Fixed #1197: WSAECONNRESET errors on Windows 2000 or 2003 may cause UDP transport to stop working

Location:

pjproject/trunk/pjlib

Files:

• include/pj/config.h (modified) (1 diff)
• src/pj/sock_bsd.c (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/config.h

@@ -799 +799 @@
 #ifndef PJ_HAS_SSL_SOCK
 #  define PJ_HAS_SSL_SOCK           0
+#endif
+
+
+/**
+ * Disable WSAECONNRESET error for UDP sockets on Win32 platforms. See
+ * https://trac.pjsip.org/repos/ticket/1197.
+ *
+ * Default: 1
+ */
+#ifndef PJ_SOCK_DISABLE_WSAECONNRESET
+#   define PJ_SOCK_DISABLE_WSAECONNRESET    1
 #endif
 

pjproject/trunk/pjlib/src/pj/sock_bsd.c

@@ -494 +494 @@
     if (*sock == PJ_INVALID_SOCKET) 
         return PJ_RETURN_OS_ERROR(pj_get_native_netos_error());
-    else
-        return PJ_SUCCESS;
+    
+#if PJ_SOCK_DISABLE_WSAECONNRESET && \
+    (!defined(PJ_WIN32_WINCE) || PJ_WIN32_WINCE==0)
+
+#ifndef SIO_UDP_CONNRESET
+    #define SIO_UDP_CONNRESET _WSAIOW(IOC_VENDOR,12)
+#endif
+
+    /* Disable WSAECONNRESET for UDP.
+     * See https://trac.pjsip.org/repos/ticket/1197
+     */
+    if (type==PJ_SOCK_DGRAM) {
+        DWORD dwBytesReturned = 0;
+        BOOL bNewBehavior = FALSE;
+        DWORD rc;
+
+        rc = WSAIoctl(*sock, SIO_UDP_CONNRESET,
+                      &bNewBehavior, sizeof(bNewBehavior),
+                      NULL, 0, &dwBytesReturned,
+                      NULL, NULL);
+
+        if (rc==SOCKET_ERROR) {
+            // Ignored..
+        }
+    }
+#endif
+
+    return PJ_SUCCESS;
 }