sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
420 discussions

git:master:85136f92: secsipid: reformatted long lines in examples to fit properly in README

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 85136f925c80a73618b1d9e4c24a30edae1bbb1e URL: https://github.com/kamailio/kamailio/commit/85136f925c80a73618b1d9e4c24a30e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-13T17:29:33+02:00 secsipid: reformatted long lines in examples to fit properly in README --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/85136f925c80a73618b1d9e4c24a30e… Patch: https://github.com/kamailio/kamailio/commit/85136f925c80a73618b1d9e4c24a30e… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 79e77fc487..a988e30ed1 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -163,7 +163,8 @@ request_route { ... request_route { ... - secsipid_add_identity("$fU", "$rU", "A", "", "http://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem")); + secsipid_add_identity("$fU", "$rU", "A", "", + "http://kamailio.org/stir/$rd/cert.pem", "/secsipid/$rd/key.pem")); ... } ... @@ -192,7 +193,8 @@ request_route { go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba -cp secsipid.h libsecsipid.h libsecsipid.a /path/to/kamailio/src/modules/secsipid/ +cp secsipid.h libsecsipid.h libsecsipid.a \ + /path/to/kamailio/src/modules/secsipid/ cd /path/to/kamailio/ make modules modules=src/modules/secsipid/ ...

4 years, 9 months

git:master:fd409bad: secsipid: added missing module file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fd409bad5ce9f40cf6fa5b4473967ec12499ec07 URL: https://github.com/kamailio/kamailio/commit/fd409bad5ce9f40cf6fa5b4473967ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-13T17:27:21+02:00 secsipid: added missing module file --- Added: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fd409bad5ce9f40cf6fa5b4473967ec… Patch: https://github.com/kamailio/kamailio/commit/fd409bad5ce9f40cf6fa5b4473967ec…

4 years, 9 months

git:master:5f31a56a: pkg/kamailio: fixed python3 deps for RHEL 6

by Sergey Safarov

Module: kamailio Branch: master Commit: 5f31a56acd25f892e6275e6ac786677f2eb2be0c URL: https://github.com/kamailio/kamailio/commit/5f31a56acd25f892e6275e6ac786677… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-04-13T17:15:15+03:00 pkg/kamailio: fixed python3 deps for RHEL 6 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/5f31a56acd25f892e6275e6ac786677… Patch: https://github.com/kamailio/kamailio/commit/5f31a56acd25f892e6275e6ac786677… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f00d55058e..3c68a9a002 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1113,6 +1113,10 @@ UUID module for Kamailio. %prep %setup -n %{name}-%{ver} +# python3 does not exist in RHEL 6 and similar dist. +%if 0%{?rhel} == 6 +sed -i -e 's/python3/python2/' utils/kamctl/dbtextdb/dbtextdb.py +%endif %build ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version}

4 years, 9 months

Re: [sr-dev] [kamailio/kamailio] app_python3: Makefile - suppress warning if --embed is not supported by python3-config (392688f)

by micmac1

> @micmac1: I did it because after merging your PR, I got usage message on macos: > > ``` > $ python3-config --ldflags --embed > Usage: /opt/local/bin/python3-config [--prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir] > ``` > > I change it and no usage printed: > > ``` > $ python3-config --ldflags --embed 2>/dev/null > ``` Interesting. Maybe your python3-config is patched. Thanks! -- 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/commit/392688fc756a97f65c2433bb6af7ade…

4 years, 9 months

Re: [sr-dev] [kamailio/kamailio] app_python3: Makefile - suppress warning if --embed is not supported by python3-config (392688f)

by Daniel-Constantin Mierla

@micmac1: I did it because after merging your PR, I got usage message on macos: ``` $ python3-config --ldflags --embed Usage: /opt/local/bin/python3-config [--prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir] ``` I change it and no usage printed: ``` $ python3-config --ldflags --embed 2>/dev/null ``` -- 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/commit/392688fc756a97f65c2433bb6af7ade…

4 years, 9 months

[kamailio/kamailio] tls: fix typo in documentation (#2281)

by Fred Posner

- replace "private" with "private_key"   #### Pre-Submission Checklist    - [X ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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  - replace "private" with "private_key" You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2281 -- Commit Summary -- * tls: fix typo in documentation -- File Changes -- M src/modules/tls/README (2) M src/modules/tls/doc/params.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2281.patch https://github.com/kamailio/kamailio/pull/2281.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/2281

4 years, 9 months

Re: [sr-dev] [kamailio/kamailio] app_python3: Makefile - suppress warning if --embed is not supported by python3-config (392688f)

by micmac1

Hello @miconda Just as a comment, I thought about this, too, but in the end decided against it because the python3(.x)-config scripts don't send out error messages to stderr. exit_with_usage() echoes to stdout. So if there is an error message it'll be saved inside "tmp_py3_libs". Kind regards, Seb -- 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/commit/392688fc756a97f65c2433bb6af7ade…

4 years, 9 months

git:master:28be94ea: misc/examples/kemi: make reply code integer everywhere

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 28be94ea97216ba7ac1420130cc01ebda167c5d8 URL: https://github.com/kamailio/kamailio/commit/28be94ea97216ba7ac1420130cc01eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-13T12:14:52+02:00 misc/examples/kemi: make reply code integer everywhere --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq --- Diff: https://github.com/kamailio/kamailio/commit/28be94ea97216ba7ac1420130cc01eb… Patch: https://github.com/kamailio/kamailio/commit/28be94ea97216ba7ac1420130cc01eb… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index 040af8656c..7cc880f290 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -219,10 +219,10 @@ function ksr_route_location() if (rc<0) { KSR.tm.t_newtran(); if (rc==-1 || rc==-3) { - KSR.sl.send_reply("404", "Not Found"); + KSR.sl.send_reply(404, "Not Found"); KSR.x.exit(); } else if (rc==-2) { - KSR.sl.send_reply("405", "Method Not Allowed"); + KSR.sl.send_reply(405, "Method Not Allowed"); KSR.x.exit(); } } diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index b28eea0ff1..4be9b13587 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -220,10 +220,10 @@ function ksr_route_location() if rc<0 then KSR.tm.t_newtran(); if rc==-1 or rc==-3 then - KSR.sl.send_reply("404", "Not Found"); + KSR.sl.send_reply(404, "Not Found"); KSR.x.exit(); elseif rc==-2 then - KSR.sl.send_reply("405", "Method Not Allowed"); + KSR.sl.send_reply(405, "Method Not Allowed"); KSR.x.exit(); end end diff --git a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq index b1c3ae4a77..4926ec8317 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq +++ b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq @@ -223,10 +223,10 @@ function ksr_route_location() if (rc<0) { KSR.tm.t_newtran(); if (rc==-1 || rc==-3) { - KSR.sl.send_reply("404", "Not Found"); + KSR.sl.send_reply(404, "Not Found"); KSR.x.exit(); } else if (rc==-2) { - KSR.sl.send_reply("405", "Method Not Allowed"); + KSR.sl.send_reply(405, "Method Not Allowed"); KSR.x.exit(); } }

4 years, 9 months

git:master:392688fc: app_python3: Makefile - suppress warning if --embed is not supported by python3-config

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 392688fc756a97f65c2433bb6af7adedca4e0abf URL: https://github.com/kamailio/kamailio/commit/392688fc756a97f65c2433bb6af7ade… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-12T12:06:52+02:00 app_python3: Makefile - suppress warning if --embed is not supported by python3-config --- Modified: src/modules/app_python3/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/392688fc756a97f65c2433bb6af7ade… Patch: https://github.com/kamailio/kamailio/commit/392688fc756a97f65c2433bb6af7ade… --- diff --git a/src/modules/app_python3/Makefile b/src/modules/app_python3/Makefile index d31cd6ab10..3594f104c8 100644 --- a/src/modules/app_python3/Makefile +++ b/src/modules/app_python3/Makefile @@ -12,7 +12,7 @@ NAME=app_python3.so PYTHON3?=python3 LIBS=${shell \ - tmp_py3_libs=$$(${PYTHON3}-config --ldflags --embed) || \ + tmp_py3_libs=$$(${PYTHON3}-config --ldflags --embed 2>/dev/null) || \ tmp_py3_libs=$$(${PYTHON3}-config --ldflags); \ echo $$tmp_py3_libs}

4 years, 9 months

[kamailio/kamailio] app_python3: update Python3 detection mechanism (#2282)

by micmac1

This commit - removes the python calls whose output is never actually used. - changes the include discovery to use python3(.x)-config. This is preferable because it also works for cross-compiling. Calling python3(.x) directly will always provide host flags, which for cross-compiling is not feasible. - updates LDFLAGS discovery to also work with >= Python 3.8. To achieve this python3(.x)-config is first run with the argument "--embed". If this does not succeed (exit status 1) python3(.x)-config is run again without "--embed". This is the method suggested by Python upstream to provide backwards compatibility. See [1] for more details. [1] https://docs.python.org/3/whatsnew/3.8.html Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net>   #### 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  Hi all, While trying to get app_python3 going on OpenWrt I stumbled over this. We're cross-compiling and I got the wrong includes (host includes instead of target includes). And then there was also the "-lpython3.x" missing because we're using python 3.8 which doesn't provide this linker flags by default anymore. So once I tried to load the module on the target device it threw an error: ``` Fri Apr 10 18:52:13 2020 daemon.err kamailio[15622]: 0(15622) ERROR: <core> [core/sr_module.c:512]: load_module(): could not open module </usr/lib/kamailio/modules/app_python3.so>: Error relocating /usr/lib/kamailio/modules/app_python3.so: PyTuple_New: symbol not found Fri Apr 10 18:52:13 2020 daemon.err kamailio[15622]: 0(15622) CRITICAL: <core> [core/cfg.y:3543]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 124, column 12-27: failed to load module ``` This pull requested fixes this. Kind regards, Seb You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2282 -- Commit Summary -- * app_python3: update Python3 detection mechanism -- File Changes -- M src/modules/app_python3/Makefile (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2282.patch https://github.com/kamailio/kamailio/pull/2282.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/2282

4 years, 9 months

← Newer
1
...
26
27
28
29
30
31
32
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020