Skip to content

New flag to always update the Route Set #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

New flag to always update the Route Set #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion libsofia-sip-ua/nta/nta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,8 @@ struct nta_agent_s
unsigned sa_in_timer:1; /**< Set when executing timers */
unsigned sa_use_timer_c:1; /**< Application has set value for timer C */

unsigned sa_always_update_route_set:1; /**< Always update route set */

unsigned :0;

#if HAVE_SMIME
Expand Down Expand Up @@ -1502,6 +1504,7 @@ int agent_set_params(nta_agent_t *agent, tagi_t *tags)
int use_naptr = agent->sa_use_naptr;
int use_srv = agent->sa_use_srv;
int srv_503 = agent->sa_srv_503;
int always_update_route_set = agent->sa_always_update_route_set;
void *smime = agent->sa_smime;
uint32_t flags = agent->sa_flags;
int rport = agent->sa_rport;
Expand Down Expand Up @@ -1569,6 +1572,7 @@ int agent_set_params(nta_agent_t *agent, tagi_t *tags)
TPTAG_THRPSIZE_REF(threadpool),
#endif
NTATAG_SRV_503_REF(srv_503),
NTATAG_ALWAYS_UPDATE_ROUTE_SET_REF(always_update_route_set),
TAG_END());
nC = tl_gets(tags,
NTATAG_TIMER_C_REF(timer_c),
Expand Down Expand Up @@ -1733,6 +1737,7 @@ int agent_set_params(nta_agent_t *agent, tagi_t *tags)
agent->sa_use_naptr = use_naptr != 0;
agent->sa_use_srv = use_srv != 0;
agent->sa_srv_503 = srv_503 != 0;
agent->sa_always_update_route_set = always_update_route_set != 0;
agent->sa_smime = smime;
agent->sa_flags = flags & MSG_FLG_USERMASK;
agent->sa_rport = rport != 0;
Expand Down Expand Up @@ -4761,7 +4766,8 @@ int nta_leg_server_route(nta_leg_t *leg,
sip_record_route_t const *route,
sip_contact_t const *contact)
{
return leg_route(leg, route, NULL, contact, 1);
int always_update_route_set = leg->leg_agent->sa_always_update_route_set;
return leg_route(leg, route, NULL, contact, always_update_route_set ? 2 : 1);
}

/** Return route components. */
Expand Down
42 changes: 28 additions & 14 deletions libsofia-sip-ua/nta/nta_tag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,23 +1417,23 @@ tag_typedef_t ntatag_tcp_rport = BOOLTAG_TYPEDEF(tcp_rport);
*/
tag_typedef_t ntatag_tls_rport = BOOLTAG_TYPEDEF(tls_rport);

/**@def NTATAG_TLS_ORQ_CONNECT_TIMEOUT(x)
*
* Connect Timeout for outgoing requests using TLS.
*
* @par Used with
* nua_create(), nua_set_params(),
* nta_agent_create(), nta_agent_set_params()
*
* @par Parameter type
* unsigned
*
* @par Values
/**@def NTATAG_TLS_ORQ_CONNECT_TIMEOUT(x)
*
* Connect Timeout for outgoing requests using TLS.
*
* @par Used with
* nua_create(), nua_set_params(),
* nta_agent_create(), nta_agent_set_params()
*
* @par Parameter type
* unsigned
*
* @par Values
* - 0 - Disabled
* - value - Milliseconds
*
* @NEW_1_13_2
*/
* @NEW_1_13_2
*/
tag_typedef_t ntatag_tls_orq_connect_timeout = UINTTAG_TYPEDEF(tls_orq_connect_timeout);

/**@def NTATAG_PRELOAD(x)
Expand Down Expand Up @@ -1547,6 +1547,20 @@ tag_typedef_t ntatag_srv_503 = BOOLTAG_TYPEDEF(srv_503);
*/
tag_typedef_t ntatag_rseq = UINTTAG_TYPEDEF(rseq);

/**@def NTATAG_ALWAYS_UPDATE_ROUTE_SET(x)
*
* If true, always update route set.
*
* @par Parameter type
* boolean: true (non-zero or non-NULL pointer)
* or false (zero or NULL pointer)
*
* @par Values
* - true - enable always update route set
* - false - disable always update route set
*/
tag_typedef_t ntatag_always_update_route_set = BOOLTAG_TYPEDEF(always_update_route_set);

/* Status */

/**@def NTATAG_S_IRQ_HASH_REF(x)
Expand Down
6 changes: 6 additions & 0 deletions libsofia-sip-ua/nta/sofia-sip/nta_tag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,12 @@ NTA_DLL extern tag_typedef_t ntatag_rseq;
NTA_DLL extern tag_typedef_t ntatag_rseq_ref;
#define NTATAG_RSEQ_REF(x) ntatag_rseq_ref, tag_uint_vr(&(x))

NTA_DLL extern tag_typedef_t ntatag_always_update_route_set;
#define NTATAG_ALWAYS_UPDATE_ROUTE_SET(x) ntatag_always_update_route_set, tag_bool_v((x))

NTA_DLL extern tag_typedef_t ntatag_always_update_route_set_ref;
#define NTATAG_ALWAYS_UPDATE_ROUTE_SET_REF(x) ntatag_always_update_route_set_ref, tag_bool_vr(&(x))

/* ====================================================================== */
/* Tags for statistics. */

Expand Down