diff --git a/.github/workflows/linux-release.yml b/.github/workflows/linux-release.yml index 5ba85ca1b..39d5f59c8 100644 --- a/.github/workflows/linux-release.yml +++ b/.github/workflows/linux-release.yml @@ -3,7 +3,7 @@ name: Linux release on: push: tags: - - 'qwqw' + - 'qqq' env: RELEASE_ARCHIVE_NAME: linux-release diff --git a/.github/workflows/macos-x86-release.yml b/.github/workflows/macos-x86-release.yml index 80d9a2724..56d91a6e1 100644 --- a/.github/workflows/macos-x86-release.yml +++ b/.github/workflows/macos-x86-release.yml @@ -3,7 +3,7 @@ name: MacOs x86 release on: push: tags: - - 'qwqw' + - 'qqq' env: RELEASE_ARCHIVE_NAME: macOS-x86-release diff --git a/pjsip-apps/src/samples/pjsip-perf.c b/pjsip-apps/src/samples/pjsip-perf.c index 9fdcfc201..7f3846687 100644 --- a/pjsip-apps/src/samples/pjsip-perf.c +++ b/pjsip-apps/src/samples/pjsip-perf.c @@ -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); diff --git a/pjsip-apps/src/samples/siprtp.c b/pjsip-apps/src/samples/siprtp.c index 825b2c9bd..1621841db 100644 --- a/pjsip-apps/src/samples/siprtp.c +++ b/pjsip-apps/src/samples/siprtp.c @@ -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); diff --git a/pjsip-apps/src/samples/stateful_proxy.c b/pjsip-apps/src/samples/stateful_proxy.c index d1d0ac29e..d77a5a3cb 100644 --- a/pjsip-apps/src/samples/stateful_proxy.c +++ b/pjsip-apps/src/samples/stateful_proxy.c @@ -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) { diff --git a/pjsip-apps/src/samples/stateless_proxy.c b/pjsip-apps/src/samples/stateless_proxy.c index c0198ac1d..b49ba4b2a 100644 --- a/pjsip-apps/src/samples/stateless_proxy.c +++ b/pjsip-apps/src/samples/stateless_proxy.c @@ -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) { diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c index 05eefb9c6..4412c92f0 100644 --- a/pjsip/src/pjsip-ua/sip_inv.c +++ b/pjsip/src/pjsip-ua/sip_inv.c @@ -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; diff --git a/pjsip/src/pjsip/sip_dialog.c b/pjsip/src/pjsip/sip_dialog.c index 2c40106a6..1d3a58a2a 100644 --- a/pjsip/src/pjsip/sip_dialog.c +++ b/pjsip/src/pjsip/sip_dialog.c @@ -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. */ diff --git a/pjsip/src/pjsip/sip_endpoint.c b/pjsip/src/pjsip/sip_endpoint.c index 873b1da15..ead4b96dc 100644 --- a/pjsip/src/pjsip/sip_endpoint.c +++ b/pjsip/src/pjsip/sip_endpoint.c @@ -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); } diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c index 3416cbfb0..c464556d8 100644 --- a/pjsip/src/pjsip/sip_transaction.c +++ b/pjsip/src/pjsip/sip_transaction.c @@ -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) diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c index 34cb0bbd7..6176d51af 100644 --- a/pjsip/src/pjsip/sip_transport.c +++ b/pjsip/src/pjsip/sip_transport.c @@ -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); } @@ -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; } } @@ -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); diff --git a/pjsip/src/pjsip/sip_transport_tls.c b/pjsip/src/pjsip/sip_transport_tls.c index 50accc919..1a5d2ad45 100644 --- a/pjsip/src/pjsip/sip_transport_tls.c +++ b/pjsip/src/pjsip/sip_transport_tls.c @@ -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) && \ @@ -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)); @@ -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); } diff --git a/pjsip/src/pjsip/sip_util.c b/pjsip/src/pjsip/sip_util.c index 116709316..f357952d5 100644 --- a/pjsip/src/pjsip/sip_util.c +++ b/pjsip/src/pjsip/sip_util.c @@ -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. */ @@ -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, @@ -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 @@ -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; @@ -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. */ @@ -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, @@ -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)); @@ -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; } diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c index fd04e5d83..000f70bf0 100644 --- a/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/pjsip/src/pjsua-lib/pjsua_acc.c @@ -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, @@ -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")); @@ -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; @@ -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, @@ -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) diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index 718cbb33e..71a941836 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -1605,7 +1605,15 @@ 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->dest_info) { + 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 { @@ -1825,7 +1833,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); diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 687ebd41f..ddbefb928 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -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);