sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test: Add missing socket errno in test_util.c 

According to 21116, it seems to be needed for Wheezy Raspbian build. Also,
manpage of socket(2) does confirm that this errno value should be catched as
well in case of no support from the OS of IPv4 or/and IPv6.

Fixes #21116

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2017-02-08 08:56:39 -05:00
parent 9a9f4ffdfa
commit e129393e40
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug21116 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (test):
- Fix Raspbian build missing socket errno in test util. Fixes bug 21116.;
bugfix on tor-0.2.8.2. Patch by "hein".

3
src/test/test_util.c
View File

@ -5091,7 +5091,8 @@ test_util_socket(void *arg)
fd1 = tor_open_socket_with_extensions(domain, SOCK_STREAM, 0, 0, 0);
int err = tor_socket_errno(fd1);
if (fd1 < 0 && err == SOCK_ERRNO(EPROTONOSUPPORT)) {
if (fd1 < 0 && (err == SOCK_ERRNO(EPROTONOSUPPORT) ||
err == SOCK_ERRNO(EAFNOSUPPORT))) {
/* Assume we're on an IPv4-only or IPv6-only system, and give up now. */
goto done;
}