zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix active tcp port to 9

Browse Source 
In tcp only call:
Tested with hangout.
Tested with firefox.

To test firefox, goto about:config, search for media.peerconnection.ice.tcp and turn it on.

Existing test case should be suffice to cover this.

R=juberti@google.com
TBR=jubert@webrtc.org
BUG=webrtc:3849

Review URL: https://codereview.webrtc.org/1217463004 .

Cr-Commit-Position: refs/heads/master@{#10683}
This commit is contained in:
Guo-wei Shieh
2015-11-17 19:15:50 -08:00
parent 2935e01419
commit 310b093aa4
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
webrtc/p2p/base/p2ptransportchannel_unittest.cc
View File

@ -650,6 +650,21 @@ class P2PTransportChannelTestBase : public testing::Test,
GetEndpoint(endpoint)->save_candidates_ = true; GetEndpoint(endpoint)->save_candidates_ = true;
} }
// Tcp candidate verification has to be done when they are generated.
void VerifySavedTcpCandidates(int endpoint, const std::string& tcptype) {
for (auto& data : GetEndpoint(endpoint)->saved_candidates_) {
EXPECT_EQ(data->candidate.protocol(), cricket::TCP_PROTOCOL_NAME);
EXPECT_EQ(data->candidate.tcptype(), tcptype);
if (data->candidate.tcptype() == cricket::TCPTYPE_ACTIVE_STR) {
EXPECT_EQ(data->candidate.address().port(), cricket::DISCARD_PORT);
} else if (data->candidate.tcptype() == cricket::TCPTYPE_PASSIVE_STR) {
EXPECT_NE(data->candidate.address().port(), cricket::DISCARD_PORT);
} else {
FAIL() << "Unknown tcptype: " << data->candidate.tcptype();
}
}
}
void ResumeCandidates(int endpoint) { void ResumeCandidates(int endpoint) {
Endpoint* ed = GetEndpoint(endpoint); Endpoint* ed = GetEndpoint(endpoint);
std::vector<CandidateData*>::iterator it = ed->saved_candidates_.begin(); std::vector<CandidateData*>::iterator it = ed->saved_candidates_.begin();
@ -1290,8 +1305,19 @@ TEST_F(P2PTransportChannelTest, TestTcpConnectionsFromActiveToPassive) {
SetAllowTcpListen(0, true); // actpass. SetAllowTcpListen(0, true); // actpass.
SetAllowTcpListen(1, false); // active. SetAllowTcpListen(1, false); // active.
// Pause candidate so we could verify the candidate properties.
PauseCandidates(0);
PauseCandidates(1);
CreateChannels(1); CreateChannels(1);
// Verify tcp candidates.
VerifySavedTcpCandidates(0, cricket::TCPTYPE_PASSIVE_STR);
VerifySavedTcpCandidates(1, cricket::TCPTYPE_ACTIVE_STR);
// Resume candidates.
ResumeCandidates(0);
ResumeCandidates(1);
EXPECT_TRUE_WAIT(ep1_ch1()->receiving() && ep1_ch1()->writable() && EXPECT_TRUE_WAIT(ep1_ch1()->receiving() && ep1_ch1()->writable() &&
ep2_ch1()->receiving() && ep2_ch1()->writable(), ep2_ch1()->receiving() && ep2_ch1()->writable(),
1000); 1000);
@ -1300,12 +1326,6 @@ TEST_F(P2PTransportChannelTest, TestTcpConnectionsFromActiveToPassive) {
LocalCandidate(ep1_ch1())->address().EqualIPs(kPublicAddrs[0]) && LocalCandidate(ep1_ch1())->address().EqualIPs(kPublicAddrs[0]) &&
RemoteCandidate(ep1_ch1())->address().EqualIPs(kPublicAddrs[1])); RemoteCandidate(ep1_ch1())->address().EqualIPs(kPublicAddrs[1]));
std::string kTcpProtocol = "tcp";
EXPECT_EQ(kTcpProtocol, RemoteCandidate(ep1_ch1())->protocol());
EXPECT_EQ(kTcpProtocol, LocalCandidate(ep1_ch1())->protocol());
EXPECT_EQ(kTcpProtocol, RemoteCandidate(ep2_ch1())->protocol());
EXPECT_EQ(kTcpProtocol, LocalCandidate(ep2_ch1())->protocol());
TestSendRecv(1); TestSendRecv(1);
DestroyChannels(); DestroyChannels();
} }

11
webrtc/p2p/base/tcpport.cc
View File

@ -184,10 +184,13 @@ void TCPPort::PrepareAddress() {
} else { } else {
LOG_J(LS_INFO, this) << "Not listening due to firewall restrictions."; LOG_J(LS_INFO, this) << "Not listening due to firewall restrictions.";
// Note: We still add the address, since otherwise the remote side won't // Note: We still add the address, since otherwise the remote side won't
// recognize our incoming TCP connections. // recognize our incoming TCP connections. According to
AddAddress(rtc::SocketAddress(ip(), 0), rtc::SocketAddress(ip(), 0), // https://tools.ietf.org/html/rfc6544#section-4.5, for active candidate,
rtc::SocketAddress(), TCP_PROTOCOL_NAME, "", TCPTYPE_ACTIVE_STR, // the port must be set to the discard port, i.e. 9.
LOCAL_PORT_TYPE, ICE_TYPE_PREFERENCE_HOST_TCP, 0, true); AddAddress(rtc::SocketAddress(ip(), DISCARD_PORT),
rtc::SocketAddress(ip(), 0), rtc::SocketAddress(),
TCP_PROTOCOL_NAME, "", TCPTYPE_ACTIVE_STR, LOCAL_PORT_TYPE,
ICE_TYPE_PREFERENCE_HOST_TCP, 0, true);
} }
} }