kbe/calls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sip: improve connection handling by using relevant sofia tags

Browse Source 
NUTAG_SUPPORTED and SIPTAG_EXPIRES_STR for instance

sip: include expire, urn uuid

sip.linphone.org accounts seems to be working!
This commit is contained in:
Evangelos Ribeiro Tzaras
2021-03-08 17:39:13 +01:00
parent de44a17fe5
commit 45285062ca
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/sip/calls-sip-origin.c
View File

@@ -375,9 +375,12 @@ sip_callback (nua_event_t event,
case nua_i_outbound: case nua_i_outbound:
g_debug ("status of outbound engine has changed: %03d %s", status, phrase); g_debug ("status of outbound engine has changed: %03d %s", status, phrase);
if (status == 404) if (status == 404) {
CALLS_EMIT_MESSAGE (origin, "contact not found", GTK_MESSAGE_ERROR); CALLS_EMIT_MESSAGE (origin, "contact not found", GTK_MESSAGE_ERROR);
g_warning ("outbound engine changed state to %03d %s", status, phrase);
}
break; break;
case nua_i_state: case nua_i_state:
@@ -433,11 +436,16 @@ setup_nua (CallsSipOrigin *self)
gboolean use_ipv6 = FALSE; /* TODO make configurable or use DNS to figure out if ipv6 is supported*/ gboolean use_ipv6 = FALSE; /* TODO make configurable or use DNS to figure out if ipv6 is supported*/
gchar *ipv6_bind = "*"; gchar *ipv6_bind = "*";
gchar *ipv4_bind = "0.0.0.0"; gchar *ipv4_bind = "0.0.0.0";
g_autofree gchar * sip_url = NULL; g_autofree gchar *sip_url = NULL;
g_autofree gchar * sips_url = NULL; g_autofree gchar *sips_url = NULL;
const gchar *uuid = NULL;
g_autofree gchar* urn_uuid = NULL;
g_return_val_if_fail (CALLS_IS_SIP_ORIGIN (self), NULL); g_return_val_if_fail (CALLS_IS_SIP_ORIGIN (self), NULL);
uuid = nua_generate_instance_identifier (self->ctx->home);
urn_uuid = g_strdup_printf ("urn:uuid:%s", uuid);
address = g_strconcat (self->protocol_prefix, ":", self->user, "@", self->host, NULL); address = g_strconcat (self->protocol_prefix, ":", self->user, "@", self->host, NULL);
use_sips = check_sips (address); use_sips = check_sips (address);
@@ -464,14 +472,21 @@ setup_nua (CallsSipOrigin *self)
NUTAG_USER_AGENT (APP_DATA_NAME), NUTAG_USER_AGENT (APP_DATA_NAME),
NUTAG_URL (sip_url), NUTAG_URL (sip_url),
TAG_IF (use_sips, NUTAG_SIPS_URL (sips_url)), TAG_IF (use_sips, NUTAG_SIPS_URL (sips_url)),
NUTAG_M_USERNAME (self->user),
SIPTAG_FROM_STR (address), SIPTAG_FROM_STR (address),
NUTAG_ALLOW ("INVITE, ACK, BYE, CANCEL, OPTIONS, UPDATE"),
NTATAG_MAX_FORWARDS (70),
NUTAG_ENABLEINVITE (1), NUTAG_ENABLEINVITE (1),
NUTAG_AUTOANSWER (0), NUTAG_AUTOANSWER (0),
NUTAG_AUTOACK (1), NUTAG_AUTOACK (1),
NUTAG_PATH_ENABLE (0),
NUTAG_MEDIA_ENABLE (1), NUTAG_MEDIA_ENABLE (1),
NUTAG_INSTANCE (urn_uuid),
TAG_NULL ()); TAG_NULL ());
nua_set_params (nua,
NUTAG_SUPPORTED ("replaces, gruu, outbound"),
TAG_END ());
return nua; return nua;
} }
@@ -495,7 +510,6 @@ setup_sip_handles (CallsSipOrigin *self)
NUTAG_REGISTRAR (registrar_url), NUTAG_REGISTRAR (registrar_url),
TAG_END ()); TAG_END ());
oper->call_handle = NULL; oper->call_handle = NULL;
return oper; return oper;
} }
@@ -1135,7 +1149,13 @@ calls_sip_origin_go_online (CallsSipOrigin *self,
return; return;
nua_register (self->oper->register_handle, nua_register (self->oper->register_handle,
NUTAG_M_FEATURES("expires=180"), SIPTAG_EXPIRES_STR ("180"),
NUTAG_SUPPORTED ("replaces, outbound, gruu"),
NUTAG_OUTBOUND ("outbound natify gruuize"), // <- janus uses "no-validate"
NUTAG_M_USERNAME (self->user),
NUTAG_M_DISPLAY ("SIP tester"),
NUTAG_M_PARAMS ("user=phone"),
NUTAG_CALLEE_CAPS (1), // <- this should be to include media information: SDP
TAG_END ()); TAG_END ());
} }
else { else {