midway through refactor, ft done (?)
This commit is contained in:
218
ngc_ft1.cpp
218
ngc_ft1.cpp
@@ -1,6 +1,6 @@
|
||||
#include "./ngc_ft1.h"
|
||||
|
||||
#include "ngc_ext_common.hpp"
|
||||
#include "../tox_ngc_ext/ngc_ext.hpp"
|
||||
|
||||
#include <vector>
|
||||
#include <deque>
|
||||
@@ -104,6 +104,10 @@ struct NGC_FT1 {
|
||||
std::unordered_map<NGC_FT1_file_kind, NGC_FT1_recv_init_cb*> cb_recv_init;
|
||||
std::unordered_map<NGC_FT1_file_kind, NGC_FT1_recv_data_cb*> cb_recv_data;
|
||||
std::unordered_map<NGC_FT1_file_kind, NGC_FT1_send_data_cb*> cb_send_data;
|
||||
std::unordered_map<NGC_FT1_file_kind, void*> ud_recv_request;
|
||||
std::unordered_map<NGC_FT1_file_kind, void*> ud_recv_init;
|
||||
std::unordered_map<NGC_FT1_file_kind, void*> ud_recv_data;
|
||||
std::unordered_map<NGC_FT1_file_kind, void*> ud_send_data;
|
||||
|
||||
struct Group {
|
||||
struct Peer {
|
||||
@@ -167,18 +171,37 @@ static bool _send_pkg_FT1_INIT(const Tox* tox, uint32_t group_number, uint32_t p
|
||||
static bool _send_pkg_FT1_INIT_ACK(const Tox* tox, uint32_t group_number, uint32_t peer_number, uint8_t transfer_id);
|
||||
static bool _send_pkg_FT1_DATA(const Tox* tox, uint32_t group_number, uint32_t peer_number, uint8_t transfer_id, uint16_t sequence_id, const uint8_t* data, size_t data_size);
|
||||
static bool _send_pkg_FT1_DATA_ACK(const Tox* tox, uint32_t group_number, uint32_t peer_number, uint8_t transfer_id, const uint16_t* seq_ids, size_t seq_ids_size);
|
||||
//static bool _send_pkg_FT1_DATA_FIN(const Tox* tox, uint32_t group_number, uint32_t peer_number, uint8_t transfer_id);
|
||||
//static bool _send_pkg_FT1_DATA_FIN_ACK(const Tox* tox, uint32_t group_number, uint32_t peer_number, uint8_t transfer_id);
|
||||
|
||||
// handle pkgs
|
||||
static void _handle_FT1_REQUEST(Tox* tox, NGC_EXT_CTX* ngc_ext_ctx, uint32_t group_number, uint32_t peer_number, const uint8_t *data, size_t length);
|
||||
static void _handle_FT1_INIT(Tox* tox, NGC_EXT_CTX* ngc_ext_ctx, uint32_t group_number, uint32_t peer_number, const uint8_t *data, size_t length);
|
||||
static void _handle_FT1_INIT_ACK(Tox* tox, NGC_EXT_CTX* ngc_ext_ctx, uint32_t group_number, uint32_t peer_number, const uint8_t *data, size_t length);
|
||||
static void _handle_FT1_DATA(Tox* tox, NGC_EXT_CTX* ngc_ext_ctx, uint32_t group_number, uint32_t peer_number, const uint8_t *data, size_t length);
|
||||
static void _handle_FT1_DATA_ACK(Tox* tox, NGC_EXT_CTX* ngc_ext_ctx, uint32_t group_number, uint32_t peer_number, const uint8_t *data, size_t length);
|
||||
//static void _handle_FT1_DATA_FIN(Tox* tox, NGC_EXT_CTX* ngc_ext_ctx, uint32_t group_number, uint32_t peer_number, const uint8_t *data, size_t length);
|
||||
//static void _handle_FT1_DATA_FIN_ACK(Tox* tox, NGC_EXT_CTX* ngc_ext_ctx, uint32_t group_number, uint32_t peer_number, const uint8_t *data, size_t length);
|
||||
static void _handle_FT1_REQUEST(Tox* tox, NGC_EXT_CTX* ngc_ext_ctx, uint32_t group_number, uint32_t peer_number, const uint8_t *data, size_t length, void* user_data);
|
||||
static void _handle_FT1_INIT(Tox* tox, NGC_EXT_CTX* ngc_ext_ctx, uint32_t group_number, uint32_t peer_number, const uint8_t *data, size_t length, void* user_data);
|
||||
static void _handle_FT1_INIT_ACK(Tox* tox, NGC_EXT_CTX* ngc_ext_ctx, uint32_t group_number, uint32_t peer_number, const uint8_t *data, size_t length, void* user_data);
|
||||
static void _handle_FT1_DATA(Tox* tox, NGC_EXT_CTX* ngc_ext_ctx, uint32_t group_number, uint32_t peer_number, const uint8_t *data, size_t length, void* user_data);
|
||||
static void _handle_FT1_DATA_ACK(Tox* tox, NGC_EXT_CTX* ngc_ext_ctx, uint32_t group_number, uint32_t peer_number, const uint8_t *data, size_t length, void* user_data);
|
||||
|
||||
NGC_FT1* NGC_FT1_new(const struct NGC_FT1_options* options) {
|
||||
NGC_FT1* ngc_ft1_ctx = new NGC_FT1;
|
||||
ngc_ft1_ctx->options = *options;
|
||||
return ngc_ft1_ctx;
|
||||
}
|
||||
|
||||
bool NGC_FT1_register_ext(NGC_FT1* ngc_ft1_ctx, NGC_EXT_CTX* ngc_ext_ctx) {
|
||||
ngc_ext_ctx->callbacks[NGC_EXT::FT1_REQUEST] = _handle_FT1_REQUEST;
|
||||
ngc_ext_ctx->callbacks[NGC_EXT::FT1_INIT] = _handle_FT1_INIT;
|
||||
ngc_ext_ctx->callbacks[NGC_EXT::FT1_INIT_ACK] = _handle_FT1_INIT_ACK;
|
||||
ngc_ext_ctx->callbacks[NGC_EXT::FT1_DATA] = _handle_FT1_DATA;
|
||||
ngc_ext_ctx->callbacks[NGC_EXT::FT1_DATA_ACK] = _handle_FT1_DATA_ACK;
|
||||
|
||||
ngc_ext_ctx->user_data[NGC_EXT::FT1_REQUEST] = ngc_ft1_ctx;
|
||||
ngc_ext_ctx->user_data[NGC_EXT::FT1_INIT] = ngc_ft1_ctx;
|
||||
ngc_ext_ctx->user_data[NGC_EXT::FT1_INIT_ACK] = ngc_ft1_ctx;
|
||||
ngc_ext_ctx->user_data[NGC_EXT::FT1_DATA] = ngc_ft1_ctx;
|
||||
ngc_ext_ctx->user_data[NGC_EXT::FT1_DATA_ACK] = ngc_ft1_ctx;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
#if 0
|
||||
bool NGC_FT1_init(NGC_EXT_CTX* ngc_ext_ctx, const struct NGC_FT1_options* options) {
|
||||
ngc_ext_ctx->ngc_ft1_ctx = new NGC_FT1;
|
||||
ngc_ext_ctx->ngc_ft1_ctx->options = *options;
|
||||
@@ -191,17 +214,24 @@ bool NGC_FT1_init(NGC_EXT_CTX* ngc_ext_ctx, const struct NGC_FT1_options* option
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
void NGC_FT1_kill(NGC_FT1* ngc_ft1_ctx) {
|
||||
delete ngc_ft1_ctx;
|
||||
}
|
||||
|
||||
#if 0
|
||||
void NGC_FT1_kill(NGC_EXT_CTX* ngc_ext_ctx) {
|
||||
delete ngc_ext_ctx->ngc_ft1_ctx;
|
||||
ngc_ext_ctx->ngc_ft1_ctx = nullptr;
|
||||
}
|
||||
#endif
|
||||
|
||||
void NGC_FT1_iterate(Tox *tox, NGC_EXT_CTX* ngc_ext_ctx/*, void *user_data*/) {
|
||||
assert(ngc_ext_ctx);
|
||||
assert(ngc_ext_ctx->ngc_ft1_ctx);
|
||||
void NGC_FT1_iterate(Tox *tox, NGC_FT1* ngc_ft1_ctx) {
|
||||
//void NGC_FT1_iterate(Tox *tox, NGC_EXT_CTX* ngc_ext_ctx/*, void *user_data*/) {
|
||||
assert(ngc_ft1_ctx);
|
||||
|
||||
for (auto& [group_number, group] : ngc_ext_ctx->ngc_ft1_ctx->groups) {
|
||||
for (auto& [group_number, group] : ngc_ft1_ctx->groups) {
|
||||
for (auto& [peer_number, peer] : group.peers) {
|
||||
//for (auto& tf_opt : peer.send_transfers) {
|
||||
for (size_t idx = 0; idx < peer.send_transfers.size(); idx++) {
|
||||
@@ -238,7 +268,7 @@ void NGC_FT1_iterate(Tox *tox, NGC_EXT_CTX* ngc_ext_ctx/*, void *user_data*/) {
|
||||
}
|
||||
});
|
||||
|
||||
assert(ngc_ext_ctx->ngc_ft1_ctx->cb_send_data.count(tf.file_kind));
|
||||
assert(ngc_ft1_ctx->cb_send_data.count(tf.file_kind));
|
||||
|
||||
// if chunks in flight < window size (1 lol)
|
||||
while (tf.ssb.size() < 1) {
|
||||
@@ -252,7 +282,14 @@ void NGC_FT1_iterate(Tox *tox, NGC_EXT_CTX* ngc_ext_ctx/*, void *user_data*/) {
|
||||
|
||||
new_data.resize(chunk_size);
|
||||
|
||||
ngc_ext_ctx->ngc_ft1_ctx->cb_send_data[tf.file_kind](tox, ngc_ext_ctx, group_number, peer_number, idx, tf.file_size_current, new_data.data(), new_data.size());
|
||||
ngc_ft1_ctx->cb_send_data[tf.file_kind](
|
||||
tox,
|
||||
group_number, peer_number,
|
||||
idx,
|
||||
tf.file_size_current,
|
||||
new_data.data(), new_data.size(),
|
||||
ngc_ft1_ctx->ud_send_data.count(tf.file_kind) ? ngc_ft1_ctx->ud_send_data.at(tf.file_kind) : nullptr
|
||||
);
|
||||
uint16_t seq_id = tf.ssb.add(std::move(new_data));
|
||||
_send_pkg_FT1_DATA(tox, group_number, peer_number, idx, seq_id, tf.ssb.entries.at(seq_id).data.data(), tf.ssb.entries.at(seq_id).data.size());
|
||||
|
||||
@@ -279,69 +316,55 @@ void NGC_FT1_iterate(Tox *tox, NGC_EXT_CTX* ngc_ext_ctx/*, void *user_data*/) {
|
||||
}
|
||||
|
||||
void NGC_FT1_register_callback_recv_request(
|
||||
NGC_EXT_CTX* ngc_ext_ctx,
|
||||
NGC_FT1* ngc_ft1_ctx,
|
||||
NGC_FT1_file_kind file_kind,
|
||||
NGC_FT1_recv_request_cb* callback
|
||||
NGC_FT1_recv_request_cb* callback,
|
||||
void* user_data
|
||||
) {
|
||||
assert(ngc_ext_ctx);
|
||||
assert(ngc_ext_ctx->ngc_ft1_ctx);
|
||||
assert(ngc_ft1_ctx);
|
||||
|
||||
ngc_ext_ctx->ngc_ft1_ctx->cb_recv_request[file_kind] = callback;
|
||||
ngc_ft1_ctx->cb_recv_request[file_kind] = callback;
|
||||
ngc_ft1_ctx->ud_recv_request[file_kind] = user_data;
|
||||
}
|
||||
|
||||
void NGC_FT1_register_callback_recv_init(
|
||||
NGC_EXT_CTX* ngc_ext_ctx,
|
||||
NGC_FT1* ngc_ft1_ctx,
|
||||
NGC_FT1_file_kind file_kind,
|
||||
NGC_FT1_recv_init_cb* callback
|
||||
NGC_FT1_recv_init_cb* callback,
|
||||
void* user_data
|
||||
) {
|
||||
assert(ngc_ext_ctx);
|
||||
assert(ngc_ext_ctx->ngc_ft1_ctx);
|
||||
assert(ngc_ft1_ctx);
|
||||
|
||||
ngc_ext_ctx->ngc_ft1_ctx->cb_recv_init[file_kind] = callback;
|
||||
ngc_ft1_ctx->cb_recv_init[file_kind] = callback;
|
||||
ngc_ft1_ctx->ud_recv_init[file_kind] = user_data;
|
||||
}
|
||||
|
||||
void NGC_FT1_register_callback_recv_data(
|
||||
NGC_EXT_CTX* ngc_ext_ctx,
|
||||
NGC_FT1* ngc_ft1_ctx,
|
||||
NGC_FT1_file_kind file_kind,
|
||||
NGC_FT1_recv_data_cb* callback
|
||||
NGC_FT1_recv_data_cb* callback,
|
||||
void* user_data
|
||||
) {
|
||||
assert(ngc_ext_ctx);
|
||||
assert(ngc_ext_ctx->ngc_ft1_ctx);
|
||||
assert(ngc_ft1_ctx);
|
||||
|
||||
ngc_ext_ctx->ngc_ft1_ctx->cb_recv_data[file_kind] = callback;
|
||||
ngc_ft1_ctx->cb_recv_data[file_kind] = callback;
|
||||
ngc_ft1_ctx->ud_recv_data[file_kind] = user_data;
|
||||
}
|
||||
|
||||
void NGC_FT1_register_callback_send_data(
|
||||
NGC_EXT_CTX* ngc_ext_ctx,
|
||||
NGC_FT1* ngc_ft1_ctx,
|
||||
NGC_FT1_file_kind file_kind,
|
||||
NGC_FT1_send_data_cb* callback
|
||||
NGC_FT1_send_data_cb* callback,
|
||||
void* user_data
|
||||
) {
|
||||
assert(ngc_ext_ctx);
|
||||
assert(ngc_ext_ctx->ngc_ft1_ctx);
|
||||
assert(ngc_ft1_ctx);
|
||||
|
||||
ngc_ext_ctx->ngc_ft1_ctx->cb_send_data[file_kind] = callback;
|
||||
}
|
||||
|
||||
void NGC_FT1_send_request(
|
||||
Tox *tox, NGC_EXT_CTX* ngc_ext_ctx,
|
||||
|
||||
uint32_t group_number,
|
||||
|
||||
NGC_FT1_file_kind file_kind,
|
||||
|
||||
const uint8_t* file_id,
|
||||
size_t file_id_size
|
||||
) {
|
||||
// just call private for every peer in group?
|
||||
for (;;) {
|
||||
uint32_t peer_number = 0;
|
||||
NGC_FT1_send_request_private(tox, ngc_ext_ctx, group_number, peer_number, file_kind, file_id, file_id_size);
|
||||
assert(false && "not implemented");
|
||||
}
|
||||
ngc_ft1_ctx->cb_send_data[file_kind] = callback;
|
||||
ngc_ft1_ctx->ud_send_data[file_kind] = user_data;
|
||||
}
|
||||
|
||||
void NGC_FT1_send_request_private(
|
||||
Tox *tox, NGC_EXT_CTX* ngc_ext_ctx,
|
||||
Tox *tox, NGC_FT1* ngc_ft1_ctx,
|
||||
|
||||
uint32_t group_number,
|
||||
uint32_t peer_number,
|
||||
@@ -352,8 +375,7 @@ void NGC_FT1_send_request_private(
|
||||
size_t file_id_size
|
||||
) {
|
||||
assert(tox);
|
||||
assert(ngc_ext_ctx);
|
||||
assert(ngc_ext_ctx->ngc_ft1_ctx);
|
||||
assert(ngc_ft1_ctx);
|
||||
|
||||
// record locally that we sent(or want to send) the request?
|
||||
|
||||
@@ -361,7 +383,7 @@ void NGC_FT1_send_request_private(
|
||||
}
|
||||
|
||||
bool NGC_FT1_send_init_private(
|
||||
Tox *tox, NGC_EXT_CTX* ngc_ext_ctx,
|
||||
Tox *tox, NGC_FT1* ngc_ft1_ctx,
|
||||
uint32_t group_number, uint32_t peer_number,
|
||||
NGC_FT1_file_kind file_kind,
|
||||
const uint8_t* file_id, size_t file_id_size,
|
||||
@@ -376,7 +398,7 @@ bool NGC_FT1_send_init_private(
|
||||
return false;
|
||||
}
|
||||
|
||||
auto& peer = ngc_ext_ctx->ngc_ft1_ctx->groups[group_number].peers[peer_number];
|
||||
auto& peer = ngc_ft1_ctx->groups[group_number].peers[peer_number];
|
||||
|
||||
// allocate transfer_id
|
||||
size_t idx = peer.next_send_transfer_idx;
|
||||
@@ -425,7 +447,7 @@ static bool _send_pkg_FT1_REQUEST(const Tox* tox, uint32_t group_number, uint32_
|
||||
// - 1 byte (TODO: more?) file_kind
|
||||
// - X bytes file_id
|
||||
std::vector<uint8_t> pkg;
|
||||
pkg.push_back(FT1_REQUEST);
|
||||
pkg.push_back(NGC_EXT::FT1_REQUEST);
|
||||
pkg.push_back(file_kind);
|
||||
for (size_t i = 0; i < file_id_size; i++) {
|
||||
pkg.push_back(file_id[i]);
|
||||
@@ -443,7 +465,7 @@ static bool _send_pkg_FT1_INIT(const Tox* tox, uint32_t group_number, uint32_t p
|
||||
// - X bytes (file_kind dependent id, differnt sizes)
|
||||
|
||||
std::vector<uint8_t> pkg;
|
||||
pkg.push_back(FT1_INIT);
|
||||
pkg.push_back(NGC_EXT::FT1_INIT);
|
||||
pkg.push_back(file_kind);
|
||||
for (size_t i = 0; i < sizeof(file_size); i++) {
|
||||
pkg.push_back((file_size>>(i*8)) & 0xff);
|
||||
@@ -462,7 +484,7 @@ static bool _send_pkg_FT1_INIT_ACK(const Tox* tox, uint32_t group_number, uint32
|
||||
// - 1 byte packet id
|
||||
// - 1 byte transfer_id
|
||||
std::vector<uint8_t> pkg;
|
||||
pkg.push_back(FT1_INIT_ACK);
|
||||
pkg.push_back(NGC_EXT::FT1_INIT_ACK);
|
||||
pkg.push_back(transfer_id);
|
||||
|
||||
// lossless
|
||||
@@ -476,7 +498,7 @@ static bool _send_pkg_FT1_DATA(const Tox* tox, uint32_t group_number, uint32_t p
|
||||
// check header_size+data_size <= max pkg size
|
||||
|
||||
std::vector<uint8_t> pkg;
|
||||
pkg.push_back(FT1_DATA);
|
||||
pkg.push_back(NGC_EXT::FT1_DATA);
|
||||
pkg.push_back(transfer_id);
|
||||
pkg.push_back(sequence_id & 0xff);
|
||||
pkg.push_back((sequence_id >> (1*8)) & 0xff);
|
||||
@@ -492,7 +514,7 @@ static bool _send_pkg_FT1_DATA(const Tox* tox, uint32_t group_number, uint32_t p
|
||||
|
||||
static bool _send_pkg_FT1_DATA_ACK(const Tox* tox, uint32_t group_number, uint32_t peer_number, uint8_t transfer_id, const uint16_t* seq_ids, size_t seq_ids_size) {
|
||||
std::vector<uint8_t> pkg;
|
||||
pkg.push_back(FT1_DATA_ACK);
|
||||
pkg.push_back(NGC_EXT::FT1_DATA_ACK);
|
||||
pkg.push_back(transfer_id);
|
||||
|
||||
// TODO: optimize
|
||||
@@ -505,15 +527,6 @@ static bool _send_pkg_FT1_DATA_ACK(const Tox* tox, uint32_t group_number, uint32
|
||||
return tox_group_send_custom_private_packet(tox, group_number, peer_number, true, pkg.data(), pkg.size(), nullptr);
|
||||
}
|
||||
|
||||
//static bool _send_pkg_FT1_DATA_FIN(const Tox* tox, uint32_t group_number, uint32_t peer_number, uint8_t transfer_id) {
|
||||
//std::vector<uint8_t> pkg;
|
||||
//pkg.push_back(FT1_DATA_FIN);
|
||||
//pkg.push_back(transfer_id);
|
||||
|
||||
//// lossless?
|
||||
//return tox_group_send_custom_private_packet(tox, group_number, peer_number, true, pkg.data(), pkg.size(), nullptr);
|
||||
//}
|
||||
|
||||
#define _DATA_HAVE(x, error) if ((length - curser) < (x)) { error; }
|
||||
|
||||
static void _handle_FT1_REQUEST(
|
||||
@@ -524,8 +537,10 @@ static void _handle_FT1_REQUEST(
|
||||
uint32_t peer_number,
|
||||
|
||||
const uint8_t *data,
|
||||
size_t length
|
||||
size_t length,
|
||||
void* user_data
|
||||
) {
|
||||
NGC_FT1* ngc_ft1_ctx = static_cast<NGC_FT1*>(user_data);
|
||||
size_t curser = 0;
|
||||
|
||||
// TODO: might be uint16_t or even larger
|
||||
@@ -541,11 +556,15 @@ static void _handle_FT1_REQUEST(
|
||||
fprintf(stderr, "]\n");
|
||||
|
||||
NGC_FT1_recv_request_cb* fn_ptr = nullptr;
|
||||
if (ngc_ext_ctx->ngc_ft1_ctx->cb_recv_request.count(file_kind)) {
|
||||
fn_ptr = ngc_ext_ctx->ngc_ft1_ctx->cb_recv_request.at(file_kind);
|
||||
if (ngc_ft1_ctx->cb_recv_request.count(file_kind)) {
|
||||
fn_ptr = ngc_ft1_ctx->cb_recv_request.at(file_kind);
|
||||
}
|
||||
void* ud_ptr = nullptr;
|
||||
if (ngc_ft1_ctx->ud_recv_request.count(file_kind)) {
|
||||
ud_ptr = ngc_ft1_ctx->ud_recv_request.at(file_kind);
|
||||
}
|
||||
if (fn_ptr) {
|
||||
fn_ptr(tox, ngc_ext_ctx, group_number, peer_number, data+curser, length-curser);
|
||||
fn_ptr(tox, group_number, peer_number, data+curser, length-curser, ud_ptr);
|
||||
} else {
|
||||
fprintf(stderr, "FT: missing cb for requests\n");
|
||||
}
|
||||
@@ -559,8 +578,10 @@ static void _handle_FT1_INIT(
|
||||
uint32_t peer_number,
|
||||
|
||||
const uint8_t *data,
|
||||
size_t length
|
||||
size_t length,
|
||||
void* user_data
|
||||
) {
|
||||
NGC_FT1* ngc_ft1_ctx = static_cast<NGC_FT1*>(user_data);
|
||||
size_t curser = 0;
|
||||
|
||||
// - 1 byte (file_kind)
|
||||
@@ -596,13 +617,17 @@ static void _handle_FT1_INIT(
|
||||
// did we allready ack this and the other side just did not see the ack?
|
||||
|
||||
NGC_FT1_recv_init_cb* fn_ptr = nullptr;
|
||||
if (ngc_ext_ctx->ngc_ft1_ctx->cb_recv_init.count(file_kind)) {
|
||||
fn_ptr = ngc_ext_ctx->ngc_ft1_ctx->cb_recv_init.at(file_kind);
|
||||
if (ngc_ft1_ctx->cb_recv_init.count(file_kind)) {
|
||||
fn_ptr = ngc_ft1_ctx->cb_recv_init.at(file_kind);
|
||||
}
|
||||
void* ud_ptr = nullptr;
|
||||
if (ngc_ft1_ctx->ud_recv_init.count(file_kind)) {
|
||||
ud_ptr = ngc_ft1_ctx->ud_recv_init.at(file_kind);
|
||||
}
|
||||
bool accept_ft;
|
||||
if (fn_ptr) {
|
||||
// last part of message (file_id) is not yet parsed, just give it to cb
|
||||
accept_ft = fn_ptr(tox, ngc_ext_ctx, group_number, peer_number, data+curser, length-curser, transfer_id, file_size);
|
||||
accept_ft = fn_ptr(tox, group_number, peer_number, data+curser, length-curser, transfer_id, file_size, ud_ptr);
|
||||
} else {
|
||||
fprintf(stderr, "FT: missing cb for init\n");
|
||||
accept_ft = false;
|
||||
@@ -611,7 +636,7 @@ static void _handle_FT1_INIT(
|
||||
if (accept_ft) {
|
||||
_send_pkg_FT1_INIT_ACK(tox, group_number, peer_number, transfer_id);
|
||||
fprintf(stderr, "FT: accepted init\n");
|
||||
auto& peer = ngc_ext_ctx->ngc_ft1_ctx->groups[group_number].peers[peer_number];
|
||||
auto& peer = ngc_ft1_ctx->groups[group_number].peers[peer_number];
|
||||
if (peer.recv_transfers[transfer_id].has_value()) {
|
||||
fprintf(stderr, "FT: overwriting existing recv_transfer %d\n", transfer_id);
|
||||
}
|
||||
@@ -637,8 +662,10 @@ static void _handle_FT1_INIT_ACK(
|
||||
uint32_t peer_number,
|
||||
|
||||
const uint8_t *data,
|
||||
size_t length
|
||||
size_t length,
|
||||
void* user_data
|
||||
) {
|
||||
NGC_FT1* ngc_ft1_ctx = static_cast<NGC_FT1*>(user_data);
|
||||
size_t curser = 0;
|
||||
|
||||
// - 1 byte (transfer_id)
|
||||
@@ -648,7 +675,7 @@ static void _handle_FT1_INIT_ACK(
|
||||
|
||||
// we now should start sending data
|
||||
|
||||
auto& groups = ngc_ext_ctx->ngc_ft1_ctx->groups;
|
||||
auto& groups = ngc_ft1_ctx->groups;
|
||||
if (!groups.count(group_number)) {
|
||||
fprintf(stderr, "FT: init_ack for unknown group\n");
|
||||
return;
|
||||
@@ -680,8 +707,10 @@ static void _handle_FT1_DATA(
|
||||
uint32_t group_number,
|
||||
uint32_t peer_number,
|
||||
|
||||
const uint8_t *data, size_t length
|
||||
const uint8_t *data, size_t length,
|
||||
void* user_data
|
||||
) {
|
||||
NGC_FT1* ngc_ft1_ctx = static_cast<NGC_FT1*>(user_data);
|
||||
size_t curser = 0;
|
||||
|
||||
// - 1 byte (transfer_id)
|
||||
@@ -700,7 +729,7 @@ static void _handle_FT1_DATA(
|
||||
return;
|
||||
}
|
||||
|
||||
auto& groups = ngc_ext_ctx->ngc_ft1_ctx->groups;
|
||||
auto& groups = ngc_ft1_ctx->groups;
|
||||
if (!groups.count(group_number)) {
|
||||
fprintf(stderr, "FT: data for unknown group\n");
|
||||
return;
|
||||
@@ -718,8 +747,13 @@ static void _handle_FT1_DATA(
|
||||
transfer.rsb.add(sequence_id, std::vector<uint8_t>(data+curser, data+curser+(length-curser)));
|
||||
|
||||
NGC_FT1_recv_data_cb* fn_ptr = nullptr;
|
||||
if (ngc_ext_ctx->ngc_ft1_ctx->cb_recv_data.count(transfer.file_kind)) {
|
||||
fn_ptr = ngc_ext_ctx->ngc_ft1_ctx->cb_recv_data.at(transfer.file_kind);
|
||||
if (ngc_ft1_ctx->cb_recv_data.count(transfer.file_kind)) {
|
||||
fn_ptr = ngc_ft1_ctx->cb_recv_data.at(transfer.file_kind);
|
||||
}
|
||||
|
||||
void* ud_ptr = nullptr;
|
||||
if (ngc_ft1_ctx->ud_recv_data.count(transfer.file_kind)) {
|
||||
ud_ptr = ngc_ft1_ctx->ud_recv_data.at(transfer.file_kind);
|
||||
}
|
||||
|
||||
if (!fn_ptr) {
|
||||
@@ -731,7 +765,7 @@ static void _handle_FT1_DATA(
|
||||
while (transfer.rsb.canPop()) {
|
||||
auto data = transfer.rsb.pop();
|
||||
|
||||
fn_ptr(tox, ngc_ext_ctx, group_number, peer_number, transfer_id, transfer.file_size_current, data.data(), data.size());
|
||||
fn_ptr(tox, group_number, peer_number, transfer_id, transfer.file_size_current, data.data(), data.size(), ud_ptr);
|
||||
|
||||
transfer.file_size_current += data.size();
|
||||
}
|
||||
@@ -751,8 +785,10 @@ static void _handle_FT1_DATA_ACK(
|
||||
uint32_t peer_number,
|
||||
|
||||
const uint8_t *data,
|
||||
size_t length
|
||||
size_t length,
|
||||
void* user_data
|
||||
) {
|
||||
NGC_FT1* ngc_ft1_ctx = static_cast<NGC_FT1*>(user_data);
|
||||
size_t curser = 0;
|
||||
|
||||
// - 1 byte (transfer_id)
|
||||
@@ -760,7 +796,7 @@ static void _handle_FT1_DATA_ACK(
|
||||
_DATA_HAVE(sizeof(transfer_id), fprintf(stderr, "FT: packet too small, missing transfer_id\n"); return)
|
||||
transfer_id = data[curser++];
|
||||
|
||||
auto& groups = ngc_ext_ctx->ngc_ft1_ctx->groups;
|
||||
auto& groups = ngc_ft1_ctx->groups;
|
||||
if (!groups.count(group_number)) {
|
||||
fprintf(stderr, "FT: data_ack for unknown group\n");
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user