Remove redundant embedded download entry and update service-stop request
This commit is contained in:
1 parent
c81cc8b9ca
commit
02e1526115
3 files changed
+1
-3
No files matched your search
@@ -859,7 +859,6 @@ int media_download_start(struct UTUN_INSTANCE* inst, uint64_t group_id,
|
||||
md->downloads = queue_new(inst->ua, 256, offsetof(struct media_download, media_id), 16, "md_dl");
|
||||
if (!md->downloads) { DEBUG_ERROR(DEBUG_CATEGORY_GENERAL, "%s: queue_new(downloads) failed", MDL_ID); u_free(dl->blocks); u_free(dl->block_sigs); u_free(dl); return -1; }
|
||||
}
|
||||
memcpy(dl->ll.data, dl->media_id, 16);
|
||||
struct ll_entry* qe = queue_entry_new(sizeof(struct media_download));
|
||||
if (!qe) { DEBUG_ERROR(DEBUG_CATEGORY_GENERAL, "%s: queue_entry_new(download) failed", MDL_ID); u_free(dl->blocks); u_free(dl->block_sigs); u_free(dl); return -1; }
|
||||
memcpy(qe->data, dl, sizeof(*dl));
|
||||
|
||||
@@ -133,7 +133,6 @@ static struct media_download* make_test_dl(sqlite3* db, struct UTUN_INSTANCE* in
|
||||
size_t key_size = 32;
|
||||
if (!author || EVP_PKEY_get_raw_public_key(author, dl->author_pubkey, &key_size) != 1) exit(1);
|
||||
EVP_PKEY_free(author);
|
||||
memcpy(dl->ll.data, dl->media_id, 16);
|
||||
|
||||
struct ll_entry* qe = queue_entry_new(sizeof(*dl));
|
||||
if (!qe) { u_free(dl->blocks); u_free(dl->block_sigs); u_free(dl); return NULL; }
|
||||
|
||||
@@ -196,7 +196,7 @@ int main(void) {
|
||||
etcp_router_on_send_ready(inst, chat_id, node.node_id, ETCP_RT_ID_MEDIA_DELIVERY, &waiter, ready, &ready_calls);
|
||||
assert(waiter.call_soon_id);
|
||||
etcp_router_cancel_send_ready(inst, chat_id, node.node_id, ETCP_RT_ID_MEDIA_DELIVERY, &waiter);
|
||||
struct media_pkt_block_req request = { .subcmd = MEDIA_SUBCMD_BLOCK_REQ, .group_id = chat_id };
|
||||
struct media_pkt_block_req request = {.subcmd = MEDIA_SUBCMD_BLOCK_REQ, .transfer_id = {1}};
|
||||
memcpy(request.media_id, media_id, 16); memcpy(request.block_id, block_id, 16);
|
||||
struct ll_entry* packet = ll_alloc_lldgram(ROUTER_SVC_PAYLOAD_OFF + sizeof(request)); assert(packet);
|
||||
memset(packet->dgram, 0, ROUTER_SVC_PAYLOAD_OFF);
|
||||
|
||||
Reference in new issue
Block a user