depau/Purism-Calls
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2025-01-07 12:25:31 +00:00
Code Issues Releases Wiki Activity

sip: origin: Recreate sofia handles on network change

Browse source 
Otherwise the origin will not be able to do any communication anymore
as used sockets might not be valid any more.

Fixes #317
This commit is contained in:
Evangelos Ribeiro Tzaras 2021-07-31 12:59:03 +02:00
parent 3714f99d38
commit bede9f42e8
1 changed files with 45 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
plugins/sip/calls-sip-origin.c
View file

@ -33,6 +33,7 @@
#include "calls-sip-origin.h" #include "calls-sip-origin.h"
#include "calls-sip-util.h" #include "calls-sip-util.h"
#include "calls-sip-media-manager.h" #include "calls-sip-media-manager.h"
#include "calls-network-watch.h"
#include "config.h" #include "config.h"
#include "enum-types.h" #include "enum-types.h"
@ -1018,6 +1019,41 @@ init_sip_account (CallsSipOrigin *self,
} }
static void
deinit_sip_account (CallsSipOrigin *self)
{
g_assert (CALLS_IS_SIP_ORIGIN (self));
if (self->state == CALLS_ACCOUNT_NULL)
return;
remove_calls (self, NULL);
if (self->nua) {
g_debug ("Requesting nua_shutdown ()");
self->is_nua_shutdown = FALSE;
nua_shutdown (self->nua);
// need to wait for nua_r_shutdown event before calling nua_destroy ()
while (!self->is_nua_shutdown)
su_root_step (self->ctx->root, 100);
g_debug ("nua_shutdown () complete. Destroying nua handle");
nua_destroy (self->nua);
self->nua = NULL;
}
self->state = CALLS_ACCOUNT_NULL;
}
static void
on_network_changed (CallsSipOrigin *self)
{
deinit_sip_account (self);
init_sip_account (self, NULL);
}
static gboolean static gboolean
supports_protocol (CallsOrigin *origin, supports_protocol (CallsOrigin *origin,
const char *protocol) const char *protocol)
@ -1051,6 +1087,7 @@ update_name (CallsSipOrigin *self)
g_object_notify_by_pspec (G_OBJECT (self), props[PROP_NAME]); g_object_notify_by_pspec (G_OBJECT (self), props[PROP_NAME]);
} }
static void static void
calls_sip_origin_set_property (GObject *object, calls_sip_origin_set_property (GObject *object,
guint property_id, guint property_id,
@ -1227,27 +1264,10 @@ calls_sip_origin_dispose (GObject *object)
{ {
CallsSipOrigin *self = CALLS_SIP_ORIGIN (object); CallsSipOrigin *self = CALLS_SIP_ORIGIN (object);
if (self->state == CALLS_ACCOUNT_NULL)
return;
remove_calls (self, NULL);
if (!self->use_direct_connection && self->state == CALLS_ACCOUNT_ONLINE) if (!self->use_direct_connection && self->state == CALLS_ACCOUNT_ONLINE)
go_online (CALLS_ACCOUNT (self), FALSE); go_online (CALLS_ACCOUNT (self), FALSE);
if (self->nua) { deinit_sip_account (self);
g_debug ("Requesting nua_shutdown ()");
nua_shutdown (self->nua);
// need to wait for nua_r_shutdown event before calling nua_destroy ()
while (!self->is_nua_shutdown)
su_root_step (self->ctx->root, 100);
g_debug ("nua_shutdown () complete. Destroying nua handle");
nua_destroy (self->nua);
self->nua = NULL;
}
self->state = CALLS_ACCOUNT_NULL;
G_OBJECT_CLASS (calls_sip_origin_parent_class)->dispose (object); G_OBJECT_CLASS (calls_sip_origin_parent_class)->dispose (object);
} }
@ -1398,7 +1418,14 @@ calls_sip_origin_accounts_interface_init (CallsAccountInterface *iface)
static void static void
calls_sip_origin_init (CallsSipOrigin *self) calls_sip_origin_init (CallsSipOrigin *self)
{ {
CallsNetworkWatch *nw = calls_network_watch_get_default ();
if (nw)
g_signal_connect_swapped (nw, "network-changed",
G_CALLBACK (on_network_changed), self);
self->call_handles = g_hash_table_new (NULL, NULL); self->call_handles = g_hash_table_new (NULL, NULL);
} }
void void