From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 22 Sep 2009 11:33:58 +0000 (+0000)
Subject: PR: 2050
X-Git-Tag: OpenSSL_0_9_8m-beta1~101
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0badc909ae3f73a0d4ee2e403cf8425776a5f126;p=oweals%2Fopenssl.git

PR: 2050
Submitted by: Michael Tuexen <tuexen@fh-muenster.de>
Approved by: steve@openssl.org

Fix handling of ENOTCONN and EMSGSIZE for dgram BIOs.
---

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 97b9ec8a5f..14ca854b4a 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -324,7 +324,7 @@ static int dgram_write(BIO *b, const char *in, int inl)
 	BIO_clear_retry_flags(b);
 	if (ret <= 0)
 		{
-		if (BIO_sock_should_retry(ret))
+		if (BIO_dgram_should_retry(ret))
 			{
 			BIO_set_retry_write(b);  
 			data->_errno = get_last_socket_error();
@@ -690,10 +690,6 @@ int BIO_dgram_non_fatal_error(int err)
 # endif
 #endif
 
-#if defined(ENOTCONN)
-	case ENOTCONN:
-#endif
-
 #ifdef EINTR
 	case EINTR:
 #endif
@@ -716,11 +712,6 @@ int BIO_dgram_non_fatal_error(int err)
 	case EALREADY:
 #endif
 
-/* DF bit set, and packet larger than MTU */
-#ifdef EMSGSIZE
-	case EMSGSIZE:
-#endif
-
 		return(1);
 		/* break; */
 	default: