This commit is contained in:
John Smith 2022-08-29 11:22:03 -04:00
parent acf65fa48b
commit 38ec19d9da
4 changed files with 437 additions and 474 deletions

872
Cargo.lock generated

File diff suppressed because it is too large Load Diff

@ -1 +1 @@
Subproject commit 2d2860bf63c13749dd156c87eb3f3314746de3e7 Subproject commit fd560c499be0f34305e0d48aca7f1bc3d015a17f

View File

@ -480,22 +480,6 @@ impl Network {
c.network.restricted_nat_retries c.network.restricted_nat_retries
}; };
// See if we already have a public dialinfo of this protocol/address type
let routing_table = self.routing_table();
let dif = DialInfoFilter::global()
.with_protocol_type(protocol_type)
.with_address_type(AddressType::IPV4);
let dids =
routing_table.all_filtered_dial_info_details(Some(RoutingDomain::PublicInternet), &dif);
if !dids.is_empty() {
log_net!(debug
"Skipping detection for public dialinfo for {:?}:IPV4",
protocol_type
);
context.set_detected_network_class(NetworkClass::InboundCapable);
return Ok(());
}
// Start doing ipv4 protocol // Start doing ipv4 protocol
context.protocol_begin(protocol_type, AddressType::IPV4); context.protocol_begin(protocol_type, AddressType::IPV4);
@ -553,21 +537,6 @@ impl Network {
context: &DiscoveryContext, context: &DiscoveryContext,
protocol_type: ProtocolType, protocol_type: ProtocolType,
) -> EyreResult<()> { ) -> EyreResult<()> {
// See if we already have a public dialinfo of this protocol/address type
let routing_table = self.routing_table();
let dif = DialInfoFilter::global()
.with_protocol_type(protocol_type)
.with_address_type(AddressType::IPV6);
let dids =
routing_table.all_filtered_dial_info_details(Some(RoutingDomain::PublicInternet), &dif);
if !dids.is_empty() {
log_net!(debug
"Skipping detection for public dialinfo for {:?}:IPV6",
protocol_type
);
context.set_detected_network_class(NetworkClass::InboundCapable);
return Ok(());
}
// Start doing ipv6 protocol // Start doing ipv6 protocol
context.protocol_begin(protocol_type, AddressType::IPV6); context.protocol_begin(protocol_type, AddressType::IPV6);

View File

@ -373,7 +373,8 @@ impl RPCProcessor {
let (span_id, rpcreader) = res.take_value().unwrap(); let (span_id, rpcreader) = res.take_value().unwrap();
let end_ts = intf::get_timestamp(); let end_ts = intf::get_timestamp();
Span::current().follows_from(span_id); // fixme: causes crashes? "Missing otel data span extensions"??
//Span::current().follows_from(span_id);
(rpcreader, end_ts - start_ts) (rpcreader, end_ts - start_ts)
})) }))
@ -903,7 +904,8 @@ impl RPCProcessor {
receiver.recv_async().timeout_at(stop_token.clone()).await receiver.recv_async().timeout_at(stop_token.clone()).await
{ {
let rpc_worker_span = span!(parent: None, Level::TRACE, "rpc_worker"); let rpc_worker_span = span!(parent: None, Level::TRACE, "rpc_worker");
rpc_worker_span.follows_from(span_id); // fixme: causes crashes? "Missing otel data span extensions"??
//rpc_worker_span.follows_from(span_id);
let _enter = rpc_worker_span.enter(); let _enter = rpc_worker_span.enter();
let _ = self let _ = self