Compare commits

...

3 Commits

Author SHA1 Message Date
026bf080c3 move packet ids around 2023-08-06 18:35:02 +02:00
2b186a3071 missing include 2023-01-16 17:05:10 +01:00
fc13d93d42 reduce log spam 2023-01-16 15:30:46 +01:00
2 changed files with 12 additions and 2 deletions

View File

@ -1,8 +1,13 @@
#include "./ngc_ext.hpp"
//#include <cstdint>
#include <cstdio>
#include <new>
#ifndef EXTRA_LOGGING
#define EXTRA_LOGGING 0
#endif
using namespace NGC_EXT;
// global scope
@ -42,7 +47,9 @@ void NGC_EXT_handle_group_custom_packet(
PacketType pkg_type = static_cast<PacketType>(*(data + curser));
curser++;
#if defined(EXTRA_LOGGING) && EXTRA_LOGGING == 1
fprintf(stderr, "EX: custom_packet [%s] %lu\n", pkgid2str(pkg_type), length);
#endif
if (pkg_type == INVALID) {
fprintf(stderr, "(invalid)\n");
@ -52,7 +59,9 @@ void NGC_EXT_handle_group_custom_packet(
auto handle_fn = ngc_ext_ctx->callbacks[pkg_type];
auto handle_ud = ngc_ext_ctx->user_data[pkg_type]; // can be null
if (handle_fn == nullptr) {
#if defined(EXTRA_LOGGING) && EXTRA_LOGGING == 1
fprintf(stderr, "EX: !!! no handler for packet\n");
#endif
return;
}

View File

@ -27,6 +27,7 @@ struct NGC_EXT_CTX {
namespace NGC_EXT {
// start with first bit set, to avoid collisions (this will have to change, since those will be standadized?)
enum PacketType : uint8_t {
// TODO: why?
INVALID = 0u,
@ -35,7 +36,7 @@ enum PacketType : uint8_t {
// request last (few) message_ids for a peer
// - peer_key bytes (peer key we want to know ids for)
// - 1 byte (uint8_t count ids, atleast 1)
HS1_REQUEST_LAST_IDS = 1u,
HS1_REQUEST_LAST_IDS = 0x80 | 1u,
// respond to a request with 0 or more message ids, sorted by newest first
// - peer_key bytes (the msg_ids are from)
@ -48,7 +49,7 @@ enum PacketType : uint8_t {
// request the other side to initiate a FT
// - 1 byte (file_kind)
// - X bytes (file_kind dependent id, differnt sizes)
FT1_REQUEST = 8u,
FT1_REQUEST = 0x80 | 8u,
// TODO: request result negative, speed up not found