projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use correct PRNG initializer
[oweals/gnunet.git]
/
src
/
util
/
network.c
diff --git
a/src/util/network.c
b/src/util/network.c
index ce3f7b40b12265143858fd9f038b4d3c29319aae..e112d90932241884d8a54d77cf5b3a7ed3835a91 100644
(file)
--- a/
src/util/network.c
+++ b/
src/util/network.c
@@
-19,7
+19,7
@@
*/
\r
\r
/**
\r
*/
\r
\r
/**
\r
- * @file util/
soc
k.c
\r
+ * @file util/
networ
k.c
\r
* @brief basic, low-level networking interface
\r
* @author Nils Durner
\r
*/
\r
* @brief basic, low-level networking interface
\r
* @author Nils Durner
\r
*/
\r
@@
-182,7
+182,11
@@
GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,
ret = connect (desc->fd, address, address_len);
\r
#ifdef MINGW
\r
if (SOCKET_ERROR == ret)
\r
ret = connect (desc->fd, address, address_len);
\r
#ifdef MINGW
\r
if (SOCKET_ERROR == ret)
\r
- SetErrnoFromWinsockError (WSAGetLastError ());
\r
+ {
\r
+ SetErrnoFromWinsockError (WSAGetLastError ());
\r
+ if (errno == EWOULDBLOCK)
\r
+ errno = EINPROGRESS;
\r
+ }
\r
#endif
\r
return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
\r
}
\r
#endif
\r
return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
\r
}
\r
@@
-817,4
+821,4
@@
GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
#endif
\r
}
\r
\r
#endif
\r
}
\r
\r
-/* end of network
_socket
.c */
\r
+/* end of network.c */
\r