sr-dev February 2023

sr-dev@lists.kamailio.org

10 participants
293 discussions

git:5.5:ee526921: pkg/kamailio: fixed rpm packging for CentOS 6

by Sergey Safarov

Module: kamailio Branch: 5.5 Commit: ee52692185a959a30d30382d72fb9578917d59b6 URL: https://github.com/kamailio/kamailio/commit/ee52692185a959a30d30382d72fb957… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-02-10T16:48:44+03:00 pkg/kamailio: fixed rpm packging for CentOS 6 (cherry picked from commit db634e7fb3e5913238561afb4381363bbfe58882) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ee52692185a959a30d30382d72fb957… Patch: https://github.com/kamailio/kamailio/commit/ee52692185a959a30d30382d72fb957… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index dc341430327..58b0e572cf2 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -728,8 +728,12 @@ BuildRequires: zlib-devel Requires: libmysqlclient18 BuildRequires: libmysqlclient-devel %else +%if 0%{?rhel} == 6 +BuildRequires: mysql-devel +%else BuildRequires: mariadb-devel %endif +%endif %description mysql MySQL database connectivity for Kamailio.

1 year, 3 months

git:5.6:b7f8c5a4: pkg/kamailio: fixed rpm packging for CentOS 6

by Sergey Safarov

Module: kamailio Branch: 5.6 Commit: b7f8c5a44b0f4d3e09e6cad1eaeeae7e9330cffe URL: https://github.com/kamailio/kamailio/commit/b7f8c5a44b0f4d3e09e6cad1eaeeae7… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-02-10T16:47:53+03:00 pkg/kamailio: fixed rpm packging for CentOS 6 (cherry picked from commit db634e7fb3e5913238561afb4381363bbfe58882) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b7f8c5a44b0f4d3e09e6cad1eaeeae7… Patch: https://github.com/kamailio/kamailio/commit/b7f8c5a44b0f4d3e09e6cad1eaeeae7… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 42c9bce60a..5a84894863 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -736,8 +736,12 @@ BuildRequires: zlib-devel Requires: libmysqlclient18 BuildRequires: libmysqlclient-devel %else +%if 0%{?rhel} == 6 +BuildRequires: mysql-devel +%else BuildRequires: mariadb-devel %endif +%endif %description mysql MySQL database connectivity for Kamailio.

1 year, 3 months

git:master:db634e7f: pkg/kamailio: fixed rpm packging for CentOS 6

by Sergey Safarov

Module: kamailio Branch: master Commit: db634e7fb3e5913238561afb4381363bbfe58882 URL: https://github.com/kamailio/kamailio/commit/db634e7fb3e5913238561afb4381363… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-02-10T16:47:04+03:00 pkg/kamailio: fixed rpm packging for CentOS 6 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/db634e7fb3e5913238561afb4381363… Patch: https://github.com/kamailio/kamailio/commit/db634e7fb3e5913238561afb4381363… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 36b3d65f08..bb608525b5 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -736,8 +736,12 @@ BuildRequires: zlib-devel Requires: libmysqlclient18 BuildRequires: libmysqlclient-devel %else +%if 0%{?rhel} == 6 +BuildRequires: mysql-devel +%else BuildRequires: mariadb-devel %endif +%endif %description mysql MySQL database connectivity for Kamailio.

1 year, 3 months

git:master:857d777b: dlgs: cast to uint64_t when using time_t values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 857d777b73d3802d157042b0ea7126b7b8dd45f8 URL: https://github.com/kamailio/kamailio/commit/857d777b73d3802d157042b0ea7126b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-10T08:04:24+01:00 dlgs: cast to uint64_t when using time_t values --- Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/857d777b73d3802d157042b0ea7126b… Patch: https://github.com/kamailio/kamailio/commit/857d777b73d3802d157042b0ea7126b… --- diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index 9fe29ca0b9..2f0bb65b6c 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> +#include <stdint.h> #include <regex.h> #include <fnmatch.h> @@ -657,8 +658,8 @@ int dlgs_ht_dbg(void) LM_ERR("\tdst: %.*s\n", it->dst.len, it->dst.s); LM_ERR("\tdata: %.*s\n", it->data.len, it->data.s); LM_ERR("\truid: %.*s\n", it->ruid.len, it->ruid.s); - LM_ERR("\thashid: %u ts_init: %u ts_answer: %u\n", it->hashid, - (unsigned int)it->ts_init, (unsigned int)it->ts_answer); + LM_ERR("\thashid: %u ts_init: %llu ts_answer: %llu\n", it->hashid, + (uint64_t)it->ts_init, (uint64_t)it->ts_answer); it = it->next; } lock_release(&dsht->slots[i].lock); @@ -1063,7 +1064,7 @@ static int dlgs_rpc_add_item(rpc_t *rpc, void *ctx, dlgs_item_t *it, int n, rpc->fault(ctx, 500, "Internal error creating rpc"); return -1; } - if(rpc->struct_add(th, "dSSSSSSSuuu", + if(rpc->struct_add(th, "dSSSSSSSJJu", "count", n, "src", &it->src, "dst", &it->dst, @@ -1072,8 +1073,8 @@ static int dlgs_rpc_add_item(rpc_t *rpc, void *ctx, dlgs_item_t *it, int n, "callid", &it->callid, "ftag", &it->ftag, "ttag", &it->ttag, - "ts_init", (unsigned int)it->ts_init, - "ts_answer", (unsigned int)it->ts_answer, + "ts_init", (uint64_t)it->ts_init, + "ts_answer", (uint64_t)it->ts_answer, "state", it->state)<0) { rpc->fault(ctx, 500, "Internal error creating item"); return -1;

1 year, 3 months

git:master:8f5a1c20: dispatcher: cast to uint64_t when using time_t value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8f5a1c20a6816e18f9f08f3b0273691dc5f8cc2c URL: https://github.com/kamailio/kamailio/commit/8f5a1c20a6816e18f9f08f3b0273691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-09T17:16:43+01:00 dispatcher: cast to uint64_t when using time_t value --- Modified: src/modules/dispatcher/ds_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/8f5a1c20a6816e18f9f08f3b0273691… Patch: https://github.com/kamailio/kamailio/commit/8f5a1c20a6816e18f9f08f3b0273691… --- diff --git a/src/modules/dispatcher/ds_ht.c b/src/modules/dispatcher/ds_ht.c index 540d0b5fdad..87eaf5e7544 100644 --- a/src/modules/dispatcher/ds_ht.c +++ b/src/modules/dispatcher/ds_ht.c @@ -19,6 +19,7 @@ */ #include <stddef.h> +#include <stdint.h> #include <regex.h> #include "../../core/mem/shm_mem.h" @@ -333,8 +334,8 @@ int ds_ht_dbg(ds_ht_t *dsht) while(it) { LM_ERR("\tcell: %.*s\n", it->callid.len, it->callid.s); LM_ERR("\tduid: %.*s\n", it->duid.len, it->duid.s); - LM_ERR("\thid: %u expire: %u initexpire: %u\n", it->cellid, - (unsigned int)it->expire, (unsigned int)it->initexpire); + LM_ERR("\thid: %u expire: %llu initexpire: %llu\n", it->cellid, + (uint64_t)it->expire, (uint64_t)it->initexpire); LM_ERR("\tdset:%d\n", it->dset); it = it->next; }

1 year, 3 months

git:master:dd6339f8: core: tmrec - cast to 64b types when using time_t value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dd6339f817822cd0590aec2a9a467330bde499dd URL: https://github.com/kamailio/kamailio/commit/dd6339f817822cd0590aec2a9a46733… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-09T12:38:53+01:00 core: tmrec - cast to 64b types when using time_t value --- Modified: src/core/utils/tmrec.c --- Diff: https://github.com/kamailio/kamailio/commit/dd6339f817822cd0590aec2a9a46733… Patch: https://github.com/kamailio/kamailio/commit/dd6339f817822cd0590aec2a9a46733… --- diff --git a/src/core/utils/tmrec.c b/src/core/utils/tmrec.c index 29366fe0b2..adae68edbf 100644 --- a/src/core/utils/tmrec.c +++ b/src/core/utils/tmrec.c @@ -31,6 +31,7 @@ #include <stdio.h> #include <string.h> #include <time.h> +#include <stdint.h> #include "../../core/mem/mem.h" #include "tmrec.h" @@ -271,7 +272,7 @@ int ac_print(ac_tm_t *_atp) return -1; } - printf("\nSys time: %d\nTime: %02d:%02d:%02d\n", (int)_atp->time, + printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year+1900, _atp->t.tm_mon+1, _atp->t.tm_mday); @@ -511,15 +512,15 @@ int tr_print(tmrec_t *_trp) return -1; } printf("Recurrence definition\n-- start time ---\n"); - printf("Sys time: %d\n", (int)_trp->dtstart); + printf("Sys time: %llu\n", (uint64_t)_trp->dtstart); printf("Time: %02d:%02d:%02d\n", _trp->ts.tm_hour, _trp->ts.tm_min, _trp->ts.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_trp->ts.tm_wday], _trp->ts.tm_year+1900, _trp->ts.tm_mon+1, _trp->ts.tm_mday); printf("---\n"); - printf("End time: %d\n", (int)_trp->dtend); - printf("Duration: %d\n", (int)_trp->duration); - printf("Until: %d\n", (int)_trp->until); + printf("End time: %llu\n", (uint64_t)_trp->dtend); + printf("Duration: %llu\n", (uint64_t)_trp->duration); + printf("Until: %llu\n", (uint64_t)_trp->until); printf("Freq: %d\n", (int)_trp->freq); printf("Interval: %d\n", (int)_trp->interval); if(_trp->byday) @@ -997,7 +998,7 @@ int tr_check_recurrence(tmrec_t *_trp, ac_tm_t *_atp, tr_res_t *_tsw) int check_freq_interval(tmrec_t *_trp, ac_tm_t *_atp) { - int _t0, _t1; + uint64_t _t0, _t1; struct tm _tm; if(!_trp || !_atp) return REC_ERR; @@ -1016,12 +1017,12 @@ int check_freq_interval(tmrec_t *_trp, ac_tm_t *_atp) _tm.tm_year = _trp->ts.tm_year; _tm.tm_mon = _trp->ts.tm_mon; _tm.tm_mday = _trp->ts.tm_mday; - _t0 = (int)mktime(&_tm); + _t0 = (uint64_t)mktime(&_tm); memset(&_tm, 0, sizeof(struct tm)); _tm.tm_year = _atp->t.tm_year; _tm.tm_mon = _atp->t.tm_mon; _tm.tm_mday = _atp->t.tm_mday; - _t1 = (int)mktime(&_tm); + _t1 = (uint64_t)mktime(&_tm); if(_trp->freq == FREQ_DAILY) return (((_t1-_t0)/(24*3600))%_trp->interval==0)? REC_MATCH:REC_NOMATCH;

1 year, 3 months

git:master:0a3c1523: async: catch up on possible skipped slots due to slow tasks

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0a3c15239a620474bbbc7f4d2f57dda0e9aa0f58 URL: https://github.com/kamailio/kamailio/commit/0a3c15239a620474bbbc7f4d2f57dda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-08T15:51:37+01:00 async: catch up on possible skipped slots due to slow tasks --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/0a3c15239a620474bbbc7f4d2f57dda… Patch: https://github.com/kamailio/kamailio/commit/0a3c15239a620474bbbc7f4d2f57dda… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 02c3b8d488..d6dd41d3f1 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -271,9 +271,12 @@ int async_sleep(sip_msg_t *msg, int seconds, cfg_action_t *act, str *cbname) return 0; } +static unsigned int _async_timer_exec_last_slot = -1; + void async_timer_exec(unsigned int ticks, void *param) { - int slot; + unsigned int idx; + unsigned int slot; async_item_t *ai; sr_kemi_eng_t *keng = NULL; str cbname = STR_NULL; @@ -282,33 +285,55 @@ void async_timer_exec(unsigned int ticks, void *param) if(_async_list_head == NULL) return; - slot = ticks % ASYNC_RING_SIZE; + idx = ticks % ASYNC_RING_SIZE; - while(1) { - lock_get(&_async_list_head->ring[slot].lock); - ai = _async_list_head->ring[slot].lstart; - if(ai != NULL) - _async_list_head->ring[slot].lstart = ai->next; - lock_release(&_async_list_head->ring[slot].lock); + if(idx == _async_timer_exec_last_slot) { + /* timer faster than 1sec */ + return; + } - if(ai == NULL) - break; - if(ai->ract != NULL) { - tmb.t_continue(ai->tindex, ai->tlabel, ai->ract); - ksr_msg_env_reset(); - } else { - keng = sr_kemi_eng_get(); - if(keng != NULL && ai->cbname_len>0) { - cbname.s = ai->cbname; - cbname.len = ai->cbname_len; - tmb.t_continue_cb(ai->tindex, ai->tlabel, &cbname, &evname); + if(_async_timer_exec_last_slot < 0) { + _async_timer_exec_last_slot = idx; + } + slot = (_async_timer_exec_last_slot + 1) % ASYNC_RING_SIZE; + if(slot != idx) { + LM_DBG("need to catch up from slot %u to %u (slots: %u)\n", slot, idx, + ASYNC_RING_SIZE); + } + + do { + while(1) { + lock_get(&_async_list_head->ring[slot].lock); + ai = _async_list_head->ring[slot].lstart; + if(ai != NULL) + _async_list_head->ring[slot].lstart = ai->next; + lock_release(&_async_list_head->ring[slot].lock); + + if(ai == NULL) + break; + if(ai->ract != NULL) { + tmb.t_continue(ai->tindex, ai->tlabel, ai->ract); ksr_msg_env_reset(); } else { - LM_WARN("no callback to be executed\n"); + keng = sr_kemi_eng_get(); + if(keng != NULL && ai->cbname_len>0) { + cbname.s = ai->cbname; + cbname.len = ai->cbname_len; + tmb.t_continue_cb(ai->tindex, ai->tlabel, &cbname, &evname); + ksr_msg_env_reset(); + } else { + LM_WARN("no callback to be executed\n"); + } } + shm_free(ai); } - shm_free(ai); - } + if(slot == idx) { + break; + } + slot = (slot + 1) % ASYNC_RING_SIZE; + } while(1); + + _async_timer_exec_last_slot = idx; } void async_mstimer_exec(unsigned int ticks, void *param)

1 year, 3 months

git:master:6be85c8a: modules: readme files regenerated - seas ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 6be85c8a72bc37b2bb4b1f4be59c5d0c20996850 URL: https://github.com/kamailio/kamailio/commit/6be85c8a72bc37b2bb4b1f4be59c5d0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-08T14:16:31+01:00 modules: readme files regenerated - seas ... [skip ci] --- Modified: src/modules/seas/README Modified: src/modules/siputils/README Modified: src/modules/tls/README Modified: src/modules/tls_wolfssl/README Modified: src/modules/xcap_client/README --- Diff: https://github.com/kamailio/kamailio/commit/6be85c8a72bc37b2bb4b1f4be59c5d0… Patch: https://github.com/kamailio/kamailio/commit/6be85c8a72bc37b2bb4b1f4be59c5d0…

1 year, 3 months

[kamailio/kamailio] Typos (PR #3362)

by Дилян Палаузов

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3362 -- Commit Summary -- * doc/scripts: typos * seas: typos * siputis: typos * tls: typos * tls_wolfssl: typos * xcap_client: typos * xcap_server: typos * xhttp: typo * xhttp_pi: typos * xhttp_prom: typo * xhttp_rpc: typos * xmlrpc: typos * xprint: typos -- File Changes -- M doc/scripts/cdefs2doc/dump_cfg_defs.pl (4) M doc/scripts/cdefs2doc/dump_counters.pl (2) M doc/scripts/cdefs2doc/dump_rpcs.pl (2) M doc/scripts/cdefs2doc/dump_selects.pl (2) M src/modules/seas/doc/seas_admin.xml (2) M src/modules/seas/encode_content_length.c (2) M src/modules/seas/encode_content_length.h (4) M src/modules/seas/encode_msg.c (6) M src/modules/seas/encode_parameters.c (2) M src/modules/seas/encode_to_body.c (2) M src/modules/seas/encode_uri.c (2) M src/modules/seas/event_dispatcher.c (12) M src/modules/seas/seas.c (4) M src/modules/seas/seas_action.c (10) M src/modules/seas/statistics.c (6) M src/modules/siputils/chargingvector.c (2) M src/modules/siputils/checks.c (2) M src/modules/siputils/checks.h (2) M src/modules/siputils/contact_ops.c (2) M src/modules/siputils/doc/siputils_admin.xml (2) M src/modules/siputils/siputils.c (2) M src/modules/tls/doc/params.xml (12) M src/modules/tls/doc/tls.xml (2) M src/modules/tls/sbufq.h (2) M src/modules/tls/tls_cfg.h (2) M src/modules/tls/tls_ct_q.h (2) M src/modules/tls/tls_domain.c (8) M src/modules/tls/tls_init.c (18) M src/modules/tls/tls_init.h (6) M src/modules/tls/tls_server.c (10) M src/modules/tls_wolfssl/doc/tls_wolfssl.xml (2) M src/modules/tls_wolfssl/sbufq.h (2) M src/modules/tls_wolfssl/tls_cfg.h (2) M src/modules/tls_wolfssl/tls_ct_q.h (2) M src/modules/tls_wolfssl/tls_domain.c (6) M src/modules/tls_wolfssl/tls_init.c (4) M src/modules/tls_wolfssl/tls_server.c (4) M src/modules/xcap_client/doc/xcap_client_devel.xml (2) M src/modules/xcap_client/xcap_functions.c (2) M src/modules/xcap_server/xcap_misc.c (2) M src/modules/xcap_server/xcap_misc.h (2) M src/modules/xhttp/xhttp_mod.c (2) M src/modules/xhttp_pi/Makefile (4) M src/modules/xhttp_pi/xhttp_pi.c (2) M src/modules/xhttp_pi/xhttp_pi_fnc.c (12) M src/modules/xhttp_prom/xhttp_prom.c (2) M src/modules/xhttp_rpc/xhttp_rpc.c (6) M src/modules/xhttp_rpc/xhttp_rpc_fnc.c (6) M src/modules/xmlrpc/xmlrpc.c (16) M src/modules/xprint/xp_lib.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3362.patch https://github.com/kamailio/kamailio/pull/3362.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3362 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3362(a)github.com>

1 year, 3 months

git:master:ec6f3b12: xprint: typos

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ec6f3b122f9c41b437ccfcb07b0952e2ffcc2719 URL: https://github.com/kamailio/kamailio/commit/ec6f3b122f9c41b437ccfcb07b0952e… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-08T14:05:32+01:00 xprint: typos --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/ec6f3b122f9c41b437ccfcb07b0952e… Patch: https://github.com/kamailio/kamailio/commit/ec6f3b122f9c41b437ccfcb07b0952e… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index 89d53d59fc2..06b744fe92d 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -239,7 +239,7 @@ static int xl_get_ruri(struct sip_msg *msg, str *res, str *hp, int hi, int hf) if(msg==NULL || res==NULL) return -1; - if(msg->first_line.type == SIP_REPLY) /* REPLY doesnt have a ruri */ + if(msg->first_line.type == SIP_REPLY) /* REPLY doesn't have a ruri */ return xl_get_null(msg, res, hp, hi, hf); if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ && parse_sip_msg_uri(msg)<0) @@ -580,7 +580,7 @@ static int xl_get_color(struct sip_msg *msg, str *res, str *hp, int hi, int hf) p = color; end = p + COL_BUF; - /* excape sequenz */ + /* escape sequence */ append_sstring(p, end, "\033["); if(hp->s[0]!='_')

1 year, 3 months

← Newer
1
...
22
23
24
25
26
27
28
29
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2023