diff options
| -rw-r--r-- | include/asterisk/res_pjsip.h | 10 | ||||
| -rw-r--r-- | res/res_pjsip.c | 2 | ||||
| -rw-r--r-- | res/res_pjsip/pjsip_distributor.c | 14 | ||||
| -rw-r--r-- | res/res_pjsip_outbound_publish.c | 3 | ||||
| -rw-r--r-- | res/res_pjsip_outbound_registration.c | 1 |
5 files changed, 18 insertions, 12 deletions
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index c97e4b534..d8e172fc5 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -1368,6 +1368,16 @@ struct ast_taskprocessor *ast_sip_create_serializer_group_named(const char *name struct ast_taskprocessor *ast_sip_get_distributor_serializer(pjsip_rx_data *rdata); /*! + * \brief Record the task's serializer name on the tdata structure. + * \since 13.15.0 + * + * \param tdata The outgoing message. + * + * \retval PJ_SUCCESS. + */ +pj_status_t ast_sip_record_request_serializer(pjsip_tx_data *tdata); + +/*! * \brief Set a serializer on a SIP dialog so requests and responses are automatically serialized * * Passing a NULL serializer is a way to remove a serializer from a dialog. diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 9b9905826..a167150f6 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -3603,6 +3603,8 @@ static pj_status_t endpt_send_request(struct ast_sip_endpoint *endpoint, } } + ast_sip_record_request_serializer(tdata); + /* We need to insure that the wrapper and tdata are available when the * transaction callback is executed. */ diff --git a/res/res_pjsip/pjsip_distributor.c b/res/res_pjsip/pjsip_distributor.c index 82ca184d3..e076db3b8 100644 --- a/res/res_pjsip/pjsip_distributor.c +++ b/res/res_pjsip/pjsip_distributor.c @@ -29,12 +29,11 @@ static int distribute(void *data); static pj_bool_t distributor(pjsip_rx_data *rdata); -static pj_status_t record_serializer(pjsip_tx_data *tdata); static pjsip_module distributor_mod = { .name = {"Request Distributor", 19}, .priority = PJSIP_MOD_PRIORITY_TSX_LAYER - 6, - .on_tx_request = record_serializer, + .on_tx_request = ast_sip_record_request_serializer, .on_rx_request = distributor, .on_rx_response = distributor, }; @@ -65,16 +64,7 @@ struct unidentified_request{ /*! Pool of serializers to use if not supplied. */ static struct ast_taskprocessor *distributor_pool[DISTRIBUTOR_POOL_SIZE]; -/*! - * \internal - * \brief Record the task's serializer name on the tdata structure. - * \since 14.0.0 - * - * \param tdata The outgoing message. - * - * \retval PJ_SUCCESS. - */ -static pj_status_t record_serializer(pjsip_tx_data *tdata) +pj_status_t ast_sip_record_request_serializer(pjsip_tx_data *tdata) { struct ast_taskprocessor *serializer; diff --git a/res/res_pjsip_outbound_publish.c b/res/res_pjsip_outbound_publish.c index 35eedf0d2..7c0b64b4d 100644 --- a/res/res_pjsip_outbound_publish.c +++ b/res/res_pjsip_outbound_publish.c @@ -349,6 +349,7 @@ static int send_unpublish_task(void *data) pjsip_tx_data_set_transport(tdata, &selector); } + ast_sip_record_request_serializer(tdata); pjsip_publishc_send(client->client, tdata); } @@ -598,6 +599,7 @@ static int sip_publish_client_service_queue(void *data) pjsip_tx_data_set_transport(tdata, &selector); } + ast_sip_record_request_serializer(tdata); status = pjsip_publishc_send(client->client, tdata); if (status == PJ_EBUSY) { /* We attempted to send the message but something else got there first */ @@ -910,6 +912,7 @@ static void sip_outbound_publish_callback(struct pjsip_publishc_cbparam *param) pjsip_tx_data_set_transport(tdata, &selector); } + ast_sip_record_request_serializer(tdata); pjsip_publishc_send(client->client, tdata); } client->auth_attempts++; diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c index da15f19f5..6c615f0a4 100644 --- a/res/res_pjsip_outbound_registration.c +++ b/res/res_pjsip_outbound_registration.c @@ -528,6 +528,7 @@ static pj_status_t registration_client_send(struct sip_outbound_registration_cli */ ast_sip_set_tpselector_from_transport_name(client_state->transport_name, &selector); pjsip_regc_set_transport(client_state->client, &selector); + ast_sip_record_request_serializer(tdata); status = pjsip_regc_send(client_state->client, tdata); /* If the attempt to send the message failed and the callback was not invoked we need to |