tweak defaults, better peer connection state tracking (none :P)

src/states/receive_start_sha1.cpp

@@ -47,22 +47,25 @@ bool ReceiveStartSHA1::iterate(float delta) {
 		}
 	} else if (_time_since_last_request >= 15.f) { // blast ever 15sec
 		_time_since_last_request = 0.f;
-		// TODO: select random and try, not blas
-		// ... and we are blasing
+
 		_tcl.forEachGroup([this](const uint32_t group_number) {
-			_tcl.forEachGroupPeer(group_number, [this, group_number](uint32_t peer_number, Tox_Connection connection_status) {
+			_tcl.forEachGroupPeer(group_number, [this, group_number](uint32_t peer_number) {
 				_tcl.sendFT1RequestPrivate(
 					group_number, peer_number,
 					NGC_FT1_file_kind::HASH_SHA1_INFO,
 					_sha1_info_hash.data.data(), _sha1_info_hash.size()
 				);
-				std::cout << "ReceiveStartSHA1 sendig info request to " << group_number << ":" << peer_number << " over " << (connection_status == Tox_Connection::TOX_CONNECTION_TCP ? "tcp" : "udp")  <<"\n";
+				std::cout
+					<< "ReceiveStartSHA1 sendig info request to "
+					<< group_number << ":" << peer_number
+					<< " over " << (_tcl.getGroupPeerConnectionStatus(group_number, peer_number) == Tox_Connection::TOX_CONNECTION_TCP ? "tcp" : "udp")
+					<< "\n"
+				;
 			});
 		});
 	}
 
 	// if not transfer, request from random peer (equal dist!!)
-	// TODO: return true if done
 	return _done;
 }
 

src/states/sha1.cpp

@@ -30,6 +30,7 @@ SHA1::SHA1(
 {
 	assert(_have_chunk.size() == _sha1_info.chunks.size());
 
+	_udp_only = cl.request_only_from_udp_peer;
 	_max_concurrent_in = cl.max_incoming_transfers;
 	_max_concurrent_out = cl.max_incoming_transfers;
 
@@ -194,12 +195,21 @@ bool SHA1::iterate(float delta) {
 		_peer_speed_mesurement_interval_timer = 0.f; // we lose some time here, but precision is not the issue
 
 		_peer_in_bytes_array_index = (_peer_in_bytes_array_index + 1) % _peer_speed_mesurement_interval_count;
-		for (const auto& [peer, array] : _peer_in_bytes_array) {
+		//for (const auto& [peer, array] : _peer_in_bytes_array) {
+		for (auto it = _peer_in_bytes_array.begin(); it != _peer_in_bytes_array.end();) {
+			const auto& [peer, array] = *it;
+
 			float avg {0.f};
 			for (size_t i = 0; i < array.size(); i++) {
 				avg += array[i];
 			}
 
+			if (avg == 0.f || _tcl.getGroupPeerConnectionStatus(peer.first, peer.second) == Tox_Connection::TOX_CONNECTION_NONE) {
+				_peer_in_speed.erase(peer);
+				it = _peer_in_bytes_array.erase(it);
+				continue;
+			}
+
 			// if 6 mesurment every 0.5sec -> avg is over 3sec -> /3 for /s
 			avg /= _peer_speed_mesurement_interval * _peer_speed_mesurement_interval_count;
 
@@ -207,12 +217,14 @@ bool SHA1::iterate(float delta) {
 			_peer_in_bytes_array[peer][_peer_in_bytes_array_index] = 0;
 
 			_peer_in_speed[peer] = avg;
+
+			it++;
 		}
 
 		_peer_in_targets.clear();
 		_tcl.forEachGroup([this](uint32_t group_number) {
-			_tcl.forEachGroupPeer(group_number, [group_number, this](uint32_t peer_number, Tox_Connection connection_status) {
-				if (connection_status == Tox_Connection::TOX_CONNECTION_UDP || !_udp_only) {
+			_tcl.forEachGroupPeer(group_number, [group_number, this](uint32_t peer_number) {
+				if (!_udp_only || _tcl.getGroupPeerConnectionStatus(group_number, peer_number) == Tox_Connection::TOX_CONNECTION_UDP) {
 					_peer_in_targets.push_back({group_number, peer_number});
 				}
 			});
@@ -278,7 +290,12 @@ bool SHA1::iterate(float delta) {
 		std::cout << "SHA1 cwq:" << _chunk_want_queue.size() << " cwqr:" << _chunks_requested.size() << " trc:" << _transfers_receiving_chunk.size() << " tsc:" << _transfers_sending_chunk.size() << "\n";
 		std::cout << "SHA1 peer down speeds:\n";
 		for (const auto& [peer, speed] : _peer_in_speed) {
-			std::cout << "    " << peer.first << ":" << peer.second << "(" << _tcl.getGroupPeerName(peer.first, peer.second) << ")" << "\t" << speed / 1024.f << "KiB/s\n";
+			std::cout
+				<< "    " << peer.first << ":" << peer.second
+				<< " " << (_tcl.getGroupPeerConnectionStatus(peer.first, peer.second) == Tox_Connection::TOX_CONNECTION_TCP ? "tcp" : "udp")
+				<< " (" << _tcl.getGroupPeerName(peer.first, peer.second) << ")"
+				<< "    " << speed / 1024.f << "KiB/s\n"
+			;
 		}
 	}
 

src/states/sha1.hpp

@@ -57,9 +57,13 @@ struct SHA1 final : public StateI {
 		size_t chunkSize(size_t chunk_index) const;
 		bool haveChunk(const SHA1Digest& hash) const;
 
-	private:
+	public: // config
 		bool _udp_only {false};
 
+		size_t _max_concurrent_in {32};
+		size_t _max_concurrent_out {16};
+
+	private:
 		mio::mmap_sink _file_map; // writable if not all
 		const FTInfoSHA1 _sha1_info;
 		const std::vector<uint8_t> _sha1_info_data;
@@ -79,11 +83,7 @@ struct SHA1 final : public StateI {
 		// chunk_index -> time since request
 		std::map<size_t, float> _chunks_requested;
 
-		size_t _max_concurrent_in {32};
-		size_t _max_concurrent_out {16};
-
 		std::minstd_rand _rng {1337};
-		std::uniform_int_distribution<size_t> _distrib;
 
 		std::unordered_map<SHA1Digest, size_t> _chunk_hash_to_index;
 
@@ -114,7 +114,6 @@ struct SHA1 final : public StateI {
 		// _peer_in_speed feeds directly into _peer_in_targets_dist
 		std::vector<std::pair<uint32_t, uint32_t>> _peer_in_targets;
 		std::discrete_distribution<size_t> _peer_in_targets_dist;
-
 };
 
 } // States