boilerplate

src/solanaceae/tox_p2prng/p2prng.hpp

@@ -68,6 +68,7 @@ namespace P2PRNG::Events {
 		const ByteSpan id;
 
 		bool self {false}; // who started the rng
+		const ByteSpan initial_state;
 	};
 
 	// received an hmac (or own, when first)

src/solanaceae/tox_p2prng/tox_p2prng.cpp

@@ -1,7 +1,42 @@
 #include "./tox_p2prng.hpp"
 
+// packets:
+//
+// init_with_hmac
+//   - id
+//   - peerlist (includes sender, determines fusion order)
+//   - sender hmac
+//
+// hmac
+//   - id
+//   - hmac
+//
+// hmac_request
+//   - id
+//
+// secret
+//   - id
+//   - secret (msg+k)
+//
+// secret_request
+//   - id
 
-ToxP2PRNG::ToxP2PRNG(ToxContactModel2& tcm) : _tcm(tcm) {
+enum PKG {
+	INIT_WITH_HMAC,
+	HMAC,
+	HMAC_REQUEST,
+	SECRET,
+	SECRET_REQUEST,
+};
+
+ToxP2PRNG::ToxP2PRNG(
+	ToxI& t,
+	ToxEventProviderI& tep,
+	ToxContactModel2& tcm
+) : _t(t), _tep(tep), _tcm(tcm) {
+	_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_LOSSLESS_PACKET);
+	_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_CUSTOM_PACKET);
+	_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_CUSTOM_PRIVATE_PACKET);
 }
 
 ToxP2PRNG::~ToxP2PRNG(void) {
@@ -11,7 +46,121 @@ std::vector<uint8_t> ToxP2PRNG::newGernation(Contact3Handle c, const ByteSpan in
 	return {};
 }
 
-std::vector<uint8_t> newGernationPeers(const std::vector<Contact3Handle>& c_vec, const ByteSpan initial_state_user_data) {
+std::vector<uint8_t> ToxP2PRNG::newGernationPeers(const std::vector<Contact3Handle>& c_vec, const ByteSpan initial_state_user_data) {
 	return {};
 }
 
+bool ToxP2PRNG::handlePacket(
+	Contact3Handle c,
+	const uint8_t* data,
+	const size_t data_size
+) {
+	if (data_size < 1) {
+		return false; // waht
+	}
+
+	PKG pkg_type = static_cast<PKG>(data[0]);
+
+	switch (pkg_type) {
+		case PKG::INIT_WITH_HMAC:
+			return parse_init_with_hmac(c, data+1, data_size-1);
+		case PKG::HMAC:
+			return parse_hmac(c, data+1, data_size-1);
+		case PKG::HMAC_REQUEST:
+			return parse_hmac_request(c, data+1, data_size-1);
+		case PKG::SECRET:
+			return parse_secret(c, data+1, data_size-1);
+		case PKG::SECRET_REQUEST:
+			return parse_secret_request(c, data+1, data_size-1);
+		default:
+			return false;
+	}
+
+
+	return false;
+}
+
+bool ToxP2PRNG::handleFriendPacket(
+	const uint32_t friend_number,
+	const uint8_t* data,
+	const size_t data_size
+) {
+	auto c = _tcm.getContactFriend(friend_number);
+	if (!static_cast<bool>(c)) {
+		return false;
+	}
+
+	return handlePacket(c, data, data_size);
+}
+
+bool ToxP2PRNG::handleGroupPacket(
+	const uint32_t group_number,
+	const uint32_t peer_number,
+	const uint8_t* data,
+	const size_t data_size,
+	const bool /*_private*/
+) {
+	auto c = _tcm.getContactGroupPeer(group_number, peer_number);
+	if (!static_cast<bool>(c)) {
+		return false;
+	}
+
+	return handlePacket(c, data, data_size);
+}
+
+bool ToxP2PRNG::parse_init_with_hmac(Contact3Handle c, const uint8_t* data, size_t data_size) {
+	size_t curser = 0;
+
+	return false;
+}
+
+bool ToxP2PRNG::parse_hmac(Contact3Handle c, const uint8_t* data, size_t data_size) {
+	size_t curser = 0;
+
+	return false;
+}
+
+bool ToxP2PRNG::parse_hmac_request(Contact3Handle c, const uint8_t* data, size_t data_size) {
+	size_t curser = 0;
+
+	return false;
+}
+
+bool ToxP2PRNG::parse_secret(Contact3Handle c, const uint8_t* data, size_t data_size) {
+	size_t curser = 0;
+
+	return false;
+}
+
+bool ToxP2PRNG::parse_secret_request(Contact3Handle c, const uint8_t* data, size_t data_size) {
+	size_t curser = 0;
+
+	return false;
+}
+
+bool ToxP2PRNG::onToxEvent(const Tox_Event_Friend_Lossless_Packet* e) {
+	const auto friend_number = tox_event_friend_lossless_packet_get_friend_number(e);
+	const uint8_t* data = tox_event_friend_lossless_packet_get_data(e);
+	const auto data_length = tox_event_friend_lossless_packet_get_data_length(e);
+
+	return handleFriendPacket(friend_number, data, data_length);
+}
+
+bool ToxP2PRNG::onToxEvent(const Tox_Event_Group_Custom_Packet* e) {
+	const auto group_number = tox_event_group_custom_packet_get_group_number(e);
+	const auto peer_number = tox_event_group_custom_packet_get_peer_id(e);
+	const uint8_t* data = tox_event_group_custom_packet_get_data(e);
+	const auto data_length = tox_event_group_custom_packet_get_data_length(e);
+
+	return handleGroupPacket(group_number, peer_number, data, data_length, false);
+}
+
+bool ToxP2PRNG::onToxEvent(const Tox_Event_Group_Custom_Private_Packet* e) {
+	const auto group_number = tox_event_group_custom_private_packet_get_group_number(e);
+	const auto peer_number = tox_event_group_custom_private_packet_get_peer_id(e);
+	const uint8_t* data = tox_event_group_custom_private_packet_get_data(e);
+	const auto data_length = tox_event_group_custom_private_packet_get_data_length(e);
+
+	return handleGroupPacket(group_number, peer_number, data, data_length, true);
+}
+

src/solanaceae/tox_p2prng/tox_p2prng.hpp

@@ -6,12 +6,19 @@
 
 // implements P2PRNGI for tox
 // both tox friends(1to1) aswell as tox ngc(NtoN) should be supported
-class ToxP2PRNG : public P2PRNGI {
+// TODO: use generic packet handling service (eg ngc_ext) instead
+class ToxP2PRNG : public P2PRNGI, public ToxEventI {
+	ToxI& _t;
+	ToxEventProviderI& _tep;
 	ToxContactModel2& _tcm;
 
 	public:
-		ToxP2PRNG(ToxContactModel2& tcm);
+		ToxP2PRNG(
-		~ToxP2PRNG();
+			ToxI& t,
+			ToxEventProviderI& tep,
+			ToxContactModel2& tcm
+		);
+		~ToxP2PRNG(void);
 
 	public: // p2prng
 		std::vector<uint8_t> newGernation(Contact3Handle c, const ByteSpan initial_state_user_data) override;
@@ -19,4 +26,35 @@ class ToxP2PRNG : public P2PRNGI {
 
 		P2PRNG::State getSate(const ByteSpan id) override;
 		ByteSpan getResult(const ByteSpan id) override;
+
+	protected:
+		bool handlePacket(
+			Contact3Handle c,
+			const uint8_t* data,
+			const size_t data_size
+		);
+		bool handleFriendPacket(
+			const uint32_t friend_number,
+			const uint8_t* data,
+			const size_t data_size
+		);
+
+		bool handleGroupPacket(
+			const uint32_t group_number,
+			const uint32_t peer_number,
+			const uint8_t* data,
+			const size_t data_size,
+			const bool _private
+		);
+
+		bool parse_init_with_hmac(Contact3Handle c, const uint8_t* data, size_t data_size);
+		bool parse_hmac(Contact3Handle c, const uint8_t* data, size_t data_size);
+		bool parse_hmac_request(Contact3Handle c, const uint8_t* data, size_t data_size);
+		bool parse_secret(Contact3Handle c, const uint8_t* data, size_t data_size);
+		bool parse_secret_request(Contact3Handle c, const uint8_t* data, size_t data_size);
+
+	protected:
+		bool onToxEvent(const Tox_Event_Friend_Lossless_Packet* e) override;
+		bool onToxEvent(const Tox_Event_Group_Custom_Packet* e) override;
+		bool onToxEvent(const Tox_Event_Group_Custom_Private_Packet* e) override;
 };