Skip to content

Unify server protocol diagnostics #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
itlezy merged 6 commits into from
Oct 24, 2026
Merged

Unify server protocol diagnostics #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6246417
feat(diagnostics): preserve server trace state (RUST-CI-031)
Oct 24, 2026
a8942a4
feat(diagnostics): record terminal server TCP sends (RUST-CI-031)
Oct 24, 2026
2082e4b
feat(diagnostics): record terminal server UDP sends (RUST-CI-031)
Oct 24, 2026
a6c8ae7
refactor(diagnostics): close encoded server send gaps (RUST-CI-031)
Oct 24, 2026
0a58c81
refactor(diagnostics): retire server packet side file (RUST-CI-031)
Oct 24, 2026
2429477
fix(diagnostics): settle obfuscated send outcomes explicitly (RUST-CI…
Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions crates/emulebb-ed2k/src/ed2k_server/active_callback.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use crate::{
use super::packet_handler::{decode_id_change_payload, log_uncorrelated_server_reject};
use super::{
Ed2kServerState, OP_CALLBACK_FAIL, OP_CALLBACKREQUEST, OP_IDCHANGE, OP_LOGINREQUEST, OP_REJECT,
ServerSession, ServerSessionPhase, ServerSessionRole, encode_login_request, encode_packet,
ServerSession, ServerSessionPhase, ServerSessionRole, encode_login_request,
login_identity_for_server_transport, resolve_callback_server_entry,
send_connected_server_startup, should_use_server_obfuscation, wait_for_offer_files_settle,
};
Expand Down Expand Up @@ -68,9 +68,8 @@ pub async fn request_callback_on_server(options: Ed2kCallbackRequestOptions<'_>)
let login_payload =
encode_login_request(login_identity, &nickname, ServerSessionRole::Callback);
if use_server_obfuscation {
let login_request = encode_packet(OP_LOGINREQUEST, &login_payload, false)?;
session
.negotiate_obfuscation_and_send(&login_request)
.negotiate_obfuscation_and_send(OP_LOGINREQUEST, &login_payload)
.await?;
} else {
session.send_packet(OP_LOGINREQUEST, &login_payload).await?;
Expand Down
18 changes: 5 additions & 13 deletions crates/emulebb-ed2k/src/ed2k_server/active_keyword.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use super::{
OP_LOGINREQUEST, OP_QUERY_MORE_RESULT, OP_REJECT, OP_SEARCHREQUEST, OP_SEARCHRESULT,
ResolvedServerEntry, SERVER_UDP_FLAG_LARGEFILES, SearchCriteria, ServerSession,
ServerSessionPhase, ServerSessionRole, bind_server_udp_socket, configured_server_entries,
decode_search_result_page, decode_udp_search_result_pages, encode_login_request, encode_packet,
decode_search_result_page, decode_udp_search_result_pages, encode_login_request,
encode_search_request, encode_search_request_with_criteria,
login_identity_for_server_transport, read_server_udp_packet_from_any, resolve_server_entry,
retain_live_servers, send_connected_server_startup, send_udp_keyword_search,
Expand Down Expand Up @@ -454,14 +454,11 @@ async fn search_keyword_on_server(
},
search_payload.len()
);
let login_request = encode_packet(
OP_LOGINREQUEST,
&encode_login_request(login_identity, nickname, ServerSessionRole::KeywordSearch),
false,
)?;
let login_payload =
encode_login_request(login_identity, nickname, ServerSessionRole::KeywordSearch);
if use_server_obfuscation {
session
.negotiate_obfuscation_and_send(&login_request)
.negotiate_obfuscation_and_send(OP_LOGINREQUEST, &login_payload)
.await
.with_context(|| {
format!(
Expand All @@ -470,12 +467,7 @@ async fn search_keyword_on_server(
)
})?;
} else {
session
.send_encoded_packet(
&login_request,
format!("failed to send ED2K server login request to {transport_endpoint}"),
)
.await?;
session.send_packet(OP_LOGINREQUEST, &login_payload).await?;
}
session.set_phase(
ServerSessionPhase::AwaitingIdChange,
Expand Down
5 changes: 2 additions & 3 deletions crates/emulebb-ed2k/src/ed2k_server/active_source.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use super::{
Ed2kFoundSource, Ed2kServerState, OP_FOUNDSOURCES, OP_FOUNDSOURCES_OBFU, OP_IDCHANGE,
OP_LOGINREQUEST, OP_REJECT, ResolvedServerEntry, ServerSession, ServerSessionPhase,
ServerSessionRole, annotate_found_sources_server, configured_server_entries,
decode_found_sources, encode_login_request, encode_packet, encode_source_request,
decode_found_sources, encode_login_request, encode_source_request,
login_identity_for_server_transport, merge_found_sources, resolve_server_entry,
send_connected_server_startup, should_use_server_obfuscation, source_request_opcode,
validate_found_sources,
Expand Down Expand Up @@ -210,10 +210,9 @@ async fn search_sources_on_server(
.await?;
let login_payload =
encode_login_request(login_identity, nickname, ServerSessionRole::SourceSearch);
let login_request = encode_packet(OP_LOGINREQUEST, &login_payload, false)?;
if use_server_obfuscation {
session
.negotiate_obfuscation_and_send(&login_request)
.negotiate_obfuscation_and_send(OP_LOGINREQUEST, &login_payload)
.await
.with_context(|| {
format!(
Expand Down
Loading
Loading