Increase the stun ping interval.

webrtc/p2p/base/p2ptransportchannel_unittest.cc

 /*
  *  Copyright 2009 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 20 matching lines @@
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/virtualsocketserver.h"
 
 using cricket::kDefaultPortAllocatorFlags;
 using cricket::kMinimumStepDelay;
 using cricket::kDefaultStepDelay;
 using cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET;
 using cricket::ServerAddresses;
 using cricket::MIN_PINGS_AT_WEAK_PING_INTERVAL;
+using cricket::MIN_PINGS_TO_STABILIZE;
 using rtc::SocketAddress;
 
 static const int kDefaultTimeout = 1000;
 static const int kOnlyLocalPorts = cricket::PORTALLOCATOR_DISABLE_STUN |
                                    cricket::PORTALLOCATOR_DISABLE_RELAY |
                                    cricket::PORTALLOCATOR_DISABLE_TCP;
 // Addresses on the public internet.
 static const SocketAddress kPublicAddrs[2] =
     { SocketAddress("11.11.11.11", 0), SocketAddress("22.22.22.22", 0) };
 // IPv6 Addresses on the public internet.
@@ skipping 2018 matching lines @@
 
   // Low-priority connection becomes writable so that the other connection
   // is not pruned.
   conn1->ReceivedPingResponse();
   EXPECT_TRUE_WAIT(
       conn1->num_pings_sent() >= MIN_PINGS_AT_WEAK_PING_INTERVAL &&
           conn2->num_pings_sent() >= MIN_PINGS_AT_WEAK_PING_INTERVAL,
       kDefaultTimeout);
 }
 
+TEST_F(P2PTransportChannelPingTest, TestInitialPingInterval) {
+  rtc::ScopedFakeClock clock;
+
+  cricket::FakePortAllocator pa(rtc::Thread::Current(), nullptr);
+  cricket::P2PTransportChannel ch("TestChannel", 1, &pa);
+  PrepareChannel(&ch);
+  ch.Connect();
+  ch.MaybeStartGathering();
+  ch.AddRemoteCandidate(CreateHostCandidate("1.1.1.1", 1, 1));
+  cricket::Connection* conn = WaitForConnectionTo(&ch, "1.1.1.1", 1);
+  ASSERT_TRUE(conn != nullptr);
+
+  int64_t start = clock.TimeNanos() / 1000000;
+  // Wait for the connection to send MIN_PINGS_AT_WEAK_PING_INTERVAL pings.
+  SIMULATED_WAIT(conn->num_pings_sent() >= MIN_PINGS_AT_WEAK_PING_INTERVAL,
+                 kDefaultTimeout, clock);
+  int64_t duration = clock.TimeNanos() / 1000000 - start;
+  EXPECT_TRUE(duration >= 100 && duration <= 200);

[Zhi Huang, 2016/06/10 20:39:02]

The duration is not expected to be exactly the same as the intervals
(stabilizing / stabilized etc.) because the ping is scheduled based on the ping
interval and the check receiving interval.

[Zhi Huang, 2016/06/20 17:18:17]

We can get the exact ping interval for initial pings.

+}
+
+TEST_F(P2PTransportChannelPingTest, TestStabilizingPingInterval) {
+  rtc::ScopedFakeClock clock;
+  int stablilizing_timeout = 2000;
+
+  cricket::FakePortAllocator pa(rtc::Thread::Current(), nullptr);
+  cricket::P2PTransportChannel ch("TestChannel", 1, &pa);
+  PrepareChannel(&ch);
+  ch.Connect();
+  ch.MaybeStartGathering();
+  ch.AddRemoteCandidate(CreateHostCandidate("1.1.1.1", 1, 1));
+  cricket::Connection* conn = WaitForConnectionTo(&ch, "1.1.1.1", 1);
+
+  ASSERT_TRUE(conn != nullptr);
+  // Wait for the connection to send MIN_PINGS_AT_WEAK_PING_INTERVAL pings.
+  SIMULATED_WAIT(conn->num_pings_sent() >= MIN_PINGS_AT_WEAK_PING_INTERVAL,
+                 kDefaultTimeout, clock);
+  // The connection become strong but not stabilized. The ping interval is
+  // expected to be STABLIZING_WRITABLE_CONNECTION_PING_INTERVAL.
+  conn->ReceivedPingResponse();
+  int ping_sent_before = conn->num_pings_sent();
+  int64_t start = clock.TimeNanos() / 1000000;
+  SIMULATED_WAIT(conn->num_pings_sent() == ping_sent_before + 1,
+                 stablilizing_timeout, clock);
+  int64_t duration = clock.TimeNanos() / 1000000 - start;
+  EXPECT_TRUE(duration >= 900 && duration <= 1100);
+}
+
+TEST_F(P2PTransportChannelPingTest, TestStabilizedPingInterval) {
+  rtc::ScopedFakeClock clock;
+  int stabilized_timeout = 3000;
+
+  cricket::FakePortAllocator pa(rtc::Thread::Current(), nullptr);
+  cricket::P2PTransportChannel ch("TestChannel", 1, &pa);
+  PrepareChannel(&ch);
+  ch.Connect();
+  ch.MaybeStartGathering();
+  ch.AddRemoteCandidate(CreateHostCandidate("1.1.1.1", 1, 1));
+  cricket::Connection* conn = WaitForConnectionTo(&ch, "1.1.1.1", 1);
+  ASSERT_TRUE(conn != nullptr);
+
+  // Wait for the connection to send MIN_PINGS_TO_STABILIZE pings to stablize.
+  SIMULATED_WAIT(conn->num_pings_sent() > MIN_PINGS_TO_STABILIZE,
+                 kDefaultTimeout, clock);
+  // The connection become writable and receiving.
+  conn->ReceivedPingResponse();
+  int ping_sent_before = conn->num_pings_sent();
+  int64_t start = clock.TimeNanos() / 1000000;
+  SIMULATED_WAIT(conn->num_pings_sent() == ping_sent_before + 1,
+                 stabilized_timeout, clock);
+  int64_t duration = clock.TimeNanos() / 1000000 - start;
+  EXPECT_TRUE(duration >= 2500 && duration <= 2600);
+}
+
+// Verify that a stabilized connection will ping faster if a in-flight ping time
+// out.
+TEST_F(P2PTransportChannelPingTest, TestTimeoutPingInterval) {
+  rtc::ScopedFakeClock clock;
+  int stablilizing_timeout = 2000;
+
+  cricket::FakePortAllocator pa(rtc::Thread::Current(), nullptr);
+  cricket::P2PTransportChannel ch("TestChannel", 1, &pa);
+  PrepareChannel(&ch);
+  ch.Connect();
+  ch.MaybeStartGathering();
+  ch.AddRemoteCandidate(CreateHostCandidate("1.1.1.1", 1, 1));
+  cricket::Connection* conn = WaitForConnectionTo(&ch, "1.1.1.1", 1);
+  ASSERT_TRUE(conn != nullptr);
+
+  // Wait for the connection to send MIN_PINGS_TO_STABILIZE pings to stablize.
+  SIMULATED_WAIT(conn->num_pings_sent() >= MIN_PINGS_TO_STABILIZE,
+                 kDefaultTimeout, clock);
+  // The connection become writable and receiving.
+  conn->ReceivedPingResponse();
+
+  // Create a in-flight ping.
+  conn->Ping(clock.TimeNanos() / 1000000);
+  int ping_sent_before = conn->num_pings_sent();
+  int64_t start = clock.TimeNanos() / 1000000;
+  SIMULATED_WAIT(conn->num_pings_sent() == ping_sent_before + 1,
+                 stablilizing_timeout, clock);
+  int64_t duration = clock.TimeNanos() / 1000000 - start;
+  EXPECT_TRUE(duration >= 900 && duration <= 1100);
+}
+
 TEST_F(P2PTransportChannelPingTest, TestNoTriggeredChecksWhenWritable) {
   cricket::FakePortAllocator pa(rtc::Thread::Current(), nullptr);
   cricket::P2PTransportChannel ch("trigger checks", 1, &pa);
   PrepareChannel(&ch);
   ch.Connect();
   ch.MaybeStartGathering();
   ch.AddRemoteCandidate(CreateHostCandidate("1.1.1.1", 1, 1));
   ch.AddRemoteCandidate(CreateHostCandidate("2.2.2.2", 2, 2));
 
   cricket::Connection* conn1 = WaitForConnectionTo(&ch, "1.1.1.1", 1);
@@ skipping 611 matching lines @@
     cricket::RelayServerConfig config(cricket::RELAY_TURN);
     config.credentials = kRelayCredentials;
     config.ports.push_back(
         cricket::ProtocolAddress(kTurnUdpIntAddr, cricket::PROTO_UDP, false));
     allocator_->AddTurnServer(config);
     allocator_->set_step_delay(kMinimumStepDelay);
   }
 
   cricket::P2PTransportChannel& StartTransportChannel(
       bool prioritize_most_likely_to_work,
-      int max_strong_interval) {
+      int stable_writable_connection_ping_interval) {
     channel_.reset(
         new cricket::P2PTransportChannel("checks", 1, nullptr, allocator()));
     cricket::IceConfig config = channel_->config();
     config.prioritize_most_likely_candidate_pairs =
         prioritize_most_likely_to_work;
-    config.max_strong_interval = max_strong_interval;
+    config.stable_writable_connection_ping_interval =
+        stable_writable_connection_ping_interval;
     channel_->SetIceConfig(config);
     PrepareChannel(channel_.get());
     channel_->Connect();
     channel_->MaybeStartGathering();
     return *channel_.get();
   }
 
   cricket::BasicPortAllocator* allocator() { return allocator_.get(); }
   cricket::TestTurnServer* turn_server() { return &turn_server_; }
 
@@ skipping 188 matching lines @@
 
   // TCP Relay/Relay is the next.
   VerifyNextPingableConnection(cricket::RELAY_PORT_TYPE,
                                cricket::RELAY_PORT_TYPE,
                                cricket::TCP_PROTOCOL_NAME);
 
   // Finally, Local/Relay will be pinged.
   VerifyNextPingableConnection(cricket::LOCAL_PORT_TYPE,
                                cricket::RELAY_PORT_TYPE);
 }