v0.34.0_fina;
This commit is contained in:
1 parent
1ca019d849
commit
c207e8a03f
69 files changed
+1496
-13838
No files matched your search
@@ -28,29 +28,38 @@ impl PeerFormatting {
|
||||
local,
|
||||
peer_ip,
|
||||
peer_header: HeaderValue::from_str(&peer_text).expect("IP text is a valid header"),
|
||||
peer_node: if peer_ip.is_ipv4() { peer_text } else { node(peer_ip) },
|
||||
peer_node: if peer_ip.is_ipv4() {
|
||||
peer_text
|
||||
} else {
|
||||
node(peer_ip)
|
||||
},
|
||||
by_node: node(canonical(local.ip())),
|
||||
port_header: HeaderValue::from_str(&local.port().to_string())
|
||||
.expect("TCP port is a valid header"),
|
||||
untrusted_headers: std::sync::Mutex::new(None),
|
||||
}
|
||||
}
|
||||
fn peer_header(&self) -> &HeaderValue { &self.peer_header }
|
||||
fn peer_header(&self) -> &HeaderValue {
|
||||
&self.peer_header
|
||||
}
|
||||
|
||||
fn cached_untrusted(&self, authority: &HeaderValue, tls: bool) -> Option<HeaderMap> {
|
||||
self.untrusted_headers.lock().unwrap_or_else(|e| e.into_inner())
|
||||
self.untrusted_headers
|
||||
.lock()
|
||||
.unwrap_or_else(|e| e.into_inner())
|
||||
.as_ref()
|
||||
.filter(|entry| entry.tls == tls
|
||||
&& entry.authority.as_bytes() == authority.as_bytes())
|
||||
.filter(|entry| entry.tls == tls && entry.authority.as_bytes() == authority.as_bytes())
|
||||
.map(|entry| entry.base.clone())
|
||||
}
|
||||
|
||||
fn remember_untrusted(&self, authority: &HeaderValue, tls: bool, base: &HeaderMap) {
|
||||
*self.untrusted_headers.lock().unwrap_or_else(|e| e.into_inner()) =
|
||||
Some(UntrustedHeaders {
|
||||
authority: authority.clone(),
|
||||
tls,
|
||||
base: base.clone(),
|
||||
});
|
||||
*self
|
||||
.untrusted_headers
|
||||
.lock()
|
||||
.unwrap_or_else(|e| e.into_inner()) = Some(UntrustedHeaders {
|
||||
authority: authority.clone(),
|
||||
tls,
|
||||
base: base.clone(),
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user