Add the URL attribute to cricket::Candiate. (Objc wrapper)

webrtc/sdk/objc/Framework/Classes/RTCIceCandidate.mm

 /*
  *  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.
  */
 
 #import "RTCIceCandidate+Private.h"
 
 #include <memory>
 
 #import "NSString+StdString.h"
 #import "WebRTC/RTCLogging.h"
 
 @implementation RTCIceCandidate
 
 @synthesize sdpMid = _sdpMid;
 @synthesize sdpMLineIndex = _sdpMLineIndex;
 @synthesize sdp = _sdp;
+@synthesize serverUrl = _serverUrl;
 
 - (instancetype)initWithSdp:(NSString *)sdp
               sdpMLineIndex:(int)sdpMLineIndex
                      sdpMid:(NSString *)sdpMid {
+  return [self initWithSdpAndServerUrl:sdp
+                         sdpMLineIndex:sdpMLineIndex
+                                sdpMid:sdpMid
+                             serverUrl:@""];
+}
+
+- (instancetype)initWithSdpAndServerUrl:(NSString *)sdp

[tkchin_webrtc, 2017/02/14 21:58:55]

remove this ctor since it's only ever used privately

[Zhi Huang, 2017/02/15 00:22:48]

Done.

+                          sdpMLineIndex:(int)sdpMLineIndex
+                                 sdpMid:(NSString *)sdpMid
+                              serverUrl:(NSString *)serverUrl {
   NSParameterAssert(sdp.length);
   if (self = [super init]) {
     _sdpMid = [sdpMid copy];
     _sdpMLineIndex = sdpMLineIndex;
     _sdp = [sdp copy];
+    _serverUrl = [serverUrl copy];

[tkchin_webrtc, 2017/02/14 21:58:55]

remove

[Zhi Huang, 2017/02/15 00:22:49]

Done.

   }
   return self;
 }
 
 - (NSString *)description {
-  return [NSString stringWithFormat:@"RTCIceCandidate:\n%@\n%d\n%@",
+  return [NSString stringWithFormat:@"RTCIceCandidate:\n%@\n%d\n%@\n%@",
                                     _sdpMid,
                                     _sdpMLineIndex,
-                                    _sdp];
+                                    _sdp,
+                                    _serverUrl];
 }
 
 #pragma mark - Private
 
 - (instancetype)initWithNativeCandidate:
     (const webrtc::IceCandidateInterface *)candidate {
   NSParameterAssert(candidate);
   std::string sdp;
   candidate->ToString(&sdp);
 
-  return [self initWithSdp:[NSString stringForStdString:sdp]
-             sdpMLineIndex:candidate->sdp_mline_index()
-                    sdpMid:[NSString stringForStdString:candidate->sdp_mid()]];
+  return [self initWithSdpAndServerUrl:[NSString stringForStdString:sdp]

[tkchin_webrtc, 2017/02/14 21:58:55]

RTCIceCandidate *candidate = [self initWithSdp:sdpMLineIndex:sdpMid:];
candidate->_serverUrl = [NSString stringForStdString:candidate->server_url()];
return candidate;

alternately, make the serverUrl property readwrite in the +Private file, and use
candidate.serverUrl = ...

[Zhi Huang, 2017/02/15 00:22:49]

Done.

+                         sdpMLineIndex:candidate->sdp_mline_index()
+                                sdpMid:[NSString stringForStdString:candidate->sdp_mid()]
+                             serverUrl:[NSString stringForStdString:candidate->server_url()]];
 }
 
 - (std::unique_ptr<webrtc::IceCandidateInterface>)nativeCandidate {
   webrtc::SdpParseError error;
 
   webrtc::IceCandidateInterface *candidate = webrtc::CreateIceCandidate(
       _sdpMid.stdString, _sdpMLineIndex, _sdp.stdString, &error);
 
   if (!candidate) {
     RTCLog(@"Failed to create ICE candidate: %s\nline: %s",
            error.description.c_str(),
            error.line.c_str());
   }
 
   return std::unique_ptr<webrtc::IceCandidateInterface>(candidate);
 }
 
 @end