sr-dev

sr-dev@lists.kamailio.org

3 participants
45196 discussions

git: new commits in branch 5.2
by Henning Westerholt 13 May '20

13 May '20

- URL: https://github.com/kamailio/kamailio/commit/8c09b29f1a9e577dbf3c42df83e20ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:15:13Z dispatcher: docs - note about special attributes section for weight dispatching (cherry picked from commit 7602329391760b2f18d653f46d6a596be1daade5) - URL: https://github.com/kamailio/kamailio/commit/6f096013bf782f35e9ea96fc2174884… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:16:00Z xmlops: Makefile - try to use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 64d37971d2d3fbd87176fe71ae19adca7f47a6ea) - URL: https://github.com/kamailio/kamailio/commit/fea6520b3815e2694ae19c5283a081e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:16:06Z presence: Makefile - try to use pkg-config if xml2-config is not found (cherry picked from commit 5ce9690245e0a075742c7cb8eac1786622c976f4) - URL: https://github.com/kamailio/kamailio/commit/f43cc0fa9110e078405ad4c62b6718a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:16:11Z presence_xml: Makefile - try to use pkg-config if xml2-config is not found (cherry picked from commit 77ad9e626a8b9f26f3ce904fe35dda70ad4ce164) - URL: https://github.com/kamailio/kamailio/commit/705e1737bf0990858906ec27d079aa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:16:17Z presence_dialoginfo: Makefile - try to use pkg-config if xml2-config is not found (cherry picked from commit 517283c245be8c35d3c6ee9721fa1e85865b4638) - URL: https://github.com/kamailio/kamailio/commit/aa5bd6dfa556e0fea81172356e97d2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:16:23Z utils: Makefile - try to use pkg-config if xml2-config is not found (cherry picked from commit 02cf454fc601dd3b246a8886ec6d86103ad87a6e) - URL: https://github.com/kamailio/kamailio/commit/96f0cbd8ffab63ddb2e1d0cfb28de17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:17:44Z lib/ims: Makefile - try to use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 58deac2e7fd62afca409b17903deb951493b213a) - URL: https://github.com/kamailio/kamailio/commit/fcb0ac2c47cb9861f38f84c3ecd59cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:17:55Z cdp: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 2749962b8354be1731ab68a0ae4aa0fac4f944e1) - URL: https://github.com/kamailio/kamailio/commit/6da63a2a9473ce21c7eff7954dc3a85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:18:04Z cplc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit f05a46dc79de45c6cb958b845b9f2d85452c4f37) - URL: https://github.com/kamailio/kamailio/commit/b4d5bd208d90b5d109dd81532c05c91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:18:11Z ims_auth: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 4d3496fb82df1d249a78365e0c50b4ec13989261) - URL: https://github.com/kamailio/kamailio/commit/d684dd3862277b5d4ff1cd7537002c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:18:21Z ims_icscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 80f2eb33a967ede3e70fef572dc9b42172ad067c) - URL: https://github.com/kamailio/kamailio/commit/004e5f20b4a8e329da75df2e35dcbed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:18:34Z test/mod_httpapitest: removed unused xml2-config discovery (cherry picked from commit b88b2306a0bdd8ba8df92cfeb60eb4032f337f44) - URL: https://github.com/kamailio/kamailio/commit/534931ce18bf01eb82221e8f243cecb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:18:43Z ims_isc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 71e67531194aa867b8f3f32b72d07e1bd4ad7dff) - URL: https://github.com/kamailio/kamailio/commit/4d7dc10923defb7667b96b8015657e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:18:51Z ims_registrar_pcscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 29573bbdb09412c9cbfe839f0c80b7dd7fe77804) - URL: https://github.com/kamailio/kamailio/commit/ffd04724da296fe2dba3c3db9ae9e9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:19:44Z ims_registrar_scscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit ff92622c3b4c6224f75318ba9e39c9b4389bff1e) - URL: https://github.com/kamailio/kamailio/commit/b3ac786b35b6b70f8c624cc3885676f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:00Z presence_conference: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 8e9e1fdeacc4c1b2b0cd67f1b36d73737dacd015) - URL: https://github.com/kamailio/kamailio/commit/148d063edf8993fb7e55234737f0324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:08Z pua: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 4f43047172260e1a524700a866693f99ea11383b) - URL: https://github.com/kamailio/kamailio/commit/b6a9617ca5f9f8b08f2fb7635aa1039… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:14Z pua_bla: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit e00ce6016afd5c0fba084a19a45fb13353e7f6f4) - URL: https://github.com/kamailio/kamailio/commit/35c0a605719386b7d79ca7f1da3695d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:20Z pua_dialoginfo: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit b4842e81e3aa861739c996ff795b6d7261202b66) - URL: https://github.com/kamailio/kamailio/commit/d1ff8f84d6b420625f62ebe807ab454… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:26Z pua_reginfo: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 7f6648a8586fdfd5a1fdba05556333095bc25777) - URL: https://github.com/kamailio/kamailio/commit/e1a5176caa05f1aa32b9570852c28a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:33Z pua_usrloc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 20d9453cd3259e8afa1de92a7dba1d25f5f43fe4) - URL: https://github.com/kamailio/kamailio/commit/64db37850a4c0ab56e2456ca92af08f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:38Z pua_xmpp: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit d40a924bd698ddf365b4db52cba2ab45f7d7a6e2) - URL: https://github.com/kamailio/kamailio/commit/4825182c0fa448cd1dbdf8cf4ba74d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:43Z rls: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit fbfe21f54c7fd845bf9c99c4091980b1ee4d61d5) - URL: https://github.com/kamailio/kamailio/commit/4d01c41746d47d74745161f90ea5d5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:48Z xcap_server: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 169ccce5e3cb302352b1e4d5ac0a0dc58eb552cb) - URL: https://github.com/kamailio/kamailio/commit/454e441e10f46a1efa590b01df0655d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:53Z xhttp_pi: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit fe173b2af121b2d6388fea3632037a0ea2999988) - URL: https://github.com/kamailio/kamailio/commit/baff4a1c240362a7ad5af4576df80d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:21:17Z xmlrpc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 994a8dfc070d84b5dad28fa873d8759280c910f2) - URL: https://github.com/kamailio/kamailio/commit/199c00984191f73d1e9bf637444740e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:25Z ims_qos: use extern in header files not to redeclare variables (cherry picked from commit df5521fcdfc96462eb191b774f242fe1d4616adb) - URL: https://github.com/kamailio/kamailio/commit/1afb7afde87f1022c10fc9e3796174b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:29Z ims_icscf: stats global variables made extern in header file (cherry picked from commit bfb717fc8504a079066a0fdc09b856a937a7b430) - URL: https://github.com/kamailio/kamailio/commit/786d18db8a1ad839cdeeda9ebb6419f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:34Z ims_isc: avoid duplicate declaration of isc_ulb by using extern (cherry picked from commit 32f37cdc876abcd7127993e079c9a0132d1f6460) - URL: https://github.com/kamailio/kamailio/commit/28f6d74dcfc68b3d7ac680ad0c3e625… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:40Z ims_auth: declare extern the stats variables in header file (cherry picked from commit 8156dd87a977a011abb9652a997f4ba61eb3e642) - URL: https://github.com/kamailio/kamailio/commit/b91953f88b4ee5343393172531c2251… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:46Z ims_dialog: declare extern dlg stats structure in header file (cherry picked from commit 15d5676fd7b6d64616fbf8ebf9517f0d56a47f5c) - URL: https://github.com/kamailio/kamailio/commit/76b5cf2dcd16e9496ba97fda947dcc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:51Z cdp: global variables declared extern in header file (cherry picked from commit a88cf96b8ba3358c08e0e210f76320f6d7926b7d) - URL: https://github.com/kamailio/kamailio/commit/2c4601d767c65da651d33411c28a336… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:56Z sipcapture: declare extern heptime in hep.c and init it to null (cherry picked from commit 16bc15156ecc8a8f4f66c44b064db854d0e3e4e0) - URL: https://github.com/kamailio/kamailio/commit/d1f187b78956ca8f515d31c36cc9370… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:26:02Z sms: removed duplicate declaration of global variables (cherry picked from commit f8284418ea7d16dec970260cb92eb1af35bbf643) - URL: https://github.com/kamailio/kamailio/commit/e2db44b2fbc6cd05e557e63d3f606ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:27:22Z ims_charging: extern declaration for cdpb (cherry picked from commit 9cd1cec4dedadcfcd50322c4709c4844a3db2f4f) - URL: https://github.com/kamailio/kamailio/commit/e6bd029c33c36a8de28ed630d6009bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:27:27Z ims_charging: use extern to avoid double declaration of globals (cherry picked from commit a13d49fb099dd5e8d832a0559a8e69aa8c61c1ae) - URL: https://github.com/kamailio/kamailio/commit/225536c1254d9bee48f7291a9e01c27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:27:32Z ims_usrloc_scscf: extern declaration for duplicated global vars (cherry picked from commit 1bbab692b749feee7f23a6c5c3fbee1ac890fffa) - URL: https://github.com/kamailio/kamailio/commit/ed81bd378fed68f9e3c117179631222… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:27:37Z ims_registrar_scscf: global vars declared extern in header files (cherry picked from commit a041e94c4dce464737d6531d11fbe4d61292d7b4) - URL: https://github.com/kamailio/kamailio/commit/19fcac6a792823ecf4fd360962650f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:28:03Z ims_diameter_server: extern declaration of global vars in header file (cherry picked from commit 19263243127c40d0418ff04e56048d31e9dd9d0c) - URL: https://github.com/kamailio/kamailio/commit/2bc21c1dc24418a0228908ac4212ac1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:01Z app_python3: declare global vars extern in header file (cherry picked from commit a771d9abd9ce97228efa7a0dfc9c4d89690e9b38) - URL: https://github.com/kamailio/kamailio/commit/2d80f8984dd2f8a13468b0b961d4d3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:08Z app_python: declare global vars extern in header file (cherry picked from commit 9cc9576c025c541264a3679618bb2be8d108a9f6) - URL: https://github.com/kamailio/kamailio/commit/9a90b41e636af948326bb552e4fb628… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:13Z pua_reginfo: extern declaration of global vars in header file (cherry picked from commit 7afe5b9837d38cd77f75c3028c9134673c95404e) - URL: https://github.com/kamailio/kamailio/commit/94268c1e65c3f2414b4b22eab2a677c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:19Z janssonrpcc: use extern not to declare tmb global many times (cherry picked from commit 6bb1e84907a6c8bdb0c72289bad7b9915c9b3385) - URL: https://github.com/kamailio/kamailio/commit/39615a12aba6834b34041812f87156b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:26Z ims_ocs: declare extern global variables in header file (cherry picked from commit 13da8cf58a2abfcd87a48fbc963d4e1a26d60085) - URL: https://github.com/kamailio/kamailio/commit/f00711733b071709fcffb874f80426d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:31Z pua: extern declaration of global variable in header file (cherry picked from commit e260447833f616066e0fa23e51e791822b55b039) - URL: https://github.com/kamailio/kamailio/commit/5cad26c5bef19de73feba84668b2f8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:37Z ims_qos: more extern declarations in the header files (cherry picked from commit 7bea30203b85b7ed17434ee3f301faa0cedcba76)

1 0

git:5.2:3235a046: Makefile.defs: detect gcc 9.0+, manual backport of 07209c3095d
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: 3235a04621dbcc3196d7e49641ec73fcebcf0ece URL: https://github.com/kamailio/kamailio/commit/3235a04621dbcc3196d7e49641ec73f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T08:47:09Z Makefile.defs: detect gcc 9.0+, manual backport of 07209c3095d --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/3235a04621dbcc3196d7e49641ec73f… Patch: https://github.com/kamailio/kamailio/commit/3235a04621dbcc3196d7e49641ec73f…

1 0

Releasing Kamailio 5.2.7
by Henning Westerholt 13 May '20

13 May '20

Hello, as discussed in the last development meeting, I am planning to release next week (likely on Wednesday 13th May) the next minor version out of branch 5.2, version 5.2.7. Backports of fixed issues from git master will be integrated as usual. If you are aware of new issues which were not yet reported, let us know (by creating an issue on the tracker). Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 1

git:master:730f65c0: core: explicit cast to (void*) for %p format printing
by Daniel-Constantin Mierla 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 730f65c06d0b8436e4a9cd0c1a62d2433819dc45 URL: https://github.com/kamailio/kamailio/commit/730f65c06d0b8436e4a9cd0c1a62d24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-12T19:52:52+02:00 core: explicit cast to (void*) for %p format printing - c standard required that for a defined value and in some cases the code analysers complain, especially when reading the value via socket/file descriptor --- Modified: src/core/async_task.c Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/730f65c06d0b8436e4a9cd0c1a62d24… Patch: https://github.com/kamailio/kamailio/commit/730f65c06d0b8436e4a9cd0c1a62d24… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index 870241b0d3..ee50412790 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -277,8 +277,8 @@ int async_task_run(int idx) continue; } if(ptask->exec!=NULL) { - LM_DBG("task executed [%p] (%p/%p)\n", ptask, - ptask->exec, ptask->param); + LM_DBG("task executed [%p] (%p/%p)\n", (void*)ptask, + (void*)ptask->exec, (void*)ptask->param); ptask->exec(ptask->param); } shm_free(ptask); diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 89e3b56b7c..fd5a644ee5 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3606,7 +3606,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) _wbufq_non_empty(tcpconn) )){ if (unlikely(TICKS_GE(t, tcpconn->wbuf_q.wr_timeout))){ LM_DBG("wr. timeout on CONN_RELEASE for %p refcnt= %d\n", - tcpconn, atomic_get(&tcpconn->refcnt)); + (void*)tcpconn, atomic_get(&tcpconn->refcnt)); /* timeout */ if (unlikely(tcpconn->state==S_CONN_CONNECT)){ #ifdef USE_DST_BLACKLIST

1 0

git:master:702630b4: imc: reserve last char in global buffer for ending zero
by Daniel-Constantin Mierla 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 702630b484ac6f7c017829c24294ce7552f1682a URL: https://github.com/kamailio/kamailio/commit/702630b484ac6f7c017829c24294ce7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-12T18:01:15+02:00 imc: reserve last char in global buffer for ending zero --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/702630b484ac6f7c017829c24294ce7… Patch: https://github.com/kamailio/kamailio/commit/702630b484ac6f7c017829c24294ce7… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 757b17b342..bf68967d21 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -960,7 +960,8 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, } p = imc_body_buf; - left = sizeof(imc_body_buf); + imc_body_buf[IMC_BUF_SIZE - 1] = '\0'; + left = sizeof(imc_body_buf) - 1; memcpy(p, MEMBERS, sizeof(MEMBERS) - 1); p += sizeof(MEMBERS) - 1; @@ -975,22 +976,22 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, } if (imp->flags & IMC_MEMBER_OWNER) { - if (left < 1) goto overrun; + if (left < 2) goto overrun; *p++ = '*'; left--; } else if (imp->flags & IMC_MEMBER_ADMIN) { - if (left < 1) goto overrun; + if (left < 2) goto overrun; *p++ = '~'; left--; } name = format_uri(imp->uri); - if (left < name->len) goto overrun; + if (left < name->len + 1) goto overrun; strncpy(p, name->s, name->len); p += name->len; left -= name->len; - if (left < 1) goto overrun; + if (left < 2) goto overrun; *p++ = '\n'; left--;

1 0

git:master:94eb9fed: keepalive: use ctime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 94eb9fed8b1d4a0aaaf76506e339f2d6a9e34e7d URL: https://github.com/kamailio/kamailio/commit/94eb9fed8b1d4a0aaaf76506e339f2d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:45:23+02:00 keepalive: use ctime_r() for a safer multi-thread usage --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/94eb9fed8b1d4a0aaaf76506e339f2d… Patch: https://github.com/kamailio/kamailio/commit/94eb9fed8b1d4a0aaaf76506e339f2d… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index 3a72b31474..e6a64dbcd1 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -78,24 +78,19 @@ static void keepalive_rpc_list(rpc_t *rpc, void *ctx) { void *sub; ka_dest_t *dest; - char *_ctime; - char *_utime; - char *_dtime; + char t_buf[26] = {0}; for(dest = ka_destinations_list->first; dest != NULL; dest = dest->next) { rpc->add(ctx, "{", &sub); rpc->struct_add(sub, "SS", "uri", &dest->uri, "owner", &dest->owner); - _ctime = ctime(&dest->last_checked); - _ctime[strlen(_ctime) - 1] = '\0'; - rpc->struct_add(sub, "s", "last checked", _ctime); - _utime = ctime(&dest->last_up); - _utime[strlen(_utime) - 1] = '\0'; - rpc->struct_add(sub, "s", "last up", _utime); - _dtime = ctime(&dest->last_down); - _dtime[strlen(_dtime) - 1] = '\0'; - rpc->struct_add(sub, "s", "last down", _dtime); + ctime_r(&dest->last_checked, t_buf); + rpc->struct_add(sub, "s", "last checked", t_buf); + ctime_r(&dest->last_up, t_buf); + rpc->struct_add(sub, "s", "last up", t_buf); + ctime_r(&dest->last_down, t_buf); + rpc->struct_add(sub, "s", "last down", t_buf); rpc->struct_add(sub, "d", "state", (int) dest->state); }

1 0

git:master:259af0c1: sipdump: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 259af0c1eea8419df247c8da0f12b1881afa5332 URL: https://github.com/kamailio/kamailio/commit/259af0c1eea8419df247c8da0f12b18… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:32:31+02:00 sipdump: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/sipdump/sipdump_write.c --- Diff: https://github.com/kamailio/kamailio/commit/259af0c1eea8419df247c8da0f12b18… Patch: https://github.com/kamailio/kamailio/commit/259af0c1eea8419df247c8da0f12b18… --- diff --git a/src/modules/sipdump/sipdump_write.c b/src/modules/sipdump/sipdump_write.c index 03ed711d81..29face97c4 100644 --- a/src/modules/sipdump/sipdump_write.c +++ b/src/modules/sipdump/sipdump_write.c @@ -137,7 +137,8 @@ static int sipdump_write_meta(char *fpath) int len; int i; FILE *mfile = NULL; - struct tm *ti; + struct tm ti; + char t_buf[26] = {0}; len = strlen(fpath); if(len>=SIPDUMP_FPATH_SIZE-1) { @@ -156,14 +157,14 @@ static int sipdump_write_meta(char *fpath) LM_ERR("failed to open meta file %s\n", mpath); return -1; } - ti = localtime(&up_since); + localtime_r(&up_since, &ti); fprintf(mfile, "v: 1.0\n" "version: %s %s\n" "start: %s" "nrprocs: %d\n", ver_name, ver_version, - asctime(ti), + asctime_r(&ti, t_buf), *process_count ); for (i=0; i<*process_count; i++) { @@ -182,7 +183,7 @@ static int sipdump_write_meta(char *fpath) static int sipdump_rotate_file(void) { time_t tv; - struct tm *ti = NULL; + struct tm ti; int n; tv = time(NULL); @@ -197,12 +198,12 @@ static int sipdump_rotate_file(void) if(_sipdump_file != NULL) { fclose(_sipdump_file); } - ti = localtime(&tv); + localtime_r(&tv, &ti); n = snprintf(_sipdump_fpath+_sipdump_fpath_prefix.len, SIPDUMP_FPATH_SIZE-_sipdump_fpath_prefix.len, "%d-%02d-%02d--%02d-%02d-%02d.data", - 1900+ti->tm_year, ti->tm_mon, ti->tm_mday, - ti->tm_hour, ti->tm_min, ti->tm_sec); + 1900+ti.tm_year, ti.tm_mon, ti.tm_mday, + ti.tm_hour, ti.tm_min, ti.tm_sec); LM_DBG("writing to file: %s (%d)\n", _sipdump_fpath, n); _sipdump_file = fopen( _sipdump_fpath, "w" ); if(_sipdump_file==NULL) {

1 0

git:master:92e2c22c: tmrec: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 92e2c22c3c709c3c9a5243b5d5bdd48293865b0c URL: https://github.com/kamailio/kamailio/commit/92e2c22c3c709c3c9a5243b5d5bdd48… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:27:58+02:00 tmrec: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/tmrec/tmrec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/92e2c22c3c709c3c9a5243b5d5bdd48… Patch: https://github.com/kamailio/kamailio/commit/92e2c22c3c709c3c9a5243b5d5bdd48… --- diff --git a/src/modules/tmrec/tmrec_mod.c b/src/modules/tmrec/tmrec_mod.c index 4bf21f9bad..cc97cc9b55 100644 --- a/src/modules/tmrec/tmrec_mod.c +++ b/src/modules/tmrec/tmrec_mod.c @@ -128,9 +128,9 @@ static void mod_destroy(void) static int w_is_leap_year(struct sip_msg* msg, char* t, char* str2) { time_t tv; - struct tm *tb; + struct tm tb; int y; - + if(msg==NULL) return -1; @@ -143,8 +143,8 @@ static int w_is_leap_year(struct sip_msg* msg, char* t, char* str2) } } else { tv = time(NULL); - tb = localtime(&tv); - y = 1900 + tb->tm_year; + localtime_r(&tv, &tb); + y = 1900 + tb.tm_year; } if(tr_is_leap_year(y)) @@ -155,12 +155,12 @@ static int w_is_leap_year(struct sip_msg* msg, char* t, char* str2) static int ki_is_leap_year_now(sip_msg_t* msg) { time_t tv; - struct tm *tb; + struct tm tb; int y; tv = time(NULL); - tb = localtime(&tv); - y = 1900 + tb->tm_year; + localtime_r(&tv, &tb); + y = 1900 + tb.tm_year; if(tr_is_leap_year(y)) return 1;

1 0

git:master:19769eb3: pv: use ctime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 19769eb372ca4d37ed45fef561cf966360ea6fd4 URL: https://github.com/kamailio/kamailio/commit/19769eb372ca4d37ed45fef561cf966… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:26:07+02:00 pv: use ctime_r() for a safer multi-thread usage --- Modified: src/modules/pv/pv_time.c --- Diff: https://github.com/kamailio/kamailio/commit/19769eb372ca4d37ed45fef561cf966… Patch: https://github.com/kamailio/kamailio/commit/19769eb372ca4d37ed45fef561cf966… --- diff --git a/src/modules/pv/pv_time.c b/src/modules/pv/pv_time.c index f3baccf6df..87b62b71e9 100644 --- a/src/modules/pv/pv_time.c +++ b/src/modules/pv/pv_time.c @@ -246,10 +246,12 @@ int pv_get_timenowf(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; + char t_buf[26] = {0}; time_t t; t = time(NULL); - s.s = ctime(&t); + + s.s = ctime_r(&t, t_buf); s.len = strlen(s.s)-1; return pv_get_strintval(msg, param, res, &s, (int)t); } @@ -269,13 +271,14 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; + char t_buf[26] = {0}; if(msg==NULL) return -1; msg_set_time(msg); - s.s = ctime(&msg->tval.tv_sec); + s.s = ctime_r(&msg->tval.tv_sec, t_buf); s.len = strlen(s.s)-1; return pv_get_strintval(msg, param, res, &s, (int)msg->tval.tv_sec); }

1 0

git:master:f72cc60b: msilo: use [c|gm]time_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: f72cc60b9e82bc810c08d42a49bb23e5134ffa9d URL: https://github.com/kamailio/kamailio/commit/f72cc60b9e82bc810c08d42a49bb23e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:19:18+02:00 msilo: use [c|gm]time_r() for a safer multi-thread usage --- Modified: src/modules/msilo/msfuncs.c --- Diff: https://github.com/kamailio/kamailio/commit/f72cc60b9e82bc810c08d42a49bb23e… Patch: https://github.com/kamailio/kamailio/commit/f72cc60b9e82bc810c08d42a49bb23e… --- diff --git a/src/modules/msilo/msfuncs.c b/src/modules/msilo/msfuncs.c index 5262a81159..dd2f4762b7 100644 --- a/src/modules/msilo/msfuncs.c +++ b/src/modules/msilo/msfuncs.c @@ -93,24 +93,24 @@ int m_apo_escape(char* src, int slen, char* dst, int dlen) */ int timetToSipDateStr(time_t date, char* buf, int bufLen) { - struct tm *gmt; + struct tm gmt; char* dayArray[7] = {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"}; char* monthArray[12] = {"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"}; int len = 0; - gmt = gmtime(&date); + gmtime_r(&date, &gmt); /* In RFC 3261 the format is always GMT and in the string form like * "Wkday, Day Month Year HOUR:MIN:SEC GMT" * "Mon, 19 Feb 2007 18:42:27 GMT" */ len = snprintf(buf,bufLen,"Date: %s, %02d %s %d %02d:%02d:%02d GMT\r\n", - dayArray[gmt->tm_wday], - gmt->tm_mday, - monthArray[gmt->tm_mon], - 1900 + gmt->tm_year, - gmt->tm_hour, - gmt->tm_min, - gmt->tm_sec + dayArray[gmt.tm_wday], + gmt.tm_mday, + monthArray[gmt.tm_mon], + 1900 + gmt.tm_year, + gmt.tm_hour, + gmt.tm_min, + gmt.tm_sec ); /* snprintf returns number of chars it should have printed, so you @@ -243,7 +243,7 @@ int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) return -1; } -/** build MESSAGE body --- add incoming time and 'from' +/** build MESSAGE body --- add incoming time and 'from' * * expects - max buf len of the resulted body in body->len * - body->s MUST be allocated @@ -252,11 +252,12 @@ int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) int m_build_body(str *body, time_t date, str msg, time_t sdate) { char *p; - + char t_buf[26] = {0}; + if(!body || !(body->s) || body->len <= 0 || msg.len <= 0 || date < 0 || msg.len < 0 || (46+msg.len > body->len) ) goto error; - + p = body->s; if(ms_add_date!=0) @@ -265,28 +266,28 @@ int m_build_body(str *body, time_t date, str msg, time_t sdate) { memcpy(p, "[Reminder message - ", 20); p += 20; - - memcpy(p, ctime(&sdate), 24); + ctime_r(&sdate, t_buf); + memcpy(p, t_buf, 24); p += 24; *p++ = ']'; } else { memcpy(p, "[Offline message - ", 19); p += 19; - - memcpy(p, ctime(&date), 24); + ctime_r(&date, t_buf); + memcpy(p, t_buf, 24); p += 24; *p++ = ']'; } *p++ = ' '; } - + memcpy(p, msg.s, msg.len); p += msg.len; body->len = p - body->s; - + return 0; error: return -1;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev