RTCIceCandidatePairStats.[state/priority] added, ConnectionInfo updated.

webrtc/p2p/base/jseptransport.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 13 matching lines @@
 #include "webrtc/p2p/base/transportinfo.h"
 #include "webrtc/base/messagequeue.h"
 #include "webrtc/base/rtccertificate.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/sslstreamadapter.h"
 
 namespace cricket {
 
 class TransportChannelImpl;
 class TransportChannelImpl;
+enum class IceCandidatePairState;
 
 typedef std::vector<Candidate> Candidates;
 
 // TODO(deadbeef): Move all of these enums, POD types and utility methods to
 // another header file.
 
 // TODO(deadbeef): Unify with PeerConnectionInterface::IceConnectionState
 // once /talk/ and /webrtc/ are combined, and also switch to ENUM_NAME naming
 // style.
 enum IceConnectionState {
@@ skipping 32 matching lines @@
   // The most recent port allocator session will keep on running.
   GATHER_CONTINUALLY,
   // The most recent port allocator session will keep on running, and it will
   // try to recover connectivity if the channel becomes disconnected.
   GATHER_CONTINUALLY_AND_RECOVER,
 };
 
 // Stats that we can return about the connections for a transport channel.
 // TODO(hta): Rename to ConnectionStats
 struct ConnectionInfo {
-  ConnectionInfo()
-      : best_connection(false),
-        writable(false),
-        receiving(false),
-        timeout(false),
-        new_connection(false),
-        rtt(0),
-        sent_total_bytes(0),
-        sent_bytes_second(0),
-        sent_discarded_packets(0),
-        sent_total_packets(0),
-        sent_ping_requests_total(0),
-        sent_ping_requests_before_first_response(0),
-        sent_ping_responses(0),
-        recv_total_bytes(0),
-        recv_bytes_second(0),
-        recv_ping_requests(0),
-        recv_ping_responses(0),
-        key(NULL) {}

[hbos, 2016/12/23 13:45:34]

Moved to .cc because constructor needs to know the definition of
IceCandidatePairState which is only forward declared because of circular
inclusion. (The alternative would be to move IceCandidatePairState to here or
another header.)

[Taylor Brandstetter, 2016/12/23 18:59:44]

Actually, I think IceCandidatePairState is in a sensible place. It's really
ConnectionInfo that doesn't belong here (but we'll fix that eventually, you
don't have to worry about it now).

[hbos, 2016/12/27 10:24:34]

Acknowledged.

+  ConnectionInfo();
 
   bool best_connection;      // Is this the best connection we have?
   bool writable;             // Has this connection received a STUN response?
   bool receiving;            // Has this connection received anything?
   bool timeout;              // Has this connection timed out?
   bool new_connection;       // Is this a newly created connection?
   size_t rtt;                // The STUN RTT for this connection.
   size_t sent_total_bytes;   // Total bytes sent on this connection.
   size_t sent_bytes_second;  // Bps over the last measurement interval.
   size_t sent_discarded_packets;  // Number of outgoing packets discarded due to
                                   // socket errors.
   size_t sent_total_packets;  // Number of total outgoing packets attempted for
                               // sending.
   size_t sent_ping_requests_total;  // Number of STUN ping request sent.
   size_t sent_ping_requests_before_first_response;  // Number of STUN ping
   // sent before receiving the first response.
   size_t sent_ping_responses;  // Number of STUN ping response sent.
 
   size_t recv_total_bytes;     // Total bytes received on this connection.
   size_t recv_bytes_second;    // Bps over the last measurement interval.
   size_t recv_ping_requests;   // Number of STUN ping request received.
   size_t recv_ping_responses;  // Number of STUN ping response received.
   Candidate local_candidate;   // The local candidate for this connection.
   Candidate remote_candidate;  // The remote candidate for this connection.
   void* key;                   // A static value that identifies this conn.
+  // https://w3c.github.io/webrtc-stats/#dom-rtcicecandidatepairstats-state
+  IceCandidatePairState state;
+  // https://w3c.github.io/webrtc-stats/#dom-rtcicecandidatepairstats-priority
+  uint64_t priority;
 };
 
 // Information about all the connections of a channel.
 typedef std::vector<ConnectionInfo> ConnectionInfos;
 
 // Information about a specific channel
 struct TransportChannelStats {
   int component = 0;
   ConnectionInfos connection_infos;
   int srtp_crypto_suite = rtc::SRTP_INVALID_CRYPTO_SUITE;
@@ skipping 232 matching lines @@
 
   // Candidate component => DTLS channel
   std::map<int, TransportChannelImpl*> channels_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(JsepTransport);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_JSEPTRANSPORT_H_