Add network cost as part of the connection comparison.

webrtc/p2p/base/stun.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 586 matching lines @@
       default: return StunMessage::GetAttributeValueType(type);
     }
   }
   virtual StunMessage* CreateNew() const { return new TurnMessage(); }
 };
 
 // RFC 5245 ICE STUN attributes.
 enum IceAttributeType {
   STUN_ATTR_PRIORITY                    = 0x0024,  // UInt32
   STUN_ATTR_USE_CANDIDATE               = 0x0025,  // No content, Length = 0
+  STUN_ATTR_NETWORK_COST                = 0x0026,  // UInt32

[pthatcher1, 2016/02/04 23:16:21]

According to RFC 5389, section 18.2, we have to choose a value in the range
0xC000 - 0xFFFF and make sure no one else is using it.

   STUN_ATTR_ICE_CONTROLLED              = 0x8029,  // UInt64
   STUN_ATTR_ICE_CONTROLLING             = 0x802A   // UInt64
 };
 
 // RFC 5245-defined errors.
 enum IceErrorCode {
   STUN_ERROR_ROLE_CONFLICT              = 487,
 };
 extern const char STUN_ERROR_REASON_ROLE_CONFLICT[];
 
 // A RFC 5245 ICE STUN message.
 class IceMessage : public StunMessage {
  protected:
   virtual StunAttributeValueType GetAttributeValueType(int type) const {
     switch (type) {
-      case STUN_ATTR_PRIORITY:        return STUN_VALUE_UINT32;
+      case STUN_ATTR_PRIORITY:
+      case STUN_ATTR_NETWORK_COST:

[pthatcher1, 2016/02/04 23:16:21]

32-bits is overkill.  Let's make it uint8.  We'll have to add a little code to
parse a uint8, but that should be trivial.

Actually, I'm tempted to save a byte by making us have no-content and instead
have two attributes: one for HIGH and one for LAST_RESORT, just like
CONTROLLED/CONTROLLING.  Let's ask Justin what he thinks about that. It might be
an over-optimization.

[juberti2, 2016/02/04 23:31:10]

attribs are padded to 32 bits, so no point in going smaller than 32 bits.

[pthatcher1, 2016/02/04 23:51:18]

Yes, I forgot about that.  It's pretty lame when you're trying to save bytes.  
4 bytes seems like a lot to waste.  Should we make the default non-zero so that
cellular networks are the one that can avoid sending it and WiFi networks are
the one that needs to send it?

+        return STUN_VALUE_UINT32;
       case STUN_ATTR_USE_CANDIDATE:   return STUN_VALUE_BYTE_STRING;
       case STUN_ATTR_ICE_CONTROLLED:  return STUN_VALUE_UINT64;
       case STUN_ATTR_ICE_CONTROLLING: return STUN_VALUE_UINT64;
       default: return StunMessage::GetAttributeValueType(type);
     }
   }
   virtual StunMessage* CreateNew() const { return new IceMessage(); }
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_STUN_H_