| Index: webrtc/api/objc/RTCDataChannel.mm
|
| diff --git a/webrtc/api/objc/RTCDataChannel.mm b/webrtc/api/objc/RTCDataChannel.mm
|
| index 4be3a227becc54776d975e9b6ec927c407f509d7..a2c2e182ed1ff306fe2b2cda47b838bad105c59e 100644
|
| --- a/webrtc/api/objc/RTCDataChannel.mm
|
| +++ b/webrtc/api/objc/RTCDataChannel.mm
|
| @@ -86,7 +86,7 @@ class DataChannelDelegateAdapter : public DataChannelObserver {
|
|
|
|
|
| @implementation RTCDataChannel {
|
| - rtc::scoped_refptr<webrtc::DataChannelInterface> _nativDataChannel;
|
| + rtc::scoped_refptr<webrtc::DataChannelInterface> _nativeDataChannel;
|
| rtc::scoped_ptr<webrtc::DataChannelDelegateAdapter> _observer;
|
| BOOL _isObserverRegistered;
|
| }
|
| @@ -100,40 +100,52 @@ class DataChannelDelegateAdapter : public DataChannelObserver {
|
| }
|
|
|
| - (NSString *)label {
|
| - return [NSString stringForStdString:_nativDataChannel->label()];
|
| + return [NSString stringForStdString:_nativeDataChannel->label()];
|
| +}
|
| +
|
| +- (BOOL)isReliable {
|
| + return _nativeDataChannel->reliable();
|
| }
|
|
|
| - (BOOL)isOrdered {
|
| - return _nativDataChannel->ordered();
|
| + return _nativeDataChannel->ordered();
|
| +}
|
| +
|
| +- (NSUInteger)maxRetransmitTime {
|
| + return self.maxPacketLifeTime;
|
| }
|
|
|
| - (uint16_t)maxPacketLifeTime {
|
| - return _nativDataChannel->maxRetransmitTime();
|
| + return _nativeDataChannel->maxRetransmitTime();
|
| }
|
|
|
| - (uint16_t)maxRetransmits {
|
| - return _nativDataChannel->maxRetransmits();
|
| + return _nativeDataChannel->maxRetransmits();
|
| }
|
|
|
| - (NSString *)protocol {
|
| - return [NSString stringForStdString:_nativDataChannel->protocol()];
|
| + return [NSString stringForStdString:_nativeDataChannel->protocol()];
|
| }
|
|
|
| - (BOOL)isNegotiated {
|
| - return _nativDataChannel->negotiated();
|
| + return _nativeDataChannel->negotiated();
|
| +}
|
| +
|
| +- (NSInteger)streamId {
|
| + return self.channelId;
|
| }
|
|
|
| - (int)channelId {
|
| - return _nativDataChannel->id();
|
| + return _nativeDataChannel->id();
|
| }
|
|
|
| - (RTCDataChannelState)readyState {
|
| return [[self class] dataChannelStateForNativeState:
|
| - _nativDataChannel->state()];
|
| + _nativeDataChannel->state()];
|
| }
|
|
|
| - (uint64_t)bufferedAmount {
|
| - return _nativDataChannel->buffered_amount();
|
| + return _nativeDataChannel->buffered_amount();
|
| }
|
|
|
| - (void)setDelegate:(id<RTCDataChannelDelegate>)delegate {
|
| @@ -141,22 +153,22 @@ class DataChannelDelegateAdapter : public DataChannelObserver {
|
| return;
|
| }
|
| if (_isObserverRegistered) {
|
| - _nativDataChannel->UnregisterObserver();
|
| + _nativeDataChannel->UnregisterObserver();
|
| _isObserverRegistered = NO;
|
| }
|
| _delegate = delegate;
|
| if (_delegate) {
|
| - _nativDataChannel->RegisterObserver(_observer.get());
|
| + _nativeDataChannel->RegisterObserver(_observer.get());
|
| _isObserverRegistered = YES;
|
| }
|
| }
|
|
|
| - (void)close {
|
| - _nativDataChannel->Close();
|
| + _nativeDataChannel->Close();
|
| }
|
|
|
| - (BOOL)sendData:(RTCDataBuffer *)data {
|
| - return _nativDataChannel->Send(*data.nativeDataBuffer);
|
| + return _nativeDataChannel->Send(*data.nativeDataBuffer);
|
| }
|
|
|
| - (NSString *)description {
|
| @@ -173,7 +185,7 @@ class DataChannelDelegateAdapter : public DataChannelObserver {
|
| (rtc::scoped_refptr<webrtc::DataChannelInterface>)nativeDataChannel {
|
| NSParameterAssert(nativeDataChannel);
|
| if (self = [super init]) {
|
| - _nativDataChannel = nativeDataChannel;
|
| + _nativeDataChannel = nativeDataChannel;
|
| _observer.reset(new webrtc::DataChannelDelegateAdapter(self));
|
| }
|
| return self;
|
|
|