ログの削除、レコーダ名をAndroid側と合わせた。その他、Warning消し残し修正。

TakayukiHoshi1984 · TakayukiHoshi1984 · commit f4630822a763 · 2017-11-18T08:28:31.000+09:00
diff --git a/dConnectDevicePlugin/dConnectDeviceAWSIoT/Podfile.lock b/dConnectDevicePlugin/dConnectDeviceAWSIoT/Podfile.lock
@@ -12,4 +12,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: e57f03e93e2bb0fafc6335552293afc70c7f47dc
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.3.1
diff --git a/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT.xcodeproj/project.pbxproj b/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT.xcodeproj/project.pbxproj
diff --git a/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/DPAWSIoTUtils.m b/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/DPAWSIoTUtils.m
@@ -443,7 +443,7 @@ + (NSString *)packageName {
 }
 
 // アラート表示
-+ (void)showAlert:(UIViewController*)vc title:(NSString*)title message:(NSString*)message handler:(void (^)())handler {
++ (void)showAlert:(UIViewController*)vc title:(NSString*)title message:(NSString*)message handler:(void (^)(void))handler {
 	UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title
 																			 message:message
 																	  preferredStyle:UIAlertControllerStyleAlert];
diff --git a/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/Core/DPAWSIoTRelayClient.mm b/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/Core/DPAWSIoTRelayClient.mm
@@ -100,7 +100,6 @@ - (int) execute:(NSString *)address port:(int)port
         NSLog(@"DPAWSIoTRelayClient: connect: %s", UDT::getlasterror().getErrorMessage());
         return 0;
     }
-    
     freeaddrinfo(peer);
     
     _socket = [[DPAWSIoTSocketTask alloc] initWithSocket:socket];
diff --git a/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/Core/DPAWSIoTSocketTask.mm b/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/Core/DPAWSIoTSocketTask.mm
@@ -8,7 +8,6 @@
 //
 
 #import "DPAWSIoTSocketTask.h"
-
 #define BUFFER_SIZE 512
 
 char const HEADER[4] = {
@@ -57,30 +56,26 @@ - (void) sendData:(const char *)data offset:(int)offset length:(int)length
         NSLog(@"DPAWSIoTSocketTask send error .");
         return;
     }
-    
     if (length == 0) {
         return;
     }
-
     [self intToByte:length to:_sendBuffer];
-    
     if (UDT::ERROR == UDT::send(_socket, HEADER, 4, 0)) {
         NSLog(@"DPAWSIoTSocketTask send error .");
         return;
     }
-    
     if (UDT::ERROR == UDT::send(_socket, _sendBuffer, 4, 0)) {
         NSLog(@"DPAWSIoTSocketTask send error .");
         return;
     }
-    
     int _offset = offset;
     int _length;
     while (_offset < offset + length) {
         _length = offset + length - _offset;
         if (_length > BUFFER_SIZE) {
             _length = BUFFER_SIZE;
         }
+
         if (UDT::ERROR == UDT::send(_socket, data + _offset, _length, 0)) {
             NSLog(@"DPAWSIoTSocketTask send error .");
             return;
@@ -96,26 +91,22 @@ - (void) execute
     if ([_delegate respondsToSelector:@selector(didConnectedAddress:port:)]) {
         [_delegate didConnectedAddress:_address port:_port];
     }
-    
     while (!_closeFlag) {
         if (![self readHeader]) {
             NSLog(@"DPAWSIoTSocketTask header error.");
         }
-        
         int size = [self readSize];
         if (size == -1) {
             NSLog(@"DPAWSIoTSocketTask size error.");
             break;
         }
-
         while (size > 0 && !_closeFlag) {
             int rs = UDT::recv(_socket, data, BUFFER_SIZE, 0);
             if (_closeFlag || UDT::ERROR == rs) {
                 NSLog(@"DPAWSIoTSocketTask UDT error...");
                 break;
             }
             size -= rs;
-
             if ([_delegate respondsToSelector:@selector(didReceivedData:length:)]) {
                 [_delegate didReceivedData:(const char *)data length:(int)rs];
             }
diff --git a/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/Core/DPAWSIoTStunClient.mm b/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/Core/DPAWSIoTStunClient.mm
@@ -41,7 +41,6 @@ - (instancetype) init
 - (void) bindingRequest:(StunBindingRequestCallback)callback
 {
     _callback = callback;
-    
     if (_stunAddress) {
         [self doBindingRequest:_stunAddress];
     } else {
@@ -149,7 +148,7 @@ - (void) parse:(NSData *)data
     _cancelBlock = nil;
     
     if (_callback) {
-        _callback(ip, [port integerValue]);
+        _callback(ip, (int)[port integerValue]);
     }
 }
 
@@ -174,8 +173,8 @@ - (void) didConnect
     [request appendBytes:changeRequest length:sizeof(changeRequest)];
     [request appendBytes:attributeSize length:sizeof(attributeSize)];
     [request appendBytes:attributeBody length:sizeof(attributeBody)];
-    
-    [_server sendData:(const char *)[request bytes] length:[request length] to:_stunAddress port:_stunPort];
+
+    [_server sendData:(const char *)[request bytes] length:(int)[request length] to:_stunAddress port:_stunPort];
 }
 
 - (void) didNotConnect
diff --git a/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/DPAWSIoTServerRunnable.m b/dConnectDevicePlugin/dConnectDeviceAWSIoT/dConnectDeviceAWSIoT/Classes/P2P/DPAWSIoTServerRunnable.m
@@ -47,7 +47,7 @@ - (void) r:(NSData *)data
         if (headerSize > 0) {
             NSData *d = [self convHeader:_headerData];
             [self.connection sendData:d.bytes length:(int)d.length];
-            [self.connection sendData:data.bytes offset:headerSize length:data.length - headerSize];
+            [self.connection sendData:data.bytes offset:headerSize length:(int) (data.length - headerSize)];
             _headerEndFlag = YES;
         }
     } else {
diff --git a/dConnectDevicePlugin/dConnectDeviceChromeCast/dConnectDeviceChromecast/Classes/DPChromecastMediaPlayerProfile.m b/dConnectDevicePlugin/dConnectDeviceChromeCast/dConnectDeviceChromecast/Classes/DPChromecastMediaPlayerProfile.m
@@ -67,7 +67,7 @@ - (id)init
                              [DConnectMediaPlayerProfile setTitle:@"Title: Sample" target:response];
                              [DConnectMediaPlayerProfile setLanguage:@"ja" target:response];
                              [DConnectMediaPlayerProfile setDescription:@"Sample Movie" target:response];
-                             [DConnectMediaPlayerProfile setDuration:9999 target:response];
+                             [DConnectMediaPlayerProfile setDuration:600 target:response];
                              
                          } else {
                              NSURL *url = [NSURL URLWithString:mediaId];
@@ -278,7 +278,6 @@ - (id)init
                                      [weakSelf saveMovie:ctx
                                                 callback:
                                       ^(NSString *url) {
-                                          NSLog(@"url:%@", url);
                                                 if (url) {
                                                     DPChromecastManager *mgr = [DPChromecastManager sharedManager];
                                                     NSInteger requestId = [mgr loadMediaWithID:serviceId
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaPlayer/DPHostMediaContext.h b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaPlayer/DPHostMediaContext.h
@@ -15,7 +15,7 @@
 extern NSString *MediaContextMediaIdSchemeIPodAudio; ///< iPodライブラリの音声メディアのmediaIdに使用されるスキーム
 extern NSString *MediaContextMediaIdSchemeIPodMovie; ///< iPodライブラリの動画メディアのmediaIdに使用されるスキーム
 extern NSString *MediaContextMediaIdSchemeIPodLibrary;
-
+extern NSString *MediaContextMediaIdSchemeFile;
 typedef NS_ENUM(NSUInteger, MediaPlayerType) {
     MediaPlayerTypeIPod,     ///< iPodミュージックプレイヤー
     MediaPlayerTypeMoviePlayer, ///< MoviePlayer + 独自UI
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaPlayer/DPHostMediaPlayerProfile.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaPlayer/DPHostMediaPlayerProfile.m
@@ -69,11 +69,16 @@ - (instancetype)init
                              [response setErrorToInvalidRequestParameterWithMessage:@"mediaId must be specified."];
                              return YES;
                          }
-                         if (![mediaId hasPrefix:@"file://"]) {
+                         if (![mediaId hasPrefix:MediaContextMediaIdSchemeIPodAudio]
+                             && ![mediaId hasPrefix:MediaContextMediaIdSchemeFile]
+                             && ![mediaId hasPrefix:MediaContextMediaIdSchemeIPodLibrary]
+                             && ![mediaId hasPrefix:MediaContextMediaIdSchemeIPodMovie]
+                             && [mediaId hasPrefix:@"/"]) {
                              mediaId = [NSString stringWithFormat:@"file://%@", mediaId];
                          }
                          NSURL *url = [NSURL URLWithString:[mediaId stringByReplacingOccurrencesOfString:@" " withString:@"%20"]];
                          DPHostMediaContext *ctx = [DPHostMediaContext contextWithURL:url];
+
                          if (ctx) {
                              [ctx setVariousMetadataToMessage:response omitMediaId:YES];
                              [response setResult:DConnectMessageResultTypeOk];
@@ -142,7 +147,11 @@ - (instancetype)init
                                  sleep(1.0);
                              }
                          }
-                         if (![mediaId hasPrefix:@"file://"]) {
+                         if (![mediaId hasPrefix:MediaContextMediaIdSchemeIPodAudio]
+                             && ![mediaId hasPrefix:MediaContextMediaIdSchemeFile]
+                             && ![mediaId hasPrefix:MediaContextMediaIdSchemeIPodLibrary]
+                             && ![mediaId hasPrefix:MediaContextMediaIdSchemeIPodMovie]
+                             && [mediaId hasPrefix:@"/"]) {
                              mediaId = [NSString stringWithFormat:@"file://%@", mediaId];
                          }
                          weakSelf.mediaPlayer = [DPHostMediaPlayerFactory createPlayerWithMediaId:[mediaId stringByReplacingOccurrencesOfString:@" " withString:@"%20"]
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/DPHostMediaStreamRecordingProfile.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/DPHostMediaStreamRecordingProfile.m
@@ -45,7 +45,7 @@ - (instancetype)init
                              [recorderItr performReading:^{
                                  
                                    DConnectMessage *recorder = [DConnectMessage message];
-                                   [DConnectMediaStreamRecordingProfile setRecorderId:[recorderItr.recorderId stringValue] target:recorder];
+                                   [DConnectMediaStreamRecordingProfile setRecorderId:recorderItr.recorderId target:recorder];
                                    [DConnectMediaStreamRecordingProfile setRecorderName:recorderItr.name target:recorder];
  
                                    NSString *state;
@@ -96,7 +96,6 @@ - (instancetype)init
                               return YES;
                           }
                           [recorder takePhotoWithSuccessCompletion:^(NSURL *assetURL) {
-                              
                               [DConnectMediaStreamRecordingProfile setUri:assetURL.absoluteString target:response];
                               [DConnectMediaStreamRecordingProfile setPath:assetURL.path target:response];
                               NSString *mimeType = [DConnectFileManager searchMimeTypeForExtension:@"jpg"];
@@ -310,7 +309,7 @@ - (instancetype)init
                          return YES;
                      }];
         
-        // API登録(didReceivePutOnDataAvailableRequest相当)
+        // API登録(didReceivePutPreviewRequest相当)
         NSString *putPreviewRequestApiPath = [self apiPath: nil
                                              attributeName: DConnectMediaStreamRecordingProfileAttrPreview];
         [self addPutPath: putPreviewRequestApiPath
@@ -375,7 +374,7 @@ - (instancetype)init
                             return YES;
                         }];
         
-        // API登録(didReceiveDeleteOnDataAvailableRequest相当)
+        // API登録(didReceiveDeletePreviewRequest相当)
         NSString *deletePreviewRequestApiPath = [self apiPath: nil
                                                 attributeName: DConnectMediaStreamRecordingProfileAttrPreview];
         [self addDeletePath: deletePreviewRequestApiPath
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/DPHostRecorderUtils.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/DPHostRecorderUtils.m
@@ -201,12 +201,16 @@ + (AVCaptureConnection *)connectionForDevice:(AVCaptureDevice *)device output:(A
 + (void)setLightOnOff:(BOOL)bSwitch
 {
     AVCaptureDevice *captureDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
-    [captureDevice lockForConfiguration:NULL];
-    if (bSwitch) {
-        captureDevice.torchMode = AVCaptureTorchModeOn;
-    } else {
-        captureDevice.torchMode = AVCaptureTorchModeOff;
+    if ([captureDevice isTorchAvailable]
+        && [captureDevice isTorchModeSupported:AVCaptureTorchModeOn]
+        && [captureDevice isTorchModeSupported:AVCaptureTorchModeOff]) {
+        [captureDevice lockForConfiguration:NULL];
+        if (bSwitch) {
+            captureDevice.torchMode = AVCaptureTorchModeOn;
+        } else {
+            captureDevice.torchMode = AVCaptureTorchModeOff;
+        }
+        [captureDevice unlockForConfiguration];
     }
-    [captureDevice unlockForConfiguration];
 }
 @end
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Audio/DPHostAudioRecorder.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Audio/DPHostAudioRecorder.m
@@ -13,14 +13,23 @@ @interface DPHostAudioRecorder()
 @end
 @implementation DPHostAudioRecorder
 
-
+- (instancetype)initWithRecorderId:(NSNumber*)recorderId
+                       videoDevice:(AVCaptureDevice*)videoDevice
+                       audioDevice:(AVCaptureDevice*)audioDevice
+{
+    self = [super initWithRecorderId:recorderId videoDevice:videoDevice audioDevice:audioDevice];
+    if (self) {
+        self.recorderId = [NSString stringWithFormat:@"audio_%d", [recorderId intValue]];
+    }
+    return self;
+}
 - (void)initialize
 {
     [super initialize];
     self.mimeType = [DConnectFileManager searchMimeTypeForExtension:@"mp4"];
     self.state = DPHostRecorderStateInactive;
     [self setAudioSourceTypeWithDelegate:self];
-    self.name = @"movie_audio_0";
+    self.name = @"iOSHost Audio Recorder";
 }
 
 #pragma mark - AVCapture{Audio,Video}DataOutputSampleBufferDelegate
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/DPHostRecorder.h b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/DPHostRecorder.h
@@ -46,7 +46,7 @@ typedef NS_ENUM(NSUInteger, DPHostRecorderState) {
 @property BOOL needRecalculationOfTotalPauseDuration;
 
 // ID
-@property NSNumber *recorderId;
+@property NSString *recorderId;
 // Recorder名
 @property NSString *name;
 // RecorderのMimeType
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/DPHostRecorder.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/DPHostRecorder.m
@@ -29,7 +29,7 @@ - (instancetype)initWithRecorderId:(NSNumber*)recorderId
 {
     self = [super init];
     if (self) {
-        self.recorderId = recorderId;
+        self.recorderId = [recorderId stringValue];
         self.isMuted = NO;
         self.videoCaptureDevice = videoDevice;
         self.audioCaptureDevice = audioDevice;
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/DPHostRecorderManager.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/DPHostRecorderManager.m
@@ -58,9 +58,6 @@ - (void)createRecorders
                                                                                audioDevice:nil];
         
         [photoArray addObject:cRecorder];
-        recorderIdCount++;
-    }
-    for (AVCaptureDevice *videoDev in videoDevArr) {
         for (AVCaptureDevice *audioDev in audioDevArr) {
             DPHostVideoRecorder *vRecorder = [[DPHostVideoRecorder alloc] initWithRecorderId:@(recorderIdCount)
                                                                                  videoDevice:videoDev
@@ -78,7 +75,7 @@ - (void)createRecorders
     [recs addObjectsFromArray:photoArray];
     [recs addObjectsFromArray:videoArray];
     for (AVCaptureDevice *audioDev in audioDevArr) {
-        [recs addObject:[[DPHostAudioRecorder alloc] initWithRecorderId:@(recorderIdCount)
+        [recs addObject:[[DPHostAudioRecorder alloc] initWithRecorderId:@(0)
                                                             videoDevice:nil
                                                             audioDevice:audioDev]];
     }
@@ -107,7 +104,7 @@ - (DPHostRecorder*)getRecorderForRecorderId:(NSString*)recorderId
         return self.defaultPhotoRecorder;
     }
     for (DPHostRecorder *recorder in self.recorders) {
-        if ([recorderId isEqualToString:[recorder.recorderId stringValue]]) {
+        if ([recorderId isEqualToString:recorder.recorderId]) {
             return recorder;
         }
     }
@@ -120,7 +117,7 @@ - (DPHostPhotoRecorder*)getCameraRecorderForRecorderId:(NSString*)recorderId
         return (DPHostCameraRecorder *) self.defaultPhotoRecorder;
     }
     for (DPHostRecorder *recorder in self.recorders) {
-        if ([recorderId isEqualToString:[recorder.recorderId stringValue]] && [recorder isKindOfClass:[DPHostPhotoRecorder class]]) {
+        if ([recorderId isEqualToString:recorder.recorderId] && [recorder isKindOfClass:[DPHostPhotoRecorder class]]) {
             return (DPHostPhotoRecorder *) recorder;
         }
     }
@@ -133,7 +130,7 @@ - (DPHostStreamRecorder*)getVideoRecorderForRecorderId:(NSString*)recorderId
         return (DPHostStreamRecorder *) self.defaultVideoRecorder;
     }
     for (DPHostRecorder *recorder in self.recorders) {
-        if ([recorderId isEqualToString:[recorder.recorderId stringValue]] && [recorder isKindOfClass:[DPHostStreamRecorder class]]) {
+        if ([recorderId isEqualToString:recorder.recorderId] && [recorder isKindOfClass:[DPHostStreamRecorder class]]) {
             return (DPHostStreamRecorder *) recorder;
         }
     }
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Photo/DPHostCameraRecorder.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Photo/DPHostCameraRecorder.m
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Photo/DPHostSimpleHttpServer.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Photo/DPHostSimpleHttpServer.m
diff --git a/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Video/DPHostVideoRecorder.m b/dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Video/DPHostVideoRecorder.m

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@ SPEC CHECKSUMS:`
`12`	`12`
`13`	`13`	`PODFILE CHECKSUM: e57f03e93e2bb0fafc6335552293afc70c7f47dc`
`14`	`14`
`15`		`-COCOAPODS: 1.2.0`
	`15`	`+COCOAPODS: 1.3.1`
Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ + (NSString *)packageName {`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`// アラート表示`
`446`		`-+ (void)showAlert:(UIViewController)vc title:(NSString)title message:(NSString*)message handler:(void (^)())handler {`
	`446`	`++ (void)showAlert:(UIViewController)vc title:(NSString)title message:(NSString*)message handler:(void (^)(void))handler {`
`447`	`447`	`UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title`
`448`	`448`	`message:message`
`449`	`449`	`preferredStyle:UIAlertControllerStyleAlert];`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,6 @@ - (int) execute:(NSString *)address port:(int)port`
`100`	`100`	`NSLog(@"DPAWSIoTRelayClient: connect: %s", UDT::getlasterror().getErrorMessage());`
`101`	`101`	`return 0;`
`102`	`102`	`}`
`103`		`-`
`104`	`103`	`freeaddrinfo(peer);`
`105`	`104`
`106`	`105`	`_socket = [[DPAWSIoTSocketTask alloc] initWithSocket:socket];`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ - (instancetype) init`
`41`	`41`	`- (void) bindingRequest:(StunBindingRequestCallback)callback`
`42`	`42`	`{`
`43`	`43`	`_callback = callback;`
`44`		`-`
`45`	`44`	`if (_stunAddress) {`
`46`	`45`	`[self doBindingRequest:_stunAddress];`
`47`	`46`	`} else {`
`@@ -149,7 +148,7 @@ - (void) parse:(NSData *)data`
`149`	`148`	`_cancelBlock = nil;`
`150`	`149`
`151`	`150`	`if (_callback) {`
`152`		`- _callback(ip, [port integerValue]);`
	`151`	`+ _callback(ip, (int)[port integerValue]);`
`153`	`152`	`}`
`154`	`153`	`}`
`155`	`154`
`@@ -174,8 +173,8 @@ - (void) didConnect`
`174`	`173`	`[request appendBytes:changeRequest length:sizeof(changeRequest)];`
`175`	`174`	`[request appendBytes:attributeSize length:sizeof(attributeSize)];`
`176`	`175`	`[request appendBytes:attributeBody length:sizeof(attributeBody)];`
`177`		`-`
`178`		`- [_server sendData:(const char *)[request bytes] length:[request length] to:_stunAddress port:_stunPort];`
	`176`	`+`
	`177`	`+ [_server sendData:(const char *)[request bytes] length:(int)[request length] to:_stunAddress port:_stunPort];`
`179`	`178`	`}`
`180`	`179`
`181`	`180`	`- (void) didNotConnect`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ - (void) r:(NSData *)data`
`47`	`47`	`if (headerSize > 0) {`
`48`	`48`	`NSData *d = [self convHeader:_headerData];`
`49`	`49`	`[self.connection sendData:d.bytes length:(int)d.length];`
`50`		`- [self.connection sendData:data.bytes offset:headerSize length:data.length - headerSize];`
	`50`	`+ [self.connection sendData:data.bytes offset:headerSize length:(int) (data.length - headerSize)];`
`51`	`51`	`_headerEndFlag = YES;`
`52`	`52`	`}`
`53`	`53`	`} else {`