add crc for resume

Author: longbai

QiniuSDK/Common/QNCrc32.m

@@ -32,14 +32,12 @@ + (UInt32)file:(NSString *)filePath
 		int count = (len + kQNBlockSize - 1) / kQNBlockSize;
 
 		uLong crc = crc32(0L, Z_NULL, 0);
-		NSLog(@"%lu %d", crc, count);
 		for (int i = 0; i < count; i++) {
 			int offset = i * kQNBlockSize;
 			int size = (len - offset) > kQNBlockSize ? kQNBlockSize : (len - offset);
 			NSData *d = [data subdataWithRange:NSMakeRange(offset, (unsigned int)size)];
 			crc = crc32(crc, [d bytes], (uInt)[d length]);
 		}
-		NSLog(@"%lu %d", crc, count);
 		return (UInt32)crc;
 	}
 }

QiniuSDK/Storage/QNResumeUpload.m

@@ -14,6 +14,7 @@
 #import "QNHttpManager.h"
 #import "QNUploadOption+Private.h"
 #import "QNRecorderDelegate.h"
+#import "QNCrc32.h"
 
 typedef void (^task)(void);
 
@@ -34,6 +35,7 @@ @interface QNResumeUpload ()
 @property UInt64 modifyTime;
 @property (nonatomic, weak) id <QNRecorderDelegate> recorder;
 
+@property UInt32 chunkCrc;
 
 - (void)makeBlock:(NSString *)uphost
            offset:(UInt32)offset
@@ -216,8 +218,15 @@ - (void)nextTask:(UInt32)offset retriedTimes:(int)retried host:(NSString *)host
 			[self nextTask:offset retriedTimes:retried + 1 host:nextHost];
 			return;
 		}
+
+		if (resp == nil) {
+			[self nextTask:offset retriedTimes:retried host:host];
+			return;
+		}
+
 		NSString *ctx = resp[@"ctx"];
-		if (ctx == nil) {
+		NSNumber *crc = resp[@"crc32"];
+		if (ctx == nil || crc == nil || [crc unsignedLongValue] != _chunkCrc) {
 			[self nextTask:offset retriedTimes:retried host:host];
 			return;
 		}
@@ -252,6 +261,7 @@ - (void)makeBlock:(NSString *)uphost
          complete:(QNCompleteBlock)complete {
 	NSData *data = [self.data subdataWithRange:NSMakeRange(offset, (unsigned int)chunkSize)];
 	NSString *url = [[NSString alloc] initWithFormat:@"http://%@/mkblk/%u", uphost, (unsigned int)blockSize];
+	_chunkCrc = [QNCrc32 data:data];
 	[self post:url withData:data withCompleteBlock:complete withProgressBlock:progressBlock];
 }
 
@@ -264,7 +274,7 @@ - (void)putChunk:(NSString *)uphost
 	NSData *data = [self.data subdataWithRange:NSMakeRange(offset, (unsigned int)size)];
 	UInt32 chunkOffset = offset % kQNBlockSize;
 	NSString *url = [[NSString alloc] initWithFormat:@"http://%@/bput/%@/%u", uphost, context, (unsigned int)chunkOffset];
-
+	_chunkCrc = [QNCrc32 data:data];
 	[self post:url withData:data withCompleteBlock:complete withProgressBlock:progressBlock];
 }