Skip to content

check crc32 #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 28, 2019
Merged

check crc32 #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f16a5b3
check crc32
sxci Dec 17, 2018
e2707cc
check context first.
sxci Dec 17, 2018
45ab999
update Crc32NotMatch code to -416 [ci skip]
sxci Feb 28, 2019
d94d15d
Delete Project.xml
sxci Feb 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions library/src/main/java/com/qiniu/android/http/ResponseInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ public final class ResponseInfo {
public static final int Cancelled = -2;
public static final int NetworkError = -1;

public static final int Crc32NotMatch = -406;

public static final int UnknownError = 0;

// <-- error code copy from ios
Expand Down Expand Up @@ -171,6 +173,12 @@ private static String getUpType(String path) {
}
}

public static ResponseInfo errorInfo(ResponseInfo old, int statusCode, String error) {
ResponseInfo _new = new ResponseInfo(old.response, statusCode, old.reqId, old.xlog, old.xvia, old.host,
old.path, old.ip, old.port, old.duration, old.sent, error, old.upToken, old.totalSize);
return _new;
}

public static ResponseInfo zeroSize(final UpToken upToken) {
return create(null, ZeroSizeFile, "", "", "", "", "", "", 80, 0, 0, "file or data size is zero", upToken, 0);
}
Expand Down
19 changes: 19 additions & 0 deletions library/src/main/java/com/qiniu/android/storage/ResumeUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,17 +301,36 @@ public void complete(ResponseInfo info, JSONObject response) {
return;
}
long crc = 0;
Exception tempE = null;
try {
context = response.getString("ctx");
crc = response.getLong("crc32");
} catch (Exception e) {
tempE = e;
e.printStackTrace();
}
if ((context == null || crc != ResumeUploader.this.crc32) && retried < config.retryMax) {
String upHostRetry = config.zone.upHost(token.token, config.useHttps, upHost);
nextTask(offset, retried + 1, upHostRetry);
return;
}
if (context == null) {
String error = "get context failed.";
if (tempE != null) {
error += "\n";
error += tempE.getMessage();
}
ResponseInfo info2 = ResponseInfo.errorInfo(info, ResponseInfo.UnknownError, error);
completionHandler.complete(key, info2, response);
return;
}
if (crc != ResumeUploader.this.crc32) {
String error = "block's crc32 is not match. local: " + ResumeUploader.this.crc32 + ", remote: " + crc;
ResponseInfo info2 = ResponseInfo.errorInfo(info, ResponseInfo.Crc32NotMatch, error);
completionHandler.complete(key, info2, response);
return;
}

contexts[(int) (offset / Configuration.BLOCK_SIZE)] = context;
record(offset + chunkSize);
nextTask(offset + chunkSize, retried, upHost);
Expand Down