sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
286 discussions

git:master:078041b0: cdp: switch to use ksr_clock_gettime() from core

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 078041b0145838b3d607810e68c3cc3d9165cd7f URL: https://github.com/kamailio/kamailio/commit/078041b0145838b3d607810e68c3cc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-19T08:23:16+02:00 cdp: switch to use ksr_clock_gettime() from core --- Modified: src/modules/cdp/routing.c --- Diff: https://github.com/kamailio/kamailio/commit/078041b0145838b3d607810e68c3cc3… Patch: https://github.com/kamailio/kamailio/commit/078041b0145838b3d607810e68c3cc3… --- diff --git a/src/modules/cdp/routing.c b/src/modules/cdp/routing.c index dae24d7f61..34347caa26 100644 --- a/src/modules/cdp/routing.c +++ b/src/modules/cdp/routing.c @@ -34,11 +34,6 @@ * */ -#ifdef __OS_darwin -#include <mach/clock.h> -#include <mach/mach.h> -#endif - #include "routing.h" #include "config.h" #include "peermanager.h" @@ -50,26 +45,6 @@ extern dp_config *config; /**< Configuration for this diameter peer */ int gcount = 0; -/** - * portable implementation for clock_gettime(CLOCK_REALTIME, ts) - */ -int ser_clock_gettime(struct timespec *ts) -{ -#ifdef __OS_darwin - clock_serv_t cclock; - mach_timespec_t mts; - - /* OS X does not have clock_gettime, use clock_get_time */ - host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); - clock_get_time(cclock, &mts); - mach_port_deallocate(mach_task_self(), cclock); - ts->tv_sec = mts.tv_sec; - ts->tv_nsec = mts.tv_nsec; - return 0; -#else - return clock_gettime(CLOCK_REALTIME, ts); -#endif -} /** * Returns if the peer advertised support for an Application ID @@ -156,7 +131,7 @@ peer* get_first_connected_route(cdp_session_t* cdp_session, routing_entry *r, in } } - ser_clock_gettime(&time_spec); + ksr_clock_gettime(&time_spec); p->last_selected = (time_spec.tv_sec*1000000) + round(time_spec.tv_nsec / 1.0e3); // Convert nanoseconds to microseconds LM_DBG("chosen peer [%.*s]\n", p->fqdn.len, p->fqdn.s);

3 years

git:master:d04edc01: core: ut - added ksr_clock_gettime()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d04edc014e6077e9ffc1f3b8e73f24ab71f45728 URL: https://github.com/kamailio/kamailio/commit/d04edc014e6077e9ffc1f3b8e73f24a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-19T08:23:16+02:00 core: ut - added ksr_clock_gettime() - portable version for clock_gettime() --- Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/d04edc014e6077e9ffc1f3b8e73f24a… Patch: https://github.com/kamailio/kamailio/commit/d04edc014e6077e9ffc1f3b8e73f24a… --- diff --git a/src/core/ut.c b/src/core/ut.c index 08edd2f24e..65143b3e9d 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -32,6 +32,11 @@ #include <sys/utsname.h> /* uname() */ #include <libgen.h> +#ifdef __OS_darwin +/* portable clock_gettime() */ +#include <mach/clock.h> +#include <mach/mach.h> +#endif #include "ut.h" #include "mem/mem.h" @@ -150,6 +155,27 @@ time_t utc2local(time_t in) } +/** + * portable implementation for clock_gettime(CLOCK_REALTIME, ts) + */ +int ksr_clock_gettime(struct timespec *ts) +{ +#ifdef __OS_darwin + clock_serv_t cclock; + mach_timespec_t mts; + + /* OS X does not have clock_gettime, use clock_get_time */ + host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); + clock_get_time(cclock, &mts); + mach_port_deallocate(mach_task_self(), cclock); + ts->tv_sec = mts.tv_sec; + ts->tv_nsec = mts.tv_nsec; + return 0; +#else + return clock_gettime(CLOCK_REALTIME, ts); +#endif +} + /* * Return str as zero terminated string allocated * using pkg_malloc diff --git a/src/core/ut.h b/src/core/ut.h index 61ff696e13..f2173d3dcf 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1065,6 +1065,9 @@ time_t local2utc(time_t in); /* Convert time_t value in UTC to to value relative to local time zone */ time_t utc2local(time_t in); +/* Portable clock_gettime() */ +int ksr_clock_gettime(struct timespec *ts); + /* * Return str as zero terminated string allocated * using pkg_malloc

3 years

git:master:13342658: pv: remove verbose debug message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1334265846ebe6a06e7e139421778e960cb54c7a URL: https://github.com/kamailio/kamailio/commit/1334265846ebe6a06e7e139421778e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-19T08:23:16+02:00 pv: remove verbose debug message --- Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/1334265846ebe6a06e7e139421778e9… Patch: https://github.com/kamailio/kamailio/commit/1334265846ebe6a06e7e139421778e9… --- diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index ae2c6ce048..92e60f06ea 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -603,7 +603,6 @@ int xavp_slist_explode(str *slist, str *sep, str *mode, str *xname) s.s = slist->s; for(i=0; i<slist->len; i++) { - LM_DBG("==== %d = %c\n", i, slist->s[i]); sfound = 0; for(j=0; j<sep->len; j++) { if(slist->s[i]==sep->s[j]) {

3 years

git:5.3:bc597081: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.3 Commit: bc5970811dc23ea0a01cb437688da731e44cc57f URL: https://github.com/kamailio/kamailio/commit/bc5970811dc23ea0a01cb437688da73… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-18T21:31:46+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/bc5970811dc23ea0a01cb437688da73… Patch: https://github.com/kamailio/kamailio/commit/bc5970811dc23ea0a01cb437688da73… --- diff --git a/src/modules/xhttp_prom/README b/src/modules/xhttp_prom/README index da9ddbabcb..c6e2908a57 100644 --- a/src/modules/xhttp_prom/README +++ b/src/modules/xhttp_prom/README @@ -417,7 +417,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the ga uge if it does not exist.

3 years

git:5.4:0ef00531: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.4 Commit: 0ef00531926d77351f1202d18b5ffe1c071aef12 URL: https://github.com/kamailio/kamailio/commit/0ef00531926d77351f1202d18b5ffe1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-18T21:31:33+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/0ef00531926d77351f1202d18b5ffe1… Patch: https://github.com/kamailio/kamailio/commit/0ef00531926d77351f1202d18b5ffe1… --- diff --git a/src/modules/xhttp_prom/README b/src/modules/xhttp_prom/README index da9ddbabcb..c6e2908a57 100644 --- a/src/modules/xhttp_prom/README +++ b/src/modules/xhttp_prom/README @@ -417,7 +417,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the ga uge if it does not exist.

3 years

git:master:6ad49854: modules: readme files regenerated - xhttp_prom ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 6ad49854e23e7642dbda01a74378e9e8d8eef622 URL: https://github.com/kamailio/kamailio/commit/6ad49854e23e7642dbda01a74378e9e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-18T21:16:17+02:00 modules: readme files regenerated - xhttp_prom ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/6ad49854e23e7642dbda01a74378e9e… Patch: https://github.com/kamailio/kamailio/commit/6ad49854e23e7642dbda01a74378e9e… --- diff --git a/src/modules/xhttp_prom/README b/src/modules/xhttp_prom/README index 4ccdd4bd06..280d79caa8 100644 --- a/src/modules/xhttp_prom/README +++ b/src/modules/xhttp_prom/README @@ -512,7 +512,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the ga uge if it does not exist.

3 years

git:5.3:9a381b67: xhttp_prom: fix small copy/paste typo in documentation

by Ovidiu Sas

Module: kamailio Branch: 5.3 Commit: 9a381b67709d051c3451c7822443540a4e8ef45f URL: https://github.com/kamailio/kamailio/commit/9a381b67709d051c3451c7822443540… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-18T15:04:42-04:00 xhttp_prom: fix small copy/paste typo in documentation (cherry picked from commit 2967a41f5537df81745a71226ba9e793ccbdd453) --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9a381b67709d051c3451c7822443540… Patch: https://github.com/kamailio/kamailio/commit/9a381b67709d051c3451c7822443540… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index c098f2d382..278d51aac2 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -448,7 +448,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the gauge if it does not exist. prom_gauge_set("gg02", "2.8", "push", "192.168.0.1");

3 years

git:5.4:f2dc57a7: xhttp_prom: fix small copy/paste typo in documentation

by Ovidiu Sas

Module: kamailio Branch: 5.4 Commit: f2dc57a75ddad30205dadc59c435e423e3ee669f URL: https://github.com/kamailio/kamailio/commit/f2dc57a75ddad30205dadc59c435e42… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-18T15:03:14-04:00 xhttp_prom: fix small copy/paste typo in documentation (cherry picked from commit 2967a41f5537df81745a71226ba9e793ccbdd453) --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f2dc57a75ddad30205dadc59c435e42… Patch: https://github.com/kamailio/kamailio/commit/f2dc57a75ddad30205dadc59c435e42… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index c098f2d382..278d51aac2 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -448,7 +448,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the gauge if it does not exist. prom_gauge_set("gg02", "2.8", "push", "192.168.0.1");

3 years

git:5.5:ef765d3f: xhttp_prom: fix small copy/paste typo in documentation

by Ovidiu Sas

Module: kamailio Branch: 5.5 Commit: ef765d3f4c9fb4bfa5949b2e10f208cd44c5e1db URL: https://github.com/kamailio/kamailio/commit/ef765d3f4c9fb4bfa5949b2e10f208c… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-18T15:01:44-04:00 xhttp_prom: fix small copy/paste typo in documentation (cherry picked from commit 2967a41f5537df81745a71226ba9e793ccbdd453) --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ef765d3f4c9fb4bfa5949b2e10f208c… Patch: https://github.com/kamailio/kamailio/commit/ef765d3f4c9fb4bfa5949b2e10f208c… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index eb331ab9c6..c35c44a024 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -566,7 +566,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the gauge if it does not exist. prom_gauge_set("gg02", "2.8", "push", "192.168.0.1");

3 years

git:master:2967a41f: xhttp_prom: fix small copy/paste typo in documentation

by Ovidiu Sas

Module: kamailio Branch: master Commit: 2967a41f5537df81745a71226ba9e793ccbdd453 URL: https://github.com/kamailio/kamailio/commit/2967a41f5537df81745a71226ba9e79… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-05-18T15:00:23-04:00 xhttp_prom: fix small copy/paste typo in documentation --- Modified: src/modules/xhttp_prom/doc/xhttp_prom_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2967a41f5537df81745a71226ba9e79… Patch: https://github.com/kamailio/kamailio/commit/2967a41f5537df81745a71226ba9e79… --- diff --git a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml index eb331ab9c6..c35c44a024 100644 --- a/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml +++ b/src/modules/xhttp_prom/doc/xhttp_prom_admin.xml @@ -566,7 +566,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the gauge if it does not exist. prom_gauge_set("gg02", "2.8", "push", "192.168.0.1");

3 years

← Newer
1
...
13
14
15
16
17
18
19
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2021