sr-dev December 2023

sr-dev@lists.kamailio.org

14 participants
228 discussions

git:master:5bbff26c: sca: removed if on rc before being set

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5bbff26ce6e95b841e69f2dffc2214318a748c36 URL: https://github.com/kamailio/kamailio/commit/5bbff26ce6e95b841e69f2dffc22143… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-31T09:35:08+01:00 sca: removed if on rc before being set - reorder some conditions on range --- Modified: src/modules/sca/sca_appearance.c Modified: src/modules/sca/sca_rpc.c Modified: src/modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/5bbff26ce6e95b841e69f2dffc22143… Patch: https://github.com/kamailio/kamailio/commit/5bbff26ce6e95b841e69f2dffc22143… --- diff --git a/src/modules/sca/sca_appearance.c b/src/modules/sca/sca_appearance.c index c467137a8d7..fcc94c4c2b6 100644 --- a/src/modules/sca/sca_appearance.c +++ b/src/modules/sca/sca_appearance.c @@ -60,7 +60,7 @@ void sca_appearance_state_to_str(int state, str *state_str) { assert(state_str != NULL); - if(state >= SCA_APPEARANCE_STATE_NAME_COUNT || state < 0) { + if(state < 0 || state >= SCA_APPEARANCE_STATE_NAME_COUNT) { state_str->len = SCA_APPEARANCE_STATE_STR_UNKNOWN.len; state_str->s = SCA_APPEARANCE_STATE_STR_UNKNOWN.s; diff --git a/src/modules/sca/sca_rpc.c b/src/modules/sca/sca_rpc.c index c3b9b0f2bae..bedfdaa0162 100644 --- a/src/modules/sca/sca_rpc.c +++ b/src/modules/sca/sca_rpc.c @@ -199,10 +199,6 @@ void sca_rpc_deactivate_all_subscriptions(rpc_t *rpc, void *ctx) rpc->rpl_printf(ctx, "Deactivating %s subscription from %.*s", sca_event_name_from_type(sub->event), STR_FMT(&sub->subscriber)); - if(rc < 0) { - // make sure we unlock below - break; - } rc = sca_notify_subscriber( sca, sub, SCA_CALL_INFO_APPEARANCE_INDEX_ANY); diff --git a/src/modules/sca/sca_subscribe.c b/src/modules/sca/sca_subscribe.c index 6e9949a5d78..895141e1e25 100644 --- a/src/modules/sca/sca_subscribe.c +++ b/src/modules/sca/sca_subscribe.c @@ -1426,7 +1426,7 @@ int sca_subscription_reply(sca_mod *scam, int status_code, char *status_msg, extra_headers.s = hdr_buf; len = snprintf(extra_headers.s, sizeof(hdr_buf), "Event: %s%s", sca_event_name_from_type(event_type), CRLF); - if(len >= sizeof(hdr_buf) || len < 0) { + if(len < 0 || len >= sizeof(hdr_buf)) { LM_ERR("sca_subscription_reply: extra headers too long\n"); return (-1); } @@ -1446,7 +1446,7 @@ int sca_subscription_reply(sca_mod *scam, int status_code, char *status_msg, len = snprintf(extra_headers.s + extra_headers.len, sizeof(hdr_buf) - extra_headers.len, "Expires: %d%s", expires, CRLF); - if(len >= (sizeof(hdr_buf) - extra_headers.len) || len < 0) { + if(len < 0 || len >= (sizeof(hdr_buf) - extra_headers.len)) { LM_ERR("sca_subscription_reply: extra headers too long\n"); return (-1); }

4 months, 2 weeks

git:master:6c129bdc: ratelimit: removed unnecessary condition

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6c129bdc87352d0d883cc46fce0b78444e619084 URL: https://github.com/kamailio/kamailio/commit/6c129bdc87352d0d883cc46fce0b784… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-31T09:22:28+01:00 ratelimit: removed unnecessary condition --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/6c129bdc87352d0d883cc46fce0b784… Patch: https://github.com/kamailio/kamailio/commit/6c129bdc87352d0d883cc46fce0b784… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index d993bbd6e98..4e327460044 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -1256,7 +1256,7 @@ static void rpc_set_queue(rpc_t *rpc, void *c) if(rpc->scan(c, "dSd", &queue_no, &method, &pipe_no) < 3) return; - if(pipe_no >= MAX_PIPES || (int)pipe_no < 0) { + if(pipe_no >= MAX_PIPES) { LM_ERR("Invalid pipe number: %d\n", pipe_no); rpc->fault(c, 400, "Invalid pipe number"); return;

4 months, 2 weeks

git:master:a268f073: core: main - typos in log messages

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a268f073bc9716fefc35248687d793bdcc6d66b9 URL: https://github.com/kamailio/kamailio/commit/a268f073bc9716fefc35248687d793b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-30T10:15:04+01:00 core: main - typos in log messages --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/a268f073bc9716fefc35248687d793b… Patch: https://github.com/kamailio/kamailio/commit/a268f073bc9716fefc35248687d793b… --- diff --git a/src/main.c b/src/main.c index c107f354672..fc1570c3b7a 100644 --- a/src/main.c +++ b/src/main.c @@ -2193,7 +2193,7 @@ int main(int argc, char **argv) /* safety check for upper limit of 1TB */ if(l1 <= 0 || l1 > 1024L * 1024) { fprintf(stderr, - "our of limits private mem size number: -M %s\n", + "out of limits private mem size number: -M %s\n", optarg); goto error; } @@ -2333,7 +2333,7 @@ int main(int argc, char **argv) } /* safety check for upper limit of 16TB */ if(l1 <= 0 || l1 > 16L * 1024 * 1024) { - fprintf(stderr, "our of limits shmem size number: -m %s\n", + fprintf(stderr, "out of limits shmem size number: -m %s\n", optarg); goto error; }

4 months, 2 weeks

git:master:9410ce38: core: cfg.y - check limit for shm size

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9410ce3848c1ab7fa8b7ded47d090342fd4cf1c0 URL: https://github.com/kamailio/kamailio/commit/9410ce3848c1ab7fa8b7ded47d09034… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-30T10:05:29+01:00 core: cfg.y - check limit for shm size --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/9410ce3848c1ab7fa8b7ded47d09034… Patch: https://github.com/kamailio/kamailio/commit/9410ce3848c1ab7fa8b7ded47d09034… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 545ca7fdc66..c357faa927d 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1865,11 +1865,18 @@ assign_stm: | OPEN_FD_LIMIT EQUAL NUMBER { open_files_limit=$3; } | OPEN_FD_LIMIT EQUAL error { yyerror("number expected"); } | SHM_MEM_SZ EQUAL NUMBER { - if (shm_initialized()) + if (shm_initialized()) { yyerror("shm/shm_mem_size must be before any modparam or the" " route blocks"); - else if (shm_mem_size == 0 || shm_mem_size == SHM_MEM_POOL_SIZE) + } else if (shm_mem_size == 0 || shm_mem_size == SHM_MEM_POOL_SIZE) { + /* safety check for upper limit of 16TB */ + if($3 <= 0 || $3 > 16L * 1024 * 1024) { + LM_ERR("out of limits shmem size number: %ld\n", (long int)$3); + yyerror("invalid config option"); + YYABORT; + } shm_mem_size=$3 * 1024 * 1024; + } } | SHM_MEM_SZ EQUAL error { yyerror("number expected"); } | SHM_FORCE_ALLOC EQUAL NUMBER {

4 months, 2 weeks

git:master:b59607bb: debugger: explicit cast for pointer arithmetic operation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b59607bbcf6ca872e190dfcd9abf8fc5c0f64359 URL: https://github.com/kamailio/kamailio/commit/b59607bbcf6ca872e190dfcd9abf8fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-30T09:01:21+01:00 debugger: explicit cast for pointer arithmetic operation --- Modified: src/modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b59607bbcf6ca872e190dfcd9abf8fc… Patch: https://github.com/kamailio/kamailio/commit/b59607bbcf6ca872e190dfcd9abf8fc… --- diff --git a/src/modules/debugger/debugger_mod.c b/src/modules/debugger/debugger_mod.c index b6248644d65..c2d2dda79af 100644 --- a/src/modules/debugger/debugger_mod.c +++ b/src/modules/debugger/debugger_mod.c @@ -324,7 +324,7 @@ static struct action *dbg_fixup_get_action(void **param, int param_no) action_u_t *au; /* param points to au->u.string, get pointer to au */ au = ksr_container_of(param, action_u_t, u.string); - au = au - 1 - param_no; + au = (action_u_t *)au - 1 - param_no; /* au points to ac->val, get pointer to ac */ ac = ksr_container_of(au, cfg_action_t, val); return ac;

4 months, 2 weeks

git:master:3d2bae35: modules: readme files regenerated - siputils ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3d2bae3532e496648a902dac853edf013434672f URL: https://github.com/kamailio/kamailio/commit/3d2bae3532e496648a902dac853edf0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-12-29T10:01:51+01:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/3d2bae3532e496648a902dac853edf0… Patch: https://github.com/kamailio/kamailio/commit/3d2bae3532e496648a902dac853edf0…

4 months, 3 weeks

git:master:3d6fecc6: siputils: docs for tel2sip2() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3d6fecc6bc6d52f56d0fdd4e075a15032da91421 URL: https://github.com/kamailio/kamailio/commit/3d6fecc6bc6d52f56d0fdd4e075a150… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-29T09:55:33+01:00 siputils: docs for tel2sip2() function --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3d6fecc6bc6d52f56d0fdd4e075a150… Patch: https://github.com/kamailio/kamailio/commit/3d6fecc6bc6d52f56d0fdd4e075a150… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 63984c60c67..d2197b1c3f4 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -539,13 +539,15 @@ if (uri_param_rm("param1")) { <para> The conversion follows the rules in RFC 3261 section 19.1.6: <itemizedlist> - <listitem> - <para>Visual separators ( "-", ".", "(", ")" ) are removed from tel URI number before converting it to SIP URI userinfo.</para> + <listitem> + <para>Visual separators ( "-", ".", "(", ")" ) are removed + from tel URI number before converting it to SIP URI userinfo.</para> </listitem> <listitem> - <para>tel URI parameters are downcased before appending them to SIP URI userinfo</para> - </listitem> - </itemizedlist> + <para>tel URI parameters are downcased before appending them + to SIP URI userinfo</para> + </listitem> + </itemizedlist> </para> <para> The SIP URI hostpart is taken from second param @@ -569,6 +571,36 @@ tel2sip("$ru", $fd", "$ru"); tel2sip("$ru", $fd", "$ru"); # $ru: sip:+12345678;ext=200;isub=+123-456@foo.com;user=phone ... +</programlisting> + </example> + </section> + <section id="siputils.f.tel2sip2"> + <title> + <function moreinfo="none">tel2sip2(uri, hostpart, result)</function> + </title> + <para> + Alternative to sip2tel() function that tries to follow closer the RFC + requrements (e.g., sort tel: uri parameters copied to the sip: uri in + the manner defined in the standard; deletes the phone-context parameter + if it is a domain, and, takes visual separators from the phone-context + parameter if it is a telephone number). + </para> + <para> + Its parameters have the same meaning as for tel2sip(). + </para> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + BRANCH_ROUTE, or ONREPLY_ROUTE. + </para> + <example> + <title><function>tel2sip2</function> usage</title> + <programlisting format="linespecific"> +... +# $ru: tel:+(34)-999-888-777 +# $fu: sip:test@foo.com +tel2sip2("$ru", $fd", "$ru"); +# $ru: sip:+34999888777@foo.com;user=phone +... </programlisting> </example> </section>

4 months, 3 weeks

git:master:366e2862: siputils: added tel2sip2() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 366e28627dc7047d4dce2aefe67b5e97b5ae6682 URL: https://github.com/kamailio/kamailio/commit/366e28627dc7047d4dce2aefe67b5e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-29T09:43:10+01:00 siputils: added tel2sip2() function - based on proposal presented at: https://github.com/kamailio/kamailio/issues/1173#issuecomment-315198949 - alternative to tel2sip() which has a simpler approach, but it does not follow all the RFC requirements. This is still kept as it proved to be useful over the years Co-authored-by: Donald Carr <doncarr(a)gmail.com> Co-authored-by: Supreeth Herle <herlesupreeth(a)gmail.com> --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/366e28627dc7047d4dce2aefe67b5e9… Patch: https://github.com/kamailio/kamailio/commit/366e28627dc7047d4dce2aefe67b5e9…

4 months, 3 weeks

[kamailio/kamailio] ims_ipsec_pcscf: dummy AOR sip:you@kamailio.org prevents ipsec_destroy() from finding contact (Issue #3570)

by jbipre2

### Description Have two 4G UE's registered (over Open5GS CN / Amarisoft eNB): UE1 (OnePlus) connects to P-CSCF over UDP, UE2 (Huawei) connects using IPSec SA. Immediately after registration, VoLTE calls work from UE1 to UE2 and vice-versa; but after some time, only from UE2 to UE1. Calls initiated from UE1 fail with a "network error" message. Following Kamailio logfile extract shows periodic OPTIONS processing failing (cause unknown to me) leading to de-registration: ``` Sep 14 00:56:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:67435055-f201-4c46-a31f-10b7f30c9574@10.46.0.11:5060 via sip:10.46.0.11:5060;transport=tcp... Sep 14 00:56:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:001010000051194@10.46.0.6:31907 via sip:10.46.0.6:31907;transport=tcp... Sep 14 00:57:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:67435055-f201-4c46-a31f-10b7f30c9574@10.46.0.11:5060 via sip:10.46.0.11:5060;transport=tcp... Sep 14 00:57:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:001010000051194@10.46.0.6:31907 via sip:10.46.0.6:31907;transport=tcp... Sep 14 00:58:01 corsa03 p-cscf[8124]: INFO: cdp [authstatemachine.c:270]: auth_client_statefull_sm_process(): after callback of event 1 Sep 14 00:58:01 corsa03 p-cscf[8134]: INFO: cdp [authstatemachine.c:270]: auth_client_statefull_sm_process(): after callback of event 17 Sep 14 00:58:01 corsa03 p-cscf[8134]: INFO: cdp [authstatemachine.c:425]: auth_client_statefull_sm_process(): state machine: AUTH_EV_RECV_STA about to clean up Sep 14 00:58:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:67435055-f201-4c46-a31f-10b7f30c9574@10.46.0.11:5060 via sip:10.46.0.11:5060;transport=tcp... Sep 14 00:58:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:001010000051194@10.46.0.6:31907 via sip:10.46.0.6:31907;transport=tcp... Sep 14 00:58:37 corsa03 p-cscf[8124]: NOTICE: <script>: request sent to sip:001010000051194@10.46.0.6:31907: Fail Counter is 1 Sep 14 00:59:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:67435055-f201-4c46-a31f-10b7f30c9574@10.46.0.11:5060 via sip:10.46.0.11:5060;transport=tcp... Sep 14 00:59:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:001010000051194@10.46.0.6:31907 via sip:10.46.0.6:31907;transport=tcp... Sep 14 00:59:37 corsa03 p-cscf[8124]: NOTICE: <script>: request sent to sip:001010000051194@10.46.0.6:31907: Fail Counter is 2 Sep 14 01:00:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:67435055-f201-4c46-a31f-10b7f30c9574@10.46.0.11:5060 via sip:10.46.0.11:5060;transport=tcp... Sep 14 01:00:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:001010000051194@10.46.0.6:31907 via sip:10.46.0.6:31907;transport=tcp... Sep 14 01:00:37 corsa03 p-cscf[8124]: NOTICE: <script>: request sent to sip:001010000051194@10.46.0.6:31907: Fail Counter is 3 Sep 14 01:01:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:67435055-f201-4c46-a31f-10b7f30c9574@10.46.0.11:5060 via sip:10.46.0.11:5060;transport=tcp... Sep 14 01:01:07 corsa03 p-cscf[8138]: INFO: <script>: OPTIONS to sip:001010000051194@10.46.0.6:31907 via sip:10.46.0.6:31907;transport=tcp... Sep 14 01:01:37 corsa03 p-cscf[8124]: NOTICE: <script>: request sent to sip:001010000051194@10.46.0.6:31907: Fail Counter is 4 Sep 14 01:01:37 corsa03 p-cscf[8124]: NOTICE: <script>: Unregistering sip:001010000051194@10.46.0.6:31907;alias=10.46.0.6~31907~2 ``` But now the dummy AOR: sip:you@kamailio.org is used by ipsec_destroy(), instead of UE2's AOR: sip:001010000051194@10.46.0.6:31907: ``` Sep 14 01:01:37 corsa03 p-cscf[8124]: NOTICE: <script>: Unregistering sip:001010000051194@10.46.0.6:31907;alias=10.46.0.6~31907~2 Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_ipsec_pcscf [cmd.c:198]: fill_contact(): using original uri for contact filling: sip:you@kamailio.org Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: <core> [core/mem/q_malloc.c:373]: qm_malloc(): qm_malloc(0x7f73e298e010, 50) called from ims_ipsec_pcscf: cmd.c: fill_contact(282) Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: <core> [core/mem/q_malloc.c:416]: qm_malloc(): qm_malloc(0x7f73e298e010, 56) returns address 0x7f73e2c5a0f8 frag. 0x7f73e2c5a0c0 (size=56) on 1 -th hit Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_ipsec_pcscf [cmd.c:333]: fill_contact(): SIP REQUEST fill contact with AOR [sip:you@kamailio.org], VIA [0://kamailio.org:5060], received_host [1://1.0.0.127:5060] Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [usrloc.c:157]: get_aor_hash(): Returning hash: [4128780523] Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [usrloc.c:148]: get_hash_slot(): Returning hash slot: [235] Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [udomain.c:459]: get_pcontact_from_cache(): Searching for contact with AOR [sip:you@kamailio.org] in P-CSCF usrloc based on VIA [0://kamailio.org:5060] Received [1://1.0.0.127:5060], Search flag is 0, reverse_search 0 Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [udomain.c:469]: get_pcontact_from_cache(): Have an AOR to search for Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [udomain.c:474]: get_pcontact_from_cache(): checking for rinstance Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [usrloc.c:157]: get_aor_hash(): Returning hash: [4128780523] Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [udomain.c:509]: get_pcontact_from_cache(): get_pcontact slot is [235] Sep 14 01:01:37 corsa03 p-cscf[8124]: DEBUG: ims_usrloc_pcscf [udomain.c:642]: get_pcontact_from_cache(): contact not found in memory Sep 14 01:01:37 corsa03 p-cscf[8124]: ERROR: ims_ipsec_pcscf [cmd.c:1062]: ipsec_destroy(): Contact doesn't exist ``` I assume that ipsec_destroy() determines that the contact doesn't exist, so no change can be made to any SA. The ipsec_destroy() function call in pcscf/kamailio.cfg is used as follows: ``` event_route[uac:reply] { #!ifdef WITH_DEBUG xnotice("request sent to $uac_req(ruri) completed with code: $uac_req(evcode), Type $uac_req(evtype)\n"); #!endif if (($uac_req(evtype) != 1) || ($uac_req(evcode) != 200)) { if ($sht(natpingfail=>$uac_req(ouri)) == $null) { $sht(natpingfail=>$uac_req(ouri)) = 1; } else { $sht(natpingfail=>$uac_req(ouri)) = $sht(natpingfail=>$uac_req(ouri)) + 1; } xnotice(" request sent to $uac_req(ruri): Fail Counter is $sht(natpingfail=>$uac_req(ouri))\n"); if ($sht(natpingfail=>$uac_req(ouri)) > 3) { if ($(uac_req(ouri){uri.transport}) == "tcp") { $var(alias) = "alias="+$(uac_req(ouri){uri.host})+"~"+$(uac_req(ouri){uri.port})+"~2"; } else if ($(uac_req(ouri){uri.transport}) == "tls") { $var(alias) = "alias="+$(uac_req(ouri){uri.host})+"~"+$(uac_req(ouri){uri.port})+"~3"; } else { $var(alias) = "alias="+$(uac_req(ouri){uri.host})+"~"+$(uac_req(ouri){uri.port})+"~1"; } xnotice(" Unregistering $uac_req(ruri);$var(alias)\n"); setdebug("9"); ipsec_destroy("location"); pcscf_unregister("location", "$uac_req(ruri);$var(alias)", "$(uac_req(ouri){uri.host})", "$(uac_req(ouri){uri.port})"); resetdebug(); sht_lock("natping=>natpinglock"); $sht(natping=>$uac_req(ouri)) = $null; sht_unlock("natping=>natpinglock"); sht_lock("natpingfrom=>natpingfromlock"); $sht(natpingfrom=>$uac_req(ouri)) = $null; sht_unlock("natpingfrom=>natpingfromlock"); $sht(natpingfail=>$uac_req(ouri)) = $null; } } else { $sht(natpingfail=>$uac_req(ouri)) = $null; } } ``` How do I ensure that ipsec_destroy() receives a real AOR, and not the dummy (default?) value sip:you@kamailio.org? ### Additional Information ``` version: kamailio 5.7.1 (x86_64/linux) 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 17:01:00 Aug 12 2023 with x86_64-pc-linux-gnu-gcc 13.2.0 ``` * **Operating System**: ``` Linux corsa03 6.5.2-gentoo-x86_64 #2 SMP PREEMPT_DYNAMIC Thu Sep 7 15:16:58 CEST 2023 x86_64 AMD EPYC 7513 32-Core Processor AuthenticAMD GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3570 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3570(a)github.com>

4 months, 3 weeks

git:master:453a8f1e: pike: renamed short common name global variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 453a8f1e2ae10d765790ddafe92bcaaf7f5b9c32 URL: https://github.com/kamailio/kamailio/commit/453a8f1e2ae10d765790ddafe92bcaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T16:44:20+01:00 pike: renamed short common name global variable --- Modified: src/modules/pike/pike_top.c --- Diff: https://github.com/kamailio/kamailio/commit/453a8f1e2ae10d765790ddafe92bcaa… Patch: https://github.com/kamailio/kamailio/commit/453a8f1e2ae10d765790ddafe92bcaa… --- diff --git a/src/modules/pike/pike_top.c b/src/modules/pike/pike_top.c index a5126760a3a..bf450ee5584 100644 --- a/src/modules/pike/pike_top.c +++ b/src/modules/pike/pike_top.c @@ -33,7 +33,7 @@ static struct TopListItem_t *top_list_root = 0; static struct TopListItem_t *top_list_iter = 0; -static char buff[PIKE_BUFF_SIZE]; +static char _pike_top_buff[PIKE_BUFF_SIZE]; struct TopListItem_t *pike_top_get_root() { @@ -72,7 +72,8 @@ char *pike_top_print_addr( /* if you do not need global buffer, you can use this simpler call */ static char *print_addr(unsigned char *ip, int iplen) { - return pike_top_print_addr(ip, iplen, buff, sizeof(buff)); + return pike_top_print_addr( + ip, iplen, _pike_top_buff, sizeof(_pike_top_buff)); } int pike_top_add_entry(unsigned char *ip_addr, int addr_len, @@ -88,8 +89,8 @@ int pike_top_add_entry(unsigned char *ip_addr, int addr_len, print_addr(ip_addr, addr_len); DBG("pike_top_add_enrty(ip: %s, leaf_hits[%d,%d], hits[%d,%d]," " expires: %d, status: %d)", - buff, leaf_hits[0], leaf_hits[1], hits[0], hits[1], expires, - status); + _pike_top_buff, leaf_hits[0], leaf_hits[1], hits[0], hits[1], + expires, status); assert(new_item != 0); memset((void *)new_item, 0, sizeof(struct TopListItem_t)); @@ -123,5 +124,5 @@ void pike_top_list_clear() top_list_iter = ptr; } top_list_root = 0; - memset(buff, 0, sizeof(buff)); + memset(_pike_top_buff, 0, sizeof(_pike_top_buff)); }

4 months, 3 weeks

← Newer
1
2
3
4
5
6
7
8
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2023