anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

XEP-0215: management of the field expires

Browse source 
Add a field in `Xmpp.Xep.ExternalServiceDiscovery` to keep track
of the `expires` TURN service value and use it (divided by 2) to
restart periodically the external services discovery.
This commit is contained in:
Alexandre Jousset 2024-04-18 17:41:55 +03:00 committed by Maxim Logaev
parent 5784530204
commit d6173ba850
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
plugins/ice/src/plugin.vala
View file

@ -54,6 +54,21 @@ public class Dino.Plugins.Ice.Plugin : RootInterface, Object {
ice_udp_module.stun_ip = ip.to_string(); ice_udp_module.stun_ip = ip.to_string();
ice_udp_module.stun_port = 7886; ice_udp_module.stun_port = 7886;
} }
if (ice_udp_module.turn_service != null) {
int64? expires = ice_udp_module.turn_service.expires;
if (expires != null) {
uint delay = (uint) (expires - new DateTime.now_utc().to_unix()) / 2;
debug("Next server external service discovery in %us (because of TURN credentials' expiring time)", delay);
Timeout.add_seconds(delay, () => {
if (app.stream_interactor.connection_manager.get_state(account) != ConnectionManager.ConnectionState.CONNECTED) return false;
on_stream_negotiated.begin(account, stream);
return false;
});
}
}
} }
public void shutdown() { public void shutdown() {

4
xmpp-vala/src/module/xep/0215_external_service_discovery.vala
View file

@ -25,6 +25,9 @@ namespace Xmpp.Xep.ExternalServiceDiscovery {
service.username = service_node.get_attribute("username", NS_URI); service.username = service_node.get_attribute("username", NS_URI);
service.password = service_node.get_attribute("password", NS_URI); service.password = service_node.get_attribute("password", NS_URI);
string? expires_str = service_node.get_attribute("expires", NS_URI);
if (expires_str != null) service.expires = DateTimeProfiles.parse_string(expires_str).to_unix();
service.transport = service_node.get_attribute("transport", NS_URI); service.transport = service_node.get_attribute("transport", NS_URI);
service.name = service_node.get_attribute("name", NS_URI); service.name = service_node.get_attribute("name", NS_URI);
string? restricted_str = service_node.get_attribute("restricted", NS_URI); string? restricted_str = service_node.get_attribute("restricted", NS_URI);
@ -41,6 +44,7 @@ namespace Xmpp.Xep.ExternalServiceDiscovery {
public string username { get; set; } public string username { get; set; }
public string password { get; set; } public string password { get; set; }
public int64? expires { get; set; }
public string transport { get; set; } public string transport { get; set; }
public string name { get; set; } public string name { get; set; }