Skip to content

Commit

Permalink
Log transport sert info
Browse files Browse the repository at this point in the history
  • Loading branch information
vkolesnikov-intermedia committed Aug 5, 2024
1 parent 6c2bcbe commit 0ecb588
Show file tree
Hide file tree
Showing 16 changed files with 93 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Linux release
on:
push:
tags:
- 'qwqw'
- 'qqq'

env:
RELEASE_ARCHIVE_NAME: linux-release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos-x86-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: MacOs x86 release
on:
push:
tags:
- 'qwqw'
- 'qqq'

env:
RELEASE_ARCHIVE_NAME: macOS-x86-release
Expand Down
7 changes: 7 additions & 0 deletions pjsip-apps/src/samples/pjsip-perf.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,13 @@ static pj_bool_t mod_call_on_rx_request(pjsip_rx_data *rdata)
pjsip_response_addr res_addr;

pjsip_get_response_addr(tdata->pool, rdata, &res_addr);
if (tdata) {
char * remote_name = tdata->dest_info.name.ptr;
PJ_LOG(4,(THIS_FILE, remote_name, "[ISSUE] remote value in mod_call_on_rx_request"));
} else {
PJ_LOG(4,( THIS_FILE, "[ISSUE] no remote value"));
}

status = pjsip_endpt_send_response(app.sip_endpt, &res_addr, tdata,
NULL, NULL);
if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(tdata);
Expand Down
2 changes: 2 additions & 0 deletions pjsip-apps/src/samples/siprtp.c
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,8 @@ static void process_incoming_call(pjsip_rx_data *rdata)
pjsip_response_addr res_addr;

pjsip_get_response_addr(tdata->pool, rdata, &res_addr);
PJ_LOG(4, (THIS_FILE, " !!!! tut? !!!!"));

status = pjsip_endpt_send_response(app.sip_endpt, &res_addr, tdata,
NULL, NULL);
if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(tdata);
Expand Down
2 changes: 2 additions & 0 deletions pjsip-apps/src/samples/stateful_proxy.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,8 @@ static pj_bool_t proxy_on_rx_response( pjsip_rx_data *rdata )
}

/* Forward response */
PJ_LOG(4, (THIS_FILE, " !!!! proxy statefull !!!!"));

status = pjsip_endpt_send_response(global.endpt, &res_addr, tdata,
NULL, NULL);
if (status != PJ_SUCCESS) {
Expand Down
2 changes: 2 additions & 0 deletions pjsip-apps/src/samples/stateless_proxy.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ static pj_bool_t on_rx_response( pjsip_rx_data *rdata )
}

/* Forward response */
PJ_LOG(4, (THIS_FILE, tdata->dest_info.name.ptr, " !!!! proxy statatelss !!!!"));

status = pjsip_endpt_send_response(global.endpt, &res_addr, tdata,
NULL, NULL);
if (status != PJ_SUCCESS) {
Expand Down
2 changes: 1 addition & 1 deletion pjsip/src/pjsip-ua/sip_inv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,7 @@ PJ_DEF(pj_status_t) pjsip_inv_verify_request3(pjsip_rx_data *rdata,
pjsip_endpoint *endpt,
pjsip_tx_data **p_tdata)
{
pjsip_msg *msg = NULL;
pjsip_msg *msg = NULL; // !!!
pjsip_allow_hdr *allow = NULL;
pjsip_supported_hdr *sup_hdr = NULL;
pjsip_require_hdr *req_hdr = NULL;
Expand Down
1 change: 1 addition & 0 deletions pjsip/src/pjsip/sip_dialog.c
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,7 @@ static pj_status_t dlg_create_request_throw( pjsip_dialog *dlg,
pj_strdup(tdata->pool, &tdata->dest_info.name, &dlg->initial_dest);
PJ_LOG(5, (THIS_FILE, "Setting initial dest %.*s",
(int)dlg->initial_dest.slen, dlg->initial_dest.ptr));
PJ_LOG(4, (THIS_FILE, tdata->dest_info.name.ptr, " !!!! lol kek checbu !!!"));
}

/* Done. */
Expand Down
4 changes: 3 additions & 1 deletion pjsip/src/pjsip/sip_endpoint.c
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,9 @@ PJ_DEF(pj_status_t) pjsip_endpt_acquire_transport2(pjsip_endpoint *endpt,
pjsip_tx_data *tdata,
pjsip_transport **transport)
{
return pjsip_tpmgr_acquire_transport2(endpt->transport_mgr, type, remote,
PJ_LOG(4, (THIS_FILE, " !!!! endpoint pjsip_endpt_acquire_transport2"));

return pjsip_tpmgr_acquire_transport2(endpt->transport_mgr, type, remote,
addr_len, sel, tdata, transport);
}

Expand Down
9 changes: 8 additions & 1 deletion pjsip/src/pjsip/sip_transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -2479,7 +2479,14 @@ static pj_status_t tsx_send_msg( pjsip_transaction *tsx,
} else {

tsx->transport_flag |= TSX_HAS_PENDING_TRANSPORT;
status = pjsip_endpt_send_response( tsx->endpt, &tsx->res_addr,
if (tdata) {
char * remote_name = tdata->dest_info.name.ptr;
PJ_LOG(4,(THIS_FILE, remote_name, "[ISSUE] in tsx_send_msg"));
} else {
PJ_LOG(4,( THIS_FILE, "[ISSUE] no remote value"));
}

status = pjsip_endpt_send_response( tsx->endpt, &tsx->res_addr,
tdata, tsx,
&send_msg_callback);
if (status == PJ_EPENDING)
Expand Down
10 changes: 9 additions & 1 deletion pjsip/src/pjsip/sip_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -2356,6 +2356,8 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport(pjsip_tpmgr *mgr,
const pjsip_tpselector *sel,
pjsip_transport **tp)
{
PJ_LOG(4, (THIS_FILE, " !!!! sip transport pjsip_tpmgr_acquire_transport"));

return pjsip_tpmgr_acquire_transport2(mgr, type, remote, addr_len, sel,
NULL, tp);
}
Expand Down Expand Up @@ -2482,10 +2484,13 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr,
* destination host matches the transport's
* remote host.
*/

if (pj_stricmp(&tdata->dest_info.name,
&tp_iter->tp->remote_name.host))
{
tp_iter = tp_iter->next;
PJ_LOG(4, (THIS_FILE, tdata->dest_info.name.ptr, " !!!! old name 2"));

continue;
}
}
Expand Down Expand Up @@ -2633,11 +2638,14 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr,
TRACE_((THIS_FILE, "Creating new transport from factory"));

/* Request factory to create transport. */
if (factory->create_transport2) {
if (factory->create_transport2) { // !!!!! kekekekek
PJ_LOG(4, (THIS_FILE, " !!!! transport 2"));
status = factory->create_transport2(factory, mgr, mgr->endpt,
(const pj_sockaddr*) remote,
addr_len, tdata, tp);
} else {
PJ_LOG(4, (THIS_FILE, " !!!! transport 1!!!!"));

status = factory->create_transport(factory, mgr, mgr->endpt,
(const pj_sockaddr*) remote,
addr_len, tp);
Expand Down
8 changes: 5 additions & 3 deletions pjsip/src/pjsip/sip_transport_tls.c
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start2( pjsip_endpoint *endpt,
/* Register to transport manager */
listener->endpt = endpt;
listener->tpmgr = pjsip_endpt_get_tpmgr(endpt);
listener->factory.create_transport2 = lis_create_transport;
listener->factory.create_transport2 = lis_create_transport; // kekus
listener->factory.destroy = lis_destroy;

#if !(defined(PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER) && \
Expand Down Expand Up @@ -1196,8 +1196,10 @@ static pj_status_t lis_create_transport(pjsip_tpfactory *factory,
PJ_ASSERT_RETURN(pool != NULL, PJ_ENOMEM);

/* Get remote host name from tdata */
if (tdata)
if (tdata) {
remote_name = tdata->dest_info.name;
PJ_LOG(4,(THIS_FILE, remote_name.ptr, "[ISSUE] new remote name in lis_create_transport"));
}
else
pj_bzero(&remote_name, sizeof(remote_name));

Expand Down Expand Up @@ -1977,7 +1979,7 @@ static pj_bool_t on_connect_complete(pj_ssl_sock_t *ssock,
* and destroy the transport.
*/
if (ssl_info.verify_status && tls->verify_server) {
if (tls->close_reason == PJ_SUCCESS)
if (tls->close_reason == PJ_SUCCESS)
tls->close_reason = PJSIP_TLS_ECERTVERIF;
pjsip_transport_shutdown(&tls->base);
}
Expand Down
33 changes: 29 additions & 4 deletions pjsip/src/pjsip/sip_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -783,10 +783,14 @@ PJ_DEF(pj_status_t) pjsip_endpt_create_cancel( pjsip_endpoint *endpt,
pj_memcpy(&cancel_tdata->dest_info, &req_tdata->dest_info,
sizeof(req_tdata->dest_info));



/* Finally, copy the destination host name from the original request */
pj_strdup(cancel_tdata->pool, &cancel_tdata->dest_info.name,
&req_tdata->dest_info.name);

PJ_LOG(4, (THIS_FILE, cancel_tdata->dest_info.name.ptr, " !!!! ptetr !!!"));

/* Done.
* Return the transmit buffer containing the CANCEL request.
*/
Expand Down Expand Up @@ -1185,6 +1189,7 @@ static void stateless_send_transport_cb( void *token,
cur_addr = &tdata->dest_info.addr.entry[tdata->dest_info.cur_addr].addr;
cur_addr_type = tdata->dest_info.addr.entry[tdata->dest_info.cur_addr].type;
cur_addr_len = tdata->dest_info.addr.entry[tdata->dest_info.cur_addr].addr_len;
PJ_LOG(4, (THIS_FILE, " !!!! skekeusdfd"));

/* Acquire transport. */
status = pjsip_endpt_acquire_transport2(stateless_data->endpt,
Expand Down Expand Up @@ -1463,6 +1468,8 @@ PJ_DEF(pj_status_t) pjsip_endpt_send_request_stateless(pjsip_endpoint *endpt,
if (!tdata->dest_info.name.slen) {
pj_strdup(tdata->pool, &tdata->dest_info.name,
&dest_info.addr.host);
PJ_LOG(4, (THIS_FILE, tdata->dest_info.name.ptr, " !!!! Cuno doesn't ** care !!!"));

} else {
/* Check if:
* - User configures transport to use a specific IP version
Expand All @@ -1479,7 +1486,9 @@ PJ_DEF(pj_status_t) pjsip_endpt_send_request_stateless(pjsip_endpoint *endpt,
tdata->dest_info.name.ptr));
pj_strdup(tdata->pool, &dest_info.addr.host,
&tdata->dest_info.name);
if (tdata->tp_sel.u.ip_ver == PJSIP_TPSELECTOR_USE_IPV4_ONLY) {
PJ_LOG(4, (THIS_FILE, tdata->dest_info.name.ptr, " !!!! ksksksskskskks !!!"));

if (tdata->tp_sel.u.ip_ver == PJSIP_TPSELECTOR_USE_IPV4_ONLY) {
dest_info.type &= ~PJSIP_TRANSPORT_IPV6;
} else {
dest_info.type |= PJSIP_TRANSPORT_IPV6;
Expand Down Expand Up @@ -1640,6 +1649,9 @@ PJ_DEF(pj_status_t) pjsip_endpt_send_raw_to_uri(pjsip_endpoint *endpt,
/* Copy the destination host name to TX data */
pj_strdup(tdata->pool, &tdata->dest_info.name, &dest_info.addr.host);

PJ_LOG(4, (THIS_FILE, tdata->dest_info.name.ptr, " !!!! Again, I can't kek"));


/* Resolve destination host.
* The processing then resumed when the resolving callback is called.
*/
Expand Down Expand Up @@ -1794,6 +1806,7 @@ static void send_response_resolver_cb( pj_status_t status, void *token,
}

/* Only handle the first address resolved. */
PJ_LOG(4, (THIS_FILE, " !!!! !@##$@#$@#$@$"));

/* Acquire transport. */
status = pjsip_endpt_acquire_transport2(send_state->endpt,
Expand All @@ -1808,10 +1821,14 @@ static void send_response_resolver_cb( pj_status_t status, void *token,
pj_bool_t cont = PJ_FALSE;
(*send_state->app_cb)(send_state, -status, &cont);
}
PJ_LOG(4, (THIS_FILE, send_state->tdata->dest_info.name.ptr, " !!!! ±±± !!! "));
pjsip_tx_data_dec_ref(send_state->tdata);
return;
}

PJ_LOG(4, (THIS_FILE, send_state->tdata->dest_info.name.ptr, " !!!! ±±± !!! next "));


/* Update address in send_state. */
pj_memcpy(&send_state->tdata->dest_info.addr, addr, sizeof(*addr));

Expand Down Expand Up @@ -1877,13 +1894,21 @@ PJ_DEF(pj_status_t) pjsip_endpt_send_response( pjsip_endpoint *endpt,
return status;
}
} else {
/* Copy the destination host name to TX data */

/* Copy the destination host name to TX data */
if (!tdata->dest_info.name.slen) {
pj_strdup(tdata->pool, &tdata->dest_info.name,
PJ_LOG(4,( THIS_FILE, "[ISSUE] set new value?"));
pj_strdup(tdata->pool, &tdata->dest_info.name,
&res_addr->dst_host.addr.host);
}

pjsip_endpt_resolve(endpt, tdata->pool, &res_addr->dst_host,
if (tdata) {
char * remote_name = tdata->dest_info.name.ptr;
PJ_LOG(4,(THIS_FILE, remote_name, "[ISSUE] remote value in pjsip_endpt_send_response"));
} else {
PJ_LOG(4,( THIS_FILE, "[ISSUE] no remote value"));
}
pjsip_endpt_resolve(endpt, tdata->pool, &res_addr->dst_host,
send_state, &send_response_resolver_cb);
return PJ_SUCCESS;
}
Expand Down
11 changes: 9 additions & 2 deletions pjsip/src/pjsua-lib/pjsua_acc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3379,6 +3379,8 @@ PJ_DEF(pj_status_t) pjsua_acc_create_request(pjsua_acc_id acc_id,
/* Choose local interface to use in Via if acc is not using
* STUN nor UPnP.
*/
PJ_LOG(4, (THIS_FILE, " !!!! acc create request"));

pjsua_acc_get_uac_addr(acc_id, tdata->pool,
target,
&tdata->via_addr,
Expand Down Expand Up @@ -3635,7 +3637,7 @@ pj_status_t pjsua_acc_get_uac_addr(pjsua_acc_id acc_id,
pj_uint16_t port;

status = pjsip_get_dest_info((pjsip_uri *)sip_uri, NULL,
pool, &dinfo);
pool, &dinfo); // get destination info
if (status != PJ_SUCCESS) {
PJ_PERROR(4, (THIS_FILE, status, "Unable to use source local "
"TCP/TLS socket address for Contact"));
Expand Down Expand Up @@ -3718,6 +3720,7 @@ pj_status_t pjsua_acc_get_uac_addr(pjsua_acc_id acc_id,
/* Create a dummy tdata to inform remote host name to transport */
pj_bzero(&tdata, sizeof(tdata));
pj_strdup(pool, &tdata.dest_info.name, &dinfo.addr.host);
PJ_LOG(4, (THIS_FILE, tdata.dest_info.name.ptr, " !!!! in acc !!!"));
port = (pj_uint16_t)dinfo.addr.port;
if (port == 0) {
port = (dinfo.flag & PJSIP_TRANSPORT_SECURE) ? 5061 : 5060;
Expand All @@ -3735,8 +3738,10 @@ pj_status_t pjsua_acc_get_uac_addr(pjsua_acc_id acc_id,
tp_type &= ~PJSIP_TRANSPORT_IPV6;
}

PJ_LOG(4, (THIS_FILE, " !!!! pjsua_acc_get_uac_addr"));

pj_sockaddr_set_port(&ai[i].ai_addr, port);
status = pjsip_endpt_acquire_transport2(pjsua_var.endpt,
status = pjsip_endpt_acquire_transport2(pjsua_var.endpt, // !!! pjsip_endpt_acquire_transport2
dinfo.type,
&ai[i].ai_addr,
addr_len,
Expand Down Expand Up @@ -3817,6 +3822,8 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uac_contact( pj_pool_t *pool,
return PJ_SUCCESS;
}

PJ_LOG(4, (THIS_FILE, " !!!! crreate auc contact ???"));

status = pjsua_acc_get_uac_addr(acc_id, pool, suri, &addr,
&tp_type, &secure, NULL);
if (status != PJ_SUCCESS)
Expand Down
14 changes: 12 additions & 2 deletions pjsip/src/pjsua-lib/pjsua_call.c
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,16 @@ pj_bool_t pjsua_call_on_incoming(pjsip_rx_data *rdata)
ret_st_code = response->msg->line.status.code;

pjsip_get_response_addr(response->pool, rdata, &res_addr);
status = pjsip_endpt_send_response(pjsua_var.endpt, &res_addr,


if (response) {
char * remote_name = response->dest_info.name.ptr;
PJ_LOG(4,(THIS_FILE, remote_name, "[ISSUE] in pjsua_call_on_incoming"));
} else {
PJ_LOG(4,( THIS_FILE, "[ISSUE] no remote value"));
}

status = pjsip_endpt_send_response(pjsua_var.endpt, &res_addr,
response, NULL, NULL);
if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(response);
} else {
Expand Down Expand Up @@ -1825,7 +1834,8 @@ pj_bool_t pjsua_call_on_incoming(pjsip_rx_data *rdata)
ret_st_code = response->msg->line.status.code;

pjsip_get_response_addr(response->pool, rdata, &res_addr);
status = pjsip_endpt_send_response(pjsua_var.endpt, &res_addr,
PJ_LOG(4, (THIS_FILE, " !!!! tut!!!!??? !!!!"));
status = pjsip_endpt_send_response(pjsua_var.endpt, &res_addr,
response, NULL, NULL);
if (status != PJ_SUCCESS) pjsip_tx_data_dec_ref(response);

Expand Down
1 change: 1 addition & 0 deletions pjsip/src/pjsua-lib/pjsua_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,7 @@ static pj_bool_t options_on_rx_request(pjsip_rx_data *rdata)

/* Send response */
pjsip_get_response_addr(tdata->pool, rdata, &res_addr);

status = pjsip_endpt_send_response(pjsua_var.endpt, &res_addr, tdata, NULL, NULL);
if (status != PJ_SUCCESS)
pjsip_tx_data_dec_ref(tdata);
Expand Down

0 comments on commit 0ecb588

Please sign in to comment.