liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

fix up url handling

Browse Source
This commit is contained in:
John Smith
2021-12-09 16:55:20 -05:00
parent 2f6237c5e6
commit feb54071f2
6 changed files with 62 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
veilid-core/src/intf/native/network/mod.rs
View File

@@ -869,10 +869,10 @@ impl Network {
)
};
trace!("WS: starting listener at {:?}", listen_address);
let (fqdn, port) = split_port(&listen_address)
let (host, port) = split_port(&listen_address)
.map_err(|_| "invalid WS listen address, port not specified correctly".to_owned())?;
let port = port.ok_or_else(|| "port must be specified for WS address".to_owned())?;
let _ = self
let addresses = self
.start_tcp_listener(
listen_address.clone(),
false,
@@ -881,11 +881,12 @@ impl Network {
.await?;
trace!("WS: listener started");
// websockets must use FQDN
routing_table.register_local_dial_info(
DialInfo::ws(fqdn.clone(), port, path.clone()),
DialInfoOrigin::Static,
);
let mut dial_infos: Vec<DialInfo> = Vec::new();
for (a, p) in addresses {
let di = DialInfo::ws(a.address_string(), p, path.clone());
dial_infos.push(di.clone());
routing_table.register_local_dial_info(di, DialInfoOrigin::Static);
}
// Add static public dialinfo if it's configured
if let Some(url) = url.as_ref() {
@@ -922,7 +923,7 @@ impl Network {
)
};
trace!("WSS: starting listener at {}", listen_address);
let (fqdn, port) = split_port(&listen_address)
let (host, port) = split_port(&listen_address)
.map_err(|_| "invalid WSS listen address, port not specified correctly".to_owned())?;
let port = port.ok_or_else(|| "port must be specified for WSS address".to_owned())?;
@@ -935,11 +936,17 @@ impl Network {
.await?;
trace!("WSS: listener started");
// websockets must use FQDN
routing_table.register_local_dial_info(
DialInfo::wss(fqdn.clone(), port, path.clone()),
DialInfoOrigin::Static,
);
// NOTE: No local dial info for WSS, as there is no way to connect to a local dialinfo via TLS
// If the hostname is specified, it is the public dialinfo via the URL. If no hostname
// is specified, then TLS won't validate, so no local dialinfo is possible.
// This is not the case with unencrypted websockets, which can be specified solely by an IP address
//
// let mut dial_infos: Vec<DialInfo> = Vec::new();
// for (a, p) in addresses {
// let di = DialInfo::wss(a.address_string(), p, path.clone());
// dial_infos.push(di.clone());
// routing_table.register_local_dial_info(di, DialInfoOrigin::Static);
// }
// Add static public dialinfo if it's configured
if let Some(url) = url.as_ref() {

4
veilid-core/src/intf/native/network/protocol/ws.rs
View File

@@ -237,14 +237,14 @@ impl WebsocketProtocolHandler {
DialInfo::WS(di) => (
false,
di.path.clone(),
di.fqdn.clone(),
di.host.clone(),
di.port,
ProtocolType::WS,
),
DialInfo::WSS(di) => (
true,
di.path.clone(),
di.fqdn.clone(),
di.host.clone(),
di.port,
ProtocolType::WSS,
),