sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
270 discussions

[kamailio/kamailio] ims_charging: fix charging reply route with kemi (PR #2972)

by Riccardo-78

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2972 -- Commit Summary -- * ims_charging: fix charging reply route with kemi -- File Changes -- M src/modules/ims_charging/ims_charging_mod.c (30) M src/modules/ims_charging/ims_ro.c (35) M src/modules/ims_charging/ims_ro.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2972.patch https://github.com/kamailio/kamailio/pull/2972.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2972

2 years, 11 months

git:master:43c48edc: core: cfg.lex - renamed defenv value mode parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 43c48edc5064cdef9d4a41a579d59dfbb2cfb865 URL: https://github.com/kamailio/kamailio/commit/43c48edc5064cdef9d4a41a579d59df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T12:11:00+01:00 core: cfg.lex - renamed defenv value mode parameter --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/43c48edc5064cdef9d4a41a579d59df… Patch: https://github.com/kamailio/kamailio/commit/43c48edc5064cdef9d4a41a579d59df…

2 years, 11 months

[kamailio/kamailio] websockets: enable KEEPALIVE_MECHANISM_CONCHECK (PR #2966)

by lazedo

KEEPALIVE_MECHANISM_CONCHECK was added but can't be enabled   #### 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  add case for KEEPALIVE_MECHANISM_CONCHECK in mod_init validation of ws_keepalive_mechanism You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2966 -- Commit Summary -- * websockets: enable KEEPALIVE_MECHANISM_CONCHECK -- File Changes -- M src/modules/websocket/websocket.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2966.patch https://github.com/kamailio/kamailio/pull/2966.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2966

2 years, 11 months

git:master:29c3b865: websockets: enable KEEPALIVE_MECHANISM_CONCHECK

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 29c3b865d8efde8435c2217df44d1df684caaea2 URL: https://github.com/kamailio/kamailio/commit/29c3b865d8efde8435c2217df44d1df… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T12:02:18+01:00 websockets: enable KEEPALIVE_MECHANISM_CONCHECK KEEPALIVE_MECHANISM_CONCHECK was added but can't be enabled --- Modified: src/modules/websocket/websocket.c --- Diff: https://github.com/kamailio/kamailio/commit/29c3b865d8efde8435c2217df44d1df… Patch: https://github.com/kamailio/kamailio/commit/29c3b865d8efde8435c2217df44d1df… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 5cef5d6b1a7..f7273048e36 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -221,6 +221,7 @@ static int mod_init(void) switch(ws_keepalive_mechanism) { case KEEPALIVE_MECHANISM_PING: case KEEPALIVE_MECHANISM_PONG: + case KEEPALIVE_MECHANISM_CONCHECK: break; default: ws_keepalive_mechanism = DEFAULT_KEEPALIVE_MECHANISM;

2 years, 11 months

[kamailio/kamailio] core: cfg.lex support for undefned env vars (PR #2969)

by Ben Kaufman

#### 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] New feature (non-breaking change which adds new functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #2967 #### Description Add new preprocessor keywords `trydefenv` and `trydefenvs` that work like `defenv` and `defenvs` respectively, with the difference that if the environmental variable is not defined, then the value in Kamailio will not be defined. For example: ``` #!KAMAILIO loadmodule "xlog" loadmodule "pv" #!trydefenv EXTRALOG request_route { #!ifdef EXTRALOG xlog("L_I", "Some Extra Logging here\n"); #!endif forward (); } ``` If the environmental variable `$EXTRALOG` is defined, the log line will be written. If the environmental variable is not set, then in Kamailio `EXTRALOG` will not be defined and the `#!ifdef` section will not be loaded. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2969 -- Commit Summary -- * core: cfg.lex support for undefned env vars -- File Changes -- M src/core/cfg.lex (56) M src/core/ppcfg.h (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2969.patch https://github.com/kamailio/kamailio/pull/2969.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2969

2 years, 11 months

git:master:03cd22b4: core: cfg.lex support for undefned env vars

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 03cd22b41b80a81a4260c0dee2c500cf1007e1f8 URL: https://github.com/kamailio/kamailio/commit/03cd22b41b80a81a4260c0dee2c500c… Author: Ben Kaufman <bkaufman(a)nexvortex.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T12:01:19+01:00 core: cfg.lex support for undefned env vars Feature Request GH #2967 for undefined defenv Add new keywords for preprocessing: - #!trydefenv - The same as #!defenv, except if the variable is undefined, the def value will be undefined as well. - #!trydefenvs - The same as #!defenvs, except if the variable is undefined, the def value will be undefined as well. --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/03cd22b41b80a81a4260c0dee2c500c… Patch: https://github.com/kamailio/kamailio/commit/03cd22b41b80a81a4260c0dee2c500c…

2 years, 11 months

git:master:53fc8c1d: app_sqlang: update to handle xval return for functions with 3 parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 53fc8c1dfeeff8231278563595cd3ae46ba81e22 URL: https://github.com/kamailio/kamailio/commit/53fc8c1dfeeff8231278563595cd3ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:58:10+01:00 app_sqlang: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/53fc8c1dfeeff8231278563595cd3ae… Patch: https://github.com/kamailio/kamailio/commit/53fc8c1dfeeff8231278563595cd3ae…

2 years, 11 months

git:master:7658cc9f: misc: kemi-code-gen.py - generate code for sqlang functions with xval return

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7658cc9fdbfaba2001d538dbef23deaec4af8557 URL: https://github.com/kamailio/kamailio/commit/7658cc9fdbfaba2001d538dbef23dea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:57:38+01:00 misc: kemi-code-gen.py - generate code for sqlang functions with xval return --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/7658cc9fdbfaba2001d538dbef23dea… Patch: https://github.com/kamailio/kamailio/commit/7658cc9fdbfaba2001d538dbef23dea… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index 7def9fcf25..b7b4bba8c8 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -4,7 +4,7 @@ PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="ruby" +PRINTMODE="sqlang" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -169,33 +169,16 @@ def printCodeIfRuby(prefix): def printCodeIfSQLang(prefix): global PRINTELSE - sfunc = PRINTTABS + "\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" - for i, c in enumerate(prefix): - if i==0: - if c == 's': - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " - PRINTELSE = "} else " - elif i==PRINTPARAMS-1: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sfunc += "&vps[" + str(i) +"].s);" - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sfunc += "vps[" + str(i) +"].n);" - else: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " - - print(sfunc) - print(PRINTTABS + "\treturn sr_kemi_sqlang_return_int(J, ket, ret);") + sparams = printCodeIfParams(prefix) + print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") + sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_sqlang_return_xval(J, ket, xret);") + print("\t\t\t\t} else {") + sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_J->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_sqlang_return_int(J, ket, ret);") + print("\t\t\t\t}") # generated possible strings of length k with chars from set.

2 years, 11 months

git:master:3136d479: app_ruby: update to handle xval return for functions with 3 parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3136d47993a9f08ea1c7e4de715f5fbbdf18a4e4 URL: https://github.com/kamailio/kamailio/commit/3136d47993a9f08ea1c7e4de715f5fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:43:17+01:00 app_ruby: update to handle xval return for functions with 3 parameters - fix for functions like KSR.sqlops.sql_result_get() --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/3136d47993a9f08ea1c7e4de715f5fb… Patch: https://github.com/kamailio/kamailio/commit/3136d47993a9f08ea1c7e4de715f5fb…

2 years, 11 months

git:master:b9124539: misc: kemi-code-gen.py - generate code for ruby functions with xval return

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b91245397f1c61313b853fc770f20a860f07b395 URL: https://github.com/kamailio/kamailio/commit/b91245397f1c61313b853fc770f20a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-10T08:42:43+01:00 misc: kemi-code-gen.py - generate code for ruby functions with xval return --- Modified: misc/tools/kemi/kemi-code-gen.py --- Diff: https://github.com/kamailio/kamailio/commit/b91245397f1c61313b853fc770f20a8… Patch: https://github.com/kamailio/kamailio/commit/b91245397f1c61313b853fc770f20a8… --- diff --git a/misc/tools/kemi/kemi-code-gen.py b/misc/tools/kemi/kemi-code-gen.py index ba5d4bcfff..7def9fcf25 100644 --- a/misc/tools/kemi/kemi-code-gen.py +++ b/misc/tools/kemi/kemi-code-gen.py @@ -4,7 +4,7 @@ PRINTPARAMS=3 # - print mode: typedefs, js, lua, python, pythonparams, ruby, sqlang -PRINTMODE="lua" +PRINTMODE="ruby" # - two tabs for python params, three for the other cases # PRINTTABS="\t\t" PRINTTABS="\t\t\t" @@ -155,33 +155,16 @@ def printCodeIfPythonParams(prefix): def printCodeIfRuby(prefix): global PRINTELSE - sfunc = PRINTTABS + "\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_R->msg,\n" + PRINTTABS + "\t\t\t" - for i, c in enumerate(prefix): - if i==0: - if c == 's': - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + PRINTELSE + "if(ket->ptypes[0]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " - PRINTELSE = "} else " - elif i==PRINTPARAMS-1: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR) {") - sfunc += "&vps[" + str(i) +"].s);" - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT) {") - sfunc += "vps[" + str(i) +"].n);" - else: - if c == 's': - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_STR") - sfunc += "&vps[" + str(i) +"].s, " - else: - print(PRINTTABS + "\t\t&& ket->ptypes[" + str(i) + "]==SR_KEMIP_INT") - sfunc += "vps[" + str(i) +"].n, " - - print(sfunc) - print(PRINTTABS + "\treturn sr_kemi_ruby_return_int(ket, ret);") + sparams = printCodeIfParams(prefix) + print("\t\t\t\tif(ket->rtype==SR_KEMIP_XVAL) {") + sfunc = PRINTTABS + "\t\txret = ((sr_kemi_xfm" + prefix + "_f)(ket->func))(env_R->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_ruby_return_xval(ket, xret);") + print("\t\t\t\t} else {") + sfunc = PRINTTABS + "\t\tret = ((sr_kemi_fm" + prefix + "_f)(ket->func))(env_R->msg,\n" + PRINTTABS + "\t\t\t" + print(sfunc + sparams) + print(PRINTTABS + "\t\treturn sr_kemi_ruby_return_int(ket, ret);") + print("\t\t\t\t}") def printCodeIfSQLang(prefix):

2 years, 11 months

← Newer
1
...
17
18
19
20
21
22
23
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021