Green-Sky/NGC_HS1
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add logging cats

Browse Source
This commit is contained in:
Green Sky
2023-01-04 20:25:41 +01:00
parent d4f3d3c4fb
commit 6852cdd046
3 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ngc_ft1.cpp
View File

@@ -126,12 +126,12 @@ void NGC_FT1_iterate(Tox *tox, NGC_EXT_CTX* ngc_ext_ctx/*, void *user_data*/) {
if (tf.time_since_activity >= 20.f) {
if (tf.inits_sent >= 3) {
// delete, timed out 3 times
fprintf(stderr, "warning, ft init timed out, deleting\n");
fprintf(stderr, "FT: warning, ft init timed out, deleting\n");
tf_opt.reset();
continue;
} else {
// timed out, resend
fprintf(stderr, "warning, ft init timed out, resending\n");
fprintf(stderr, "FT: warning, ft init timed out, resending\n");
_send_pkg_FT1_INIT(tox, group_number, peer_number, tf.file_kind, tf.file_size, idx, tf.file_id.data(), tf.file_id.size());
tf.inits_sent++;
tf.time_since_activity = 0.f;
@@ -146,7 +146,7 @@ void NGC_FT1_iterate(Tox *tox, NGC_EXT_CTX* ngc_ext_ctx/*, void *user_data*/) {
// finfin o.o
default: // invalid state, delete
fprintf(stderr, "error, ft in invalid state, deleting\n");
fprintf(stderr, "FT: error, ft in invalid state, deleting\n");
tf_opt.reset();
continue;
}
@@ -255,10 +255,10 @@ bool NGC_FT1_send_init_private(
size_t file_size
) {
//fprintf(stderr, "TODO: init ft for %08X\n", msg_id);
fprintf(stderr, "init ft\n");
fprintf(stderr, "FT: init ft\n");
if (tox_group_peer_get_connection_status(tox, group_number, peer_number, nullptr) == TOX_CONNECTION_NONE) {
fprintf(stderr, "error: cant init ft, peer offline\n");
fprintf(stderr, "FT: error: cant init ft, peer offline\n");
return false;
}
@@ -282,7 +282,7 @@ bool NGC_FT1_send_init_private(
} while (i != idx);
if (!found) {
fprintf(stderr, "error: cant init ft, no free transfer slot\n");
fprintf(stderr, "FT: error: cant init ft, no free transfer slot\n");
return false;
}
}
@@ -420,11 +420,11 @@ static void _handle_FT1_REQUEST(
// TODO: might be uint16_t or even larger
uint8_t file_kind_u8;
_DATA_HAVE(sizeof(file_kind_u8), fprintf(stderr, "packet too small, missing file_kind\n"); return)
_DATA_HAVE(sizeof(file_kind_u8), fprintf(stderr, "FT: packet too small, missing file_kind\n"); return)
file_kind_u8 = data[curser++];
auto file_kind = static_cast<NGC_FT1_file_kind>(file_kind_u8);
fprintf(stderr, "got FT request with file_kind %u [", file_kind_u8);
fprintf(stderr, "FT: got FT request with file_kind %u [", file_kind_u8);
for (size_t curser_copy = curser; curser_copy < length; curser_copy++) {
fprintf(stderr, "%02X", data[curser_copy]);
}
@@ -437,7 +437,7 @@ static void _handle_FT1_REQUEST(
if (fn_ptr) {
fn_ptr(tox, ngc_ext_ctx, group_number, peer_number, data+curser, length-curser);
} else {
fprintf(stderr, "missing cb for requests\n");
fprintf(stderr, "FT: missing cb for requests\n");
}
}
@@ -458,25 +458,25 @@ static void _handle_FT1_INIT(
// TODO: might be uint16_t or even larger
uint8_t file_kind_u8;
_DATA_HAVE(sizeof(file_kind_u8), fprintf(stderr, "packet too small, missing file_kind\n"); return)
_DATA_HAVE(sizeof(file_kind_u8), fprintf(stderr, "FT: packet too small, missing file_kind\n"); return)
file_kind_u8 = data[curser++];
auto file_kind = static_cast<NGC_FT1_file_kind>(file_kind_u8);
// - 8 bytes (data size)
size_t file_size {0u};
_DATA_HAVE(sizeof(file_size), fprintf(stderr, "packet too small, missing file_size\n"); return)
_DATA_HAVE(sizeof(file_size), fprintf(stderr, "FT: packet too small, missing file_size\n"); return)
for (size_t i = 0; i < sizeof(file_size); i++, curser++) {
file_size |= size_t(data[curser]) << (i*8);
}
// - 1 byte (temporary_file_tf_id, for this peer only, technically just a prefix to distinguish between simultainious fts)
uint8_t transfer_id;
_DATA_HAVE(sizeof(transfer_id), fprintf(stderr, "packet too small, missing transfer_id\n"); return)
_DATA_HAVE(sizeof(transfer_id), fprintf(stderr, "FT: packet too small, missing transfer_id\n"); return)
transfer_id = data[curser++];
// - X bytes (file_kind dependent id, differnt sizes)
fprintf(stderr, "got FT init with file_kind:%u file_size:%lu tf_id:%u [", file_kind_u8, file_size, transfer_id);
fprintf(stderr, "FT: got FT init with file_kind:%u file_size:%lu tf_id:%u [", file_kind_u8, file_size, transfer_id);
for (size_t curser_copy = curser; curser_copy < length; curser_copy++) {
fprintf(stderr, "%02X", data[curser_copy]);
}
@@ -494,16 +494,16 @@ static void _handle_FT1_INIT(
// 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);
} else {
fprintf(stderr, "missing cb for init\n");
fprintf(stderr, "FT: missing cb for init\n");
accept_ft = false;
}
if (accept_ft) {
_send_pkg_FT1_INIT_ACK(tox, group_number, peer_number, transfer_id);
fprintf(stderr, "accepted init\n");
fprintf(stderr, "FT: accepted init\n");
} else {
// TODO deny?
fprintf(stderr, "rejected init\n");
fprintf(stderr, "FT: rejected init\n");
}
}