[sr-dev] Re: [kamailio/kamailio] crypto: SHA1_Init deprecated at openssl 3.0 (PR #3518)
I don't think that would fly looking into the definition of the structure... https://github.com/openssl/openssl/blob/7551264186f176ca5801aa84d60c7b91d8fba31f/crypto/evp/evp_local.h#L16-L34 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3518#issuecomment-1647485089 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:2750e48b: rtpproxy: make sure we null terminate the copy of the string.
Module: kamailio
Branch: master
Commit: 2750e48b5445e9334cb7a062d7d53a1fb9a0a411
URL:
https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1fb9a0a411
Author: Maksym Sobolyev
Committer: Victor Seva
Date: 2023-07-26T14:46:45+02:00
rtpproxy: make sure we null terminate the copy of the string.
Broken in d00ceda2c04.
---
Modified: src/modules/rtpproxy/rtpproxy.c
---
Diff:
https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1fb9a0a411.diff
Patch:
https://github.com/kamailio/kamailio/commit/2750e48b5445e9334cb7a062d7d53a1fb9a0a411.patch
---
diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c
index 8103fef4edd..9d7190cabc3 100644
--- a/src/modules/rtpproxy/rtpproxy.c
+++ b/src/modules/rtpproxy/rtpproxy.c
@@ -1698,7 +1698,8 @@ static int rtpproxy_manage(struct sip_msg *msg, char
*flags, char *ip)
if(ip == NULL) {
cp.s = ip_addr2a(&msg->rcv.dst_ip);
cp.len = strlen(cp.s);
- memcpy(newip, cp.s, cp.len);
+ /* Copy, including teminating \0 */
+ memcpy(newip, cp.s, cp.len + 1);
}
if(msg->msg_flags & FL_SDP_BODY)
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] rtpproxy: make sure we null terminate the copy of the string. (PR #3524)
Merged #3524 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3524#event-9923697519 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:3c1700fb: rtpproxy: make sure we null terminate the copy of the string.
Module: kamailio Branch: master Commit: 3c1700fb7693c05025be1058e856fe610f4be031 URL: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe610f4be031 Author: Victor Seva Committer: Victor Seva Date: 2023-07-26T14:55:17+02:00 rtpproxy: make sure we null terminate the copy of the string. bug introduced at d00ceda2c04 --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe610f4be031.diff Patch: https://github.com/kamailio/kamailio/commit/3c1700fb7693c05025be1058e856fe610f4be031.patch --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 9d7190cabc3..bc252982e1c 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1834,7 +1834,8 @@ static int rtpproxy_answer1_helper_f(struct sip_msg *msg, char *flags) cp.s = ip_addr2a(&msg->rcv.dst_ip); cp.len = strlen(cp.s); - memcpy(newip, cp.s, cp.len); + /* Copy, including teminating \0 */ + memcpy(newip, cp.s, cp.len + 1); return force_rtp_proxy(msg, flags, newip, 0, 0); } ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:192b681c: sipcapture: make sure we null terminate the copy of the string
Module: kamailio Branch: master Commit: 192b681ce7fcd868a4a47a7c26863c733321b8d4 URL: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c733321b8d4 Author: Victor Seva Committer: Victor Seva Date: 2023-07-26T15:00:38+02:00 sipcapture: make sure we null terminate the copy of the string bug introduced at cbd7810fff3d5145c1ce34c0e362b5590bb92a12 --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c733321b8d4.diff Patch: https://github.com/kamailio/kamailio/commit/192b681ce7fcd868a4a47a7c26863c733321b8d4.patch --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index de0a15174cc..5efb1898036 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2252,7 +2252,8 @@ static int sip_capture( ip.s = ip_addr2a(&msg->rcv.src_ip); ip.len = strlen(ip.s); - memcpy(buf_ip, ip.s, ip.len); + /* Copy, including teminating \0 */ + memcpy(buf_ip, ip.s, ip.len + 1); sco.source_ip.s = buf_ip; sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port; @@ -2839,7 +2840,8 @@ static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data) /* IP source and destination */ ip.s = ip_addr2a(&msg->rcv.src_ip); ip.len = strlen(ip.s); - memcpy(buf_ip, ip.s, ip.len); + /* Copy, including teminating \0 */ + memcpy(buf_ip, ip.s, ip.len + 1); sco.source_ip.s = buf_ip; sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port; ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] rtpproxy: make sure we null terminate the copy of the string. (PR #3524)
My bad, added fixes for my commits. thanks @sobomax ! ``` commit 192b681ce7fcd868a4a47a7c26863c733321b8d4 (HEAD -> master, origin/master, origin/HEAD) Author: Victor Seva Date: Wed Jul 26 15:00:38 2023 +0200 sipcapture: make sure we null terminate the copy of the string bug introduced at cbd7810fff3d5145c1ce34c0e362b5590bb92a12 commit 3c1700fb7693c05025be1058e856fe610f4be031 Author: Victor Seva Date: Wed Jul 26 14:53:26 2023 +0200 rtpproxy: make sure we null terminate the copy of the string. bug introduced at d00ceda2c04 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3524#issuecomment-1651767068 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] Initial support for devcontainers (PR #3516)
Merged #3516 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3516#event-9923951129 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:c2f12479: .clang-format: add json settings [skip ci]
Module: kamailio Branch: master Commit: c2f12479debe7bd5f5819f3c3b332929dd5fe703 URL: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b332929dd5fe703 Author: Victor Seva Committer: Victor Seva Date: 2023-07-26T15:10:03+02:00 .clang-format: add json settings [skip ci] --- Modified: .clang-format --- Diff: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b332929dd5fe703.diff Patch: https://github.com/kamailio/kamailio/commit/c2f12479debe7bd5f5819f3c3b332929dd5fe703.patch --- diff --git a/.clang-format b/.clang-format index d805149083d..6f7a705477f 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,7 @@ --- +Language: Json +BasedOnStyle: llvm +--- Language:Cpp # BasedOnStyle: LLVM AccessModifierOffset: -4 @@ -87,4 +90,3 @@ Standard:Cpp11 TabWidth:4 UseTab: Always ... - ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:bad420e9: .devcontainer: Initial support for devcontainers [skip ci]
Module: kamailio
Branch: master
Commit: bad420e9f72c237bbd608a9ff06ae3b63bce9625
URL:
https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b63bce9625
Author: Victor Seva
Committer: Victor Seva
Date: 2023-07-26T15:10:03+02:00
.devcontainer: Initial support for devcontainers [skip ci]
Allows to develop inside a container using vscode
> https://code.visualstudio.com/docs/devcontainers/containers
---
Added: .devcontainer/Dockerfile
Added: .devcontainer/devcontainer.json
---
Diff:
https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b63bce9625.diff
Patch:
https://github.com/kamailio/kamailio/commit/bad420e9f72c237bbd608a9ff06ae3b63bce9625.patch
---
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 000..50a901b764a
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,17 @@
+FROM mcr.microsoft.com/devcontainers/base:bookworm
+# utils packages
+RUN apt-get update && \
+ export DEBIAN_FRONTEND=noninteractive && \
+ apt-get -y install --no-install-recommends \
+apt-utils dialog clang-format clang pbuilder
+
+# bookworm packaging
+RUN mkdir -p /usr/local/src/pkg
+COPY bookworm /usr/local/src/pkg/debian
+
+# get build dependences
+RUN cd /usr/local/src/pkg/ && \
+ /usr/lib/pbuilder/pbuilder-satisfydepends-experimental
+
+# clean
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000..98d103801ea
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,34 @@
+{
+ /* For format details, see https://aka.ms/devcontainer.json. For config
options, see the
+ * README at: https://github.com/devcontainers/templates/tree/main/src/debian
+ */
+ "name": "Debian",
+ "build": {
+"context": "../pkg/kamailio/deb",
+"dockerfile": "Dockerfile"
+ },
+
+ // Features to add to the dev container. More info:
https://containers.dev/features.
+ "features": {
+"ghcr.io/wxw-matt/devcontainer-features/command_runner:0": {}
+ },
+
+ // Use 'forwardPorts' to make a list of ports inside the container available
locally.
+ "forwardPorts": [
+5060
+ ],
+
+ // Configure tool-specific properties.
+ "customizations": {
+"vscode": {
+ "settings": {},
+ "extensions": [
+"ms-vscode.cpptools-extension-pack",
+"xaver.clang-format"
+ ]
+}
+ },
+
+ // Uncomment to connect as root instead. More info:
https://aka.ms/dev-containers-non-root.
+ "remoteUser": "root"
+}
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] crypto: SHA1_Init deprecated at openssl 3.0 (PR #3518)
Merged #3518 into master. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3518#event-9932609925 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:e55a6ed0: crypto: SHA1_Init deprecated at openssl 3.0
Module: kamailio
Branch: master
Commit: e55a6ed0f24c9b81d8d3ad27ba25d4d88c474483
URL:
https://github.com/kamailio/kamailio/commit/e55a6ed0f24c9b81d8d3ad27ba25d4d88c474483
Author: Victor Seva
Committer: Victor Seva
Date: 2023-07-27T10:02:55+02:00
crypto: SHA1_Init deprecated at openssl 3.0
>From https://www.openssl.org/docs/man3.0/man7/migration_guide.html
> Use of low-level digest functions such as SHA1_Init(3) have been informally
> discouraged from use for a long time. Applications should instead use the
> high level EVP APIs EVP_DigestInit_ex(3), EVP_DigestUpdate(3) and
> EVP_DigestFinal_ex(3), or the quick one-shot EVP_Q_digest(3).
related to #3502
---
Modified: src/modules/crypto/crypto_uuid.c
---
Diff:
https://github.com/kamailio/kamailio/commit/e55a6ed0f24c9b81d8d3ad27ba25d4d88c474483.diff
Patch:
https://github.com/kamailio/kamailio/commit/e55a6ed0f24c9b81d8d3ad27ba25d4d88c474483.patch
---
diff --git a/src/modules/crypto/crypto_uuid.c b/src/modules/crypto/crypto_uuid.c
index ffe208fb85f..fbc0a3c670d 100644
--- a/src/modules/crypto/crypto_uuid.c
+++ b/src/modules/crypto/crypto_uuid.c
@@ -177,14 +177,33 @@ static inline int crypto_format_rfc4122_uuid(
*/
void crypto_generate_callid(str *callid)
{
+#if OPENSSL_VERSION_NUMBER > 0x03000L
+ EVP_MD_CTX *crypto_ctx = NULL;
+#else
static SHA_CTX crypto_ctx = {0};
+#endif
static unsigned char crypto_buf[SHA_DIGEST_LENGTH] = {0};
static char crypto_sbuf[UUID_LEN] = {0};
crypto_inc_counter(crypto_callid_counter, CTR_LEN);
+
+#if OPENSSL_VERSION_NUMBER > 0x03000L
+ if((crypto_ctx = EVP_MD_CTX_new()) == NULL) {
+ LM_ERR("can't get new context\n");
+ callid->s = NULL;
+ callid->len = 0;
+ return;
+ }
+ EVP_DigestInit_ex(crypto_ctx, EVP_sha1(), NULL);
+ EVP_DigestUpdate(crypto_ctx, crypto_callid_seed, SEED_LEN);
+ EVP_DigestUpdate(crypto_ctx, crypto_callid_counter, CTR_LEN);
+ EVP_DigestFinal_ex(crypto_ctx, crypto_buf, NULL);
+ EVP_MD_CTX_free(crypto_ctx);
+#else
SHA1_Init(&crypto_ctx);
SHA1_Update(&crypto_ctx, crypto_callid_seed, SEED_LEN);
SHA1_Update(&crypto_ctx, crypto_callid_counter, CTR_LEN);
SHA1_Final(crypto_buf, &crypto_ctx);
+#endif
crypto_format_rfc4122_uuid(
crypto_sbuf, sizeof(crypto_sbuf), crypto_buf,
sizeof(crypto_buf));
callid->s = crypto_sbuf;
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] kamailio depends on obsolete pcre3 library (Issue #2946)
And now we're out of Debian testing. ``` Testing: Excuse for kamailio Migration status for kamailio (- to 5.7.0-1): BLOCKED: Rejected/violates migration policy/introduces a regression Issues preventing migration: Removal request by auto-removals Trying to remove package, not update it Updating kamailio would introduce bugs in testing: [#1000134](https://bugs.debian.org/1000134) Additional info: Piuparts tested OK - https://piuparts.debian.org/sid/source/k/kamailio.html 74 days old (needed 5 days) Excuses generated on: Tue Aug 1 09:07:08 2023 UTC ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2946#issuecomment-1659988215 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] [kamailio/kamailio] db_redis: fix schema (#1919)
manual schema changes introduced at c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea were lost by regeneration at 5e0440aa27154c263fc883f3a7cb9680805af6c3 This change sets the types changes at location for db_redis You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1919 -- Commit Summary -- * lib/srdb1: update location types for db_redis * kamctl: regenerated db schema files -- File Changes -- M src/lib/srdb1/schema/location.xml (2) M utils/kamctl/db_redis/kamailio/location (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1919.patch https://github.com/kamailio/kamailio/pull/1919.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/1919 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] db_redis location schema (#1917)
I think the root cause is this that c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea was manually updated and lost at 5e0440aa27154c263fc883f3a7cb9680805af6c3 #1919 will restore the intended changes -- 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/issues/1917#issuecomment-478913835___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:741f7c08: lib/srdb1: update location types for db_redis
Module: kamailio
Branch: master
Commit: 741f7c08a86fc101a4f0290192dcbacff1673575
URL:
https://github.com/kamailio/kamailio/commit/741f7c08a86fc101a4f0290192dcbacff1673575
Author: Victor Seva
Committer: Victor Seva
Date: 2019-04-02T11:28:05+02:00
lib/srdb1: update location types for db_redis
changed introduced directly at c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea
---
Modified: src/lib/srdb1/schema/location.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/741f7c08a86fc101a4f0290192dcbacff1673575.diff
Patch:
https://github.com/kamailio/kamailio/commit/741f7c08a86fc101a4f0290192dcbacff1673575.patch
---
diff --git a/src/lib/srdb1/schema/location.xml
b/src/lib/srdb1/schema/location.xml
index f951f1f4e0..f923394144 100644
--- a/src/lib/srdb1/schema/location.xml
+++ b/src/lib/srdb1/schema/location.xml
@@ -89,6 +89,7 @@
expires
datetime
+time
&DEFAULT_ALIASES_EXPIRES;
to_date('&DEFAULT_ALIASES_EXPIRES;','-mm-dd
hh24:mi:ss')
Date and time when this entry expires.
@@ -121,6 +122,7 @@
last_modified
datetime
+time
&DEFAULT_DATETIME;
to_date('&DEFAULT_DATETIME;','-mm-dd
hh24:mi:ss')
Date and time when this entry was last
modified.
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:ae54cf7b: kamctl: regenerated db schema files
Module: kamailio Branch: master Commit: ae54cf7bf6c268a3fef8834a57991601e3487d57 URL: https://github.com/kamailio/kamailio/commit/ae54cf7bf6c268a3fef8834a57991601e3487d57 Author: Victor Seva Committer: Victor Seva Date: 2019-04-02T11:28:05+02:00 kamctl: regenerated db schema files restore db_redis location changes --- Modified: utils/kamctl/db_redis/kamailio/location --- Diff: https://github.com/kamailio/kamailio/commit/ae54cf7bf6c268a3fef8834a57991601e3487d57.diff Patch: https://github.com/kamailio/kamailio/commit/ae54cf7bf6c268a3fef8834a57991601e3487d57.patch --- diff --git a/utils/kamctl/db_redis/kamailio/location b/utils/kamctl/db_redis/kamailio/location index 9ca18f2fb0..7c0ea2ab81 100644 --- a/utils/kamctl/db_redis/kamailio/location +++ b/utils/kamctl/db_redis/kamailio/location @@ -1,2 +1,2 @@ -id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/int,q/double,callid/string,cseq/int,last_modified/int,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, +id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/time,q/double,callid/string,cseq/int,last_modified/time,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, 9 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] db_redis: fix schema (#1919)
Merged #1919 into master. -- 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/1919#event-2245863198___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:0853dd48: lib/srdb1: update location types for db_redis
Module: kamailio
Branch: 5.2
Commit: 0853dd48f40e4d91c207e5f4f01b4edeb34ef187
URL:
https://github.com/kamailio/kamailio/commit/0853dd48f40e4d91c207e5f4f01b4edeb34ef187
Author: Victor Seva
Committer: Victor Seva
Date: 2019-04-02T11:30:08+02:00
lib/srdb1: update location types for db_redis
changed introduced directly at c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea
(cherry picked from commit 741f7c08a86fc101a4f0290192dcbacff1673575)
---
Modified: src/lib/srdb1/schema/location.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/0853dd48f40e4d91c207e5f4f01b4edeb34ef187.diff
Patch:
https://github.com/kamailio/kamailio/commit/0853dd48f40e4d91c207e5f4f01b4edeb34ef187.patch
---
diff --git a/src/lib/srdb1/schema/location.xml
b/src/lib/srdb1/schema/location.xml
index f951f1f4e0..f923394144 100644
--- a/src/lib/srdb1/schema/location.xml
+++ b/src/lib/srdb1/schema/location.xml
@@ -89,6 +89,7 @@
expires
datetime
+time
&DEFAULT_ALIASES_EXPIRES;
to_date('&DEFAULT_ALIASES_EXPIRES;','-mm-dd
hh24:mi:ss')
Date and time when this entry expires.
@@ -121,6 +122,7 @@
last_modified
datetime
+time
&DEFAULT_DATETIME;
to_date('&DEFAULT_DATETIME;','-mm-dd
hh24:mi:ss')
Date and time when this entry was last
modified.
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:d36634a3: kamctl: regenerate db schema files
Module: kamailio Branch: 5.2 Commit: d36634a3628ef21088b9930108a0ce845ccc38d6 URL: https://github.com/kamailio/kamailio/commit/d36634a3628ef21088b9930108a0ce845ccc38d6 Author: Victor Seva Committer: Victor Seva Date: 2019-04-02T11:31:12+02:00 kamctl: regenerate db schema files --- Modified: utils/kamctl/db_redis/kamailio/location --- Diff: https://github.com/kamailio/kamailio/commit/d36634a3628ef21088b9930108a0ce845ccc38d6.diff Patch: https://github.com/kamailio/kamailio/commit/d36634a3628ef21088b9930108a0ce845ccc38d6.patch --- diff --git a/utils/kamctl/db_redis/kamailio/location b/utils/kamctl/db_redis/kamailio/location index 9ca18f2fb0..7c0ea2ab81 100644 --- a/utils/kamctl/db_redis/kamailio/location +++ b/utils/kamctl/db_redis/kamailio/location @@ -1,2 +1,2 @@ -id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/int,q/double,callid/string,cseq/int,last_modified/int,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, +id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/time,q/double,callid/string,cseq/int,last_modified/time,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, 9 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] db_redis location schema (#1917)
Closed #1917. -- 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/issues/1917#event-2245883243___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] db_redis location schema (#1917)
backported fixes to 5.2 branch too -- 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/issues/1917#issuecomment-478919766___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Changed default db_redis location schema type for timestamps. Fixes i… (#1918)
Closed #1918. -- 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/1918#event-2245949516___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Changed default db_redis location schema type for timestamps. Fixes i… (#1918)
I comment at #1917, is already fixed in master and backported the fix to 5.2 -- 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/1918#issuecomment-478946193___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.0:e3b3a752: pkg/kamailio/deb: version set to 5.0.8
Module: kamailio Branch: 5.0 Commit: e3b3a75212a1df986288b5885750c56c3f742e43 URL: https://github.com/kamailio/kamailio/commit/e3b3a75212a1df986288b5885750c56c3f742e43 Author: Victor Seva Committer: Victor Seva Date: 2019-04-04T11:06:33+02:00 pkg/kamailio/deb: version set to 5.0.8 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/e3b3a75212a1df986288b5885750c56c3f742e43.diff Patch: https://github.com/kamailio/kamailio/commit/e3b3a75212a1df986288b5885750c56c3f742e43.patch --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index f919a6cd8e..c70a3b6251 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.8) unstable; urgency=medium + + * version set to 5.0.8 + + -- Victor Seva Thu, 04 Apr 2019 11:05:40 +0200 + kamailio (5.0.7) unstable; urgency=medium * version set to 5.0.7 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:6fcd28bd: pkg/kamailio/deb: version set to 5.1.8
Module: kamailio Branch: 5.1 Commit: 6fcd28bddfba628fa49a621cd1c20919a5755085 URL: https://github.com/kamailio/kamailio/commit/6fcd28bddfba628fa49a621cd1c20919a5755085 Author: Victor Seva Committer: Victor Seva Date: 2019-04-11T09:53:51+02:00 pkg/kamailio/deb: version set to 5.1.8 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/6fcd28bddfba628fa49a621cd1c20919a5755085.diff Patch: https://github.com/kamailio/kamailio/commit/6fcd28bddfba628fa49a621cd1c20919a5755085.patch --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index ba5d29653d..16e3683d4c 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.8) unstable; urgency=medium + + * version set to 5.1.8 + + -- Victor Seva Thu, 11 Apr 2019 09:53:09 +0200 + kamailio (5.1.7) unstable; urgency=medium * version set to 5.1.7 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:0ac9dba4: pkg/kamailio/deb: switch to libssl version 1.0 where available
Module: kamailio
Branch: master
Commit: 0ac9dba4cfbab0e13f3819166849d13d28ff522f
URL:
https://github.com/kamailio/kamailio/commit/0ac9dba4cfbab0e13f3819166849d13d28ff522f
Author: Victor Seva
Committer: Victor Seva
Date: 2019-04-12T09:46:59+02:00
pkg/kamailio/deb: switch to libssl version 1.0 where available
---
Modified: pkg/kamailio/deb/bionic/control
Modified: pkg/kamailio/deb/debian/backports/bionic
Modified: pkg/kamailio/deb/debian/backports/buster
Modified: pkg/kamailio/deb/debian/backports/sid
Modified: pkg/kamailio/deb/debian/backports/stretch
Modified: pkg/kamailio/deb/debian/control
Modified: pkg/kamailio/deb/stretch/control
---
Diff:
https://github.com/kamailio/kamailio/commit/0ac9dba4cfbab0e13f3819166849d13d28ff522f.diff
Patch:
https://github.com/kamailio/kamailio/commit/0ac9dba4cfbab0e13f3819166849d13d28ff522f.patch
---
diff --git a/pkg/kamailio/deb/bionic/control b/pkg/kamailio/deb/bionic/control
index 338568ab73..b38ce443c7 100644
--- a/pkg/kamailio/deb/bionic/control
+++ b/pkg/kamailio/deb/bionic/control
@@ -42,7 +42,7 @@ Build-Depends:
libsctp-dev,
libsnmp-dev,
libsqlite3-dev,
- libssl-dev,
+ libssl1.0-dev,
libsystemd-dev,
libunistring-dev,
libxml2-dev,
diff --git a/pkg/kamailio/deb/debian/backports/bionic
b/pkg/kamailio/deb/debian/backports/bionic
index dbbe2fc694..d0848153b3 100755
--- a/pkg/kamailio/deb/debian/backports/bionic
+++ b/pkg/kamailio/deb/debian/backports/bionic
@@ -25,6 +25,9 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules
sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
+# use libssl1.0-dev
+sed -i -e 's/libssl-dev (<1.1)/libssl1.0-dev/' ${DIST}/control
+
wrap-and-sort -sat -d ${DIST}
# clean backports scripts
diff --git a/pkg/kamailio/deb/debian/backports/buster
b/pkg/kamailio/deb/debian/backports/buster
index 82a41a8d4f..969909e4d9 100755
--- a/pkg/kamailio/deb/debian/backports/buster
+++ b/pkg/kamailio/deb/debian/backports/buster
@@ -25,6 +25,9 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules
sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
+# no libssl-dev 1.0
+sed -i -e 's/libssl-dev (<1.1)/libssl-dev/' ${DIST}/control
+
wrap-and-sort -sat -d ${DIST}
# clean backports scripts
diff --git a/pkg/kamailio/deb/debian/backports/sid
b/pkg/kamailio/deb/debian/backports/sid
index 8161de7269..9e7d792173 100755
--- a/pkg/kamailio/deb/debian/backports/sid
+++ b/pkg/kamailio/deb/debian/backports/sid
@@ -25,6 +25,9 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules
sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
+# no libssl-dev 1.0
+sed -i -e 's/libssl-dev (<1.1)/libssl-dev/' ${DIST}/control
+
wrap-and-sort -sat -d ${DIST}
# clean backports scripts
diff --git a/pkg/kamailio/deb/debian/backports/stretch
b/pkg/kamailio/deb/debian/backports/stretch
index cf528bdeba..05a4705f87 100755
--- a/pkg/kamailio/deb/debian/backports/stretch
+++ b/pkg/kamailio/deb/debian/backports/stretch
@@ -22,6 +22,9 @@ sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/'
${DIST}/rules
sed -i 's/libmongoc-dev/libbson-dev,\n libmongoc-dev/' \
${DIST}/control
+# use libssl1.0-dev
+sed -i -e 's/libssl-dev (<1.1)/libssl1.0-dev/' ${DIST}/control
+
wrap-and-sort -sat -d ${DIST}
# clean backports scripts
diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control
index e8077280ae..7581509dca 100644
--- a/pkg/kamailio/deb/debian/control
+++ b/pkg/kamailio/deb/debian/control
@@ -43,7 +43,7 @@ Build-Depends:
libsctp-dev,
libsnmp-dev,
libsqlite3-dev,
- libssl-dev,
+ libssl-dev (<1.1),
libsystemd-dev,
libunistring-dev,
libval-dev,
diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control
index 7e87c253f0..2fbd439dde 100644
--- a/pkg/kamailio/deb/stretch/control
+++ b/pkg/kamailio/deb/stretch/control
@@ -44,7 +44,7 @@ Build-Depends:
libsctp-dev,
libsnmp-dev,
libsqlite3-dev,
- libssl-dev,
+ libssl1.0-dev,
libsystemd-dev,
libunistring-dev,
libxml2-dev,
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:6ed93bc8: pkg/kamailio/deb: bionic can't use libssl1.0-dev due conflicts with libcurl4-openssl-dev dependencies
Module: kamailio
Branch: master
Commit: 6ed93bc8b3fdaa0919ad4aa427cb99891eadbdd2
URL:
https://github.com/kamailio/kamailio/commit/6ed93bc8b3fdaa0919ad4aa427cb99891eadbdd2
Author: Victor Seva
Committer: Victor Seva
Date: 2019-04-12T14:52:55+02:00
pkg/kamailio/deb: bionic can't use libssl1.0-dev due conflicts with
libcurl4-openssl-dev dependencies
> The following packages have unmet dependencies:
> libcurl4-openssl-dev : Conflicts: libssl1.0-dev but 1.0.2n-1ubuntu5 is to be
> installed
> libssl-dev : Conflicts: libssl1.0-dev but 1.0.2n-1ubuntu5 is to be installed
> libssl1.0-dev : Conflicts: libssl-dev but 1.1.0g-2ubuntu4 is to be installed
> Unable to resolve dependencies! Giving up...
---
Modified: pkg/kamailio/deb/bionic/control
Modified: pkg/kamailio/deb/debian/backports/bionic
Modified: pkg/kamailio/deb/debian/backports/buster
Modified: pkg/kamailio/deb/debian/backports/sid
Modified: pkg/kamailio/deb/debian/backports/stretch
Modified: pkg/kamailio/deb/debian/control
---
Diff:
https://github.com/kamailio/kamailio/commit/6ed93bc8b3fdaa0919ad4aa427cb99891eadbdd2.diff
Patch:
https://github.com/kamailio/kamailio/commit/6ed93bc8b3fdaa0919ad4aa427cb99891eadbdd2.patch
---
diff --git a/pkg/kamailio/deb/bionic/control b/pkg/kamailio/deb/bionic/control
index b38ce443c7..338568ab73 100644
--- a/pkg/kamailio/deb/bionic/control
+++ b/pkg/kamailio/deb/bionic/control
@@ -42,7 +42,7 @@ Build-Depends:
libsctp-dev,
libsnmp-dev,
libsqlite3-dev,
- libssl1.0-dev,
+ libssl-dev,
libsystemd-dev,
libunistring-dev,
libxml2-dev,
diff --git a/pkg/kamailio/deb/debian/backports/bionic
b/pkg/kamailio/deb/debian/backports/bionic
index d0848153b3..8512ae421f 100755
--- a/pkg/kamailio/deb/debian/backports/bionic
+++ b/pkg/kamailio/deb/debian/backports/bionic
@@ -25,8 +25,8 @@ sed -i -e '/^export JAVA_HOME/d' ${DIST}/rules
sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
-# use libssl1.0-dev
-sed -i -e 's/libssl-dev (<1.1)/libssl1.0-dev/' ${DIST}/control
+# libssl1.0-dev conflicts with libcurl4-openssl-dev dependencies
+sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control
wrap-and-sort -sat -d ${DIST}
diff --git a/pkg/kamailio/deb/debian/backports/buster
b/pkg/kamailio/deb/debian/backports/buster
index 969909e4d9..a4c4473827 100755
--- a/pkg/kamailio/deb/debian/backports/buster
+++ b/pkg/kamailio/deb/debian/backports/buster
@@ -26,7 +26,7 @@ sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
# no libssl-dev 1.0
-sed -i -e 's/libssl-dev (<1.1)/libssl-dev/' ${DIST}/control
+sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control
wrap-and-sort -sat -d ${DIST}
diff --git a/pkg/kamailio/deb/debian/backports/sid
b/pkg/kamailio/deb/debian/backports/sid
index 9e7d792173..6b1c5d4eac 100755
--- a/pkg/kamailio/deb/debian/backports/sid
+++ b/pkg/kamailio/deb/debian/backports/sid
@@ -26,7 +26,7 @@ sed -i -e 's/ java[ ,$]*/ /' ${DIST}/rules
sed -i -e '/^EXCLUDED_MODULES=/s/$/ java/' ${DIST}/rules
# no libssl-dev 1.0
-sed -i -e 's/libssl-dev (<1.1)/libssl-dev/' ${DIST}/control
+sed -i -e 's/libssl-dev (<<1.1)/libssl-dev/' ${DIST}/control
wrap-and-sort -sat -d ${DIST}
diff --git a/pkg/kamailio/deb/debian/backports/stretch
b/pkg/kamailio/deb/debian/backports/stretch
index 05a4705f87..0f9780acf0 100755
--- a/pkg/kamailio/deb/debian/backports/stretch
+++ b/pkg/kamailio/deb/debian/backports/stretch
@@ -23,7 +23,7 @@ sed -i 's/libmongoc-dev/libbson-dev,\n libmongoc-dev/' \
${DIST}/control
# use libssl1.0-dev
-sed -i -e 's/libssl-dev (<1.1)/libssl1.0-dev/' ${DIST}/control
+sed -i -e 's/libssl-dev (<<1.1)/libssl1.0-dev/' ${DIST}/control
wrap-and-sort -sat -d ${DIST}
diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control
index 7581509dca..ffe8437181 100644
--- a/pkg/kamailio/deb/debian/control
+++ b/pkg/kamailio/deb/debian/control
@@ -43,7 +43,7 @@ Build-Depends:
libsctp-dev,
libsnmp-dev,
libsqlite3-dev,
- libssl-dev (<1.1),
+ libssl-dev (<<1.1),
libsystemd-dev,
libunistring-dev,
libval-dev,
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:5d6f35d8: pkg/kamailio/deb: version set to 5.3.0~dev5
Module: kamailio Branch: master Commit: 5d6f35d825cd2d688c3618bd37d11f12634d7c8f URL: https://github.com/kamailio/kamailio/commit/5d6f35d825cd2d688c3618bd37d11f12634d7c8f Author: Victor Seva Committer: Victor Seva Date: 2019-04-18T17:09:25+02:00 pkg/kamailio/deb: version set to 5.3.0~dev5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/5d6f35d825cd2d688c3618bd37d11f12634d7c8f.diff Patch: https://github.com/kamailio/kamailio/commit/5d6f35d825cd2d688c3618bd37d11f12634d7c8f.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] usrloc: udomain_contact_expired_cb fix memory leak (#1947)
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 # (replace with an open issue number) Description 9757bb8c0e2fea5173f4fa3dd7798d61759f04af introduced a memory leak due to not cleaning all the ucontacts created at get_urecord() so every time that there are expired contacts in the db we will leave some ucontacts in shared mem and will be never free This only happens on DB_ONLY mode You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1947 -- Commit Summary -- * usrloc: udomain_contact_expired_cb fix memory leak -- File Changes -- M src/modules/usrloc/udomain.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1947.patch https://github.com/kamailio/kamailio/pull/1947.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/1947 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] dialplan: add reload_delta parameter (#1946)
I would say We should not backport this change since this is a new parameter and no new features should go to stable releases -- 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/1946#issuecomment-489641614___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:926a97f4: dialplan: add reload_delta parameter
Module: kamailio
Branch: master
Commit: 926a97f4eb741401b193fb711e6c439555c646ab
URL:
https://github.com/kamailio/kamailio/commit/926a97f4eb741401b193fb711e6c439555c646ab
Author: Marco Capetta
Committer: Victor Seva
Date: 2019-05-06T16:29:48+02:00
dialplan: add reload_delta parameter
- make the rate limit of maximum allowed dialplan reload configurable
using the new 'reload_delta' paramenter.
---
Modified: src/modules/dialplan/dialplan.c
Modified: src/modules/dialplan/doc/dialplan_admin.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/926a97f4eb741401b193fb711e6c439555c646ab.diff
Patch:
https://github.com/kamailio/kamailio/commit/926a97f4eb741401b193fb711e6c439555c646ab.patch
---
diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c
index d8685d52f2..20b7744e21 100644
--- a/src/modules/dialplan/dialplan.c
+++ b/src/modules/dialplan/dialplan.c
@@ -87,6 +87,7 @@ dp_param_p default_par2 = NULL;
int dp_fetch_rows = 1000;
int dp_match_dynamic = 0;
int dp_append_branch = 1;
+int dp_reload_delta = 5;
static time_t *dp_rpc_reload_time = NULL;
@@ -105,6 +106,7 @@ static param_export_t mod_params[]={
{ "fetch_rows", PARAM_INT, &dp_fetch_rows },
{ "match_dynamic", PARAM_INT, &dp_match_dynamic },
{ "append_branch", PARAM_INT, &dp_append_branch },
+ { "reload_delta", PARAM_INT, &dp_reload_delta },
{0,0,0}
};
@@ -182,6 +184,9 @@ static int mod_init(void)
if(dp_fetch_rows<=0)
dp_fetch_rows = 1000;
+ if(dp_reload_delta<0)
+ dp_reload_delta = 5;
+
if(init_data() != 0) {
LM_ERR("could not initialize data\n");
return -1;
@@ -619,7 +624,7 @@ static void dialplan_rpc_reload(rpc_t* rpc, void* ctx)
rpc->fault(ctx, 500, "Not ready for reload");
return;
}
- if(*dp_rpc_reload_time!=0 && *dp_rpc_reload_time > time(NULL) - 5) {
+ if(*dp_rpc_reload_time!=0 && *dp_rpc_reload_time > time(NULL) -
dp_reload_delta) {
LM_ERR("ongoing reload\n");
rpc->fault(ctx, 500, "ongoing reload");
return;
diff --git a/src/modules/dialplan/doc/dialplan_admin.xml
b/src/modules/dialplan/doc/dialplan_admin.xml
index 371120fac4..e524524fb8 100644
--- a/src/modules/dialplan/doc/dialplan_admin.xml
+++ b/src/modules/dialplan/doc/dialplan_admin.xml
@@ -410,6 +410,33 @@ modparam("dialplan", "append_branch", 0)
+
+ reload_delta (int)
+
+ The number of seconds that have to be waited before executing a
new reload
+ of dialplan rules. By default there is a rate limiting of
maximum one reload
+ in five seconds.
+
+
+ If set to 0, no rate limit is configured. Note carefully: use
this configuration
+ only in tests environments because executing two dialplan
reloads at the same
+ time can cause to kamailio to crash.
+
+
+
+ Default value is 5.
+
+
+
+ Set reload_delta parameter
+
+...
+modparam("dialplan", "reload_delta", 1)
+...
+
+
+
+
@@ -620,8 +647,9 @@ xlog("translated to var $var(y) \n");
dp_reload()
- Reload the translation rules from the database. Note that there
is
- a rate limiting of maximum one reload in five seconds.
+ Reload the translation rules from the database. Note that there
is a
+ rate limiting defined by 'reload_delta' paramenter. By default
is allowed
+ maximum one reload in five seconds.
Name: dp_reload
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] dialplan: add reload_delta parameter (#1946)
Merged #1946 into master. -- 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/1946#event-2321156186___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] dialplan: add reload_delta parameter (#1946)
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/pull/1946#issuecomment-489641881___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:48fd1a23: usrloc: udomain_contact_expired_cb fix memory leak
Module: kamailio
Branch: master
Commit: 48fd1a23cc3ddcb0df082bc24669dbf3a9fdc203
URL:
https://github.com/kamailio/kamailio/commit/48fd1a23cc3ddcb0df082bc24669dbf3a9fdc203
Author: Victor Seva
Committer: Victor Seva
Date: 2019-05-07T09:27:42+02:00
usrloc: udomain_contact_expired_cb fix memory leak
We need to call release_urecord in order to free the ucontacts
generated at get_urecord() on shared memory
---
Modified: src/modules/usrloc/udomain.c
---
Diff:
https://github.com/kamailio/kamailio/commit/48fd1a23cc3ddcb0df082bc24669dbf3a9fdc203.diff
Patch:
https://github.com/kamailio/kamailio/commit/48fd1a23cc3ddcb0df082bc24669dbf3a9fdc203.patch
---
diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c
index c28c881790..11378aadee 100644
--- a/src/modules/usrloc/udomain.c
+++ b/src/modules/usrloc/udomain.c
@@ -1019,7 +1019,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t*
_d)
if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) {
LM_ERR("inserting contact failed\n");
- free_ucontact(c);
+ release_urecord(r);
unlock_udomain(_d, &user);
goto error;
}
@@ -1029,7 +1029,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t*
_d)
run_ul_callbacks( UL_CONTACT_EXPIRE, c);
}
c->state = CS_SYNC;
- free_ucontact(c);
+ release_urecord(r);
unlock_udomain(_d, &user);
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] usrloc: udomain_contact_expired_cb fix memory leak (#1947)
Merged #1947 into master. -- 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/1947#event-2323260504___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:75f743d9: usrloc: udomain_contact_expired_cb fix memory leak
Module: kamailio
Branch: 5.2
Commit: 75f743d9501faaead7a173c8f459d4b2adfcb41d
URL:
https://github.com/kamailio/kamailio/commit/75f743d9501faaead7a173c8f459d4b2adfcb41d
Author: Victor Seva
Committer: Victor Seva
Date: 2019-05-07T09:29:45+02:00
usrloc: udomain_contact_expired_cb fix memory leak
We need to call release_urecord in order to free the ucontacts
generated at get_urecord() on shared memory
(cherry picked from commit 48fd1a23cc3ddcb0df082bc24669dbf3a9fdc203)
---
Modified: src/modules/usrloc/udomain.c
---
Diff:
https://github.com/kamailio/kamailio/commit/75f743d9501faaead7a173c8f459d4b2adfcb41d.diff
Patch:
https://github.com/kamailio/kamailio/commit/75f743d9501faaead7a173c8f459d4b2adfcb41d.patch
---
diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c
index c28c881790..11378aadee 100644
--- a/src/modules/usrloc/udomain.c
+++ b/src/modules/usrloc/udomain.c
@@ -1019,7 +1019,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t*
_d)
if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) {
LM_ERR("inserting contact failed\n");
- free_ucontact(c);
+ release_urecord(r);
unlock_udomain(_d, &user);
goto error;
}
@@ -1029,7 +1029,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t*
_d)
run_ul_callbacks( UL_CONTACT_EXPIRE, c);
}
c->state = CS_SYNC;
- free_ucontact(c);
+ release_urecord(r);
unlock_udomain(_d, &user);
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] 5.2.2: `pv_cache` is never drained and eventually results in perpetual OOM (#1948)
AFAIK pv_cache works that way. We put the pv vars that we use in the config in private mem and it should not be cleaned, ever. There's no leak. Are you using different pv names for every SIP message processing? Are you using KEMI? -- 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/issues/1948#issuecomment-490411433___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] dialplan: dp_match() does substitution and replace (#1952)
### Description
dialplan ``dp_match()`` fails with a substitution error when subst_exp doesn't
match the string. I was expecting to only match the rule to get the attrs no
matter what is defined in ``subst_exp/repl_exp``
### Troubleshooting
Reproduction
```
=> select * from dialplan where id = 24;
─[ RECORD 1 ]──
id│ 24
dpid │ 101000
pr│ 1
match_op │ 1
match_exp │ ^00([1-9][0-35-9]|[1-35-9][0-9])[0-9]+$
match_len │ 0
subst_exp │ ^([1-9][0-9]{8})$
repl_exp │ +34\1
attrs │ cli=+34654205682;action=0
```
```
route[SET_DST] {
if($var(dpid_team)==0){
xdbg("SET_DST no $$var(dpid_team) - ci='$ci'");
return;
}
xinfo("SET_DST trying to get dialplan from dpid:$var(dpid_team) - ci'$ci'");
if(dp_translate("$(var(dpid_team){s.int})", "$rU/$var(dst)")){
if($rU != $var(dst)){
xinfo("SET_DST change from $$rU:'$rU' to '$var(dst)' - ci='$ci'");
$rU = $var(dst);
}
} else {
xinfo("SET_DST no valid subst_exp for '$rU' trying to match -
ci='$ci'");
dp_match("$(var(dpid_team){s.int})", "$rU");
}
if($var(dp_attrs)!=0) {
xdbg("SET_DST $$var(dp_attrs):$var(dp_attrs) "
"action:$(var(dp_attrs){param.value,action}) - ci='$ci'");
$var(action) = $(var(dp_attrs){param.value,action});
if($var(action)=='1'){
xalert("Dialing rule group for '$rU' set to 'deny' - ci='$ci'");
route(ERROR_DEST_DENY);
}
}
return;
}
```
```
INFO:
[sr-dev] [kamailio/kamailio] dialplan: don't try to translate on dp_match() (#1953)
``` INFO:
Re: [sr-dev] [kamailio/kamailio] dialplan: don't try to translate on dp_match() (#1953)
is that the correct behavior for ``dp_match()``? That is what I understand from the description ``` 6.2. dp_match(dpid, inval) The function matches the input value 'inval' using the rules with dialplan id 'dpid'. If the rule that was applied has attributes, they are stored in the variable provided via the module parameter 'attrs_pvar'. ``` -- 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/1953#issuecomment-492569785___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:61b67197: janssonrpcc: remove compilation warning
Module: kamailio
Branch: master
Commit: 61b67197ba8b996abdaff1388362469563ba2202
URL:
https://github.com/kamailio/kamailio/commit/61b67197ba8b996abdaff1388362469563ba2202
Author: Victor Seva
Committer: Victor Seva
Date: 2019-05-15T11:13:17+02:00
janssonrpcc: remove compilation warning
> janssonrpcc_mod.c:345:25: warning: comparison of unsigned expression < 0 is
> always false [-Wtautological-compare]
> if (jsonrpc_keep_alive < 0) {
> ~~ ^ ~
> 1 warning generated.
---
Modified: src/modules/janssonrpcc/janssonrpcc_mod.c
---
Diff:
https://github.com/kamailio/kamailio/commit/61b67197ba8b996abdaff1388362469563ba2202.diff
Patch:
https://github.com/kamailio/kamailio/commit/61b67197ba8b996abdaff1388362469563ba2202.patch
---
diff --git a/src/modules/janssonrpcc/janssonrpcc_mod.c
b/src/modules/janssonrpcc/janssonrpcc_mod.c
index 9076f4a543..bad41ca2c5 100644
--- a/src/modules/janssonrpcc/janssonrpcc_mod.c
+++ b/src/modules/janssonrpcc/janssonrpcc_mod.c
@@ -342,9 +342,7 @@ int parse_keep_alive_param(modparam_t type, void* val)
return -1;
}
jsonrpc_keep_alive = (int)(long)val;
- if (jsonrpc_keep_alive < 0) {
- jsonrpc_keep_alive = 0;
- }
+
INFO("jsonrpc_keep_alive set to %d\n", jsonrpc_keep_alive);
return 0;
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:cced2379: dialplan: don't try to translate on dp_match()
Module: kamailio
Branch: master
Commit: cced23795582d9f4cc2bae545ea1c24664303036
URL:
https://github.com/kamailio/kamailio/commit/cced23795582d9f4cc2bae545ea1c24664303036
Author: Victor Seva
Committer: Victor Seva
Date: 2019-05-15T11:37:41+02:00
dialplan: don't try to translate on dp_match()
fix #1952
---
Modified: src/modules/dialplan/dialplan.c
Modified: src/modules/dialplan/dp_repl.c
---
Diff:
https://github.com/kamailio/kamailio/commit/cced23795582d9f4cc2bae545ea1c24664303036.diff
Patch:
https://github.com/kamailio/kamailio/commit/cced23795582d9f4cc2bae545ea1c24664303036.patch
---
diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c
index 20b7744e21..7770679a45 100644
--- a/src/modules/dialplan/dialplan.c
+++ b/src/modules/dialplan/dialplan.c
@@ -481,8 +481,9 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid, str
*input,
pv_spec_t *pvd)
{
dpl_id_p idp;
- str output = STR_NULL;
+ str tmp = STR_NULL;
str attrs = STR_NULL;
+ str *output = NULL;
str *outattrs = NULL;
if ((idp = select_dpid(dpid)) ==0) {
@@ -491,16 +492,19 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid,
str *input,
}
outattrs = (!attr_pvar)?NULL:&attrs;
- if (dp_translate_helper(msg, input, &output, idp, outattrs)!=0) {
+ output = (!pvd)?NULL:&tmp;
+ if (dp_translate_helper(msg, input, output, idp, outattrs)!=0) {
LM_DBG("could not translate %.*s "
"with dpid %i\n", input->len, input->s,
idp->dp_id);
return -1;
}
- LM_DBG("input %.*s with dpid %i => output %.*s\n",
- input->len, input->s, idp->dp_id, output.len, output.s);
+ if (output) {
+ LM_DBG("input %.*s with dpid %i => output %.*s\n",
+ input->len, input->s, idp->dp_id, output->len,
output->s);
+ }
/* set the output */
- if (dp_update(msg, pvd, &output, outattrs) !=0){
+ if (dp_update(msg, pvd, output, outattrs) !=0){
LM_ERR("cannot set the output\n");
return -1;
}
diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c
index 06534a9dab..05949c8289 100644
--- a/src/modules/dialplan/dp_repl.c
+++ b/src/modules/dialplan/dp_repl.c
@@ -699,6 +699,9 @@ int dp_translate_helper(sip_msg_t *msg, str *input, str
*output, dpl_id_p idp,
attrs->len, attrs->s);
}
}
+ if(!output) {
+ return 0;
+ }
if(rulep->tflags&DP_TFLAGS_PV_SUBST) {
re_list = dpl_dynamic_pcre_list(msg, &rulep->subst_exp);
if(re_list==NULL) {
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] dialplan: don't try to translate on dp_match() (#1953)
Merged #1953 into master. -- 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/1953#event-2342699797___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] dialplan: dp_match() does substitution and replace (#1952)
Closed #1952 via cced23795582d9f4cc2bae545ea1c24664303036. -- 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/issues/1952#event-2342699884___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:b536723c: dialplan: don't try to translate on dp_match()
Module: kamailio
Branch: 5.2
Commit: b536723c66441203c2eaaa1ed1a68c981a0254be
URL:
https://github.com/kamailio/kamailio/commit/b536723c66441203c2eaaa1ed1a68c981a0254be
Author: Victor Seva
Committer: Victor Seva
Date: 2019-05-15T11:38:24+02:00
dialplan: don't try to translate on dp_match()
fix #1952
(cherry picked from commit cced23795582d9f4cc2bae545ea1c24664303036)
---
Modified: src/modules/dialplan/dialplan.c
Modified: src/modules/dialplan/dp_repl.c
---
Diff:
https://github.com/kamailio/kamailio/commit/b536723c66441203c2eaaa1ed1a68c981a0254be.diff
Patch:
https://github.com/kamailio/kamailio/commit/b536723c66441203c2eaaa1ed1a68c981a0254be.patch
---
diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c
index d8685d52f2..9d68d5d64b 100644
--- a/src/modules/dialplan/dialplan.c
+++ b/src/modules/dialplan/dialplan.c
@@ -476,8 +476,9 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid, str
*input,
pv_spec_t *pvd)
{
dpl_id_p idp;
- str output = STR_NULL;
+ str tmp = STR_NULL;
str attrs = STR_NULL;
+ str *output = NULL;
str *outattrs = NULL;
if ((idp = select_dpid(dpid)) ==0) {
@@ -486,16 +487,19 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid,
str *input,
}
outattrs = (!attr_pvar)?NULL:&attrs;
- if (dp_translate_helper(msg, input, &output, idp, outattrs)!=0) {
+ output = (!pvd)?NULL:&tmp;
+ if (dp_translate_helper(msg, input, output, idp, outattrs)!=0) {
LM_DBG("could not translate %.*s "
"with dpid %i\n", input->len, input->s,
idp->dp_id);
return -1;
}
- LM_DBG("input %.*s with dpid %i => output %.*s\n",
- input->len, input->s, idp->dp_id, output.len, output.s);
+ if (output) {
+ LM_DBG("input %.*s with dpid %i => output %.*s\n",
+ input->len, input->s, idp->dp_id, output->len,
output->s);
+ }
/* set the output */
- if (dp_update(msg, pvd, &output, outattrs) !=0){
+ if (dp_update(msg, pvd, output, outattrs) !=0){
LM_ERR("cannot set the output\n");
return -1;
}
diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c
index 06762ce6d2..093e48fd37 100644
--- a/src/modules/dialplan/dp_repl.c
+++ b/src/modules/dialplan/dp_repl.c
@@ -699,6 +699,9 @@ int dp_translate_helper(sip_msg_t *msg, str *input, str
*output, dpl_id_p idp,
attrs->len, attrs->s);
}
}
+ if(!output) {
+ return 0;
+ }
if(rulep->tflags&DP_TFLAGS_PV_SUBST) {
re_list = dpl_dynamic_pcre_list(msg, &rulep->match_exp);
if(re_list==NULL) {
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:5268c0b6: dialplan: don't try to translate on dp_match()
Module: kamailio
Branch: 5.1
Commit: 5268c0b6b1ece7f6dffb0f77c15a86b379d309f1
URL:
https://github.com/kamailio/kamailio/commit/5268c0b6b1ece7f6dffb0f77c15a86b379d309f1
Author: Victor Seva
Committer: Victor Seva
Date: 2019-05-15T11:39:13+02:00
dialplan: don't try to translate on dp_match()
fix #1952
(cherry picked from commit cced23795582d9f4cc2bae545ea1c24664303036)
---
Modified: src/modules/dialplan/dialplan.c
Modified: src/modules/dialplan/dp_repl.c
---
Diff:
https://github.com/kamailio/kamailio/commit/5268c0b6b1ece7f6dffb0f77c15a86b379d309f1.diff
Patch:
https://github.com/kamailio/kamailio/commit/5268c0b6b1ece7f6dffb0f77c15a86b379d309f1.patch
---
diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c
index 61aeae47f1..96bb183bd3 100644
--- a/src/modules/dialplan/dialplan.c
+++ b/src/modules/dialplan/dialplan.c
@@ -478,8 +478,9 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid, str
*input,
pv_spec_t *pvd)
{
dpl_id_p idp;
- str output = STR_NULL;
+ str tmp = STR_NULL;
str attrs = STR_NULL;
+ str *output = NULL;
str *outattrs = NULL;
if ((idp = select_dpid(dpid)) ==0) {
@@ -488,16 +489,19 @@ static int dp_replace_helper(sip_msg_t *msg, int dpid,
str *input,
}
outattrs = (!attr_pvar)?NULL:&attrs;
- if (dp_translate_helper(msg, input, &output, idp, outattrs)!=0) {
+ output = (!pvd)?NULL:&tmp;
+ if (dp_translate_helper(msg, input, output, idp, outattrs)!=0) {
LM_DBG("could not translate %.*s "
"with dpid %i\n", input->len, input->s,
idp->dp_id);
return -1;
}
- LM_DBG("input %.*s with dpid %i => output %.*s\n",
- input->len, input->s, idp->dp_id, output.len, output.s);
+ if (output) {
+ LM_DBG("input %.*s with dpid %i => output %.*s\n",
+ input->len, input->s, idp->dp_id, output->len,
output->s);
+ }
/* set the output */
- if (dp_update(msg, pvd, &output, outattrs) !=0){
+ if (dp_update(msg, pvd, output, outattrs) !=0){
LM_ERR("cannot set the output\n");
return -1;
}
diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c
index 06762ce6d2..093e48fd37 100644
--- a/src/modules/dialplan/dp_repl.c
+++ b/src/modules/dialplan/dp_repl.c
@@ -699,6 +699,9 @@ int dp_translate_helper(sip_msg_t *msg, str *input, str
*output, dpl_id_p idp,
attrs->len, attrs->s);
}
}
+ if(!output) {
+ return 0;
+ }
if(rulep->tflags&DP_TFLAGS_PV_SUBST) {
re_list = dpl_dynamic_pcre_list(msg, &rulep->match_exp);
if(re_list==NULL) {
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] app_java.so: undefined symbol: JNI_CreateJavaVM please help (#1969)
@xevilstar good to know that You want to contribute. First try to make app_java work again. From what I know it was not possible to build it with gcj so I removed the package. I'm not the maintainer of that module and I have any interest in it. If you manage to fix it and make it work properly I can add the package for sure. -- 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/issues/1969#issuecomment-497717359___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:6263bf35: pkg/kamailio/deb: version set 5.3.0~dev6 [skip ci]
Module: kamailio Branch: master Commit: 6263bf3535d8f646b07d573a0fe05dd223d5a2bf URL: https://github.com/kamailio/kamailio/commit/6263bf3535d8f646b07d573a0fe05dd223d5a2bf Author: Victor Seva Committer: Victor Seva Date: 2019-06-12T09:53:02+02:00 pkg/kamailio/deb: version set 5.3.0~dev6 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/6263bf3535d8f646b07d573a0fe05dd223d5a2bf.diff Patch: https://github.com/kamailio/kamailio/commit/6263bf3535d8f646b07d573a0fe05dd223d5a2bf.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] registrar: clean avp/xavp created at 'usrloc:contact-expired' route_event (#1994)
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 Description I was creating avp variables at route_event[usrloc:contact-expired] and shared memory was always growing I think this is the same issue #1391 and solved by ad46b115bedec01c52c5a9dcde0756db85ee61ec You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1994 -- Commit Summary -- * registrar: clean avp/xavp created at 'usrloc:contact-expired' route_event -- File Changes -- M src/modules/registrar/regpv.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1994.patch https://github.com/kamailio/kamailio/pull/1994.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/1994 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:c671e781: registrar: clean avp/xavp created at 'usrloc:contact-expired' route_event
Module: kamailio Branch: master Commit: c671e78142b51515d64392fd9a9db8f07e904167 URL: https://github.com/kamailio/kamailio/commit/c671e78142b51515d64392fd9a9db8f07e904167 Author: Victor Seva Committer: Victor Seva Date: 2019-06-27T08:56:47+02:00 registrar: clean avp/xavp created at 'usrloc:contact-expired' route_event --- Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/c671e78142b51515d64392fd9a9db8f07e904167.diff Patch: https://github.com/kamailio/kamailio/commit/c671e78142b51515d64392fd9a9db8f07e904167.patch --- diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index d04f129d47..dbf48ae47d 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -35,6 +35,7 @@ #include "../../core/action.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" +#include "../../core/receive.h" #include "../usrloc/usrloc.h" #include "registrar.h" #include "common.h" @@ -751,7 +752,7 @@ void reg_ul_expired_contact(ucontact_t* ptr, int type, void* param) } } set_route_type(backup_rt); - + ksr_msg_env_reset(); return; error: regpv_free_profile(rpp); ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] registrar: clean avp/xavp created at 'usrloc:contact-expired' route_event (#1994)
Merged #1994 into master. -- 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/1994#event-2443207265___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:4a458861: registrar: clean avp/xavp created at 'usrloc:contact-expired' route_event
Module: kamailio Branch: 5.2 Commit: 4a458861b4377f53218a6c836f18adca6b17a9ff URL: https://github.com/kamailio/kamailio/commit/4a458861b4377f53218a6c836f18adca6b17a9ff Author: Victor Seva Committer: Victor Seva Date: 2019-06-27T08:57:54+02:00 registrar: clean avp/xavp created at 'usrloc:contact-expired' route_event (cherry picked from commit c671e78142b51515d64392fd9a9db8f07e904167) --- Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/4a458861b4377f53218a6c836f18adca6b17a9ff.diff Patch: https://github.com/kamailio/kamailio/commit/4a458861b4377f53218a6c836f18adca6b17a9ff.patch --- diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index d04f129d47..dbf48ae47d 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -35,6 +35,7 @@ #include "../../core/action.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" +#include "../../core/receive.h" #include "../usrloc/usrloc.h" #include "registrar.h" #include "common.h" @@ -751,7 +752,7 @@ void reg_ul_expired_contact(ucontact_t* ptr, int type, void* param) } } set_route_type(backup_rt); - + ksr_msg_env_reset(); return; error: regpv_free_profile(rpp); ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] usrloc: fix memory leak on DB_ONLY mode on RPC commands (#1996)
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 Description release_urecord() needs to be called in order to clean ucontacts created on get_urecord() when mode is DB_ONLY You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1996 -- Commit Summary -- * usrloc: fix memory leak on DB_ONLY mode on RPC commands -- File Changes -- M src/modules/usrloc/ul_rpc.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1996.patch https://github.com/kamailio/kamailio/pull/1996.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/1996 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] error: 'pkg/docker' does not have a commit checked out (#2003)
I had no problems and nothing is on ``pkg/docker`` for me ``` vseva@debnuc:~/projects/kamailio$ ls -lah pkg/docker/ total 8.0K drwxr-xr-x 2 vseva vseva 4.0K Apr 11 09:52 . drwxr-xr-x 5 vseva vseva 4.0K Apr 11 09:52 .. vseva@debnuc:~/projects/kamailio$ git --version git version 2.20.1 ``` -- 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/issues/2003#issuecomment-509284521___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:f31dbe36: travis: use buster instead of stretch
Module: kamailio
Branch: master
Commit: f31dbe3633e1a2e787066d4cbeaf7d53d4153dcf
URL:
https://github.com/kamailio/kamailio/commit/f31dbe3633e1a2e787066d4cbeaf7d53d4153dcf
Author: Victor Seva
Committer: Victor Seva
Date: 2019-07-11T11:30:56+02:00
travis: use buster instead of stretch
* buster is now Debian stable!! :-)
---
Modified: .travis.yml
Modified: test/travis/build_travis.sh
---
Diff:
https://github.com/kamailio/kamailio/commit/f31dbe3633e1a2e787066d4cbeaf7d53d4153dcf.diff
Patch:
https://github.com/kamailio/kamailio/commit/f31dbe3633e1a2e787066d4cbeaf7d53d4153dcf.patch
---
diff --git a/.travis.yml b/.travis.yml
index 11eae2df71..73638bb613 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ compiler:
- gcc
- clang
env:
- - DIST=stretch
+ - DIST=buster
- DIST=sid
services:
- docker
diff --git a/test/travis/build_travis.sh b/test/travis/build_travis.sh
index 818508fa00..368f013ebc 100755
--- a/test/travis/build_travis.sh
+++ b/test/travis/build_travis.sh
@@ -7,7 +7,7 @@
set -e
-DIST=${DIST:-stretch}
+DIST=${DIST:-buster}
CC=${CC:-gcc}
if ! [ -d /code/pkg/kamailio/deb/"${DIST}" ] ; then
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] rtpengine: fix error output on send_rtpp_command() (#2009)
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 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2009 -- Commit Summary -- * rtpengine: fix error output on send_rtpp_command() -- File Changes -- M src/modules/rtpengine/rtpengine.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2009.patch https://github.com/kamailio/kamailio/pull/2009.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/2009 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:26206894: rtpengine: fix error output on send_rtpp_command()
Module: kamailio
Branch: master
Commit: 262068940ba8dbd1b9fd93847f83f40c038d988c
URL:
https://github.com/kamailio/kamailio/commit/262068940ba8dbd1b9fd93847f83f40c038d988c
Author: Victor Seva
Committer: Victor Seva
Date: 2019-07-15T12:37:54+02:00
rtpengine: fix error output on send_rtpp_command()
* rename out variable to cmd due to We already have an out goto label
---
Modified: src/modules/rtpengine/rtpengine.c
---
Diff:
https://github.com/kamailio/kamailio/commit/262068940ba8dbd1b9fd93847f83f40c038d988c.diff
Patch:
https://github.com/kamailio/kamailio/commit/262068940ba8dbd1b9fd93847f83f40c038d988c.patch
---
diff --git a/src/modules/rtpengine/rtpengine.c
b/src/modules/rtpengine/rtpengine.c
index a7b690f3fb..7a6b73d747 100644
--- a/src/modules/rtpengine/rtpengine.c
+++ b/src/modules/rtpengine/rtpengine.c
@@ -2770,7 +2770,7 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t
*dict, int *outlen)
static char buf[0x1];
struct pollfd fds[1];
struct iovec *v;
- str out = STR_NULL;
+ str cmd = STR_NULL;
v = bencode_iovec(dict, &vcnt, 1, 0);
if (!v) {
@@ -2835,8 +2835,9 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t
*dict, int *outlen)
len = writev(rtpp_socks[node->idx], v, vcnt +
1);
} while (len == -1 && (errno == EINTR || errno ==
ENOBUFS));
if (len <= 0) {
- bencode_get_str(bencode_dictionary_get(dict,
"command"), &out);
- LM_ERR("can't send command \"%.*s\" to RTP
proxy <%s>\n", out.len, out.s, node->rn_url.s);
+ bencode_get_str(bencode_dictionary_get(dict,
"command"), &cmd);
+ LM_ERR("can't send command \"%.*s\" to RTP
proxy <%s>\n",
+ cmd.len, cmd.s, node->rn_url.s);
goto badproxy;
}
rtpengine_tout_ms =
cfg_get(rtpengine,rtpengine_cfg,rtpengine_tout_ms);
@@ -2846,7 +2847,9 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t
*dict, int *outlen)
len = recv(rtpp_socks[node->idx], buf,
sizeof(buf)-1, 0);
} while (len == -1 && errno == EINTR);
if (len <= 0) {
- LM_ERR("can't read reply for command
\"%.*s\" from RTP proxy <%s>\n", out.len, out.s, node->rn_url.s);
+
bencode_get_str(bencode_dictionary_get(dict, "command"), &cmd);
+ LM_ERR("can't read reply for command
\"%.*s\" from RTP proxy <%s>\n",
+ cmd.len, cmd.s, node->rn_url.s);
goto badproxy;
}
if (len >= (v[0].iov_len - 1) &&
@@ -2863,7 +2866,9 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t
*dict, int *outlen)
}
}
if (i == rtpengine_retr) {
- LM_ERR("timeout waiting reply for command \"%.*s\" from
RTP proxy <%s>\n", out.len, out.s, node->rn_url.s);
+ bencode_get_str(bencode_dictionary_get(dict,
"command"), &cmd);
+ LM_ERR("timeout waiting reply for command \"%.*s\" from
RTP proxy <%s>\n",
+ cmd.len, cmd.s, node->rn_url.s);
goto badproxy;
}
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] rtpengine: fix error output on send_rtpp_command() (#2009)
Merged #2009 into master. -- 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/2009#event-2482458929___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:797705e4: rtpengine: fix error output on send_rtpp_command()
Module: kamailio
Branch: 5.1
Commit: 797705e42896c9bcef6b4b45d631d643bf07efe5
URL:
https://github.com/kamailio/kamailio/commit/797705e42896c9bcef6b4b45d631d643bf07efe5
Author: Victor Seva
Committer: Victor Seva
Date: 2019-07-15T12:39:17+02:00
rtpengine: fix error output on send_rtpp_command()
* rename out variable to cmd due to We already have an out goto label
(cherry picked from commit 262068940ba8dbd1b9fd93847f83f40c038d988c)
---
Modified: src/modules/rtpengine/rtpengine.c
---
Diff:
https://github.com/kamailio/kamailio/commit/797705e42896c9bcef6b4b45d631d643bf07efe5.diff
Patch:
https://github.com/kamailio/kamailio/commit/797705e42896c9bcef6b4b45d631d643bf07efe5.patch
---
diff --git a/src/modules/rtpengine/rtpengine.c
b/src/modules/rtpengine/rtpengine.c
index f11d03d3f9..00f0f0aff1 100644
--- a/src/modules/rtpengine/rtpengine.c
+++ b/src/modules/rtpengine/rtpengine.c
@@ -2442,7 +2442,7 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t
*dict, int *outlen)
static char buf[0x1];
struct pollfd fds[1];
struct iovec *v;
- str out = STR_NULL;
+ str cmd = STR_NULL;
v = bencode_iovec(dict, &vcnt, 1, 0);
if (!v) {
@@ -2507,8 +2507,9 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t
*dict, int *outlen)
len = writev(rtpp_socks[node->idx], v, vcnt +
1);
} while (len == -1 && (errno == EINTR || errno ==
ENOBUFS));
if (len <= 0) {
- bencode_get_str(bencode_dictionary_get(dict,
"command"), &out);
- LM_ERR("can't send command \"%.*s\" to RTP
proxy <%s>\n", out.len, out.s, node->rn_url.s);
+ bencode_get_str(bencode_dictionary_get(dict,
"command"), &cmd);
+ LM_ERR("can't send command \"%.*s\" to RTP
proxy <%s>\n",
+ cmd.len, cmd.s, node->rn_url.s);
goto badproxy;
}
rtpengine_tout_ms =
cfg_get(rtpengine,rtpengine_cfg,rtpengine_tout_ms);
@@ -2518,7 +2519,9 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t
*dict, int *outlen)
len = recv(rtpp_socks[node->idx], buf,
sizeof(buf)-1, 0);
} while (len == -1 && errno == EINTR);
if (len <= 0) {
- LM_ERR("can't read reply for command
\"%.*s\" from RTP proxy <%s>\n", out.len, out.s, node->rn_url.s);
+
bencode_get_str(bencode_dictionary_get(dict, "command"), &cmd);
+ LM_ERR("can't read reply for command
\"%.*s\" from RTP proxy <%s>\n",
+ cmd.len, cmd.s, node->rn_url.s);
goto badproxy;
}
if (len >= (v[0].iov_len - 1) &&
@@ -2535,7 +2538,9 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t
*dict, int *outlen)
}
}
if (i == rtpengine_retr) {
- LM_ERR("timeout waiting reply for command \"%.*s\" from
RTP proxy <%s>\n", out.len, out.s, node->rn_url.s);
+ bencode_get_str(bencode_dictionary_get(dict,
"command"), &cmd);
+ LM_ERR("timeout waiting reply for command \"%.*s\" from
RTP proxy <%s>\n",
+ cmd.len, cmd.s, node->rn_url.s);
goto badproxy;
}
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:7c8ee7a3: rtpengine: fix error output on send_rtpp_command()
Module: kamailio
Branch: 5.2
Commit: 7c8ee7a32a712cddc4d6080f9d9f48a588113eb0
URL:
https://github.com/kamailio/kamailio/commit/7c8ee7a32a712cddc4d6080f9d9f48a588113eb0
Author: Victor Seva
Committer: Victor Seva
Date: 2019-07-15T12:38:45+02:00
rtpengine: fix error output on send_rtpp_command()
* rename out variable to cmd due to We already have an out goto label
(cherry picked from commit 262068940ba8dbd1b9fd93847f83f40c038d988c)
---
Modified: src/modules/rtpengine/rtpengine.c
---
Diff:
https://github.com/kamailio/kamailio/commit/7c8ee7a32a712cddc4d6080f9d9f48a588113eb0.diff
Patch:
https://github.com/kamailio/kamailio/commit/7c8ee7a32a712cddc4d6080f9d9f48a588113eb0.patch
---
diff --git a/src/modules/rtpengine/rtpengine.c
b/src/modules/rtpengine/rtpengine.c
index 650ee9424b..b962113677 100644
--- a/src/modules/rtpengine/rtpengine.c
+++ b/src/modules/rtpengine/rtpengine.c
@@ -2643,7 +2643,7 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t
*dict, int *outlen)
static char buf[0x1];
struct pollfd fds[1];
struct iovec *v;
- str out = STR_NULL;
+ str cmd = STR_NULL;
v = bencode_iovec(dict, &vcnt, 1, 0);
if (!v) {
@@ -2708,8 +2708,9 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t
*dict, int *outlen)
len = writev(rtpp_socks[node->idx], v, vcnt +
1);
} while (len == -1 && (errno == EINTR || errno ==
ENOBUFS));
if (len <= 0) {
- bencode_get_str(bencode_dictionary_get(dict,
"command"), &out);
- LM_ERR("can't send command \"%.*s\" to RTP
proxy <%s>\n", out.len, out.s, node->rn_url.s);
+ bencode_get_str(bencode_dictionary_get(dict,
"command"), &cmd);
+ LM_ERR("can't send command \"%.*s\" to RTP
proxy <%s>\n",
+ cmd.len, cmd.s, node->rn_url.s);
goto badproxy;
}
rtpengine_tout_ms =
cfg_get(rtpengine,rtpengine_cfg,rtpengine_tout_ms);
@@ -2719,7 +2720,9 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t
*dict, int *outlen)
len = recv(rtpp_socks[node->idx], buf,
sizeof(buf)-1, 0);
} while (len == -1 && errno == EINTR);
if (len <= 0) {
- LM_ERR("can't read reply for command
\"%.*s\" from RTP proxy <%s>\n", out.len, out.s, node->rn_url.s);
+
bencode_get_str(bencode_dictionary_get(dict, "command"), &cmd);
+ LM_ERR("can't read reply for command
\"%.*s\" from RTP proxy <%s>\n",
+ cmd.len, cmd.s, node->rn_url.s);
goto badproxy;
}
if (len >= (v[0].iov_len - 1) &&
@@ -2736,7 +2739,9 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t
*dict, int *outlen)
}
}
if (i == rtpengine_retr) {
- LM_ERR("timeout waiting reply for command \"%.*s\" from
RTP proxy <%s>\n", out.len, out.s, node->rn_url.s);
+ bencode_get_str(bencode_dictionary_get(dict,
"command"), &cmd);
+ LM_ERR("timeout waiting reply for command \"%.*s\" from
RTP proxy <%s>\n",
+ cmd.len, cmd.s, node->rn_url.s);
goto badproxy;
}
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:bd477f5b: pkg/kamailio/deb: version set 5.3.0~dev7
Module: kamailio Branch: master Commit: bd477f5bb938a05efab76fb096cf5ac780d65c45 URL: https://github.com/kamailio/kamailio/commit/bd477f5bb938a05efab76fb096cf5ac780d65c45 Author: Victor Seva Committer: Victor Seva Date: 2019-07-29T17:30:29+02:00 pkg/kamailio/deb: version set 5.3.0~dev7 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/bd477f5bb938a05efab76fb096cf5ac780d65c45.diff Patch: https://github.com/kamailio/kamailio/commit/bd477f5bb938a05efab76fb096cf5ac780d65c45.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] TLS module compiled with outdated OpenSSL version for Ubuntu bionic (#2018)
confirmed: ``` 03:28:37 Get: 1 http://archive.ubuntu.com/ubuntu bionic/main amd64 libssl1.1 amd64 1.1.0g-2ubuntu4 [1128 kB] ``` We don't use -updates nor -security repositories -- 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/issues/2018#issuecomment-516084586___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] TLS module compiled with outdated OpenSSL version for Ubuntu bionic (#2018)
> So the only option we have is downgrading openssl to 1.1.0g? Until We build the debs with those repositories added, yes. I hope it would be not too long to solve this. -- 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/issues/2018#issuecomment-516087971___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:2306dd47: build: Call make via $(MAKE)
Module: kamailio Branch: master Commit: 2306dd47b308f99e5c22c2d6f4d2bc1200ed8453 URL: https://github.com/kamailio/kamailio/commit/2306dd47b308f99e5c22c2d6f4d2bc1200ed8453 Author: Guillem Jover Committer: Victor Seva Date: 2019-08-01T13:29:35+02:00 build: Call make via $(MAKE) When we need to call make from within a Makefile, we should do so by using the MAKE variable, which has special meaning for make itself. This makes sure, it will get marked as recursive command, and will make it possible to use the make jobserver. Change-Id: I6829f3ee0a830fc8273e1dffe696382fccc6a093 --- Modified: doc/tutorials/rpc_list/Makefile Modified: src/modules/db_berkeley/Makefile Modified: src/modules/db_oracle/Makefile Modified: src/modules/db_sqlite/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/2306dd47b308f99e5c22c2d6f4d2bc1200ed8453.diff Patch: https://github.com/kamailio/kamailio/commit/2306dd47b308f99e5c22c2d6f4d2bc1200ed8453.patch --- diff --git a/doc/tutorials/rpc_list/Makefile b/doc/tutorials/rpc_list/Makefile index c9ff69051c..e105064365 100644 --- a/doc/tutorials/rpc_list/Makefile +++ b/doc/tutorials/rpc_list/Makefile @@ -148,7 +148,7 @@ c_defsX=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \ -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT \ -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -c_defs=$(subst ^^,='\",$(subst ",\"',$(subst =",^^,$(shell make -s -C ../../../src printcdefs +c_defs=$(subst ^^,='\",$(subst ",\"',$(subst =",^^,$(shell $(MAKE) -s -C ../../../src printcdefs c_defs+= -DMOD_NAME='\"rpcgen\"' c_defs+= -I$(COREPATH)/modules/app_sqlang/squirrel/include @@ -176,7 +176,7 @@ get_listed_grp=$(word 2, $(subst :, ,$(1))) # get module interface define get_modiface=$(word 3, $(subst :, ,$(1))) -find_modiface=$(if $(findstring modules,$(1)),$(shell make -s -C $(dir $(1)) printmiface),-DNONE) +find_modiface=$(if $(findstring modules,$(1)),$(shell $(MAKE) -s -C $(dir $(1)) printmiface),-DNONE) # get base file name from file:grp: get_bname(file:grp) # => basename(file) without extension (e.g. get_bname(foo/bar.c:x) => bar) diff --git a/src/modules/db_berkeley/Makefile b/src/modules/db_berkeley/Makefile index 23013003f2..a33bc58e3e 100644 --- a/src/modules/db_berkeley/Makefile +++ b/src/modules/db_berkeley/Makefile @@ -25,7 +25,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-berkeley-scripts: $(bin_prefix)/$(bin_dir) - BERKELEYDBON=yes make -C ../../../utils/kamctl/ install-modules + BERKELEYDBON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules install-scripts: install-berkeley-scripts diff --git a/src/modules/db_oracle/Makefile b/src/modules/db_oracle/Makefile index d30c7515ba..77a52af0f2 100644 --- a/src/modules/db_oracle/Makefile +++ b/src/modules/db_oracle/Makefile @@ -17,7 +17,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-oracle-scripts: $(bin_prefix)/$(bin_dir) - ORACLEON=yes make -C ../../../utils/kamctl/ install-modules + ORACLEON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules install-scripts: install-oracle-scripts diff --git a/src/modules/db_sqlite/Makefile b/src/modules/db_sqlite/Makefile index c5f164cc37..92e4de58c1 100644 --- a/src/modules/db_sqlite/Makefile +++ b/src/modules/db_sqlite/Makefile @@ -20,7 +20,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio) # extra install for kamailio install-sqlite-scripts: $(bin_prefix)/$(bin_dir) - SQLITEON=yes make -C ../../../utils/kamctl/ install-modules + SQLITEON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules install-scripts: install-sqlite-scripts ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:f4f08a90: pkg/kamailio/deb: version set to 5.2.4 [skip ci]
Module: kamailio Branch: 5.2 Commit: f4f08a901bd798acd237851c7299c6d07083974e URL: https://github.com/kamailio/kamailio/commit/f4f08a901bd798acd237851c7299c6d07083974e Author: Victor Seva Committer: Victor Seva Date: 2019-08-14T08:32:33+02:00 pkg/kamailio/deb: version set to 5.2.4 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/f4f08a901bd798acd237851c7299c6d07083974e.diff Patch: https://github.com/kamailio/kamailio/commit/f4f08a901bd798acd237851c7299c6d07083974e.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] RFC: about sl and tm local-response event routes
On Tue, 27 Aug 2019, 13:39 Daniel-Constantin Mierla, wrote: > I am not sure how much used are the event routes for tm:local-response > and sl:local-response, I haven't seen any questions about them so far on > mailing lists, that's why I am asking here if would make sense to rename > them like tm:local-response-sent and sl:local-response-sent to properly > reflect when they are executed. I am expecting that they are very few > used so far, so no big head ache with upgrades and bringing some > consistency around (this change to be part of next major release). > Makes sense to me, rename seems more convenient > ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] TLS module compiled with outdated OpenSSL version for Ubuntu bionic (#2018)
After the changes, we are using the latest version ``` Get: 170 http://archive.ubuntu.com/ubuntu bionic-updates/main amd64 libssl-dev amd64 1.1.1-1ubuntu2.1~18.04.4 [1566 kB] ``` @welljsjs What is the version you have installed? -- 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/issues/2018#issuecomment-528222877___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:ac0a0d6f: pkg/kamailio/deb: version set 5.3.0~dev8 [skip ci]
Module: kamailio Branch: master Commit: ac0a0d6feebe738830efaa7bdcfae8ca7f41070d URL: https://github.com/kamailio/kamailio/commit/ac0a0d6feebe738830efaa7bdcfae8ca7f41070d Author: Victor Seva Committer: Victor Seva Date: 2019-09-05T08:46:10+02:00 pkg/kamailio/deb: version set 5.3.0~dev8 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/ac0a0d6feebe738830efaa7bdcfae8ca7f41070d.diff Patch: https://github.com/kamailio/kamailio/commit/ac0a0d6feebe738830efaa7bdcfae8ca7f41070d.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:7f11960a: pkg/kamailio/deb: version set 5.3.0~pre0
Module: kamailio Branch: master Commit: 7f11960acfec8b182eadee1948f1cbd0e553faa1 URL: https://github.com/kamailio/kamailio/commit/7f11960acfec8b182eadee1948f1cbd0e553faa1 Author: Victor Seva Committer: Victor Seva Date: 2019-09-05T11:53:28+02:00 pkg/kamailio/deb: version set 5.3.0~pre0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/7f11960acfec8b182eadee1948f1cbd0e553faa1.diff Patch: https://github.com/kamailio/kamailio/commit/7f11960acfec8b182eadee1948f1cbd0e553faa1.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] TLS module compiled with outdated OpenSSL version for Ubuntu bionic (#2018)
> @welljsjs What is the version you have installed? Sorry I meant what openssl version do you have in that system -- 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/issues/2018#issuecomment-528297883___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] git:master:37ec84b6: Merge branch 'master' of https://github.com/kamailio/kamailio
Hello, On Sat, 7 Sep 2019 at 15:36, wkampich wrote: > Module: kamailio > Branch: master > Commit: 37ec84b6718bf34c325f5cb522f7e41d8d345849 > URL: > https://github.com/kamailio/kamailio/commit/37ec84b6718bf34c325f5cb522f7e41d8d345849 > > Author: wkampich > Committer: wkampich > Date: 2019-09-06T16:27:25+02:00 > > Merge branch 'master' of https://github.com/kamailio/kamailio Please don't, use rebase before pushing. ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:57332eb6: pkg/kamailio/deb: version set 5.3.0~pre1 [skip ci]
Module: kamailio Branch: master Commit: 57332eb67ca2fc086c27b19332b16a1a826f03a7 URL: https://github.com/kamailio/kamailio/commit/57332eb67ca2fc086c27b19332b16a1a826f03a7 Author: Victor Seva Committer: Victor Seva Date: 2019-09-13T14:30:30+02:00 pkg/kamailio/deb: version set 5.3.0~pre1 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/57332eb67ca2fc086c27b19332b16a1a826f03a7.diff Patch: https://github.com/kamailio/kamailio/commit/57332eb67ca2fc086c27b19332b16a1a826f03a7.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:659e2c3e: acc: update doc reference to wiki [skip ci]
Module: kamailio
Branch: master
Commit: 659e2c3ebb50f4a7362b4de2340883885391ebe6
URL:
https://github.com/kamailio/kamailio/commit/659e2c3ebb50f4a7362b4de2340883885391ebe6
Author: Victor Seva
Committer: Victor Seva
Date: 2019-09-24T16:25:28+02:00
acc: update doc reference to wiki [skip ci]
---
Modified: src/modules/acc/doc/acc_admin.xml
---
Diff:
https://github.com/kamailio/kamailio/commit/659e2c3ebb50f4a7362b4de2340883885391ebe6.diff
Patch:
https://github.com/kamailio/kamailio/commit/659e2c3ebb50f4a7362b4de2340883885391ebe6.patch
---
diff --git a/src/modules/acc/doc/acc_admin.xml
b/src/modules/acc/doc/acc_admin.xml
index a0794ca562..f47a92a689 100644
--- a/src/modules/acc/doc/acc_admin.xml
+++ b/src/modules/acc/doc/acc_admin.xml
@@ -352,10 +352,8 @@ if (uri=~"sip:+40") /* calls to Romania */ {
See also .
- The full list of supported
pseudo-variables in Sip-Router is
- available at:
- http://sip-router.org/wiki/cookbooks/pseudo-variables/devel";>
-
http://sip-router.org/wiki/cookbooks/pseudo-variables/devel
+ The list with all pseudo-variables in
&kamailio; can
+ be found at: &kamwikilink;.
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:f31f0814: pkg/kamailio/deb: switch back to libssl-dev 1.1 where available
Module: kamailio Branch: master Commit: f31f0814fa50f29b45bf427cc84d12558834f836 URL: https://github.com/kamailio/kamailio/commit/f31f0814fa50f29b45bf427cc84d12558834f836 Author: Victor Seva Committer: Victor Seva Date: 2019-09-25T10:08:05+02:00 pkg/kamailio/deb: switch back to libssl-dev 1.1 where available --- Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/sid Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/f31f0814fa50f29b45bf427cc84d12558834f836.diff Patch: https://github.com/kamailio/kamailio/commit/f31f0814fa50f29b45bf427cc84d12558834f836.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.1:da88e90f: pkg/kamailio/deb: version set 5.1.9
Module: kamailio Branch: 5.1 Commit: da88e90f568a14e16dc1897473036d4c54d09ff7 URL: https://github.com/kamailio/kamailio/commit/da88e90f568a14e16dc1897473036d4c54d09ff7 Author: Victor Seva Committer: Victor Seva Date: 2019-09-26T09:32:07+02:00 pkg/kamailio/deb: version set 5.1.9 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/da88e90f568a14e16dc1897473036d4c54d09ff7.diff Patch: https://github.com/kamailio/kamailio/commit/da88e90f568a14e16dc1897473036d4c54d09ff7.patch --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 16e3683d4c..38f1309714 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.9) unstable; urgency=medium + + * version set 5.1.9 + + -- Victor Seva Thu, 26 Sep 2019 09:31:36 +0200 + kamailio (5.1.8) unstable; urgency=medium * version set to 5.1.8 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:075c74f1: pkg/kamailio/deb: version set 5.4.0~dev0
Module: kamailio Branch: master Commit: 075c74f1dfc7b3402e8c0b9c3ad0e7930b2dcba6 URL: https://github.com/kamailio/kamailio/commit/075c74f1dfc7b3402e8c0b9c3ad0e7930b2dcba6 Author: Victor Seva Committer: Victor Seva Date: 2019-10-03T11:59:52+02:00 pkg/kamailio/deb: version set 5.4.0~dev0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/075c74f1dfc7b3402e8c0b9c3ad0e7930b2dcba6.diff Patch: https://github.com/kamailio/kamailio/commit/075c74f1dfc7b3402e8c0b9c3ad0e7930b2dcba6.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.3:eb792682: pkg/kamailio/deb: version set 5.3.0~rc0
Module: kamailio Branch: 5.3 Commit: eb792682973f34b1946a36126a01f6547ae43a5b URL: https://github.com/kamailio/kamailio/commit/eb792682973f34b1946a36126a01f6547ae43a5b Author: Victor Seva Committer: Victor Seva Date: 2019-10-03T12:02:12+02:00 pkg/kamailio/deb: version set 5.3.0~rc0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/eb792682973f34b1946a36126a01f6547ae43a5b.diff Patch: https://github.com/kamailio/kamailio/commit/eb792682973f34b1946a36126a01f6547ae43a5b.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] ursloc has a memory leak if db_mode is DB_ONLY and calling reg_fetch_contacts() (#2089)
### Description
usrloc should not leave any ucontact behind when on DB_ONLY
### Troubleshooting
Reproduction
```
event_route[usrloc:contact-expired] {
$var(uri) = "sip:" + $ulc(exp=>aor) + "@localhost";
xinfo("expired contact for $ulc(exp=>aor) uri:$var(uri)");
reg_fetch_contacts("location", "$var(uri)", "caller");
if($(ulc(caller=>count)) < 0) {
xinfo("no more contacts for $ulc(exp=>aor)\n");
} else {
xinfo("$ulc(exp=>aor) has $(ulc(caller=>count)) contacts left\n");
}
return;
}
```
REGISTER a subscriber and let it expire
Debugging Data
after
```
root@16d059a62a76:/code/utils/kamcmd# sh /kamdev/shm_dump.sh 1
2 qm_status: alloc'd from usrloc: dlist.c: new_dlist(557)
2 qm_status: alloc'd from usrloc: dlist.c: new_dlist(565)
2 qm_status: alloc'd from usrloc: ucontact.c: new_ucontact(96)
2 qm_status: alloc'd from usrloc: udomain.c: new_udomain(91)
2 qm_status: alloc'd from usrloc: udomain.c: new_udomain(98)
2 qm_status: alloc'd from usrloc: ul_callback.c:
init_ulcb_list(45)
2 qm_status: alloc'd from usrloc: ul_callback.c:
register_ulcb(94)
6 qm_status: alloc'd from usrloc: udomain.c:
build_stat_name(56)
10 qm_status: alloc'd from usrloc: ../../core/ut.h:
shm_str_dup(722)
```
Log Messages
```
1(4112) DEBUG: usrloc [udomain.c:996]: udomain_contact_expired_cb(): calling
contact expired records - cycle [1]
1(4112) DEBUG: usrloc [ul_callback.h:83]: run_ul_callbacks():
contact=0x7f621e476bd0, callback type 8/8, id 0 entered
1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired]
c=[/kamdev/kamailio.cfg] l=1015 a=63 n=assign
1(4112) exec: *** cfgtrace:request_route=[usrloc:contact-expired]
c=[/kamdev/kamailio.cfg] l=1016 a=25 n=xinfo
1(4112) INFO:
Re: [sr-dev] [kamailio/kamailio] ursloc has a memory leak if db_mode is DB_ONLY and calling reg_fetch_contacts() (#2089)
after the patch ``` 1(4216) DEBUG: usrloc [udomain.c:996]: udomain_contact_expired_cb(): calling contact expired records - cycle [1] 1(4216) DEBUG: usrloc [ul_callback.h:83]: run_ul_callbacks(): contact=0x7f942fc56bd0, callback type 8/8, id 0 entered 1(4216) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1015 a=63 n=assign 1(4216) exec: *** cfgtrace:request_route=[usrloc:contact-expired] c=[/kamdev/kamailio.cfg] l=1016 a=25 n=xinfo 1(4216) INFO:
[sr-dev] [kamailio/kamailio] usrloc: keep a private copy of urecord before running ul_callbacks (#2090)
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 #2089 Description keep a local urecord in order not to loose ucontacts when calling ul_callbacks You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2090 -- Commit Summary -- * usrloc: keep a private copy of urecord before running ul_callbacks -- File Changes -- M src/modules/usrloc/udomain.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2090.patch https://github.com/kamailio/kamailio/pull/2090.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/2090 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:f3cf0a2f: usrloc: keep a private copy of urecord before running ul_callbacks
Module: kamailio
Branch: master
Commit: f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b
URL:
https://github.com/kamailio/kamailio/commit/f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b
Author: Victor Seva
Committer: Victor Seva
Date: 2019-10-07T22:56:21+02:00
usrloc: keep a private copy of urecord before running ul_callbacks
fixes #2089
---
Modified: src/modules/usrloc/udomain.c
---
Diff:
https://github.com/kamailio/kamailio/commit/f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b.diff
Patch:
https://github.com/kamailio/kamailio/commit/f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b.patch
---
diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c
index d451057bdd..80980c4cdf 100644
--- a/src/modules/usrloc/udomain.c
+++ b/src/modules/usrloc/udomain.c
@@ -907,7 +907,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d)
str user, contact;
int i;
int n;
- urecord_t* r;
+ urecord_t r;
ucontact_t* c;
#define RUIDBUF_SIZE 128
char ruidbuf[RUIDBUF_SIZE];
@@ -1013,12 +1013,16 @@ int udomain_contact_expired_cb(db1_con_t* _c,
udomain_t* _d)
}
lock_udomain(_d, &user);
- get_static_urecord(_d, &user, &r);
+ /* don't use the same static value from
get_static_urecord() */
+ memset( &r, 0, sizeof(struct urecord) );
+ r.aor = user;
+ r.aorhash = ul_get_aorhash(&user);
+ r.domain = _d->name;
- if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) {
+ if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) {
LM_ERR("inserting temporary contact failed for
%.*s\n",
user.len, user.s);
- release_urecord(r);
+ release_urecord(&r);
unlock_udomain(_d, &user);
goto error;
}
@@ -1041,7 +1045,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t*
_d)
user.len, user.s);
}
}
- release_urecord(r);
+ release_urecord(&r);
unlock_udomain(_d, &user);
if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) {
/* delete attributes by ruid */
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] usrloc: keep a private copy of urecord before running ul_callbacks (#2090)
Merged #2090 into master. -- 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/2090#event-2693285959___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] ursloc has a memory leak if db_mode is DB_ONLY and calling reg_fetch_contacts() (#2089)
Closed #2089 via f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b. -- 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/issues/2089#event-2693286015___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.3:5f477b4e: usrloc: keep a private copy of urecord before running ul_callbacks
Module: kamailio
Branch: 5.3
Commit: 5f477b4e58e4d9b02aa20176c314b2915ff832f5
URL:
https://github.com/kamailio/kamailio/commit/5f477b4e58e4d9b02aa20176c314b2915ff832f5
Author: Victor Seva
Committer: Victor Seva
Date: 2019-10-07T23:11:03+02:00
usrloc: keep a private copy of urecord before running ul_callbacks
fixes #2089
(cherry picked from commit f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b)
---
Modified: src/modules/usrloc/udomain.c
---
Diff:
https://github.com/kamailio/kamailio/commit/5f477b4e58e4d9b02aa20176c314b2915ff832f5.diff
Patch:
https://github.com/kamailio/kamailio/commit/5f477b4e58e4d9b02aa20176c314b2915ff832f5.patch
---
diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c
index d451057bdd..80980c4cdf 100644
--- a/src/modules/usrloc/udomain.c
+++ b/src/modules/usrloc/udomain.c
@@ -907,7 +907,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d)
str user, contact;
int i;
int n;
- urecord_t* r;
+ urecord_t r;
ucontact_t* c;
#define RUIDBUF_SIZE 128
char ruidbuf[RUIDBUF_SIZE];
@@ -1013,12 +1013,16 @@ int udomain_contact_expired_cb(db1_con_t* _c,
udomain_t* _d)
}
lock_udomain(_d, &user);
- get_static_urecord(_d, &user, &r);
+ /* don't use the same static value from
get_static_urecord() */
+ memset( &r, 0, sizeof(struct urecord) );
+ r.aor = user;
+ r.aorhash = ul_get_aorhash(&user);
+ r.domain = _d->name;
- if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) {
+ if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) {
LM_ERR("inserting temporary contact failed for
%.*s\n",
user.len, user.s);
- release_urecord(r);
+ release_urecord(&r);
unlock_udomain(_d, &user);
goto error;
}
@@ -1041,7 +1045,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t*
_d)
user.len, user.s);
}
}
- release_urecord(r);
+ release_urecord(&r);
unlock_udomain(_d, &user);
if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) {
/* delete attributes by ruid */
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:9fc7c9a1: usrloc: keep a private copy of urecord before running ul_callbacks
Module: kamailio
Branch: 5.2
Commit: 9fc7c9a1ee97e708247e050988eabf8b529c5fb2
URL:
https://github.com/kamailio/kamailio/commit/9fc7c9a1ee97e708247e050988eabf8b529c5fb2
Author: Victor Seva
Committer: Victor Seva
Date: 2019-10-07T23:10:19+02:00
usrloc: keep a private copy of urecord before running ul_callbacks
fixes #2089
(cherry picked from commit f3cf0a2f4e60a3a7185baa106869dab85cd8cd0b)
---
Modified: src/modules/usrloc/udomain.c
---
Diff:
https://github.com/kamailio/kamailio/commit/9fc7c9a1ee97e708247e050988eabf8b529c5fb2.diff
Patch:
https://github.com/kamailio/kamailio/commit/9fc7c9a1ee97e708247e050988eabf8b529c5fb2.patch
---
diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c
index d451057bdd..80980c4cdf 100644
--- a/src/modules/usrloc/udomain.c
+++ b/src/modules/usrloc/udomain.c
@@ -907,7 +907,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d)
str user, contact;
int i;
int n;
- urecord_t* r;
+ urecord_t r;
ucontact_t* c;
#define RUIDBUF_SIZE 128
char ruidbuf[RUIDBUF_SIZE];
@@ -1013,12 +1013,16 @@ int udomain_contact_expired_cb(db1_con_t* _c,
udomain_t* _d)
}
lock_udomain(_d, &user);
- get_static_urecord(_d, &user, &r);
+ /* don't use the same static value from
get_static_urecord() */
+ memset( &r, 0, sizeof(struct urecord) );
+ r.aor = user;
+ r.aorhash = ul_get_aorhash(&user);
+ r.domain = _d->name;
- if ( (c=mem_insert_ucontact(r, &contact, ci)) == 0) {
+ if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) {
LM_ERR("inserting temporary contact failed for
%.*s\n",
user.len, user.s);
- release_urecord(r);
+ release_urecord(&r);
unlock_udomain(_d, &user);
goto error;
}
@@ -1041,7 +1045,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t*
_d)
user.len, user.s);
}
}
- release_urecord(r);
+ release_urecord(&r);
unlock_udomain(_d, &user);
if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) {
/* delete attributes by ruid */
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.3:7f892850: pkg/kamailio/deb: version set 5.3.0~rc1
Module: kamailio Branch: 5.3 Commit: 7f892850916a6d668386575d1bb1ed1b3a638059 URL: https://github.com/kamailio/kamailio/commit/7f892850916a6d668386575d1bb1ed1b3a638059 Author: Victor Seva Committer: Victor Seva Date: 2019-10-07T23:21:33+02:00 pkg/kamailio/deb: version set 5.3.0~rc1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/7f892850916a6d668386575d1bb1ed1b3a638059.diff Patch: https://github.com/kamailio/kamailio/commit/7f892850916a6d668386575d1bb1ed1b3a638059.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:77329bdd: pkg/kamailio/deb: version set 5.4.0~dev1
Module: kamailio Branch: master Commit: 77329bdd360344fd31f515c90f90e087a81ba3ad URL: https://github.com/kamailio/kamailio/commit/77329bdd360344fd31f515c90f90e087a81ba3ad Author: Victor Seva Committer: Victor Seva Date: 2019-10-08T13:25:43+02:00 pkg/kamailio/deb: version set 5.4.0~dev1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/77329bdd360344fd31f515c90f90e087a81ba3ad.diff Patch: https://github.com/kamailio/kamailio/commit/77329bdd360344fd31f515c90f90e087a81ba3ad.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.2:361b5c5d: pkg/kamailio/deb: version set 5.2.5
Module: kamailio Branch: 5.2 Commit: 361b5c5d75bbbcf231654c0c44fbbf49619b341d URL: https://github.com/kamailio/kamailio/commit/361b5c5d75bbbcf231654c0c44fbbf49619b341d Author: Victor Seva Committer: Victor Seva Date: 2019-10-10T09:45:56+02:00 pkg/kamailio/deb: version set 5.2.5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/361b5c5d75bbbcf231654c0c44fbbf49619b341d.diff Patch: https://github.com/kamailio/kamailio/commit/361b5c5d75bbbcf231654c0c44fbbf49619b341d.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:5.3:195c0150: pkg/kamailio/deb: version set 5.3.0
Module: kamailio Branch: 5.3 Commit: 195c0150c83cdea3ec2f1dcd4c53f59d37280be7 URL: https://github.com/kamailio/kamailio/commit/195c0150c83cdea3ec2f1dcd4c53f59d37280be7 Author: Victor Seva Committer: Victor Seva Date: 2019-10-17T09:16:28+02:00 pkg/kamailio/deb: version set 5.3.0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/195c0150c83cdea3ec2f1dcd4c53f59d37280be7.diff Patch: https://github.com/kamailio/kamailio/commit/195c0150c83cdea3ec2f1dcd4c53f59d37280be7.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] RPM repos at https://rpm.kamailio.org (#2084)
We can use kamailio-sync github user, but do We want to allow this?  -- 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/issues/2084#issuecomment-543152366___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:ac21d494: pkg/kamailio/deb: update /var/run -> /run [skip ci]
Module: kamailio Branch: master Commit: ac21d494253eddd085197e2862c3206efff8233a URL: https://github.com/kamailio/kamailio/commit/ac21d494253eddd085197e2862c3206efff8233a Author: Victor Seva Committer: Victor Seva Date: 2019-10-18T09:54:50+02:00 pkg/kamailio/deb: update /var/run -> /run [skip ci] * introduced on Debian since 7 Wheezy, on Ubuntu since 11.10 Oneiric --- Modified: pkg/kamailio/deb/bionic/kamailio.init Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.init Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.init Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.init Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/precise/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.init Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/trusty/kamailio.init Modified: pkg/kamailio/deb/wheezy/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/ac21d494253eddd085197e2862c3206efff8233a.diff Patch: https://github.com/kamailio/kamailio/commit/ac21d494253eddd085197e2862c3206efff8233a.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:0436af5a: pkg/kamailio/deb: update [skip ci]
Module: kamailio Branch: master Commit: 0436af5abd8b73e17f65020c74943f0f3b72ba0d URL: https://github.com/kamailio/kamailio/commit/0436af5abd8b73e17f65020c74943f0f3b72ba0d Author: Victor Seva Committer: Victor Seva Date: 2019-10-18T10:39:05+02:00 pkg/kamailio/deb: update [skip ci] * define User and Group Thanks @sergey-safarov --- Modified: pkg/kamailio/deb/bionic/kamailio.default Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.default Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.default Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.default Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/precise/kamailio.default Modified: pkg/kamailio/deb/sid/kamailio.default Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.default Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/trusty/kamailio.default Modified: pkg/kamailio/deb/wheezy/kamailio.default Modified: pkg/kamailio/deb/xenial/kamailio.default Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/0436af5abd8b73e17f65020c74943f0f3b72ba0d.diff Patch: https://github.com/kamailio/kamailio/commit/0436af5abd8b73e17f65020c74943f0f3b72ba0d.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Systemd unit update (#1889)
ac21d494253eddd085197e2862c3206efff8233a 0436af5abd8b73e17f65020c74943f0f3b72ba0d -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1889#issuecomment-543603687___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Systemd unit update (#1889)
Closed #1889. -- You are receiving this because you commented. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1889#event-2724031965___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] rtpengine module is not retrying for rtpengine_offer. retry is working for rtpengine_answer and rtpengine_delete (#1696)
@SurendraPlivo is this still relevant? -- 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/issues/1696#issuecomment-544563462___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:0944689d: domain: fix spelling error
Module: kamailio
Branch: master
Commit: 0944689db2eabbb531fc6daed9db3a9bcc1780b6
URL:
https://github.com/kamailio/kamailio/commit/0944689db2eabbb531fc6daed9db3a9bcc1780b6
Author: Victor Seva
Committer: Victor Seva
Date: 2019-10-22T09:32:48+02:00
domain: fix spelling error
---
Modified: src/modules/domain/hash.c
---
Diff:
https://github.com/kamailio/kamailio/commit/0944689db2eabbb531fc6daed9db3a9bcc1780b6.diff
Patch:
https://github.com/kamailio/kamailio/commit/0944689db2eabbb531fc6daed9db3a9bcc1780b6.patch
---
diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c
index b093dbc3e4..4cb968e458 100644
--- a/src/modules/domain/hash.c
+++ b/src/modules/domain/hash.c
@@ -137,7 +137,7 @@ int hash_table_install(struct domain_list **hash_table, str
*did, str *domain)
np->did.len = did->len;
np->did.s = (char *)shm_malloc(did->len);
if(np->did.s == NULL) {
- LM_ERR("no shared memeory for did\n");
+ LM_ERR("no shared memory for did\n");
shm_free(np);
return -1;
}
@@ -210,4 +210,4 @@ void hash_table_free(struct domain_list **hash_table)
hash_table[DOM_HASH_SIZE] = NULL;
return;
-}
\ No newline at end of file
+}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:8a197dcc: seas: fix spelling error
Module: kamailio Branch: master Commit: 8a197dcc8d2d063d3615e8800ed8d2f7812cce0f URL: https://github.com/kamailio/kamailio/commit/8a197dcc8d2d063d3615e8800ed8d2f7812cce0f Author: Victor Seva Committer: Victor Seva Date: 2019-10-22T09:35:10+02:00 seas: fix spelling error --- Modified: src/modules/seas/event_dispatcher.c Modified: src/modules/seas/event_dispatcher.h --- Diff: https://github.com/kamailio/kamailio/commit/8a197dcc8d2d063d3615e8800ed8d2f7812cce0f.diff Patch: https://github.com/kamailio/kamailio/commit/8a197dcc8d2d063d3615e8800ed8d2f7812cce0f.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:3c26ebe4: secfilter: fix spelling error
Module: kamailio
Branch: master
Commit: 3c26ebe4670eaffce4754bbd0cd76cbecf5bf590
URL:
https://github.com/kamailio/kamailio/commit/3c26ebe4670eaffce4754bbd0cd76cbecf5bf590
Author: Victor Seva
Committer: Victor Seva
Date: 2019-10-22T09:52:42+02:00
secfilter: fix spelling error
---
Modified: src/modules/secfilter/secfilter_db.c
---
Diff:
https://github.com/kamailio/kamailio/commit/3c26ebe4670eaffce4754bbd0cd76cbecf5bf590.diff
Patch:
https://github.com/kamailio/kamailio/commit/3c26ebe4670eaffce4754bbd0cd76cbecf5bf590.patch
---
diff --git a/src/modules/secfilter/secfilter_db.c
b/src/modules/secfilter/secfilter_db.c
index 535b67922e..861f1a14bd 100644
--- a/src/modules/secfilter/secfilter_db.c
+++ b/src/modules/secfilter/secfilter_db.c
@@ -108,7 +108,7 @@ int secf_append_rule(int action, int type, str *value)
char *v = NULL;
if(action < 0 || action > 2) {
- LM_ERR("Unkown action value %d", action);
+ LM_ERR("Unknown action value %d", action);
return -1;
}
@@ -147,7 +147,7 @@ int secf_append_rule(int action, int type, str *value)
last_node = &last->user;
break;
default:
- LM_ERR("Unkown type value %d", type);
+ LM_ERR("Unknown type value %d", type);
return -1;
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:4a657005: smsops: fix spelling error
Module: kamailio
Branch: master
Commit: 4a657005a5c4eff88e48dc2b8847d5800a90bead
URL:
https://github.com/kamailio/kamailio/commit/4a657005a5c4eff88e48dc2b8847d5800a90bead
Author: Victor Seva
Committer: Victor Seva
Date: 2019-10-22T09:57:07+02:00
smsops: fix spelling error
---
Modified: src/modules/smsops/smsops_impl.c
---
Diff:
https://github.com/kamailio/kamailio/commit/4a657005a5c4eff88e48dc2b8847d5800a90bead.diff
Patch:
https://github.com/kamailio/kamailio/commit/4a657005a5c4eff88e48dc2b8847d5800a90bead.patch
---
diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c
index 8dfe70163a..83d83a7a8e 100644
--- a/src/modules/smsops/smsops_impl.c
+++ b/src/modules/smsops/smsops_impl.c
@@ -543,7 +543,7 @@ int decode_3gpp_sms(struct sip_msg *msg) {
// Check for malicious length,
which might cause buffer overflow
if(udh_len > body.len - p) {
-
LM_ERR("TP-User-Data-Lenght is bigger than the remaining message buffer!\n");
+
LM_ERR("TP-User-Data-Length is bigger than the remaining message buffer!\n");
return -1;
}
@@ -564,7 +564,7 @@ int decode_3gpp_sms(struct sip_msg *msg) {
// Check for malicious
length, which might cause buffer overflow
if(udh_read +
ie->data.len + 2 /* two octets are read so far */ > udh_len) {
- LM_ERR("IE
Lenght for IE id %d is bigger than the remaining User-Data element!\n",
+ LM_ERR("IE
Length for IE id %d is bigger than the remaining User-Data element!\n",
ie->identifier);
pkg_free(ie);
return -1;
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:4ba14d2f: smsops: fix spelling error
Module: kamailio
Branch: master
Commit: 4ba14d2f6db6144870650398da6c07b07d23d64d
URL:
https://github.com/kamailio/kamailio/commit/4ba14d2f6db6144870650398da6c07b07d23d64d
Author: Victor Seva
Committer: Victor Seva
Date: 2019-10-22T09:59:02+02:00
smsops: fix spelling error
---
Modified: src/modules/smsops/smsops_impl.c
---
Diff:
https://github.com/kamailio/kamailio/commit/4ba14d2f6db6144870650398da6c07b07d23d64d.diff
Patch:
https://github.com/kamailio/kamailio/commit/4ba14d2f6db6144870650398da6c07b07d23d64d.patch
---
diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c
index 83d83a7a8e..5271444039 100644
--- a/src/modules/smsops/smsops_impl.c
+++ b/src/modules/smsops/smsops_impl.c
@@ -573,7 +573,7 @@ int decode_3gpp_sms(struct sip_msg *msg) {
if(ie->identifier ==
TP_UDH_IE_CONCAT_SM_8BIT_REF) {
if(contains_8bit_refnum) {
pkg_free(ie);
-
LM_ERR("IE Concatenated Short Message 8bit Reference occured more than once in
UDH\n");
+
LM_ERR("IE Concatenated Short Message 8bit Reference occurred more than once in
UDH\n");
return
-1;
}
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
