c6a38c1ef6
git-svn-id: svn://svn.openwrt.org/openwrt/packages@18964 3c298f89-4303-0410-b956-a3cf2f4a3e73
23 lines
896 B
Diff
23 lines
896 B
Diff
--- a/src/socketlib.c
|
|
+++ b/src/socketlib.c
|
|
@@ -392,17 +392,15 @@ int socket_is_data_readable(int s, int t
|
|
wput_socket * socket_timeout_connect(wput_socket * sock, struct sockaddr *remote_addr, size_t size, int timeout) {
|
|
int c = 0;
|
|
printout(vDEBUG, "initiating timeout connect (%d)\n", timeout);
|
|
-#ifdef WIN32
|
|
/* reset errno before connecting. otherwise connection might "fail" for:
|
|
* no such file or directory ;) */
|
|
errno = 0;
|
|
-#endif
|
|
- socket_set_blocking(sock->fd, 0);
|
|
+ socket_set_blocking(sock->fd, 1);
|
|
c = connect(sock->fd,remote_addr,size);
|
|
/* here was a check also for errno != 36 (FILENAMETOOLONG)
|
|
* maybe this was EINPROGRESS on another system? */
|
|
if(errno > 0 && errno != EINPROGRESS) {
|
|
- printout(vMORE, "[%s]", strerror(errno));
|
|
+ printout(vMORE, "[%d:%s] ", errno, strerror(errno));
|
|
return NULL;
|
|
}
|
|
/* DEBUG if(c == -1) perror("connect"); */
|