[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: openssl/crypto/bio/ b_sock.c openssl/ e_os.h
From:       "Dr. Stephen Henson" <steve () openssl ! org>
Date:       2010-05-31 13:18:21
Message-ID: 20100531131821.B151F1EAE978 () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Dr. Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steve@openssl.org
  Module: openssl                          Date:   31-May-2010 15:18:21
  Branch: HEAD                             Handle: 2010053114182100

  Modified files:
    openssl                 e_os.h
    openssl/crypto/bio      b_sock.c

  Log:
    fix PR#2261 in a different way

  Summary:
    Revision    Changes     Path
    1.58        +7  -0      openssl/crypto/bio/b_sock.c
    1.102       +0  -4      openssl/e_os.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/crypto/bio/b_sock.c
  ============================================================================
  $ cvs diff -u -r1.57 -r1.58 b_sock.c
  --- openssl/crypto/bio/b_sock.c	7 Jan 2010 13:12:30 -0000	1.57
  +++ openssl/crypto/bio/b_sock.c	31 May 2010 13:18:21 -0000	1.58
  @@ -731,7 +731,14 @@
   #ifdef SO_REUSEADDR
   		err_num=get_last_socket_error();
   		if ((bind_mode == BIO_BIND_REUSEADDR_IF_UNUSED) &&
  +#ifdef OPENSSL_SYS_WINDOWS
  +			/* Some versions of Windows define EADDRINUSE to
  +			 * a dummy value.
  +			 */
  +			(err_num == WSAEADDRINUSE))
  +#else
   			(err_num == EADDRINUSE))
  +#endif
   			{
   			client = server;
   			if (h == NULL || strcmp(h,"*") == 0)
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/e_os.h
  ============================================================================
  $ cvs diff -u -r1.101 -r1.102 e_os.h
  --- openssl/e_os.h	27 May 2010 13:07:22 -0000	1.101
  +++ openssl/e_os.h	31 May 2010 13:18:21 -0000	1.102
  @@ -150,10 +150,6 @@
   #define clear_socket_error()	WSASetLastError(0)
   #define readsocket(s,b,n)	recv((s),(b),(n),0)
   #define writesocket(s,b,n)	send((s),(b),(n),0)
  -#ifdef EADDRINUSE
  -#undef EADDRINUSE
  -#endif
  -#define EADDRINUSE		WSAEADDRINUSE
   #elif defined(__DJGPP__)
   #define WATT32
   #define get_last_socket_error()	errno
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]