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

sigma

Browse Source
This commit is contained in:
Green Sky 2024-12-07 11:38:31 +01:00
parent 294c5346ca
commit 231928339e
No known key found for this signature in database
3 changed files with 23 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -124,8 +124,8 @@ endif()
add_library(solanaceae_ngchs2 add_library(solanaceae_ngchs2
./solanaceae/ngc_hs2/ts_find_start.hpp ./solanaceae/ngc_hs2/ts_find_start.hpp
./solanaceae/ngc_hs2/ngc_hs2_send.hpp ./solanaceae/ngc_hs2/ngc_hs2_sigma.hpp
./solanaceae/ngc_hs2/ngc_hs2_send.cpp ./solanaceae/ngc_hs2/ngc_hs2_sigma.cpp
#./solanaceae/ngc_hs2/ngc_hs2_recv.hpp #./solanaceae/ngc_hs2/ngc_hs2_recv.hpp
#./solanaceae/ngc_hs2/ngc_hs2_recv.cpp #./solanaceae/ngc_hs2/ngc_hs2_recv.cpp

79
solanaceae/ngc_hs2/ngc_hs2_send.cpp → solanaceae/ngc_hs2/ngc_hs2_sigma.cpp
View File

@ -1,4 +1,4 @@
#include "./ngc_hs2_send.hpp" #include "./ngc_hs2_sigma.hpp"
#include <solanaceae/util/span.hpp> #include <solanaceae/util/span.hpp>
@ -39,7 +39,7 @@ void IncommingTimeRangeRequestQueue::queueRequest(const TimeRangeRequest& new_re
} // Components } // Components
NGCHS2Send::NGCHS2Send( NGCHS2Sigma::NGCHS2Sigma(
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModelI& rmm, RegistryMessageModelI& rmm,
ToxContactModel2& tcm, ToxContactModel2& tcm,
@ -58,10 +58,10 @@ NGCHS2Send::NGCHS2Send(
; ;
} }
NGCHS2Send::~NGCHS2Send(void) { NGCHS2Sigma::~NGCHS2Sigma(void) {
} }
float NGCHS2Send::iterate(float delta) { float NGCHS2Sigma::iterate(float delta) {
// limit how often we update here (new fts usually) // limit how often we update here (new fts usually)
if (_iterate_heat > 0.f) { if (_iterate_heat > 0.f) {
_iterate_heat -= delta; _iterate_heat -= delta;
@ -147,7 +147,7 @@ float NGCHS2Send::iterate(float delta) {
} }
} }
for (const auto it : to_remove) { for (const auto it : to_remove) {
std::cout << "NGCHS2Send warning: timed out ." << (int)it << "\n"; std::cout << "NGCHS2Sigma warning: timed out ." << (int)it << "\n";
// TODO: need a way to tell ft? // TODO: need a way to tell ft?
irr._list.erase(it); irr._list.erase(it);
// technically we are not supposed to timeout and instead rely on the done event // technically we are not supposed to timeout and instead rely on the done event
@ -173,15 +173,15 @@ static uint64_t deserlSimpleType(ByteSpan bytes) {
return value; return value;
} }
static uint32_t deserlMID(ByteSpan mid_bytes) { //static uint32_t deserlMID(ByteSpan mid_bytes) {
return deserlSimpleType<uint32_t>(mid_bytes); // return deserlSimpleType<uint32_t>(mid_bytes);
} //}
static uint64_t deserlTS(ByteSpan ts_bytes) { static uint64_t deserlTS(ByteSpan ts_bytes) {
return deserlSimpleType<uint64_t>(ts_bytes); return deserlSimpleType<uint64_t>(ts_bytes);
} }
void NGCHS2Send::handleTimeRange(Contact3Handle c, const Events::NGCFT1_recv_request& e) { void NGCHS2Sigma::handleTimeRange(Contact3Handle c, const Events::NGCFT1_recv_request& e) {
ByteSpan fid{e.file_id, e.file_id_size}; ByteSpan fid{e.file_id, e.file_id_size};
// TODO: better size check // TODO: better size check
if (fid.size != sizeof(uint64_t)+sizeof(uint64_t)) { if (fid.size != sizeof(uint64_t)+sizeof(uint64_t)) {
@ -213,50 +213,7 @@ void NGCHS2Send::handleTimeRange(Contact3Handle c, const Events::NGCFT1_recv_req
); );
} }
#if 0 std::vector<uint8_t> NGCHS2Sigma::buildChatLogFileRange(Contact3Handle c, uint64_t ts_start, uint64_t ts_end) {
void NGCHS2Send::handleSingleMessage(Contact3Handle c, const Events::NGCFT1_recv_request& e) {
ByteSpan fid{e.file_id, e.file_id_size};
// TODO: better size check
if (fid.size != 32+sizeof(uint32_t)+sizeof(uint64_t)) {
std::cerr << "NGCHS2S error: singlemessage not lange enough\n";
return;
}
ByteSpan ppk;
uint32_t mid {0};
uint64_t ts {0}; // deciseconds
// parse
try {
// - ppk
// TOX_GROUP_PEER_PUBLIC_KEY_SIZE (32)
ppk = {fid.ptr, 32};
// - mid
ByteSpan mid_bytes{fid.ptr+ppk.size, sizeof(uint32_t)};
mid = deserlMID(mid_bytes);
// - ts
ByteSpan ts_bytes{mid_bytes.ptr+mid_bytes.size, sizeof(uint64_t)};
ts = deserlTS(ts_bytes);
} catch (...) {
std::cerr << "NGCHS2S error: failed to parse singlemessage\n";
return;
}
// for queue, we need group, peer, msg_ppk, msg_mid, msg_ts
// dedupe insert into queue
c.get_or_emplace<Components::IncommingMsgRequestQueue>().queueRequest({
ppk,
mid,
ts,
});
}
#endif
std::vector<uint8_t> NGCHS2Send::buildChatLogFileRange(Contact3Handle c, uint64_t ts_start, uint64_t ts_end) {
const Message3Registry* reg_ptr = static_cast<const RegistryMessageModelI&>(_rmm).get(c); const Message3Registry* reg_ptr = static_cast<const RegistryMessageModelI&>(_rmm).get(c);
if (reg_ptr == nullptr) { if (reg_ptr == nullptr) {
return {}; return {};
@ -368,19 +325,19 @@ std::vector<uint8_t> NGCHS2Send::buildChatLogFileRange(Contact3Handle c, uint64_
return nlohmann::json::to_msgpack(j_array); return nlohmann::json::to_msgpack(j_array);
} }
bool NGCHS2Send::onEvent(const Message::Events::MessageConstruct&) { bool NGCHS2Sigma::onEvent(const Message::Events::MessageConstruct&) {
return false; return false;
} }
bool NGCHS2Send::onEvent(const Message::Events::MessageUpdated&) { bool NGCHS2Sigma::onEvent(const Message::Events::MessageUpdated&) {
return false; return false;
} }
bool NGCHS2Send::onEvent(const Message::Events::MessageDestory&) { bool NGCHS2Sigma::onEvent(const Message::Events::MessageDestory&) {
return false; return false;
} }
bool NGCHS2Send::onEvent(const Events::NGCFT1_recv_request& e) { bool NGCHS2Sigma::onEvent(const Events::NGCFT1_recv_request& e) {
if ( if (
e.file_kind != NGCFT1_file_kind::HS2_RANGE_TIME_MSGPACK e.file_kind != NGCFT1_file_kind::HS2_RANGE_TIME_MSGPACK
) { ) {
@ -415,7 +372,7 @@ bool NGCHS2Send::onEvent(const Events::NGCFT1_recv_request& e) {
return true; return true;
} }
bool NGCHS2Send::onEvent(const Events::NGCFT1_send_data& e) { bool NGCHS2Sigma::onEvent(const Events::NGCFT1_send_data& e) {
auto c = _tcm.getContactGroupPeer(e.group_number, e.peer_number); auto c = _tcm.getContactGroupPeer(e.group_number, e.peer_number);
if (!c) { if (!c) {
return false; return false;
@ -432,7 +389,7 @@ bool NGCHS2Send::onEvent(const Events::NGCFT1_send_data& e) {
auto& transfer = irr._list.at(e.transfer_id); auto& transfer = irr._list.at(e.transfer_id);
if (transfer.data.size() < e.data_offset+e.data_size) { if (transfer.data.size() < e.data_offset+e.data_size) {
std::cerr << "NGCHS2Send error: ft send data larger then file???\n"; std::cerr << "NGCHS2Sigma error: ft send data larger then file???\n";
assert(false && "how"); assert(false && "how");
} }
std::memcpy(e.data, transfer.data.data()+e.data_offset, e.data_size); std::memcpy(e.data, transfer.data.data()+e.data_offset, e.data_size);
@ -441,7 +398,7 @@ bool NGCHS2Send::onEvent(const Events::NGCFT1_send_data& e) {
return true; return true;
} }
bool NGCHS2Send::onEvent(const Events::NGCFT1_send_done& e) { bool NGCHS2Sigma::onEvent(const Events::NGCFT1_send_done& e) {
auto c = _tcm.getContactGroupPeer(e.group_number, e.peer_number); auto c = _tcm.getContactGroupPeer(e.group_number, e.peer_number);
if (!c) { if (!c) {
return false; return false;
@ -459,7 +416,7 @@ bool NGCHS2Send::onEvent(const Events::NGCFT1_send_done& e) {
irr._list.erase(e.transfer_id); irr._list.erase(e.transfer_id);
// TODO: check if we completed it // TODO: check if we completed it
std::cout << "NGCHS2Send: sent chatlog to " << e.group_number << ":" << e.peer_number << "." << (int)e.transfer_id << "\n"; std::cout << "NGCHS2Sigma: sent chatlog to " << e.group_number << ":" << e.peer_number << "." << (int)e.transfer_id << "\n";
return true; return true;
} }

6
solanaceae/ngc_hs2/ngc_hs2_send.hpp → solanaceae/ngc_hs2/ngc_hs2_sigma.hpp
View File

@ -47,7 +47,7 @@ namespace Components {
}; };
} // Components } // Components
class NGCHS2Send : public RegistryMessageModelEventI, public NGCFT1EventI { class NGCHS2Sigma : public RegistryMessageModelEventI, public NGCFT1EventI {
Contact3Registry& _cr; Contact3Registry& _cr;
RegistryMessageModelI& _rmm; RegistryMessageModelI& _rmm;
ToxContactModel2& _tcm; ToxContactModel2& _tcm;
@ -72,14 +72,14 @@ class NGCHS2Send : public RegistryMessageModelEventI, public NGCFT1EventI {
constexpr static int64_t _max_time_into_past_default {60*15}; // s constexpr static int64_t _max_time_into_past_default {60*15}; // s
public: public:
NGCHS2Send( NGCHS2Sigma(
Contact3Registry& cr, Contact3Registry& cr,
RegistryMessageModelI& rmm, RegistryMessageModelI& rmm,
ToxContactModel2& tcm, ToxContactModel2& tcm,
NGCFT1& nf NGCFT1& nf
); );
~NGCHS2Send(void); ~NGCHS2Sigma(void);
float iterate(float delta); float iterate(float delta);