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 handles when updating credentials

Browse source 
Otherwise transport protocol changes won't be picked up.

This also allows to get rid of update_nua().
This commit is contained in:
Evangelos Ribeiro Tzaras 2021-09-20 06:44:17 +02:00
parent fbb6316fee
commit 4675821838
1 changed files with 3 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -319,29 +319,6 @@ create_inbound (CallsSipOrigin *self,
add_call (self, address, TRUE, handle); add_call (self, address, TRUE, handle);
} }
static void
update_nua (CallsSipOrigin *self)
{
g_autofree char *from_str = NULL;
g_assert (CALLS_IS_SIP_ORIGIN (self));
if (!self->nua) {
g_warning ("Cannot update nua stack, aborting");
return;
}
self->protocol_prefix = get_protocol_prefix (self->transport_protocol);
g_free (self->address);
self->address = g_strconcat (self->user, "@", self->host, NULL);
from_str = g_strconcat (self->protocol_prefix, ":", self->address, NULL);
nua_set_params (self->nua,
SIPTAG_FROM_STR (from_str),
TAG_IF (self->display_name, NUTAG_M_DISPLAY (self->display_name)),
TAG_NULL ());
}
static void static void
sip_authenticate (CallsSipOrigin *self, sip_authenticate (CallsSipOrigin *self,
@ -1090,7 +1067,7 @@ deinit_sip_account (CallsSipOrigin *self)
static void static void
on_network_changed (CallsSipOrigin *self) recreate_sip (CallsSipOrigin *self)
{ {
if (deinit_sip_account (self)) if (deinit_sip_account (self))
init_sip_account (self, NULL); init_sip_account (self, NULL);
@ -1467,7 +1444,7 @@ calls_sip_origin_init (CallsSipOrigin *self)
CallsNetworkWatch *nw = calls_network_watch_get_default (); CallsNetworkWatch *nw = calls_network_watch_get_default ();
if (nw) if (nw)
g_signal_connect_swapped (calls_network_watch_get_default (), "network-changed", g_signal_connect_swapped (calls_network_watch_get_default (), "network-changed",
G_CALLBACK (on_network_changed), self); G_CALLBACK (recreate_sip), self);
else else
g_warning ("Network watch unavailable. Unable to detect network changes."); g_warning ("Network watch unavailable. Unable to detect network changes.");
} }
@ -1521,13 +1498,5 @@ calls_sip_origin_set_credentials (CallsSipOrigin *self,
self->port = port; self->port = port;
update_name (self); recreate_sip (self);
/* Propagate changes to nua stack */
update_nua (self);
/* TODO:
* We need to recreate the nua stack when the transport protocol changes
* because nua_set_params cannot be used to update NUTAG_URL and friends.
* This will get easier with https://gitlab.gnome.org/GNOME/calls/-/merge_requests/402
*/
} }