sr-dev December 2023

sr-dev@lists.kamailio.org

14 participants
234 discussions

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 {

1 year

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;

1 year

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…

1 year

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>

1 year

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…

1 year

[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>

1 year

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)); }

1 year

git:master:a1289520: pike: use buffer size parameter in pike_top_print_addr()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a12895208595d966cc3d4ab06358c511d0222031 URL: https://github.com/kamailio/kamailio/commit/a12895208595d966cc3d4ab06358c51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T14:25:51+01:00 pike: use buffer size parameter in pike_top_print_addr() --- Modified: src/modules/pike/pike_top.c --- Diff: https://github.com/kamailio/kamailio/commit/a12895208595d966cc3d4ab06358c51… Patch: https://github.com/kamailio/kamailio/commit/a12895208595d966cc3d4ab06358c51… --- diff --git a/src/modules/pike/pike_top.c b/src/modules/pike/pike_top.c index 0d9a5218e4c..a5126760a3a 100644 --- a/src/modules/pike/pike_top.c +++ b/src/modules/pike/pike_top.c @@ -41,33 +41,32 @@ struct TopListItem_t *pike_top_get_root() } char *pike_top_print_addr( - unsigned char *ip, int iplen, char *buff, int buffsize) + unsigned char *ip, int iplen, char *obuff, int obuffsize) { unsigned short *ipv6_ptr = (unsigned short *)ip; - int bsize; int blen; - bsize = PIKE_BUFF_SIZE * sizeof(char); - memset(buff, 0, bsize); + memset(obuff, 0, obuffsize); - DBG("pike:top:print_addr(iplen: %d, buffsize: %d)", iplen, buffsize); + DBG("address iplen: %d, buffsize: %d", iplen, obuffsize); if(iplen == 4) { - inet_ntop(AF_INET, ip, buff, buffsize); + inet_ntop(AF_INET, ip, obuff, obuffsize); } else if(iplen == 16) { - inet_ntop(AF_INET6, ip, buff, buffsize); + inet_ntop(AF_INET6, ip, obuff, obuffsize); } else { - blen = snprintf(buff, bsize, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x", - htons(ipv6_ptr[0]), htons(ipv6_ptr[1]), htons(ipv6_ptr[2]), - htons(ipv6_ptr[3]), htons(ipv6_ptr[4]), htons(ipv6_ptr[5]), - htons(ipv6_ptr[6]), htons(ipv6_ptr[7])); - if(blen < 0 || blen >= bsize) { + blen = snprintf(obuff, obuffsize, + "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x", htons(ipv6_ptr[0]), + htons(ipv6_ptr[1]), htons(ipv6_ptr[2]), htons(ipv6_ptr[3]), + htons(ipv6_ptr[4]), htons(ipv6_ptr[5]), htons(ipv6_ptr[6]), + htons(ipv6_ptr[7])); + if(blen < 0 || blen >= obuffsize) { LM_ERR("failed to print the address - reset it\n"); - memset(buff, 0, bsize); + memset(obuff, 0, obuffsize); } } - return buff; + return obuff; } /* if you do not need global buffer, you can use this simpler call */

1 year

[kamailio/kamailio] cdp: add destination realm avp only if not present (PR #3692)

by Supreeth Herle

#### 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) - [ ] 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR fixes duplicate "Destination-Realm" AVP being added to Session Termination Request Diameter message sent over Rx interface You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3692 -- Commit Summary -- * cdp: add destination realm avp only if not present -- File Changes -- M src/modules/cdp/authstatemachine.c (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3692.patch https://github.com/kamailio/kamailio/pull/3692.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3692 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3692(a)github.com>

1 year

git:master:159282d6: cdp: add destination realm avp only if not present

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 159282d6bd05b73961037b753e0a9df5ac9cdbe3 URL: https://github.com/kamailio/kamailio/commit/159282d6bd05b73961037b753e0a9df… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-28T11:10:36+01:00 cdp: add destination realm avp only if not present --- Modified: src/modules/cdp/authstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/159282d6bd05b73961037b753e0a9df… Patch: https://github.com/kamailio/kamailio/commit/159282d6bd05b73961037b753e0a9df… --- diff --git a/src/modules/cdp/authstatemachine.c b/src/modules/cdp/authstatemachine.c index 4a8d6f12ed9..a5aadb1c274 100644 --- a/src/modules/cdp/authstatemachine.c +++ b/src/modules/cdp/authstatemachine.c @@ -751,7 +751,7 @@ void auth_server_stateless_sm_process( int dup_routing_avps(AAAMessage *src, AAAMessage *dest) { - AAA_AVP *avp; + AAA_AVP *avp, *avp2; str dest_realm; if(!src) @@ -782,18 +782,24 @@ int dup_routing_avps(AAAMessage *src, AAAMessage *dest) LM_DBG("dup_routing_avps: Origin Realm AVP present, duplicating %.*s\n", avp->data.len, avp->data.s); dest_realm = avp->data; - avp = AAACreateAVP(AVP_Destination_Realm, AAA_AVP_FLAG_MANDATORY, 0, - dest_realm.s, dest_realm.len, AVP_DUPLICATE_DATA); - if(!avp) { - LM_ERR("dup_routing_avps: Failed creating Destination Host avp\n"); - goto error; - } - if(AAAAddAVPToMessage(dest, avp, dest->avpList.tail) - != AAA_ERR_SUCCESS) { - LM_ERR("dup_routing_avps: Failed adding Destination Host avp to " - "message\n"); - AAAFreeAVP(&avp); - goto error; + avp2 = AAAFindMatchingAVP(src, src->avpList.head, AVP_Destination_Realm, + 0, AAA_FORWARD_SEARCH); + if(!avp2) { + avp = AAACreateAVP(AVP_Destination_Realm, AAA_AVP_FLAG_MANDATORY, 0, + dest_realm.s, dest_realm.len, AVP_DUPLICATE_DATA); + if(!avp) { + LM_ERR("dup_routing_avps: Failed creating Destination Realm " + "avp\n"); + goto error; + } + if(AAAAddAVPToMessage(dest, avp, dest->avpList.tail) + != AAA_ERR_SUCCESS) { + LM_ERR("dup_routing_avps: Failed adding Destination Realm avp " + "to " + "message\n"); + AAAFreeAVP(&avp); + goto error; + } } }

1 year

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2023