YGGverse/ggemini
1
0
Fork 0
mirror of https://github.com/YGGverse/ggemini.git synced 2026-03-31 17:15:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement default_port option for to_network_address method

Browse source
This commit is contained in:
yggverse 2025-01-13 22:05:53 +02:00
parent a2261601f6
commit fa02234cbd
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client.rs
View file

@ -65,7 +65,7 @@ impl Client {
// Begin new connection // Begin new connection
// * [NetworkAddress](https://docs.gtk.org/gio/class.NetworkAddress.html) required for valid // * [NetworkAddress](https://docs.gtk.org/gio/class.NetworkAddress.html) required for valid
// [SNI](https://geminiprotocol.net/docs/protocol-specification.gmi#server-name-indication) // [SNI](https://geminiprotocol.net/docs/protocol-specification.gmi#server-name-indication)
match request.to_network_address() { match request.to_network_address(crate::DEFAULT_PORT) {
Ok(network_address) => { Ok(network_address) => {
self.socket self.socket
.connect_async(&network_address.clone(), Some(&cancellable.clone()), { .connect_async(&network_address.clone(), Some(&cancellable.clone()), {

16
src/client/connection/request.rs
View file

@ -18,13 +18,19 @@ impl Request {
// Getters // Getters
/// Get [NetworkAddress](https://docs.gtk.org/gio/class.NetworkAddress.html) for `Self` /// Get [NetworkAddress](https://docs.gtk.org/gio/class.NetworkAddress.html) for `Self`
pub fn to_network_address(&self) -> Result<NetworkAddress, Error> { pub fn to_network_address(&self, default_port: u16) -> Result<NetworkAddress, Error> {
let uri = match self {
Self::Gemini(ref request) => request.uri.clone(),
Self::Titan(ref request) => request.uri.clone(),
};
let port = uri.port();
match crate::gio::network_address::from_uri( match crate::gio::network_address::from_uri(
&match self { &uri,
Self::Gemini(ref request) => request.uri.clone(), if port.is_positive() {
Self::Titan(ref request) => request.uri.clone(), port as u16
} else {
default_port
}, },
crate::DEFAULT_PORT,
) { ) {
Ok(network_address) => Ok(network_address), Ok(network_address) => Ok(network_address),
Err(e) => Err(Error::NetworkAddress(e)), Err(e) => Err(Error::NetworkAddress(e)),