+18
-8
lines changedFilter options
+18
-8
lines changed Original file line number Diff line number Diff line change
@@ -48,11 +48,14 @@ class TestIPv6
48 48
{
49 49
sockaddr_any sa (family);
50 50
sa.hport(m_listen_port);
51 -
ASSERT_EQ(inet_pton(family, address.c_str(), sa.get_addr()), 1);
51 +
EXPECT_EQ(inet_pton(family, address.c_str(), sa.get_addr()), 1);
52 52 53 53
std::cout << "Calling: " << address << "(" << fam[family] << ")\n";
54 54 55 -
ASSERT_NE(srt_connect(m_caller_sock, (sockaddr*)&sa, sizeof sa), SRT_ERROR);
55 +
const int connect_res = srt_connect(m_caller_sock, (sockaddr*)&sa, sizeof sa);
56 +
EXPECT_NE(connect_res, SRT_ERROR) << "srt_connect() failed with: " << srt_getlasterror_str();
57 +
if (connect_res == SRT_ERROR)
58 +
srt_close(m_listener_sock);
56 59 57 60
PrintAddresses(m_caller_sock, "CALLER");
58 61
}
@@ -61,7 +64,7 @@ class TestIPv6
61 64 62 65
void ShowAddress(std::string src, const sockaddr_any& w)
63 66
{
64 -
ASSERT_NE(fam.count(w.family()), 0U) << "INVALID FAMILY";
67 +
EXPECT_NE(fam.count(w.family()), 0U) << "INVALID FAMILY";
65 68
std::cout << src << ": " << w.str() << " (" << fam[w.family()] << ")" << std::endl;
66 69
}
67 70
@@ -70,16 +73,23 @@ class TestIPv6
70 73
sockaddr_any sc1;
71 74 72 75
SRTSOCKET accepted_sock = srt_accept(m_listener_sock, sc1.get(), &sc1.len);
73 -
EXPECT_NE(accepted_sock, SRT_INVALID_SOCK);
76 +
EXPECT_NE(accepted_sock, SRT_INVALID_SOCK) << "accept() failed with: " << srt_getlasterror_str();
77 +
if (accepted_sock == SRT_INVALID_SOCK) {
78 +
return sockaddr_any();
79 +
}
74 80 75 81
PrintAddresses(accepted_sock, "ACCEPTED");
76 82 77 83
sockaddr_any sn;
78 84
EXPECT_NE(srt_getsockname(accepted_sock, sn.get(), &sn.len), SRT_ERROR);
79 - 80 -
int32_t ipv6_zero [] = {0, 0, 0, 0};
81 -
EXPECT_NE(memcmp(ipv6_zero, sn.get_addr(), sizeof ipv6_zero), 0)
82 -
<< "EMPTY address in srt_getsockname";
85 +
EXPECT_NE(sn.get_addr(), nullptr);
86 + 87 +
if (sn.get_addr() != nullptr)
88 +
{
89 +
const int32_t ipv6_zero[] = { 0, 0, 0, 0 };
90 +
EXPECT_NE(memcmp(ipv6_zero, sn.get_addr(), sizeof ipv6_zero), 0)
91 +
<< "EMPTY address in srt_getsockname";
92 +
}
83 93 84 94
srt_close(accepted_sock);
85 95
return sn;
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4