sr-dev January 2023

sr-dev@lists.kamailio.org

14 participants
279 discussions

[kamailio/kamailio] dialog: Add dlg_get_matches function (PR #3005)

by rhys-hanrahan

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [X] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I've marked this as a "breaking change" only because it slightly alters the error handling of the RPC dlg.list_match command, to draw attention to it. But the actual functionality is unchanged. This PR adds a new script function to the dialog module: `dlg_get_matches`. This has the same behaviour as the RPC `dlg.list_match` command, but allows use in scripts. The results are returned in an XAVP of a specified name, as an array of fields. ``` dlg_get_matches(mkey, mop, mval, xavp_name[, max_results]); Returns number of matches found. Or -1 if there's an error. ``` An example of use would be: ``` xlog("Extension is: $var(ext)\n"); $avp(dlg_count) = dlg_get_matches("turi", "sw", "sip:nexusone$var(ext)@", "dlg_matches"); xlog("Got $avp(dlg_count) matches.\n"); $var(i) = 0; $var(matched) = 0; while ($var(i) < $avp(dlg_count)) { //Skip dialogs that are not early state if ($xavp(dlg_matches[$var(i)]=>state) == 2) { xlog("Found matching dlg[$var(i)]: $xavp(dlg_matches[$var(i)]=>from_uri)\n"); } } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3005 -- Commit Summary -- * dialog: Adding dlg_get_matches function based on RPC dlg.list_match command. * dialog: Adding documentation for dlg_get_matches function. * dialog: Refactored dlg_get_matches and dlg.list_match RPC command to use a shared dlg_list_matches function. -- File Changes -- M src/modules/dialog/dialog.c (793) M src/modules/dialog/doc/dialog_admin.xml (92) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3005.patch https://github.com/kamailio/kamailio/pull/3005.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3005 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3005(a)github.com>

1 year, 10 months

[kamailio/kamailio] sipdump: clarify PV must be loaded in advance for mode=2 (PR #3329)

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

I hope the example will be properly formatted. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3329 -- Commit Summary -- * sipdump: clarify PV must be loaded in advance for mode=2 -- File Changes -- M src/modules/sipdump/doc/sipdump_admin.xml (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3329.patch https://github.com/kamailio/kamailio/pull/3329.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3329 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3329(a)github.com>

1 year, 10 months

[kamailio/kamailio] websocket: example must listen on ports 80 and 443 (PR #3332)

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

otherwise the code below always matches: ``` if ($Rp != 80 && $Rp != 443) { ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3332 -- Commit Summary -- * websocket: example must listen on ports 80 and 443 -- File Changes -- M src/modules/websocket/doc/websocket_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3332.patch https://github.com/kamailio/kamailio/pull/3332.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3332 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3332(a)github.com>

1 year, 10 months

git:master:3112e49a: websocket: example must listen on ports 80 and 443

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3112e49aac274c75cc893693e820da894125403b URL: https://github.com/kamailio/kamailio/commit/3112e49aac274c75cc893693e820da8… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-20T11:49:51+01:00 websocket: example must listen on ports 80 and 443 otherwise the code below always matches: if ($Rp != 80 && $Rp != 443) { --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3112e49aac274c75cc893693e820da8… Patch: https://github.com/kamailio/kamailio/commit/3112e49aac274c75cc893693e820da8… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index f12d109561..5d33184a85 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -44,6 +44,8 @@ <programlisting><![CDATA[ ... tcp_accept_no_cl=yes +listen=tcp:127.0.0.17:80 +listen=tls:127.0.0.17:443 ... loadmodule "sl.so" loadmodule "xhttp.so" @@ -135,6 +137,7 @@ event_route[xhttp:request] { ... loadmodule "sl.so" loadmodule "tm.so" +loadmodule "xhttp.so" ... loadmodule "websocket.so" ...

1 year, 10 months

[kamailio/kamailio] websocket: ignoring keepalive for socket in the removing state (PR #3331)

by sergey-safarov

#### 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 - [x] Related to issue #3278 #### Description When websocket is closed, then possible race condition websocket removal and websocket keepalive functions. [ws_frame.c:816](https://github.com/kamailio/kamailio/blob/ac4c2d4579f121395… - setting socked state `WS_S_CLOSING` [ws_conn.c:703](https://github.com/kamailio/kamailio/blob/master/src/modules… - setting socket state `WS_S_REMOVING` and updates `rmticks` value. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3331 -- Commit Summary -- * websocket: ignoring keepalive for socket in the removing state (GH #3278) -- File Changes -- M src/modules/websocket/ws_frame.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3331.patch https://github.com/kamailio/kamailio/pull/3331.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3331 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3331(a)github.com>

1 year, 10 months

[kamailio/kamailio] fedora 37 build warnings with gcc 12.2.1 (Issue #3330)

by sergey-safarov

``` CC (gcc) [kamailio] core/nonsip_hooks.o CC (gcc) [kamailio] core/onsend.o CC (gcc) [kamailio] core/pass_fd.o CC (gcc) [kamailio] core/ppcfg.o In file included from core/ppcfg.c:37: core/utils/snexpr.h: In function 'snexpr_create': core/utils/snexpr.h:1247:98: warning: '%d' directive output may be truncated writing between 1 and 11 bytes into a region of size 2 [-Wformat-truncation=] 1247 | snprintf(varname, sizeof(varname) - 1, "$%d", | ^~ core/utils/snexpr.h:1247:96: note: directive argument in the range [-2147483646, 2147483647] 1247 | snprintf(varname, sizeof(varname) - 1, "$%d", | ^~~~~ core/utils/snexpr.h:1247:57: note: 'snprintf' output between 3 and 13 bytes into a destination of size 3 1247 | snprintf(varname, sizeof(varname) - 1, "$%d", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1248 | (j + 1)); | ~~~~~~~~ CC (gcc) [kamailio] core/proxy.o CC (gcc) [kamailio] core/pt.o CC (gcc) [kamailio] core/pv_core.o CC (gcc) [kamailio] core/pvapi.o ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3330 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3330(a)github.com>

1 year, 10 months

git:master:d5b42fca: core: snexpr - increase local buffer to avoid compile warning

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d5b42fca13d2107590f9178c5d7c1a9d765adf73 URL: https://github.com/kamailio/kamailio/commit/d5b42fca13d2107590f9178c5d7c1a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-20T11:34:14+01:00 core: snexpr - increase local buffer to avoid compile warning - GH #3330 --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/d5b42fca13d2107590f9178c5d7c1a9… Patch: https://github.com/kamailio/kamailio/commit/d5b42fca13d2107590f9178c5d7c1a9… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index 4fb6e3f3b7..0115a52fd8 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -1243,7 +1243,7 @@ static struct snexpr *snexpr_create(const char *s, size_t len, int j; /* Assign macro parameters */ for(j = 0; j < sne_vec_len(&arg.args); j++) { - char varname[4]; + char varname[14]; snprintf(varname, sizeof(varname) - 1, "$%d", (j + 1)); struct snexpr_var *v =

1 year, 10 months

[kamailio/kamailio] kamdbctl create - database engine not loaded error (Issue #3333)

by winarama

I am trying to create a docker image which contains a preconfigured Kamailio server in presence mode. My image is based off the official Kamailio docker image version **kamailio/kamailio:5.6.2-bullseye**. My **kamctlrc** file is as follows. ``` SIP_DOMAIN="my-domain.com" DBENGINE="DBTEXT" DB_PATH="/usr/share/kamailio/dbtext" MD5="md5sum" AWK="awk" GDB="gdb" GREP="grep" EGREP="egrep" SED="sed" LAST_LINE="tail -n 1" EXPR="expr" INSTALL_EXTRA_TABLES="yes" INSTALL_PRESENCE_TABLES="yes" INSTALL_DBUID_TABLES="yes" RPCFIFOPATH="/run/kamailio/kamailio_rpc.fifo" PID_FILE="/run/kamailio/kamailio.pid" ``` However, when I try to run **kamdbctl create** I get the following error. `'18 0.402 ** ERROR: database engine not loaded - tried 'DBTEXT` Can anyone shed any light on what I am doing wrong here? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3333 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3333(a)github.com>

1 year, 10 months

git:5.6:fe0c4d5e: pkg/kamailio/obs: used mariadb connector instead of mysql

by Sergey Safarov

Module: kamailio Branch: 5.6 Commit: fe0c4d5efdff79f76a20b3519f41388782fae710 URL: https://github.com/kamailio/kamailio/commit/fe0c4d5efdff79f76a20b3519f41388… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-01-19T13:24:19+03:00 pkg/kamailio/obs: used mariadb connector instead of mysql (cherry picked from commit ea99c8fc235334d4dd48868f74ab5c62662942e6) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/fe0c4d5efdff79f76a20b3519f41388… Patch: https://github.com/kamailio/kamailio/commit/fe0c4d5efdff79f76a20b3519f41388… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f040ca5cd8..42c9bce60a 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -736,8 +736,7 @@ BuildRequires: zlib-devel Requires: libmysqlclient18 BuildRequires: libmysqlclient-devel %else -Requires: mysql-libs -BuildRequires: mysql-devel +BuildRequires: mariadb-devel %endif %description mysql

1 year, 10 months

git:master:ea99c8fc: pkg/kamailio/obs: used mariadb connector instead of mysql

by Sergey Safarov

Module: kamailio Branch: master Commit: ea99c8fc235334d4dd48868f74ab5c62662942e6 URL: https://github.com/kamailio/kamailio/commit/ea99c8fc235334d4dd48868f74ab5c6… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-01-19T11:59:03+03:00 pkg/kamailio/obs: used mariadb connector instead of mysql --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ea99c8fc235334d4dd48868f74ab5c6… Patch: https://github.com/kamailio/kamailio/commit/ea99c8fc235334d4dd48868f74ab5c6… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 1291010a63..e9d67f9edb 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -736,8 +736,7 @@ BuildRequires: zlib-devel Requires: libmysqlclient18 BuildRequires: libmysqlclient-devel %else -Requires: mysql-libs -BuildRequires: mysql-devel +BuildRequires: mariadb-devel %endif %description mysql

1 year, 10 months

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2023