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

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

Index: webrtc/sdk/objc/Framework/Classes/RTCIceCandidate.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/RTCIceCandidate.mm b/webrtc/sdk/objc/Framework/Classes/RTCIceCandidate.mm
index 193403d11d8fcfd8157100c426128b64bb30e3f0..726d367daa03b47bc0c34877895f8fdd44a7c19c 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCIceCandidate.mm
+++ b/webrtc/sdk/objc/Framework/Classes/RTCIceCandidate.mm
@@ -20,24 +20,37 @@
 @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
@@ -48,9 +61,10 @@
   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 {