sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add call_id to the callback param

This commit is contained in:
Riza Sulistyo 2023-10-03 07:43:26 +07:00
parent eb77f1f7dc
commit 70a3e2e1a4
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pjsip/include/pjsua-lib/pjsua.h
View File

@ -1085,6 +1085,12 @@ typedef struct pjsua_call_setting
* \a pjsua_on_rejected_incoming_call_cb.
*/
typedef struct pjsua_on_rejected_incoming_call_param {
/**
* The incoming call id. This will be set to PJSUA_INVALID_ID when there is
* no available call slot at the time.
*/
pjsua_call_id call_id;
/**
* Local URI.
*/

6
pjsip/include/pjsua2/endpoint.hpp
View File

@ -441,6 +441,12 @@ struct OnMediaEventParam
*/
struct OnRejectedIncomingCallParam
{
/**
* The incoming call id. This will be set to PJSUA_INVALID_ID when there is
* no available call slot at the time.
*/
pjsua_call_id callId;
/**
* Local URI.
*/

12
pjsip/src/pjsua-lib/pjsua_call.c
View File

@ -1352,7 +1352,8 @@ static pj_status_t verify_request(const pjsua_call *call,
return status;
}
static void rejected_incoming_call_cb(pjsip_rx_data *rdata,
static void rejected_incoming_call_cb(pjsua_call_id call_id,
pjsip_rx_data *rdata,
pjsip_tx_data *tdata,
int st_code,
pj_str_t *st_text)
@ -1366,6 +1367,7 @@ static void rejected_incoming_call_cb(pjsip_rx_data *rdata,
return;
pj_bzero(&param, sizeof(pjsua_on_rejected_incoming_call_param));
param.call_id = call_id;
param.st_code = st_code;
if (rdata) {
param.rdata = rdata;
@ -1469,7 +1471,8 @@ on_return:
status_ = pjsip_inv_send_msg(call->inv, response);
if ((err_code / 100 != 1) && (err_code / 100 != 2)) {
rejected_incoming_call_cb(rdata, response, err_code, &reason);
rejected_incoming_call_cb(call->index, rdata, response,
err_code, &reason);
}
}
pjsua_media_channel_deinit(call->index);
@ -1525,7 +1528,7 @@ pj_bool_t pjsua_call_on_incoming(pjsip_rx_data *rdata)
pjsip_inv_session *inv = NULL;
int acc_id;
pjsua_call *call = NULL;
int call_id = -1;
int call_id = PJSUA_INVALID_ID;
int sip_err_code = PJSIP_SC_INTERNAL_SERVER_ERROR;
pjmedia_sdp_session *offer=NULL;
pj_bool_t should_dec_dlg = PJ_FALSE;
@ -2204,7 +2207,8 @@ on_return:
if ((ret_st_code != 0) && (ret_st_code / 100 != 1) &&
(ret_st_code / 100 != 2))
{
rejected_incoming_call_cb(rdata, NULL, ret_st_code, &st_reason);
rejected_incoming_call_cb(call_id, rdata, NULL, ret_st_code,
&st_reason);
}
pj_log_pop_indent();

1
pjsip/src/pjsua2/endpoint.cpp
View File

@ -2693,6 +2693,7 @@ void Endpoint::on_rejected_incoming_call(
const pjsua_on_rejected_incoming_call_param *param)
{
OnRejectedIncomingCallParam prm;
prm.callId = param->call_id;
prm.localInfo = pj2Str(param->local_info);
prm.remoteInfo = pj2Str(param->remote_info);
prm.statusCode = param->st_code;