70 lines
2.1 KiB
Diff
70 lines
2.1 KiB
Diff
|
diff --git a/src/iperf_sctp.c b/src/iperf_sctp.c
|
||
|
|
index a0869a3..13f5cdf 100644
|
||
|
|
--- a/src/iperf_sctp.c
|
||
|
|
+++ b/src/iperf_sctp.c
|
||
|
|
@@ -130,12 +130,14 @@ iperf_sctp_accept(struct iperf_test * test)
|
||
|
|
|
||
|
|
if (Nread(s, cookie, COOKIE_SIZE, Psctp) < 0) {
|
||
|
|
i_errno = IERECVCOOKIE;
|
||
|
|
+ close(s);
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (strcmp(test->cookie, cookie) != 0) {
|
||
|
|
+ if (strncmp(test->cookie, cookie, COOKIE_SIZE) != 0) {
|
||
|
|
if (Nwrite(s, (char*) &rbuf, sizeof(rbuf), Psctp) < 0) {
|
||
|
|
i_errno = IESENDMESSAGE;
|
||
|
|
+ close(s);
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
close(s);
|
||
|
|
@@ -209,9 +211,11 @@ iperf_sctp_listen(struct iperf_test *test)
|
||
|
|
|
||
|
|
/* servers must call sctp_bindx() _instead_ of bind() */
|
||
|
|
if (!TAILQ_EMPTY(&test->xbind_addrs)) {
|
||
|
|
- freeaddrinfo(res);
|
||
|
|
- if (iperf_sctp_bindx(test, s, IPERF_SCTP_SERVER))
|
||
|
|
+ if (iperf_sctp_bindx(test, s, IPERF_SCTP_SERVER)) {
|
||
|
|
+ close(s);
|
||
|
|
+ freeaddrinfo(res);
|
||
|
|
return -1;
|
||
|
|
+ }
|
||
|
|
} else
|
||
|
|
if (bind(s, (struct sockaddr *) res->ai_addr, res->ai_addrlen) < 0) {
|
||
|
|
saved_errno = errno;
|
||
|
|
@@ -422,8 +426,11 @@ iperf_sctp_connect(struct iperf_test *test)
|
||
|
|
|
||
|
|
/* clients must call bind() followed by sctp_bindx() before connect() */
|
||
|
|
if (!TAILQ_EMPTY(&test->xbind_addrs)) {
|
||
|
|
- if (iperf_sctp_bindx(test, s, IPERF_SCTP_CLIENT))
|
||
|
|
+ if (iperf_sctp_bindx(test, s, IPERF_SCTP_CLIENT)) {
|
||
|
|
+ freeaddrinfo(server_res);
|
||
|
|
+ close(s);
|
||
|
|
return -1;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
/* TODO support sctp_connectx() to avoid heartbeating. */
|
||
|
|
@@ -435,12 +442,12 @@ iperf_sctp_connect(struct iperf_test *test)
|
||
|
|
i_errno = IESTREAMCONNECT;
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
- freeaddrinfo(server_res);
|
||
|
|
|
||
|
|
/* Send cookie for verification */
|
||
|
|
if (Nwrite(s, test->cookie, COOKIE_SIZE, Psctp) < 0) {
|
||
|
|
saved_errno = errno;
|
||
|
|
close(s);
|
||
|
|
+ freeaddrinfo(server_res);
|
||
|
|
errno = saved_errno;
|
||
|
|
i_errno = IESENDCOOKIE;
|
||
|
|
return -1;
|
||
|
|
@@ -464,6 +471,7 @@ iperf_sctp_connect(struct iperf_test *test)
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ freeaddrinfo(server_res);
|
||
|
|
return s;
|
||
|
|
#else
|
||
|
|
i_errno = IENOSCTP;
|