Better determination of Symmetric NAT

webrtc/p2p/stunprober/stunprober_unittest.cc

 /*
  *  Copyright 2015 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 13 matching lines @@
 using stunprober::HostNameResolverInterface;
 using stunprober::TaskRunner;
 using stunprober::SocketFactory;
 using stunprober::StunProber;
 using stunprober::AsyncCallback;
 using stunprober::ClientSocketInterface;
 using stunprober::ServerSocketInterface;
 using stunprober::SocketFactory;
 using stunprober::TaskRunner;
 
+using NATTYPE = stunprober::StunProber::NATTYPE;
+
 namespace stunprober {
 
 namespace {
 
 const rtc::SocketAddress kLocalAddr("192.168.0.1", 0);
 const rtc::SocketAddress kStunAddr1("1.1.1.1", 3478);
 const rtc::SocketAddress kStunAddr2("1.1.1.2", 3478);
 const rtc::SocketAddress kFailedStunAddr("1.1.1.3", 3478);
 const rtc::SocketAddress kStunMappedAddr("77.77.77.77", 0);
 
@@ skipping 117 matching lines @@
 
     StartProbing(resolver.release(), socket_factory.release(), addr,
                  shared_mode, 3, pings_per_ip);
 
     WAIT(stopped_, 1000);
 
     StunProber::Stats stats;
     EXPECT_EQ(ss_->num_socket(), total_sockets);
     EXPECT_TRUE(prober->GetStats(&stats));
     EXPECT_EQ(stats.success_percent, 100);
-    EXPECT_TRUE(stats.behind_nat);
+    EXPECT_TRUE(stats.nat_type > NATTYPE::NATTYPE_NO_NAT);
     EXPECT_EQ(stats.host_ip, kLocalAddr.ipaddr().ToString());
     EXPECT_EQ(stats.srflx_addrs, srflx_addresses);
     EXPECT_EQ(static_cast<uint32>(stats.num_request_sent),
               total_pings_reported);
     EXPECT_EQ(static_cast<uint32>(stats.num_response_received),
               total_pings_reported);
   }
 
  private:
   void StopCallback(int result) {
@@ skipping 27 matching lines @@
 
 TEST_F(StunProberTest, NonSharedMode) {
   RunProber(false);
 }
 
 TEST_F(StunProberTest, SharedMode) {
   RunProber(true);
 }
 
 }  // namespace stunprober