sr-dev May 2025

sr-dev@lists.kamailio.org

13 participants
122 discussions

[kamailio/kamailio] topos: Allow contact a/b host like user part (PR #4246)
by Xenofon Karamanos 20 May '25

20 May '25

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  In this PR we introduce a new mode and two new parameters for accomplishing the same thing for user part also in domain part. Docs incoming if no significant changes are needed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4246 -- Commit Summary -- * topos: Add new contact_mode=3 and 2 new modparam for contact host domains * topos: Refactor contact_mode handling * topos: Append port and protocol param -- File Changes -- M src/modules/topos/topos_mod.c (13) M src/modules/topos/tps_storage.c (428) M src/modules/topos/tps_storage.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4246.patch https://github.com/kamailio/kamailio/pull/4246.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4246 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4246(a)github.com>

1 0

git:master:cdf9a471: cmake: Refactor packaging setup and improve installation paths
by Xenofon Karamanos 20 May '25

20 May '25

Module: kamailio Branch: master Commit: cdf9a4716db3762b172df059d7366983216fd48c URL: https://github.com/kamailio/kamailio/commit/cdf9a4716db3762b172df059d736698… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-20T15:09:40Z cmake: Refactor packaging setup and improve installation paths - Moved packaging configuration to a new deb-packaging.cmake file for better organization. - Updated installation paths in CMakeLists to use DESTDIR for flexibility. - Enhanced group handling for module packaging, allowing for "ALL_PACKAGED" option. --- Added: cmake/deb-packaging.cmake Modified: CMakeLists.txt Modified: cmake/groups.cmake Modified: src/CMakeLists.txt Modified: src/modules/CMakeLists.txt Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/cdf9a4716db3762b172df059d736698… Patch: https://github.com/kamailio/kamailio/commit/cdf9a4716db3762b172df059d736698…

1 0

git:master:201a2bde: cmake: snmpstats Remove warning message
by Xenofon Karamanos 20 May '25

20 May '25

Module: kamailio Branch: master Commit: 201a2bdee6a8b78787908b296824cd282b78eef5 URL: https://github.com/kamailio/kamailio/commit/201a2bdee6a8b78787908b296824cd2… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-20T15:08:35Z cmake: snmpstats Remove warning message --- Modified: src/modules/snmpstats/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/201a2bdee6a8b78787908b296824cd2… Patch: https://github.com/kamailio/kamailio/commit/201a2bdee6a8b78787908b296824cd2… --- diff --git a/src/modules/snmpstats/CMakeLists.txt b/src/modules/snmpstats/CMakeLists.txt index fead0651f33..3c5f2428242 100644 --- a/src/modules/snmpstats/CMakeLists.txt +++ b/src/modules/snmpstats/CMakeLists.txt @@ -8,7 +8,6 @@ find_package(NETSNMP REQUIRED) # TODO: Compiles fine but need to do some more verifcation target_link_libraries(${module_name} PRIVATE NETSNMP::NETSNMP) -message(WARNING "group_name is: ${group_name}") install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mibs DESTINATION ${CMAKE_INSTALL_DATADIR}/snmp

1 0

git:master:e0dd3961: cmake: Fix dbschema generation to match older makefile structure
by Xenofon Karamanos 20 May '25

20 May '25

Module: kamailio Branch: master Commit: e0dd39618fae2004cd1ab44758ca323376935e2e URL: https://github.com/kamailio/kamailio/commit/e0dd39618fae2004cd1ab44758ca323… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-20T15:08:35Z cmake: Fix dbschema generation to match older makefile structure --- Added: cmake/dbschema-version-postprocess.sh Added: doc/stylesheets/dbschema_k/xsl/db_mongodb.xsl Added: doc/stylesheets/dbschema_k/xsl/db_mysql.xsl Added: doc/stylesheets/dbschema_k/xsl/db_oracle.xsl Added: doc/stylesheets/dbschema_k/xsl/db_postgres.xsl Added: doc/stylesheets/dbschema_k/xsl/db_text.xsl Modified: CMakeLists.txt Modified: cmake/dbschema.cmake Modified: doc/stylesheets/dbschema_k/xsl/common.xsl Modified: doc/stylesheets/dbschema_k/xsl/pi_framework_table.xsl Modified: src/CMakeLists.txt Modified: src/lib/srdb1/schema/version.xml Removed: doc/stylesheets/dbschema_k/xsl/dbtext.xsl Removed: doc/stylesheets/dbschema_k/xsl/mongodb.xsl Removed: doc/stylesheets/dbschema_k/xsl/mysql.xsl Removed: doc/stylesheets/dbschema_k/xsl/oracle.xsl Removed: doc/stylesheets/dbschema_k/xsl/postgres.xsl --- Diff: https://github.com/kamailio/kamailio/commit/e0dd39618fae2004cd1ab44758ca323… Patch: https://github.com/kamailio/kamailio/commit/e0dd39618fae2004cd1ab44758ca323…

1 0

git:master:ccad04cc: cmake: Fix dbschema generation with group names
by Xenofon Karamanos 20 May '25

20 May '25

Module: kamailio Branch: master Commit: ccad04cc13b1c5695aded8ee02181f10c8ed7d11 URL: https://github.com/kamailio/kamailio/commit/ccad04cc13b1c5695aded8ee02181f1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-20T15:06:11Z cmake: Fix dbschema generation with group names - Add function to find group of module - Some targets and destinations folders have changed due to changing to more consistency naming. - dbschema_{db_module_name) targets - stringparam db set to module name --- Modified: cmake/dbschema.cmake Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/ccad04cc13b1c5695aded8ee02181f1… Patch: https://github.com/kamailio/kamailio/commit/ccad04cc13b1c5695aded8ee02181f1…

1 0

[kamailio/kamailio] MAR callback is not executed after a MAR request is sent (ims _auth module) (Issue #4205)
by Amin Nazari 20 May '25

20 May '25

amnapa created an issue (kamailio/kamailio#4205) ### Description Using sCSCF sample found [here](https://github.com/kamailio/kamailio/blob/master/misc/examples/ims/sc…, after calling ims_www_challenge in REGISTER route block and sending a Diameter MAR request, the control is never passed to REG_MAR_REPLY route block and debug messages within REG_MAR_REPLY are not logged. This is not the case with REG_SAR_REPLY and PRE_REG_SAR_REPLY, those blocks are executed as expected. ``` ###################################################################### # Route for handling Registrations: ###################################################################### route[REGISTER] { xlog("ALGORITHM IS [$aa] and User-Agent is [$ua]\n"); $var(alg) = $aa; if ($aa == $null) { $var(alg) = "MD5"; #force to MD5 for zoiper.... non-ims } #!ifdef WITH_AUTH if (!ims_www_authenticate("$td")) { #!else if (($var(alg) == "MD5") && (!ims_www_authenticate("$td"))) { #!endif if ($? == -2) { send_reply("403", "Authentication Failed"); exit; } else if ($? == -3) { send_reply("400", "Bad Request"); exit; } else if ($? == -9) { xlog("L_DBG", "Authentication re-sync requested\n"); ims_www_resync_auth("REG_RESYNC_REPLY", "$td"); exit; } else { #user has not been authenticated. Lets send a challenge via 401 Unauthorized xlog("L_DBG", "About to challenge! auth_ims\n"); ims_www_challenge("REG_MAR_REPLY", "$td", "$var(alg)"); exit; } } else { xlog("L_DBG", "Auth succeeded\n"); # We need to check if this user is registered or not if (!impu_registered("location")) { xlog("L_ERR", "Not REGISTERED\n"); save("PRE_REG_SAR_REPLY", "location"); exit; } else { isc_match_filter_reg("1", "location"); save("REG_SAR_REPLY", "location"); exit; } } } route[REG_MAR_REPLY] { #this is async so to know status we have to check the reply avp xlog("L_DBG", "maa_return code is $avp(s:maa_return_code)\n"); switch ($avp(s:maa_return_code)){ case 1: #success xlog("L_DBG", "MAR success - 401/407 response sent from module\n"); break; case -1: #failure xlog("L_ERR", "MAR failure - error response sent from module\n"); break; case -2: #error xlog("L_ERR", "MAR error - sending error response now\n"); send_reply("500", "MAR failed"); break; default: xlog("L_ERR", "Unknown return code from MAR, value is [$avp(s:maa_return_code)]\n"); send_reply("500", "Unknown response code from MAR"); break; } exit; } ``` ### Troubleshooting #### Reproduction  #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages ``` ERROR: *** cfgtrace:request_route=[REGISTER] c=[/usr/local/etc/kamailio/kamailio.cfg] l=712 a=27 n=ims_www_challenge DEBUG: ims_auth [authorize.c:290]: challenge(): Looking for route block [REG_MAR_REPLY] INFO: ims_auth [cxdx_mar.c:76]: create_return_code(): created AVP successfully : [maa_return_code] - [-2] DEBUG: ims_auth [authorize.c:314]: challenge(): Need to challenge for realm [ims.mnc072.mcc432.3gppnetwork.org] DEBUG: ims_auth [authorize.c:321]: challenge(): Checking if REGISTER is authorized for realm [ims.mnc072.mcc432.3gppnetwork.org]... DEBUG: ims_auth [authorize.c:1446]: get_auth_userdata(): Searching auth_userdata for IMPU sip:bob@ims.mnc072.mcc432.3gppnetwork.org (Hash 295) DEBUG: ims_auth [authorize.c:1455]: get_auth_userdata(): Found auth_userdata DEBUG: ims_auth [authorize.c:1061]: get_auth_vector(): looping through AV status is 3 and were looking for 0 DEBUG: tm [t_lookup.c:1343]: t_newtran(): msg (0x7f8d3f410cb0) id=1/11 global id=1/11 T start=(nil) DEBUG: tm [t_lookup.c:498]: t_lookup_request(): start searching: hash=21555, isACK=0 DEBUG: tm [t_lookup.c:456]: matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bK3345.d6f2aff0d9192c2647aca3baea62cf94.1] DEBUG: tm [t_lookup.c:681]: t_lookup_request(): no transaction found DEBUG: tm [t_hooks.c:337]: run_reqin_callbacks_internal(): trans=0x7f8d2bff4520, callback type 1, id 0 entered DEBUG: ims_auth [authorize.c:457]: challenge(): Suspending SIP TM transaction DEBUG: ims_auth [authorize.c:1526]: multimedia_auth_request(): Sending MAR DEBUG: ims_auth [cxdx_mar.c:572]: cxdx_send_mar(): Successfully sent async diameter DEBUG: tm [t_lookup.c:1628]: t_lookup_ident_filter(): transaction found INFO: ims_auth [cxdx_avp.c:134]: cxdx_get_avp(): cxdx_get_experimental_result_code: Failed finding avp (avp_code = 297, vendor_id = 0) DEBUG: ims_auth [authorize.c:1557]: pack_challenge(): setting QOP str used is [, qop="auth"] DEBUG: ims_auth [authorize.c:1559]: pack_challenge(): QOP str used is [, qop="auth"] DEBUG: tm [t_reply.c:1660]: cleanup_uac_timers(): RETR/FR timers reset DEBUG: tm [t_reply.c:595]: _reply_light(): reply sent out. buf=0x7f8d3f4120b8: SIP/2.0 401 Unauthor..., shmem=0x7f8d2bff9288: SIP/2.0 401 Unauthor DEBUG: tm [t_reply.c:606]: _reply_light(): finished DEBUG: ims_auth [authorize.c:1446]: get_auth_userdata(): Searching auth_userdata for IMPU sip:bob@ims.mnc072.mcc432.3gppnetwork.org (Hash 295) DEBUG: ims_auth [authorize.c:1455]: get_auth_userdata(): Found auth_userdata DEBUG: ims_auth [authorize.c:1679]: add_auth_vector(): Adding auth_vector (status 1) for IMPU sip:bob@ims.mnc072.mcc432.3gppnetwork.org / IMPI bob(a)ims.mnc072.mcc432.3gppnetwork.org (Hash 295) DEBUG: ims_auth [cxdx_mar.c:483]: async_cdp_callback(): DBG:UAR Async CDP callback: ... Done resuming transaction INFO: ims_auth [cxdx_mar.c:76]: create_return_code(): created AVP successfully : [maa_return_code] - [1] DEBUG: ims_auth [cxdx_mar.c:495]: async_cdp_callback(): Destroying current transaction prevented! DEBUG: tm [t_lookup.c:1620]: t_lookup_ident_filter(): transaction in terminated phase - skipping ERROR: tm [t_suspend.c:196]: t_continue_helper(): active transaction not found DEBUG: ims_auth [cxdx_mar.c:84]: free_saved_transaction_data(): Freeing saved transaction data: async ``` #### SIP Traffic ``` (paste your sip traffic here) ``` ### Possible Solutions The issue is related to ims_auth module, in [cxdx_mar.c ](https://github.com/kamailio/kamailio/blob/master/src/modules/ims_auth/cxdx_mar.c). within async_cdp_callback function, if I replace: ``` tmb.t_continue(data->tindex, data->tlabel, data->act); ```` with the following: ``` tmb.t_continue_skip_timer(data->tindex, data->tlabel, data->act); ``` the issue will be fixed and the control will be passed to REG_MAR_REPLY route block. In fact, in ims_registrar_scscf module, in [cxdx_sar.c ](https://github.com/kamailio/kamailio/blob/master/src/modules/ims_registrar_scscf/cxdx_sar.c) file, the t_continue_skip_timer is called instead of t_continue, if I replace it with t_continue the same issue happens for SAR callbacks. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 6.1.0-dev0 (x86_64/linux) c858ce-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: c858ce -dirty compiled on 10:33:37 Apr 5 2025 with gcc 11.4.0 ``` * **Operating System**: ``` Distributor ID: Ubuntu Description: Ubuntu 22.04.5 LTS Release: 22.04 Codename: jammy Linux kuber-worker 5.15.0-133-generic #144-Ubuntu SMP Fri Feb 7 20:47:38 UTC 2025 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4205 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4205(a)github.com>

2 3

TSILO With Multiple Devices Over WebSocket
by bhavikpatel14388＠gmail.com 20 May '25

20 May '25

Hello, I am using exact same logic for which is define in this documentation and single device its working fine. https://www.kamailio.org/events/2015-KamailioWorld/Day2/20-Federico.Cabiddu… But seems like if multiple registration with same extension, like if extension 102 logged in mobile as well web. If web device registered and mobile is not registered with wss, then the Current transaction is not going to suspend due to its consider like there is only one location entry on location table.so only one Invite send to web and mobile its going to send notification but never get Invite, even it is going to register using push notification. So below LOCATION function should be called and sending invite to registered extension and should be waiting for Other device as well. But in my case its consider like only one device is there and transaction is not suspending. Could you check and suggest me which part of code need to improve to so i can make it working with registered device with parallel forking for adding new branch. Here is my code. modparam("registrar", "max_contacts", 10) modparam("registrar", "append_branches", 1) modparam("registrar", "use_path", 1) modparam("registrar", "path_mode", 1) loadmodule "tsilo.so" modparam("tsilo", "use_domain", 1) modparam("htable", "htable", "vtp=>size=100;autoexpire=30;") # append branches or resume the transaction route[PUSHJOIN] { $var(hjoin) = 0; lock("$tU"); $var(hjoin) = $sht(vtp=>join::$tU); $var(hstored) = $sht(vtp=>stored::$tU); $sht(vtp=>join::$tU) = $null; unlock("$tU"); if ($var(hjoin)==0) { if ($var(hstored)) ts_append("location", "$tU"); return; } $var(id_index) = $(var(hjoin){s.select,0,:}{s.int}); $var(id_label) = $(var(hjoin){s.select,1,:}{s.int}); t_continue("$var(id_index)", "$var(id_label)", "INVRESUME"); } # lookup and relay after resuming transaction route[INVRESUME] { lookup("location"); xlog("L_INFO","[RESUME] rm=$rm ru=$ru du=$du \n"); t_relay(); ts_store(); $sht(vtp=>stored::$rU) = 1; $sht(vtp=>id_index::$tu) = $null; $sht(vtp=>id_label::$tu) = $null; xlog("L_INFO","stored transaction [$T(id_index):$T(id_label)] $fU => $rU\n"); } route[SUSPEND] { if ( !t_suspend() ) { xlog("L_ERROR","[SUSPEND] failed suspending trasaction [$T(id_index):$T(id_label)]\n"); send_reply("501", "Suspending error"); exit; } xlog("L_INFO","[SUSPEND] suspended transaction [$T(id_index):$T(id_label)] $fU=> $rU\n"); $sht(vtp=>join::$rU) = "" + $T(id_index) + ":" + $T(id_label); xlog("L_INFO","htable key value [$sht(vtp=>join::$rU)]\n"); } route[SENDPUSH] { $avp(platform) = $hdr(X-pn-platform); $var(headers) = "Content-Type: application/json\r\nAuthorization: Bearer 55466cc-c789-4a48-39c8-219ebaa1512f"; $var(body) = "{\"user\": \"" + $rU + "\", " + "\"platform\": \"" + $avp(platform) + "\"}"; http_client_query("https://handlepush.xxx.com/v2/phone/call/send_notification_kamalio", "$var(body)", "$var(headers)", "$var(res)"); } # User location service route[LOCATION] { if (!lookup("location")) { send_reply("100", "Trying"); xlog("L_INFO","SUSPENDING TRANASACTION $fU => $rU\n"); route(SUSPEND); } else { t_relay(); ts_store(); $sht(vtp=>stored::$rU) = 1; xlog("L_INFO","stored transaction [$T(id_index):$T(id_label)] $fU=> $rU\n"); } route(SENDPUSH); exit; } if (is_method("REGISTER") || from_uri==myself) { xlog("L_INFO", "SAVING TO LOCATIONS $si:$sp\n"); if (!save("location")) { sl_reply_error(); } route(PUSHJOIN); exit; } Can you help me to understand why parallel forking not working in this case ? Thanks

3 8

[kamailio/kamailio] ims_dialog: missing srdb1 schema definition (Issue #4100)
by Victor Seva 20 May '25

20 May '25

there's no ``kamailio-ims_dialog.xml`` at ``src/lib/srdb1/schema`` but there's a manual file created at ``utils/kamctl/mysql/ims_dialog-create.sql`` Same thing for: - ``utils/kamctl/mysql/ims_charging-create.sql`` - ``utils/kamctl/mysql/ims_usrloc_pcscf-create.sql`` - ``utils/kamctl/mysql/ims_usrloc_scscf-create.sql`` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4100 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4100(a)github.com>

3 10

git:master:068ace09: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 20 May '25

20 May '25

Module: kamailio Branch: master Commit: 068ace09409ef1f03bf6d617b315579cfe2a46f6 URL: https://github.com/kamailio/kamailio/commit/068ace09409ef1f03bf6d617b315579… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2025-05-20T09:31:10+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/068ace09409ef1f03bf6d617b315579… Patch: https://github.com/kamailio/kamailio/commit/068ace09409ef1f03bf6d617b315579…

1 0

git:master:0cb4dd32: dialog: split w_dlg_req_with_headers_and_content() for kemi usage
by Daniel-Constantin Mierla 20 May '25

20 May '25

Module: kamailio Branch: master Commit: 0cb4dd3282ec12cdaefca491f9ed43acd0f21bdd URL: https://github.com/kamailio/kamailio/commit/0cb4dd3282ec12cdaefca491f9ed43a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-20T09:25:09+02:00 dialog: split w_dlg_req_with_headers_and_content() for kemi usage - PR #4245 --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/0cb4dd3282ec12cdaefca491f9ed43a… Patch: https://github.com/kamailio/kamailio/commit/0cb4dd3282ec12cdaefca491f9ed43a… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 382941c9925..4539d1657e2 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1363,19 +1363,57 @@ static int fixup_dlg_req_with_headers_and_content(void **param, int param_no) return 0; } +static int ki_dlg_req_with_headers_and_content(struct sip_msg *msg, int nside, + str *smethod, str *sheaders, str *scontent_type, str *scontent) +{ + dlg_cell_t *dlg = NULL; + + dlg = dlg_get_ctx_dialog(); + if(dlg == NULL) + return -1; + + if(nside == 1) { + if(dlg_request_within(msg, dlg, DLG_CALLER_LEG, smethod, sheaders, + scontent_type, scontent) + != 0) + goto error; + goto done; + } else if(nside == 2) { + if(dlg_request_within(msg, dlg, DLG_CALLEE_LEG, smethod, sheaders, + scontent_type, scontent) + != 0) + goto error; + goto done; + } else { + if(dlg_request_within(msg, dlg, DLG_CALLER_LEG, smethod, sheaders, + scontent_type, scontent) + != 0) + goto error; + if(dlg_request_within(msg, dlg, DLG_CALLEE_LEG, smethod, sheaders, + scontent_type, scontent) + != 0) + goto error; + goto done; + } + +done: + dlg_release(dlg); + return 1; + +error: + dlg_release(dlg); + return -1; +} + static int w_dlg_req_with_headers_and_content(struct sip_msg *msg, char *side, char *method, char *headers, char *content_type, char *content) { - dlg_cell_t *dlg = NULL; int n; str str_method = {0, 0}; str str_headers = {0, 0}; str str_content_type = {0, 0}; str str_content = {0, 0}; - dlg = dlg_get_ctx_dialog(); - if(dlg == NULL) - return -1; if(fixup_get_svalue(msg, (gparam_p)method, &str_method) != 0) { LM_ERR("unable to get Method\n"); @@ -1417,36 +1455,11 @@ static int w_dlg_req_with_headers_and_content(struct sip_msg *msg, char *side, } n = (int)(long)side; - if(n == 1) { - if(dlg_request_within(msg, dlg, DLG_CALLER_LEG, &str_method, - &str_headers, &str_content_type, &str_content) - != 0) - goto error; - goto done; - } else if(n == 2) { - if(dlg_request_within(msg, dlg, DLG_CALLEE_LEG, &str_method, - &str_headers, &str_content_type, &str_content) - != 0) - goto error; - goto done; - } else { - if(dlg_request_within(msg, dlg, DLG_CALLER_LEG, &str_method, - &str_headers, &str_content_type, &str_content) - != 0) - goto error; - if(dlg_request_within(msg, dlg, DLG_CALLEE_LEG, &str_method, - &str_headers, &str_content_type, &str_content) - != 0) - goto error; - goto done; - } -done: - dlg_release(dlg); - return 1; + return ki_dlg_req_with_headers_and_content( + msg, n, &str_method, &str_headers, &str_content_type, &str_content); error: - dlg_release(dlg); return -1; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2025