Fixing the behavior of the candidate filter with pooled candidates.

webrtc/p2p/base/port.h

 /*
  *  Copyright 2004 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 275 matching lines @@
   virtual void OnSentPacket(rtc::AsyncPacketSocket* socket,
                             const rtc::SentPacket& sent_packet) = 0;
 
   // Called when the socket is currently able to send.
   void OnReadyToSend();
 
   // Called when the Connection discovers a local peer reflexive candidate.
   // Returns the index of the new local candidate.
   size_t AddPrflxCandidate(const Candidate& local);
 
-  void set_candidate_filter(uint32_t candidate_filter) {
-    candidate_filter_ = candidate_filter;
-  }
   int16_t network_cost() const { return network_cost_; }
 
  protected:
   enum {
     MSG_DEAD = 0,
     MSG_FIRST_AVAILABLE
   };
 
   virtual void UpdateNetworkCost();
 
@@ skipping 33 matching lines @@
 
   // Checks if the address in addr is compatible with the port's ip.
   bool IsCompatibleAddress(const rtc::SocketAddress& addr);
 
   // Returns default DSCP value.
   rtc::DiffServCodePoint DefaultDscpValue() const {
     // No change from what MediaChannel set.
     return rtc::DSCP_NO_CHANGE;
   }
 
-  uint32_t candidate_filter() { return candidate_filter_; }
-
  private:
   void Construct();
   // Called when one of our connections deletes itself.
   void OnConnectionDestroyed(Connection* conn);
 
   // Whether this port is dead, and hence, should be destroyed on the controlled
   // side.
   bool dead() const {
     return ice_role_ == ICEROLE_CONTROLLED && connections_.empty();
   }
@@ skipping 27 matching lines @@
   AddressMap connections_;
   int timeout_delay_;
   bool enable_port_packets_;
   IceRole ice_role_;
   uint64_t tiebreaker_;
   bool shared_socket_;
   // Information to use when going through a proxy.
   std::string user_agent_;
   rtc::ProxyInfo proxy_;
 
-  // Candidate filter is pushed down to Port such that each Port could
-  // make its own decision on how to create candidates. For example,
-  // when IceTransportsType is set to relay, both RelayPort and
-  // TurnPort will hide raddr to avoid local address leakage.
-  uint32_t candidate_filter_;
-
   // A virtual cost perceived by the user, usually based on the network type
   // (WiFi. vs. Cellular). It takes precedence over the priority when
   // comparing two connections.
   uint16_t network_cost_;
 
   friend class Connection;
 };
 
 // Represents a communication link between a port on the local client and a
 // port on the remote client.
@@ skipping 257 matching lines @@
            const rtc::PacketOptions& options) override;
   int GetError() override { return error_; }
 
  private:
   int error_ = 0;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_PORT_H_