torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'dgoulet/bug21116_030_01'

Browse Source
This commit is contained in:
Nick Mathewson
2017-02-13 15:56:01 -05:00
parent b421b3f621 e129393e40
commit dca8ae5cfa
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug21116
+3
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".
src/test/test_util.c
+2 -1
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;
}