cozis/ToastyFS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
cozis
2025-11-09 19:06:23 +01:00
parent bf1a18b9d0
commit ecef79cc53
1 changed files with 55 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client.c
+46 -11
View File
@@ -1547,6 +1547,17 @@ static void process_event_for_write(TinyDFS *tdfs,
return; return;
} }
uint16_t expected_type;
if (tdfs->operations[opidx].uploads[found].chunk_index >= tdfs->operations[opidx].num_hashes) {
expected_type = MESSAGE_TYPE_CREATE_CHUNK_SUCCESS;
} else {
expected_type = MESSAGE_TYPE_UPLOAD_CHUNK_SUCCESS;
}
if (type != expected_type)
tdfs->operations[opidx].uploads[found].status = UPLOAD_FAILED;
else {
SHA256 hash; SHA256 hash;
if (!binary_read(&reader, &hash, sizeof(hash))) { if (!binary_read(&reader, &hash, sizeof(hash))) {
assert(0); // TODO assert(0); // TODO
@@ -1559,15 +1570,6 @@ static void process_event_for_write(TinyDFS *tdfs,
return; return;
} }
uint16_t expected_type;
if (tdfs->operations[opidx].uploads[found].chunk_index >= tdfs->operations[opidx].num_hashes)
expected_type = MESSAGE_TYPE_CREATE_CHUNK_SUCCESS;
else
expected_type = MESSAGE_TYPE_UPLOAD_CHUNK_SUCCESS;
if (type != expected_type) {
tdfs->operations[opidx].uploads[found].status = UPLOAD_FAILED;
} else {
tdfs->operations[opidx].uploads[found].status = UPLOAD_COMPLETED; tdfs->operations[opidx].uploads[found].status = UPLOAD_COMPLETED;
tdfs->operations[opidx].uploads[found].final_hash = hash; tdfs->operations[opidx].uploads[found].final_hash = hash;
for (int i = 0; i < tdfs->operations[opidx].num_uploads; i++) { for (int i = 0; i < tdfs->operations[opidx].num_uploads; i++) {
@@ -1694,13 +1696,44 @@ static void process_event_for_write(TinyDFS *tdfs,
free(upload_results); free(upload_results);
if (metadata_server_request_end(tdfs, &writer, opidx, TAG_COMMIT_WRITE) < 0) { if (metadata_server_request_end(tdfs, &writer, opidx, TAG_COMMIT_WRITE) < 0) {
// TODO assert(0); // TODO
} }
} }
} else { } else {
assert(request_tag == TAG_COMMIT_WRITE); assert(request_tag == TAG_COMMIT_WRITE);
BinaryReader reader = { msg.ptr, msg.len, 0 };
// version
if (!binary_read(&reader, NULL, sizeof(uint16_t))) {
tdfs->operations[opidx].result = (TinyDFS_Result) { .type=TINYDFS_RESULT_WRITE_ERROR };
return;
}
uint16_t type;
if (!binary_read(&reader, &type, sizeof(uint16_t))) {
tdfs->operations[opidx].result = (TinyDFS_Result) { .type=TINYDFS_RESULT_WRITE_ERROR };
return;
}
// length
if (!binary_read(&reader, NULL, sizeof(uint32_t))) {
tdfs->operations[opidx].result = (TinyDFS_Result) { .type=TINYDFS_RESULT_WRITE_ERROR };
return;
}
if (binary_read(&reader, NULL, 1)) {
tdfs->operations[opidx].result = (TinyDFS_Result) { .type=TINYDFS_RESULT_WRITE_ERROR };
return;
}
if (type != MESSAGE_TYPE_WRITE_SUCCESS) {
tdfs->operations[opidx].result = (TinyDFS_Result) { .type=TINYDFS_RESULT_WRITE_ERROR };
return;
}
tdfs->operations[opidx].result = (TinyDFS_Result) { .type=TINYDFS_RESULT_WRITE_SUCCESS }; tdfs->operations[opidx].result = (TinyDFS_Result) { .type=TINYDFS_RESULT_WRITE_SUCCESS };
} }
} }
@@ -1866,7 +1899,9 @@ int tinydfs_process_events(TinyDFS *tdfs, void **contexts, struct pollfd *polled
Request req; Request req;
if (request_queue_pop(reqs, &req) < 0) { if (request_queue_pop(reqs, &req) < 0) {
UNREACHABLE; // Unexpected message
tcp_consume_message(&tdfs->tcp, conn_idx);
continue;
} }
process_event(tdfs, req.opidx, req.tag, msg); process_event(tdfs, req.opidx, req.tag, msg);