Philipp Hörist pushed to branch master at gajim / python-nbxmpp

Commits: 387445a1 by lovetox at 2020-08-12T15:18:38+02:00 Client: Expose more information about the connection

- - - - -

3 changed files:

- nbxmpp/client.py - nbxmpp/connection.py - nbxmpp/tcp.py

Changes:

===================================== nbxmpp/client.py ===================================== @@ -115,6 +115,7 @@ class Client(Observable):

self._con = None self._local_address = None + self._remote_address = None self._mode = Mode.CLIENT

self._ping_source_id = None @@ -208,6 +209,10 @@ class Client(Observable): def peer_certificate(self): return self._peer_certificate, self._peer_certificate_errors

+ @property + def current_address(self): + return self._current_address + @property def current_connection_type(self): return self._current_address.type @@ -246,6 +251,10 @@ class Client(Observable): def local_address(self): return self._local_address

+ @property + def remote_address(self): + return self._remote_address + @property def connection_types(self): if self._custom_host is not None: @@ -434,6 +443,7 @@ class Client(Observable): def _on_connected(self, connection, _signal_name): self.set_state(StreamState.CONNECTED) self._local_address = connection.local_address + self._remote_address = connection.remote_address

def _on_disconnected(self, _connection, _signal_name): self.state = StreamState.DISCONNECTED

===================================== nbxmpp/connection.py ===================================== @@ -54,6 +54,7 @@ class Connection(Observable): self._client_cert = client_cert self._address = address self._local_address = None + self._remote_address = None self._state = None

self._state = TCPState.DISCONNECTED @@ -68,6 +69,10 @@ class Connection(Observable): def local_address(self): return self._local_address

+ @property + def remote_address(self): + return self._remote_address + @property def peer_certificate(self): return (self._peer_certificate, self._peer_certificate_errors)

===================================== nbxmpp/tcp.py ===================================== @@ -83,12 +83,12 @@ class TCPConnection(Connection):

def _on_event(self, _socket_client, event, _connectable, connection): if event == Gio.SocketClientEvent.CONNECTING: - remote_address = connection.get_remote_address() + self._remote_address = connection.get_remote_address().to_string() use_proxy = self._address.proxy is not None target = 'proxy' if use_proxy else self._address.domain self._log.info('Connecting to %s (%s)', target, - remote_address.to_string()) + self._remote_address)

def _check_certificate(self, _connection, certificate, errors): self._peer_certificate = certificate

View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/387445a1ae3c7827f178be591...