Add 16-bit network id to the candidate signaling.

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 588 matching lines @@
   }
   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_ICE_CONTROLLED = 0x8029,   // UInt64
   STUN_ATTR_ICE_CONTROLLING = 0x802A,  // UInt64
-  STUN_ATTR_NETWORK_COST = 0xC057      // UInt32
+  // UInt32. The higher 16 bits are the network ID. The lower 16 bits are the
+  // network cost.
+  STUN_ATTR_NETWORK_INFO = 0xC057
 };
 
 // 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:
-      case STUN_ATTR_NETWORK_COST:
+      case STUN_ATTR_NETWORK_INFO:
         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_