YGGverse/ggemini
1
0
Fork 0
mirror of https://github.com/YGGverse/ggemini.git synced 2026-04-02 01:55:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

require Priority, Cancellable arguments, remove extra members

Browse source
This commit is contained in:
yggverse 2024-12-01 04:35:19 +02:00
parent 2df9f36599
commit 8f910672e2
7 changed files with 30 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/client/connection.rs
View file

@ -2,13 +2,12 @@ pub mod error;
pub use error::Error;
use gio::{
prelude::{CancellableExt, IOStreamExt, TlsConnectionExt},
Cancellable, IOStream, NetworkAddress, SocketConnection, TlsCertificate, TlsClientConnection,
prelude::TlsConnectionExt, IOStream, NetworkAddress, SocketConnection, TlsCertificate,
TlsClientConnection,
};
use glib::object::{Cast, IsA, ObjectExt};
pub struct Connection {
pub cancellable: Option<Cancellable>,
pub socket_connection: SocketConnection,
pub tls_client_connection: TlsClientConnection,
}
@ -21,17 +20,11 @@ impl Connection {
socket_connection: SocketConnection,
certificate: Option<TlsCertificate>,
server_identity: Option<NetworkAddress>,
cancellable: Option<Cancellable>,
) -> Result<Self, Error> {
if socket_connection.is_closed() {
return Err(Error::Closed);
}
Ok(Self {
cancellable,
socket_connection: socket_connection.clone(),
tls_client_connection: match TlsClientConnection::new(
&socket_connection.clone(),
&socket_connection,
server_identity.as_ref(),
) {
Ok(tls_client_connection) => {
@ -58,38 +51,12 @@ impl Connection {
})
}
// Actions
/// Apply `cancel` action to `Self` [Cancellable](https://docs.gtk.org/gio/method.Cancellable.cancel.html)
/// * return `Error` on `Cancellable` not found
pub fn cancel(&self) -> Result<(), Error> {
match self.cancellable {
Some(ref cancellable) => {
cancellable.cancel();
Ok(())
}
None => Err(Error::Cancel),
}
}
/// Close owned [SocketConnection](https://docs.gtk.org/gio/class.SocketConnection.html)
/// * return `Ok(false)` if `Cancellable` not defined
pub fn close(&self) -> Result<bool, Error> {
match self.cancellable {
Some(ref cancellable) => match self.socket_connection.close(Some(cancellable)) {
Ok(()) => Ok(true),
Err(e) => Err(Error::SocketConnection(e)),
},
None => Ok(false),
}
}
// Getters
/// Get [IOStream](https://docs.gtk.org/gio/class.IOStream.html)
/// for [SocketConnection](https://docs.gtk.org/gio/class.SocketConnection.html)
/// or [TlsClientConnection](https://docs.gtk.org/gio/iface.TlsClientConnection.html) (if available)
/// * compatible with user (certificate) and guest (certificate-less) connection types
/// * compatible with user (certificate) and guest (certificate-less) connection type
/// * useful also to keep `Connection` active in async I/O context
pub fn stream(&self) -> impl IsA<IOStream> {
// * do not replace with `tls_client_connection.base_io_stream()`