ports/iperf3
ports/iperf3
1
1
Форкнуть 0
Код Релизы Активность

Add missing saved_errno dance around some close(2) calls. (#669)

Просмотр исходного кода
Этот коммит содержится в:
Todd C. Miller 2017-11-14 15:29:41 -07:00 коммит произвёл Bruce A. Mah
родитель 34f878a2c0
Коммит b6072241bf
4 изменённых файлов: 49 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
src/iperf_client_api.c
Просмотреть файл

@ -53,7 +53,7 @@
int int
iperf_create_streams(struct iperf_test *test) iperf_create_streams(struct iperf_test *test)
{ {
int i, s; int i, s, saved_errno;
struct iperf_stream *sp; struct iperf_stream *sp;
int orig_bind_port = test->bind_port; int orig_bind_port = test->bind_port;
@ -69,7 +69,9 @@ iperf_create_streams(struct iperf_test *test)
if (test->protocol->id == Ptcp) { if (test->protocol->id == Ptcp) {
if (test->congestion) { if (test->congestion) {
if (setsockopt(s, IPPROTO_TCP, TCP_CONGESTION, test->congestion, strlen(test->congestion)) < 0) { if (setsockopt(s, IPPROTO_TCP, TCP_CONGESTION, test->congestion, strlen(test->congestion)) < 0) {
saved_errno = errno;
close(s); close(s);
errno = saved_errno;
i_errno = IESETCONGESTION; i_errno = IESETCONGESTION;
return -1; return -1;
} }
@ -78,7 +80,9 @@ iperf_create_streams(struct iperf_test *test)
socklen_t len = TCP_CA_NAME_MAX; socklen_t len = TCP_CA_NAME_MAX;
char ca[TCP_CA_NAME_MAX + 1]; char ca[TCP_CA_NAME_MAX + 1];
if (getsockopt(s, IPPROTO_TCP, TCP_CONGESTION, ca, &len) < 0) { if (getsockopt(s, IPPROTO_TCP, TCP_CONGESTION, ca, &len) < 0) {
saved_errno = errno;
close(s); close(s);
errno = saved_errno;
i_errno = IESETCONGESTION; i_errno = IESETCONGESTION;
return -1; return -1;
} }

27
src/iperf_sctp.c
Просмотреть файл

@ -152,7 +152,7 @@ iperf_sctp_listen(struct iperf_test *test)
#if defined(HAVE_SCTP) #if defined(HAVE_SCTP)
struct addrinfo hints, *res; struct addrinfo hints, *res;
char portstr[6]; char portstr[6];
int s, opt; int s, opt, saved_errno;
close(test->listener); close(test->listener);
@ -180,8 +180,10 @@ iperf_sctp_listen(struct iperf_test *test)
opt = 1; opt = 1;
if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
(char *) &opt, sizeof(opt)) < 0) { (char *) &opt, sizeof(opt)) < 0) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(res); freeaddrinfo(res);
errno = saved_errno;
i_errno = IEPROTOCOL; i_errno = IEPROTOCOL;
return -1; return -1;
} }
@ -190,8 +192,10 @@ iperf_sctp_listen(struct iperf_test *test)
opt = 1; opt = 1;
if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(res); freeaddrinfo(res);
errno = saved_errno;
i_errno = IEREUSEADDR; i_errno = IEREUSEADDR;
return -1; return -1;
} }
@ -203,8 +207,10 @@ iperf_sctp_listen(struct iperf_test *test)
return -1; return -1;
} else } else
if (bind(s, (struct sockaddr *) res->ai_addr, res->ai_addrlen) < 0) { if (bind(s, (struct sockaddr *) res->ai_addr, res->ai_addrlen) < 0) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(res); freeaddrinfo(res);
errno = saved_errno;
i_errno = IESTREAMLISTEN; i_errno = IESTREAMLISTEN;
return -1; return -1;
} }
@ -234,7 +240,7 @@ int
iperf_sctp_connect(struct iperf_test *test) iperf_sctp_connect(struct iperf_test *test)
{ {
#if defined(HAVE_SCTP) #if defined(HAVE_SCTP)
int s, opt; int s, opt, saved_errno;
char portstr[6]; char portstr[6];
struct addrinfo hints, *local_res, *server_res; struct addrinfo hints, *local_res, *server_res;
@ -271,8 +277,10 @@ iperf_sctp_connect(struct iperf_test *test)
if (test->no_delay != 0) { if (test->no_delay != 0) {
opt = 1; opt = 1;
if (setsockopt(s, IPPROTO_SCTP, SCTP_NODELAY, &opt, sizeof(opt)) < 0) { if (setsockopt(s, IPPROTO_SCTP, SCTP_NODELAY, &opt, sizeof(opt)) < 0) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(server_res); freeaddrinfo(server_res);
errno = saved_errno;
i_errno = IESETNODELAY; i_errno = IESETNODELAY;
return -1; return -1;
} }
@ -302,8 +310,10 @@ iperf_sctp_connect(struct iperf_test *test)
av.assoc_value = test->settings->mss; av.assoc_value = test->settings->mss;
if (setsockopt(s, IPPROTO_SCTP, SCTP_MAXSEG, &av, sizeof(av)) < 0) { if (setsockopt(s, IPPROTO_SCTP, SCTP_MAXSEG, &av, sizeof(av)) < 0) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(server_res); freeaddrinfo(server_res);
errno = saved_errno;
i_errno = IESETMSS; i_errno = IESETMSS;
return -1; return -1;
} }
@ -316,8 +326,10 @@ iperf_sctp_connect(struct iperf_test *test)
*/ */
if (setsockopt(s, IPPROTO_SCTP, SCTP_MAXSEG, &opt, sizeof(opt)) < 0 && if (setsockopt(s, IPPROTO_SCTP, SCTP_MAXSEG, &opt, sizeof(opt)) < 0 &&
errno != ENOPROTOOPT) { errno != ENOPROTOOPT) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(server_res); freeaddrinfo(server_res);
errno = saved_errno;
i_errno = IESETMSS; i_errno = IESETMSS;
return -1; return -1;
} }
@ -331,8 +343,10 @@ iperf_sctp_connect(struct iperf_test *test)
initmsg.sinit_num_ostreams = test->settings->num_ostreams; initmsg.sinit_num_ostreams = test->settings->num_ostreams;
if (setsockopt(s, IPPROTO_SCTP, SCTP_INITMSG, &initmsg, sizeof(struct sctp_initmsg)) < 0) { if (setsockopt(s, IPPROTO_SCTP, SCTP_INITMSG, &initmsg, sizeof(struct sctp_initmsg)) < 0) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(server_res); freeaddrinfo(server_res);
errno = saved_errno;
i_errno = IESETSCTPNSTREAM; i_errno = IESETSCTPNSTREAM;
return -1; return -1;
} }
@ -346,8 +360,10 @@ iperf_sctp_connect(struct iperf_test *test)
/* TODO support sctp_connectx() to avoid heartbeating. */ /* TODO support sctp_connectx() to avoid heartbeating. */
if (connect(s, (struct sockaddr *) server_res->ai_addr, server_res->ai_addrlen) < 0 && errno != EINPROGRESS) { if (connect(s, (struct sockaddr *) server_res->ai_addr, server_res->ai_addrlen) < 0 && errno != EINPROGRESS) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(server_res); freeaddrinfo(server_res);
errno = saved_errno;
i_errno = IESTREAMCONNECT; i_errno = IESTREAMCONNECT;
return -1; return -1;
} }
@ -355,7 +371,9 @@ iperf_sctp_connect(struct iperf_test *test)
/* Send cookie for verification */ /* Send cookie for verification */
if (Nwrite(s, test->cookie, COOKIE_SIZE, Psctp) < 0) { if (Nwrite(s, test->cookie, COOKIE_SIZE, Psctp) < 0) {
saved_errno = errno;
close(s); close(s);
errno = saved_errno;
i_errno = IESENDCOOKIE; i_errno = IESENDCOOKIE;
return -1; return -1;
} }
@ -370,8 +388,10 @@ iperf_sctp_connect(struct iperf_test *test)
opt = 0; opt = 0;
if (setsockopt(s, IPPROTO_SCTP, SCTP_DISABLE_FRAGMENTS, &opt, sizeof(opt)) < 0 && if (setsockopt(s, IPPROTO_SCTP, SCTP_DISABLE_FRAGMENTS, &opt, sizeof(opt)) < 0 &&
errno != ENOPROTOOPT) { errno != ENOPROTOOPT) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(server_res); freeaddrinfo(server_res);
errno = saved_errno;
i_errno = IESETSCTPDISABLEFRAG; i_errno = IESETSCTPDISABLEFRAG;
return -1; return -1;
} }
@ -417,6 +437,7 @@ iperf_sctp_bindx(struct iperf_test *test, int s, int is_server)
int nxaddrs; int nxaddrs;
int retval; int retval;
int domain; int domain;
int saved_errno;
domain = test->settings->domain; domain = test->settings->domain;
xbe0 = NULL; xbe0 = NULL;
@ -525,8 +546,10 @@ iperf_sctp_bindx(struct iperf_test *test, int s, int is_server)
} }
if (sctp_bindx(s, xaddrs, nxaddrs, SCTP_BINDX_ADD_ADDR) == -1) { if (sctp_bindx(s, xaddrs, nxaddrs, SCTP_BINDX_ADD_ADDR) == -1) {
saved_errno = errno;
close(s); close(s);
free(xaddrs); free(xaddrs);
errno = saved_errno;
i_errno = IESETSCTPBINDX; i_errno = IESETSCTPBINDX;
retval = -1; retval = -1;
goto out; goto out;

6
src/iperf_server_api.c
Просмотреть файл

@ -385,7 +385,7 @@ cleanup_server(struct iperf_test *test)
int int
iperf_run_server(struct iperf_test *test) iperf_run_server(struct iperf_test *test)
{ {
int result, s, streams_accepted; int result, s, streams_accepted, saved_errno;
fd_set read_set, write_set; fd_set read_set, write_set;
struct iperf_stream *sp; struct iperf_stream *sp;
struct timeval now; struct timeval now;
@ -476,8 +476,10 @@ iperf_run_server(struct iperf_test *test)
warning("TCP congestion control algorithm not supported"); warning("TCP congestion control algorithm not supported");
} }
else { else {
saved_errno = errno;
close(s); close(s);
cleanup_server(test); cleanup_server(test);
errno = saved_errno;
i_errno = IESETCONGESTION; i_errno = IESETCONGESTION;
return -1; return -1;
} }
@ -487,8 +489,10 @@ iperf_run_server(struct iperf_test *test)
socklen_t len = TCP_CA_NAME_MAX; socklen_t len = TCP_CA_NAME_MAX;
char ca[TCP_CA_NAME_MAX + 1]; char ca[TCP_CA_NAME_MAX + 1];
if (getsockopt(s, IPPROTO_TCP, TCP_CONGESTION, ca, &len) < 0) { if (getsockopt(s, IPPROTO_TCP, TCP_CONGESTION, ca, &len) < 0) {
saved_errno = errno;
close(s); close(s);
cleanup_server(test); cleanup_server(test);
errno = saved_errno;
i_errno = IESETCONGESTION; i_errno = IESETCONGESTION;
return -1; return -1;
} }

16
src/net.c
Просмотреть файл

@ -115,7 +115,7 @@ int
netdial(int domain, int proto, char *local, int local_port, char *server, int port, int timeout) netdial(int domain, int proto, char *local, int local_port, char *server, int port, int timeout)
{ {
struct addrinfo hints, *local_res, *server_res; struct addrinfo hints, *local_res, *server_res;
int s; int s, saved_errno;
if (local) { if (local) {
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
@ -148,9 +148,11 @@ netdial(int domain, int proto, char *local, int local_port, char *server, int po
} }
if (bind(s, (struct sockaddr *) local_res->ai_addr, local_res->ai_addrlen) < 0) { if (bind(s, (struct sockaddr *) local_res->ai_addr, local_res->ai_addrlen) < 0) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(local_res); freeaddrinfo(local_res);
freeaddrinfo(server_res); freeaddrinfo(server_res);
errno = saved_errno;
return -1; return -1;
} }
freeaddrinfo(local_res); freeaddrinfo(local_res);
@ -158,8 +160,10 @@ netdial(int domain, int proto, char *local, int local_port, char *server, int po
((struct sockaddr_in *) server_res->ai_addr)->sin_port = htons(port); ((struct sockaddr_in *) server_res->ai_addr)->sin_port = htons(port);
if (timeout_connect(s, (struct sockaddr *) server_res->ai_addr, server_res->ai_addrlen, timeout) < 0 && errno != EINPROGRESS) { if (timeout_connect(s, (struct sockaddr *) server_res->ai_addr, server_res->ai_addrlen, timeout) < 0 && errno != EINPROGRESS) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(server_res); freeaddrinfo(server_res);
errno = saved_errno;
return -1; return -1;
} }
@ -174,7 +178,7 @@ netannounce(int domain, int proto, char *local, int port)
{ {
struct addrinfo hints, *res; struct addrinfo hints, *res;
char portstr[6]; char portstr[6];
int s, opt; int s, opt, saved_errno;
snprintf(portstr, 6, "%d", port); snprintf(portstr, 6, "%d", port);
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
@ -210,8 +214,10 @@ netannounce(int domain, int proto, char *local, int port)
opt = 1; opt = 1;
if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
(char *) &opt, sizeof(opt)) < 0) { (char *) &opt, sizeof(opt)) < 0) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(res); freeaddrinfo(res);
errno = saved_errno;
return -1; return -1;
} }
/* /*
@ -230,16 +236,20 @@ netannounce(int domain, int proto, char *local, int port)
opt = 1; opt = 1;
if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
(char *) &opt, sizeof(opt)) < 0) { (char *) &opt, sizeof(opt)) < 0) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(res); freeaddrinfo(res);
errno = saved_errno;
return -1; return -1;
} }
} }
#endif /* IPV6_V6ONLY */ #endif /* IPV6_V6ONLY */
if (bind(s, (struct sockaddr *) res->ai_addr, res->ai_addrlen) < 0) { if (bind(s, (struct sockaddr *) res->ai_addr, res->ai_addrlen) < 0) {
saved_errno = errno;
close(s); close(s);
freeaddrinfo(res); freeaddrinfo(res);
errno = saved_errno;
return -1; return -1;
} }
@ -247,7 +257,9 @@ netannounce(int domain, int proto, char *local, int port)
if (proto == SOCK_STREAM) { if (proto == SOCK_STREAM) {
if (listen(s, 5) < 0) { if (listen(s, 5) < 0) {
saved_errno = errno;
close(s); close(s);
errno = saved_errno;
return -1; return -1;
} }
} }