cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-19 09:15:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Relax bufferevent_connect_hostname_emfile

Browse Source 
Do not do any assumptions on the error for the EMFILE from
getaddrinfo(), expect just any error.

Fixes: #924
(cherry picked from commit 4436287d1247fb2e9c80560debf852a94657e485)
This commit is contained in:
Azat Khuzhin 2019-10-31 09:18:58 +03:00
parent 93174bb537
commit ca92a7559e
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/regress_dns.c
View File

@ -1265,27 +1265,9 @@ test_bufferevent_connect_hostname(void *arg)
int n_accept=0, n_dns=0;
char buf[128];
int emfile = data->setup_data && !strcmp(data->setup_data, "emfile");
int success = BEV_EVENT_CONNECTED;
int default_error = 0;
unsigned i;
int ret;
if (emfile) {
success = BEV_EVENT_ERROR;
#if defined(__linux__)
/* on linux glibc/musl reports EAI_SYSTEM, when getaddrinfo() cannot
* open file for resolving service. */
default_error = EVUTIL_EAI_SYSTEM;
#elif defined(__sun__)
/* on solaris it returns EAI_FAIL */
default_error = EVUTIL_EAI_FAIL;
/** the DP_POLL can also fail with EINVAL under EMFILE */
#else
/* on osx/freebsd it returns EAI_NONAME */
default_error = EVUTIL_EAI_NONAME;
#endif
}
be_connect_hostname_base = data->base;
/* Bind an address and figure out what port it's on. */
@ -1376,12 +1358,16 @@ test_bufferevent_connect_hostname(void *arg)
tt_int_op(be_outcome[0].what, ==, BEV_EVENT_ERROR);
tt_int_op(be_outcome[0].dnserr, ==, EVUTIL_EAI_NONAME);
tt_int_op(be_outcome[1].what, ==, success);
tt_int_op(be_outcome[1].what, ==, !emfile ? BEV_EVENT_CONNECTED : BEV_EVENT_ERROR);
tt_int_op(be_outcome[1].dnserr, ==, 0);
tt_int_op(be_outcome[2].what, ==, success);
tt_int_op(be_outcome[2].what, ==, !emfile ? BEV_EVENT_CONNECTED : BEV_EVENT_ERROR);
tt_int_op(be_outcome[2].dnserr, ==, 0);
tt_int_op(be_outcome[3].what, ==, success);
tt_int_op(be_outcome[3].dnserr, ==, default_error);
tt_int_op(be_outcome[3].what, ==, !emfile ? BEV_EVENT_CONNECTED : BEV_EVENT_ERROR);
if (!emfile) {
tt_int_op(be_outcome[3].dnserr, ==, 0);
} else {
tt_int_op(be_outcome[3].dnserr, !=, 0);
}
if (expect_err) {
tt_int_op(be_outcome[4].what, ==, BEV_EVENT_ERROR);
tt_int_op(be_outcome[4].dnserr, ==, expect_err);