Skip to content

[sofia-sip] Make Transport Retry Behavior Configurable #301

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+34 −16
Draft

[sofia-sip] Make Transport Retry Behavior Configurable #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3581166
add flag to disable
nltd101 Jul 3, 2025
d0eac39
disable tp retry
nltd101 Jul 3, 2025
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
9 changes: 7 additions & 2 deletions libsofia-sip-ua/nta/nta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ struct nta_outgoing_s
unsigned orq_must_100rel:1;
unsigned orq_timestamp:1; /**< Insert @Timestamp header. */
unsigned orq_100rel:1; /**< Support 100rel */
unsigned orq_try_other_tp:1; /**< Allow app to disable retry on other protocol (default: enable) */
unsigned:0; /* pad */

#if HAVE_SOFIA_SRESOLV
Expand Down Expand Up @@ -7952,7 +7953,7 @@ nta_outgoing_t *outgoing_create(nta_agent_t *agent,
ta_list ta;
char const *scheme = NULL;
char const *port = NULL;
int invalid, resolved = 0, stateless = 0, user_via = agent->sa_user_via;
int invalid, resolved = 0, stateless = 0, user_via = agent->sa_user_via, retry_other_tp = 1;
int invite_100rel = agent->sa_invite_100rel;
int explicit_transport = 1;
int call_tls_orq_connect_timeout_is_set = 0;
Expand Down Expand Up @@ -8037,6 +8038,9 @@ nta_outgoing_t *outgoing_create(nta_agent_t *agent,
call_tls_orq_connect_timeout = t->t_value;
if (call_tls_orq_connect_timeout > NTA_TIME_MAX) call_tls_orq_connect_timeout = NTA_TIME_MAX;
}
else if (ntatag_retry_other_tp == tt) {
retry_other_tp = t->t_value != 0;
}
}

orq->orq_agent = agent;
Expand All @@ -8062,6 +8066,7 @@ nta_outgoing_t *outgoing_create(nta_agent_t *agent,
orq->orq_uas = !stateless && agent->sa_is_a_uas;
orq->orq_call_tls_connect_timeout_is_set = call_tls_orq_connect_timeout_is_set;
orq->orq_call_tls_connect_timeout = (call_tls_orq_connect_timeout > 0) ? call_tls_orq_connect_timeout : 0;
orq->orq_try_other_tp = retry_other_tp;

if (cc)
orq->orq_cc = nta_compartment_ref(cc);
Expand Down Expand Up @@ -8404,7 +8409,7 @@ outgoing_send(nta_outgoing_t *orq, int retransmit)
if (cc)
nta_compartment_decref(&cc);

if (orq->orq_user_tport)
if (orq->orq_user_tport || !orq->orq_try_other_tp)
/* No retries */;
/* RFC3261, 18.1.1 */
else if (err == EMSGSIZE && !orq->orq_try_tcp_instead) {
Expand Down
38 changes: 24 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 @@ -1244,6 +1244,16 @@ tag_typedef_t ntatag_tag_3261 = BOOLTAG_TYPEDEF(tag_3261);
*/
tag_typedef_t ntatag_rel100 = BOOLTAG_TYPEDEF(rel100);

/**@def NTATAG_RETRY_OTHER_TP(x)
*
* Enable or disable retry on other transports
*
* @par x Boolean (0 to disable, 1 to allow retry)
* @default 1 (retry is enabled)
*
*/
tag_typedef_t ntatag_retry_other_tp = BOOLTAG_TYPEDEF(retry_other_tp);

/**@def NTATAG_NO_DIALOG(x)
*
* Create a leg without dialog. */
Expand Down Expand Up @@ -1417,23 +1427,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
3 changes: 3 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 @@ -345,6 +345,9 @@ NTA_DLL extern tag_typedef_t ntatag_cancel_487_ref;
NTA_DLL extern tag_typedef_t ntatag_rel100;
#define NTATAG_REL100(x) ntatag_rel100, tag_bool_v((x))

NTA_DLL extern tag_typedef_t ntatag_retry_other_tp;
#define NTATAG_RETRY_OTHER_TP(x) ntatag_retry_other_tp, tag_bool_v((x))

NTA_DLL extern tag_typedef_t ntatag_rel100_ref;
#define NTATAG_REL100_REF(x) ntatag_rel100_ref, tag_bool_vr(&(x))

Expand Down