sr-dev March 2022

sr-dev@lists.kamailio.org

10 participants
242 discussions

git:master:6695b6fc: corex: updated memory info fields

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6695b6fcb830b379e3d2aea4d7d35daba8e30317 URL: https://github.com/kamailio/kamailio/commit/6695b6fcb830b379e3d2aea4d7d35da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T09:43:59+01:00 corex: updated memory info fields --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/6695b6fcb830b379e3d2aea4d7d35da… Patch: https://github.com/kamailio/kamailio/commit/6695b6fcb830b379e3d2aea4d7d35da… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 615fb892bc..4c1d3c820c 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -71,8 +71,8 @@ static void corex_rpc_shm_stats(rpc_t* rpc, void* c) rpc->add(c, "{", &th); rpc->struct_add(th, "jjjjjj", "total", mi.total_size, - "free", mi.free, - "used", mi.used, + "free", mi.free_size, + "used", mi.used_size, "real_used", mi.real_used, "max_used", mi.max_used, "fragments", mi.total_frags

2 years, 2 months

git:master:f65c98cf: core: parser - check value of pointer with white space code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f65c98cf74e4495a6e892a701980c4b691a3390b URL: https://github.com/kamailio/kamailio/commit/f65c98cf74e4495a6e892a701980c4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T09:43:13+01:00 core: parser - check value of pointer with white space code --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/f65c98cf74e4495a6e892a701980c4b… Patch: https://github.com/kamailio/kamailio/commit/f65c98cf74e4495a6e892a701980c4b… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 9fae1f7448..c2b817f3e4 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -376,7 +376,7 @@ int extract_ice_option(str *body, sdp_stream_cell_t *stream) return -1; ptr_src = body->s + 14; - if (ptr_src == 32) ptr_src++; /* if starts with a space, skip it */ + if (*ptr_src == 32) ptr_src++; /* if starts with a space, skip it */ /* identify all existing ICE options, if they are listed in one row */ while (*ptr_src && *ptr_src != '\r' && *ptr_src != '\n' && max_options-->0)

2 years, 2 months

git:master:27d71da5: core: mem - renamed memory info fields

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 27d71da5da8a2f33a74e35765ba00ef83a20186f URL: https://github.com/kamailio/kamailio/commit/27d71da5da8a2f33a74e35765ba00ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T09:26:07+01:00 core: mem - renamed memory info fields - avoid conflict with keywords like free --- Modified: src/core/core_cmd.c Modified: src/core/mem/f_malloc.c Modified: src/core/mem/meminfo.h Modified: src/core/mem/q_malloc.c Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/27d71da5da8a2f33a74e35765ba00ef… Patch: https://github.com/kamailio/kamailio/commit/27d71da5da8a2f33a74e35765ba00ef… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index d045a144cb..c464d3686e 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -598,8 +598,8 @@ static void core_shmmem(rpc_t* rpc, void* c) rpc->add(c, "{", &handle); rpc->struct_add(handle, "dddddd", "total", (unsigned int)(mi.total_size>>rs), - "free", (unsigned int)(mi.free>>rs), - "used", (unsigned int)(mi.used>>rs), + "free", (unsigned int)(mi.free_size>>rs), + "used", (unsigned int)(mi.used_size>>rs), "real_used",(unsigned int)(mi.real_used>>rs), "max_used", (unsigned int)(mi.max_used>>rs), "fragments", (unsigned int)mi.total_frags diff --git a/src/core/mem/f_malloc.c b/src/core/mem/f_malloc.c index 38f686ff2c..6cb98addc1 100644 --- a/src/core/mem/f_malloc.c +++ b/src/core/mem/f_malloc.c @@ -951,8 +951,8 @@ void fm_info(void* qmp, struct mem_info* info) memset(info,0, sizeof(*info)); info->total_size=qm->size; info->min_frag=MIN_FRAG_SIZE; - info->free=qm->size-qm->real_used; - info->used=qm->used; + info->free_size=qm->size-qm->real_used; + info->used_size=qm->used; info->real_used=qm->real_used; info->max_used=qm->max_real_used; info->total_frags=qm->ffrags; diff --git a/src/core/mem/meminfo.h b/src/core/mem/meminfo.h index 8b69daa705..9a823c49fe 100644 --- a/src/core/mem/meminfo.h +++ b/src/core/mem/meminfo.h @@ -19,7 +19,7 @@ /** * \file * \brief Memory manager (malloc) informations and statistics - * + * * Memory manager (malloc) informations and statistics, like the used memory, * fragmentations etc.. * \ingroup mem @@ -34,8 +34,8 @@ /** Memory information structure */ struct mem_info{ unsigned long total_size; /** total size of memory pool */ - unsigned long free; /** free memory */ - unsigned long used; /** allocated size */ + unsigned long free_size; /** free memory */ + unsigned long used_size; /** allocated size */ unsigned long real_used; /** used size plus overhead from malloc */ unsigned long max_used; /** maximum used size since server start? */ unsigned long min_frag; /** minimum number of fragmentations? */ diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index fb786ba635..403ee34da8 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -942,8 +942,8 @@ void qm_info(void* qmp, struct mem_info* info) memset(info,0, sizeof(*info)); info->total_size=qm->size; info->min_frag=MIN_FRAG_SIZE; - info->free=qm->size-qm->real_used; - info->used=qm->used; + info->free_size=qm->size-qm->real_used; + info->used_size=qm->used; info->real_used=qm->real_used; info->max_used=qm->max_real_used; info->total_frags=qm->ffrags; diff --git a/src/core/mem/tlsf_malloc.c b/src/core/mem/tlsf_malloc.c index 10db30264b..19b71a8be3 100644 --- a/src/core/mem/tlsf_malloc.c +++ b/src/core/mem/tlsf_malloc.c @@ -1178,11 +1178,11 @@ void tlsf_meminfo(tlsf_t pool, struct mem_info *info) { control_t* control = tlsf_cast(control_t*, pool); memset(info, 0, sizeof(*info)); - info->free = control->total_size - control->real_used; + info->free_size = control->total_size - control->real_used; info->max_used = control->max_used; info->real_used = control->real_used; info->total_frags = control->fragments; - info->used = control->allocated; + info->used_size = control->allocated; info->total_size = control->total_size; }

2 years, 2 months

[kamailio/kamailio] cdp: increase the amount of avps allocated when reading AVP_Vendor_Sp… (PR #3031)

by kristiyan-peychev-flolive

…ecific_Application_Id   #### 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 - [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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  I've ran into issues when working with certain HSS's that sent more AVP's than were allocated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3031 -- Commit Summary -- * cdp: increase the amount of avps allocated when reading AVP_Vendor_Specific_Application_Id -- File Changes -- M src/modules/cdp/peerstatemachine.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3031.patch https://github.com/kamailio/kamailio/pull/3031.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3031 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3031(a)github.com>

2 years, 2 months

git:master:62f7be22: cdp: increase the amount of avps allocated when reading AVP_Vendor_Specific_Application_Id

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 62f7be2281f5dd91a5668c4b84e52a7d7169e21f URL: https://github.com/kamailio/kamailio/commit/62f7be2281f5dd91a5668c4b84e52a7… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-03T21:50:35+01:00 cdp: increase the amount of avps allocated when reading AVP_Vendor_Specific_Application_Id --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/62f7be2281f5dd91a5668c4b84e52a7… Patch: https://github.com/kamailio/kamailio/commit/62f7be2281f5dd91a5668c4b84e52a7… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index b83654bf1d..a4520d797d 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -732,7 +732,7 @@ void save_peer_applications(peer *p,AAAMessage *msg) total_cnt += supported_vendor_id_avp_cnt; break; case AVP_Vendor_Specific_Application_Id: - total_cnt+=2;/* wasteful, but let's skip decoding */ + total_cnt+=6;/* wasteful, but let's skip decoding */ break; } LM_DBG("Total count of applications is %d\n", total_cnt);

2 years, 2 months

[kamailio/kamailio] Infinite loop in siptrace with core callback in traffic mirror mode. (Issue #3042)

by Dennis

### Description Infiinite loop in siptrace module when configured to pure mirroring (no HEP) with core events. #### Reproduction Simple config: listen=udp:XXX.XXX.XXX.XXX:5060 listen=udp:127.0.0.1:5080 debug=2 log_facility=LOG_LOCAL0 log_prefix="{$timef(%F %T) $mt $hdr(CSeq) $ci}" children=4 loadmodule "tm.so" loadmodule "sl.so" loadmodule "pv.so" loadmodule "xlog.so" loadmodule "ctl.so" loadmodule "siptrace.so" modparam("siptrace", "trace_on", 1) modparam("siptrace", "trace_mode", 4) modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "xheaders_write", 1) modparam("siptrace", "duplicate_uri", "sip:127.0.0.1:5888") modparam("siptrace", "send_sock_addr", "sip:127.0.0.1:5080") request_route { xinfo('>>>>> Request $rm from $si'); } event_route[siptrace:msg] { xinfo(">>>>> Siptrace event method $rm"); } #### Log Messages With received OPTIONS request: ``` Feb 28 13:54:52 kamailio systemd[1]: Starting Kamailio - the Open Source SIP Server... Feb 28 13:54:52 kamailio kamailio: INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Feb 28 13:54:52 kamailio kamailio: INFO: <core> [core/tcp_main.c:4997]: init_tcp(): using epoll_lt as the io watch method (auto detected) Feb 28 13:54:52 kamailio kamailio[12246]: Listening on Feb 28 13:54:52 kamailio kamailio[12246]: udp: 2607:beef:be:beef:5054:ff:fe4b:dd25:5060 Feb 28 13:54:52 kamailio kamailio[12246]: udp: 127.0.0.1:5080 Feb 28 13:54:52 kamailio kamailio[12246]: Aliases: Feb 28 13:54:52 kamailio kamailio[12246]: udp: localhost:5080 Feb 28 13:54:52 kamailio kamailio[12246]: udp: kamailio:5060 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: siptrace [siptrace.c:410]: mod_init(): can't load dlg api. Will not install dialog callbacks. Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [main.c:3030]: main(): processes (at least): 14 - shm size: 67108864 - pkg size: 8388608 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12273]: INFO: ctl [io_listener.c:214]: io_listen_loop(): io_listen_loop: using epoll_lt io watch method (config) Feb 28 13:54:52 kamailio systemd[1]: Started Kamailio - the Open Source SIP Server. Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS ... Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio kernel: [271505.656348] kamailio[12262]: segfault at 7ffdf9d8fff8 ip 00007f3bfeb6f256 sp 00007ffdf9d90000 error 6 in pv.so[7f3bfeaf3000+e0000] Feb 28 13:54:54 kamailio kernel: [271505.715015] kamailio[12263]: segfault at 7ffdf9d8fff8 ip 00007f3bfeb6f256 sp 00007ffdf9d90000 error 6 in pv.so[7f3bfeaf3000+e0000] Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: message repeated 872 times: [ INFO: <script>: >>>>> Siptrace event method OPTIONS] Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12274]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 9 Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12259]: ALERT: <core> [main.c:788]: handle_sigs(): child process 12262 exited by a signal 11 Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12259]: ALERT: <core> [main.c:791]: handle_sigs(): core was generated Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [main.c:813]: handle_sigs(): terminating due to SIGCHLD Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12274]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12273]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12268]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12272]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12265]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12264]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12270]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12267]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12269]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12271]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12266]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.3 (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, 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 with gcc 7.5.0 ``` * **Operating System**: ``` Ubuntu 18.04.6 LTS Linux 4.15.0-169-generic #177-Ubuntu SMP Thu Feb 3 10:50:38 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3042 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3042(a)github.com>

2 years, 2 months

[kamailio/kamailio] cplc: manage case where TZ environment variable is not set. (PR #3045)

by Frédéric Gaisnon

#### 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 - [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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  cplc: manage case where TZ environment variable is not set. When TZ environment variable was not set, only the first time based CPL worked correctly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3045 -- Commit Summary -- * cplc: manage case where TZ environment variable is not set. -- File Changes -- M src/modules/cplc/cpl_switches.h (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3045.patch https://github.com/kamailio/kamailio/pull/3045.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3045 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3045(a)github.com>

2 years, 2 months

git:master:2ea56a4c: cplc: manage case where TZ environment variable is not set.

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2ea56a4cf40045bb92b1f17f5a0b8c172da4f866 URL: https://github.com/kamailio/kamailio/commit/2ea56a4cf40045bb92b1f17f5a0b8c1… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-03T16:10:17+01:00 cplc: manage case where TZ environment variable is not set. --- Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/2ea56a4cf40045bb92b1f17f5a0b8c1… Patch: https://github.com/kamailio/kamailio/commit/2ea56a4cf40045bb92b1f17f5a0b8c1… --- diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index c3c8572f4c..e2d15bfbb3 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -815,7 +815,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) /* does the recv_time match the specified interval? */ j = cpl_check_tmrec( &trt, &att, 0); /* restore the orig TZ */ - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); /* reset flags */ flags &= (1<<7); @@ -850,7 +850,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) cpl_tmrec_free( &trt ); return DEFAULT_ACTION; runtime_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt ); @@ -859,7 +859,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) LM_ERR("error parsing attr [%d][%s]\n", attr_name,attr_str?(char*)attr_str:"NULL"); script_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt );

2 years, 2 months

git:5.4:e2614c01: topos_redis: contact on A side is never updated on dialog update

by Victor Seva

Module: kamailio Branch: 5.4 Commit: e2614c014faf61fd1c6f1dccf0264589bf44698f URL: https://github.com/kamailio/kamailio/commit/e2614c014faf61fd1c6f1dccf026458… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-03T10:15:31+01:00 topos_redis: contact on A side is never updated on dialog update (cherry picked from commit 86d233d34b06016fc3436ca4574155959d24bb16) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/e2614c014faf61fd1c6f1dccf026458… Patch: https://github.com/kamailio/kamailio/commit/e2614c014faf61fd1c6f1dccf026458… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index fe366403c8..6dd77b0d4a 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1260,7 +1260,7 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, argc++; if(mode & TPS_DBU_CONTACT) { - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, + TPS_REDIS_SET_ARGS(&md->a_contact, argc, &td_key_a_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, argv, argvlen);

2 years, 2 months

git:5.5:5c0ac5a8: topos_redis: contact on A side is never updated on dialog update

by Victor Seva

Module: kamailio Branch: 5.5 Commit: 5c0ac5a847022ca43ed2b3607c5be183132b679c URL: https://github.com/kamailio/kamailio/commit/5c0ac5a847022ca43ed2b3607c5be18… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-03T10:14:59+01:00 topos_redis: contact on A side is never updated on dialog update (cherry picked from commit 86d233d34b06016fc3436ca4574155959d24bb16) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5c0ac5a847022ca43ed2b3607c5be18… Patch: https://github.com/kamailio/kamailio/commit/5c0ac5a847022ca43ed2b3607c5be18… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 0d21cbc2d1..456d54ebee 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1321,7 +1321,7 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, argc++; if(mode & TPS_DBU_CONTACT) { - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, + TPS_REDIS_SET_ARGS(&md->a_contact, argc, &td_key_a_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, argv, argvlen);

2 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2022