oxen-io/lokinet
1
1
Fork 0
mirror of https://github.com/oxen-io/lokinet synced 2023-12-14 06:53:00 +01:00
Code Issues Projects Releases Wiki Activity

save

Browse source
This commit is contained in:
dan 2023-03-02 12:40:45 -08:00
parent d783beae24
commit a5f6158547
2 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
delete_me
View file

@ -0,0 +1,27 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Directory listing for /</title>
</head>
<body>
<h1>Directory listing for /</h1>
<hr>
<ul>
<li><a href=".cache/">.cache/</a></li>
<li><a href=".clang-format">.clang-format</a></li>
<li><a href=".clang-tidy">.clang-tidy</a></li>
<li><a href=".dir-locals.el">.dir-locals.el</a></li>
<li><a href=".dockerignore">.dockerignore</a></li>
<li><a href=".drone.jsonnet">.drone.jsonnet</a></li>
<li><a href=".git/">.git/</a></li>
<li><a href=".gitattributes">.gitattributes</a></li>
<li><a href=".github/">.github/</a></li>
<li><a href=".gitignore">.gitignore</a></li>
<li><a href=".gitmodules">.gitmodules</a></li>
<li><a href=".swift-version">.swift-version</a></li>
<li><a href=".vscode/">.vscode/</a></li>
<li><a href="build/">build/</a></li>
<li><a href="cmake/">cmake/</a></li>
<li><a href="CMakeLists.txt">CMakeLists.txt</a></li>
<li><a hre

22
llarp/quic/connection.cpp
View file

@ -457,7 +457,7 @@ namespace llarp::quic
} }
else else
{ {
flush_streams(); on_io_ready();
} }
}); });
retransmit_timer->start(0ms, 0ms); retransmit_timer->start(0ms, 0ms);
@ -652,7 +652,7 @@ namespace llarp::quic
ngtcp2_ssize ndatalen; ngtcp2_ssize ndatalen;
uint16_t stream_packets = 0; uint16_t stream_packets = 0;
uint32_t flags = NGTCP2_WRITE_STREAM_FLAG_MORE; uint32_t flags = NGTCP2_WRITE_STREAM_FLAG_MORE;
std::optional<uint64_t> ts = get_timestamp(); uint64_t ts = get_timestamp();
send_pkt_info = {}; send_pkt_info = {};
auto send_packet = [&](auto nwrite) -> int { auto send_packet = [&](auto nwrite) -> int {
@ -664,7 +664,7 @@ namespace llarp::quic
{ {
log::debug(logcat, "Packet send blocked, scheduling retransmit"); log::debug(logcat, "Packet send blocked, scheduling retransmit");
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__); log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts); ngtcp2_conn_update_pkt_tx_time(conn.get(), ts);
schedule_retransmit(); schedule_retransmit();
return 0; return 0;
} }
@ -675,7 +675,7 @@ namespace llarp::quic
log::warning(logcat, "I/O error while trying to send packet: {}", sent.str()); log::warning(logcat, "I/O error while trying to send packet: {}", sent.str());
// FIXME: disconnect? // FIXME: disconnect?
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__); log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts); ngtcp2_conn_update_pkt_tx_time(conn.get(), ts);
return 0; return 0;
} }
log::debug(logcat, "packet away!"); log::debug(logcat, "packet away!");
@ -760,7 +760,7 @@ namespace llarp::quic
stream.id().id, stream.id().id,
reinterpret_cast<const ngtcp2_vec*>(vecs.data()), reinterpret_cast<const ngtcp2_vec*>(vecs.data()),
vecs.size(), vecs.size(),
(!ts) ? get_timestamp() : *ts); (!ts) ? get_timestamp() : ts);
log::debug(logcat, log::debug(logcat,
"add_stream_data for stream {} returned [{},{}]", "add_stream_data for stream {} returned [{},{}]",
@ -837,7 +837,7 @@ namespace llarp::quic
return; return;
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__); log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts); // so far always useful ngtcp2_conn_update_pkt_tx_time(conn.get(), ts); // so far always useful
++stream_packets; ++stream_packets;
std::advance(it, 1); std::advance(it, 1);
//it = strs.erase(it); //it = strs.erase(it);
@ -846,7 +846,7 @@ namespace llarp::quic
{ {
log::debug(logcat, "Max stream packets ({}) reached", max_stream_packets); log::debug(logcat, "Max stream packets ({}) reached", max_stream_packets);
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__); log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts); ngtcp2_conn_update_pkt_tx_time(conn.get(), ts);
return; return;
} }
} }
@ -870,7 +870,7 @@ namespace llarp::quic
-1, -1,
nullptr, nullptr,
0, 0,
(!ts) ? get_timestamp() : *ts); (!ts) ? get_timestamp() : ts);
log::debug(logcat, "add_stream_data for non-stream returned [{},{}]", nwrite, ndatalen); log::debug(logcat, "add_stream_data for non-stream returned [{},{}]", nwrite, ndatalen);
// debug // debug
@ -896,7 +896,7 @@ namespace llarp::quic
{ {
log::debug(logcat, "Writing non-stream data frames, and have space left"); log::debug(logcat, "Writing non-stream data frames, and have space left");
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__); log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts); ngtcp2_conn_update_pkt_tx_time(conn.get(), ts);
continue; continue;
} }
if (nwrite == -230) // NGTCP2_ERR_CLOSING if (nwrite == -230) // NGTCP2_ERR_CLOSING
@ -918,11 +918,11 @@ namespace llarp::quic
if (auto rv = send_packet(nwrite); rv != 0) if (auto rv = send_packet(nwrite); rv != 0)
return; return;
log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__); log::debug(logcat, "Updating pkt tx time at {}" ,__LINE__);
ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts); ngtcp2_conn_update_pkt_tx_time(conn.get(), ts);
} }
log::debug(logcat, "Exiting flush_streams()"); log::debug(logcat, "Exiting flush_streams()");
//ngtcp2_conn_update_pkt_tx_time(conn.get(), *ts); //ngtcp2_conn_update_pkt_tx_time(conn.get(), ts);
//schedule_retransmit(); //schedule_retransmit();
} }