socks5: Implement timeout to detect bogus service.
5e48116051a4
Actions

Description

socks5: Implement timeout to detect bogus service.

* src/assuan-socket.c (TIMEOUT_NOT_WAITING_SOCKS5_FOREVER): New.
(socks5_connect): Call 'select' in order to not waiting response
forever.

GnuPG-bug-id: T3381
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

Details

Provenance

• gniibe

Authored on Jan 25 2019, 3:34 AM

Parents

rA23bf87595432: build: With LD_LIBRARY_PATH defined, use --disable-new-dtags.

Branches

Unknown

Tags

Unknown

Tasks

T3381: dirmngr won't start on Windows 10 with admin level account

Event Timeline

• gniibe added a task: T3381: dirmngr won't start on Windows 10 with admin level account.Jan 25 2019, 4:23 AM

• gniibe committed rA5e48116051a4: socks5: Implement timeout to detect bogus service. (authored by • gniibe).Jan 25 2019, 3:39 AM

• werner awarded a token.Jan 25 2019, 7:36 AM

• aheinecke added a subscriber: • aheinecke.Jan 25 2019, 9:37 AM

• aheinecke added inline comments.

/src/assuan-socket.c

792

Thank you very much for your quick fix. I think there might be a mistake here in the first argument. Should it not be simply "1" instead of sock+1?

For Windows this raises the warning:

/home/aheinecke/dev/main/src/libassuan/src/assuan-socket.c: In function 'socks5_connect':
/home/aheinecke/dev/main/src/libassuan/src/assuan-socket.c:792:21: warning: pointer of type 'void *' used in arithmetic [-Wpointer-arith]
   ret = select (sock+1, &fds, NULL, NULL, &tv);
                     ^
/home/aheinecke/dev/main/src/libassuan/src/assuan-socket.c:792:17: warning: passing argument 1 of 'select' makes integer from pointer without a cast [-Wint-conversion]
   ret = select (sock+1, &fds, NULL, NULL, &tv);
                 ^~~~
In file included from /home/aheinecke/dev/main/src/libassuan/src/assuan-defs.h:34:0,
                 from /home/aheinecke/dev/main/src/libassuan/src/assuan-socket.c:50:
/usr/share/mingw-w64/include/winsock2.h:995:34: note: expected 'int' but argument is of type 'assuan_fd_t {aka void *}'
   WINSOCK_API_LINKAGE int WSAAPI select(int nfds,fd_set *readfds,fd_set *writefds,fd_set *exceptfds,const PTIMEVAL timeout);

• werner added a subscriber: • werner.Jan 25 2019, 1:52 PM

• werner added inline comments.

/src/assuan-socket.c

792

No:

nfds is the highest-numbered file descriptor in any of the three sets, plus 1.

To fix the warning we need to cast it - will do so.

• aheinecke added inline comments.Jan 25 2019, 2:10 PM