sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
489 discussions

git:5.3:9c6b822b: siputils: 0-ending value on deconding uri

by Ovidiu Sas

Module: kamailio Branch: 5.3 Commit: 9c6b822b4e9b297c497cec241b257a177ca804b1 URL: https://github.com/kamailio/kamailio/commit/9c6b822b4e9b297c497cec241b257a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-16T15:54:51-04:00 siputils: 0-ending value on deconding uri (cherry picked from commit 735911fcced21eb5c66393045bc143bd953d08bb) --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/9c6b822b4e9b297c497cec241b257a1… Patch: https://github.com/kamailio/kamailio/commit/9c6b822b4e9b297c497cec241b257a1… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index 427bf3bb13..20c76efdd6 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -163,12 +163,14 @@ int ki_decode_contact(sip_msg_t *msg) return res; } else { /* we do not modify the original first line */ - if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) + if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) { msg->new_uri = newUri; - else { + } else { pkg_free(msg->new_uri.s); msg->new_uri = newUri; } + msg->parsed_uri_ok=0; + ruri_mark_new(); } return 1; } @@ -575,7 +577,7 @@ int decode_uri(str uri, char separator, str *result) uri.len); /* adding one comes from * */ - result->s = pkg_malloc(result->len); + result->s = pkg_malloc(result->len + 1); /* NULL termination */ if(result->s == NULL) { LM_ERR("unable to allocate pkg memory\n"); return -4; @@ -624,6 +626,7 @@ int decode_uri(str uri, char separator, str *result) memcpy(pos, uri.s + format.second, uri.len - format.second); /* till end: */ + result->s[result->len] = '\0'; LM_DBG("New decoded uri [%.*s]\n", result->len, result->s); return 0;

3 years, 7 months

git:5.3:a6fa3dee: mangler: 0-ending value on deconding uri

by Ovidiu Sas

Module: kamailio Branch: 5.3 Commit: a6fa3dee5b1642e3285a1d92c890bff39810e804 URL: https://github.com/kamailio/kamailio/commit/a6fa3dee5b1642e3285a1d92c890bff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-16T15:54:45-04:00 mangler: 0-ending value on deconding uri (cherry picked from commit 3b038ed6761a5818441a7610a8305491aa358377) --- Modified: src/modules/mangler/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/a6fa3dee5b1642e3285a1d92c890bff… Patch: https://github.com/kamailio/kamailio/commit/a6fa3dee5b1642e3285a1d92c890bff… --- diff --git a/src/modules/mangler/contact_ops.c b/src/modules/mangler/contact_ops.c index de94edb534..c3e1a2ff2e 100644 --- a/src/modules/mangler/contact_ops.c +++ b/src/modules/mangler/contact_ops.c @@ -610,28 +610,28 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) { LOG(L_ERR,"ERROR: decode_uri: Unable to decode host address \n"); return -2;/* should I quit or ignore ? */ - } + } if ((format.password.len > 0) && (format.username.len <= 0)) { LOG(L_ERR,"ERROR: decode_uri: Password decoded but no username available\n"); return -3; } - + /* a complete uri would be sip:username:password@ip:port;transport=protocol goes to * sip:enc_pref#username#password#ip#port#protocol@public_ip */ result->len = format.first + (uri->len - format.second); /* not NULL terminated */ if (format.username.len > 0) result->len += format.username.len + 1; //: or @ if (format.password.len > 0) result->len += format.password.len + 1; //@ - + /* if (format.ip.len > 0) */ result->len += format.ip.len; - + if (format.port.len > 0) result->len += 1 + format.port.len; //: if (format.protocol.len > 0) result->len += 1 + 10 + format.protocol.len; //;transport= - + /* adding one comes from * */ - result->s = pkg_malloc (result->len); + result->s = pkg_malloc (result->len + 1); /* NULL termination */ if (result->s == NULL) { LOG(L_ERR,"ERROR: decode_contact: Unable to allocate memory\n"); @@ -640,7 +640,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) pos = result->s; memcpy (pos, uri->s, format.first); /* till sip: */ pos = pos + format.first; - + if (format.username.len > 0) { memcpy (pos, format.username.s, format.username.len); @@ -662,7 +662,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.ip.s, format.ip.len); pos = pos + format.ip.len; - + if (format.port.len > 0) { memcpy (pos, ":", 1); @@ -677,9 +677,11 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.protocol.s, format.protocol.len); pos = pos + format.protocol.len; } - + memcpy (pos, uri->s + format.second, uri->len - format.second); /* till end: */ - + + result->s[result->len] = '\0'; + /* dst_uri */ if (dst_uri && format.rcv_ip.s){ dst_uri->len=4 /* sip: */ + format.rcv_ip.len;

3 years, 7 months

git:5.4:a779c66d: mangler: 0-ending value on deconding uri

by Ovidiu Sas

Module: kamailio Branch: 5.4 Commit: a779c66dbb19cc5b7938072439327003acd5dc7a URL: https://github.com/kamailio/kamailio/commit/a779c66dbb19cc5b793807243932700… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-16T13:17:30-04:00 mangler: 0-ending value on deconding uri (cherry picked from commit 3b038ed6761a5818441a7610a8305491aa358377) --- Modified: src/modules/mangler/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/a779c66dbb19cc5b793807243932700… Patch: https://github.com/kamailio/kamailio/commit/a779c66dbb19cc5b793807243932700… --- diff --git a/src/modules/mangler/contact_ops.c b/src/modules/mangler/contact_ops.c index de94edb534..c3e1a2ff2e 100644 --- a/src/modules/mangler/contact_ops.c +++ b/src/modules/mangler/contact_ops.c @@ -610,28 +610,28 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) { LOG(L_ERR,"ERROR: decode_uri: Unable to decode host address \n"); return -2;/* should I quit or ignore ? */ - } + } if ((format.password.len > 0) && (format.username.len <= 0)) { LOG(L_ERR,"ERROR: decode_uri: Password decoded but no username available\n"); return -3; } - + /* a complete uri would be sip:username:password@ip:port;transport=protocol goes to * sip:enc_pref#username#password#ip#port#protocol@public_ip */ result->len = format.first + (uri->len - format.second); /* not NULL terminated */ if (format.username.len > 0) result->len += format.username.len + 1; //: or @ if (format.password.len > 0) result->len += format.password.len + 1; //@ - + /* if (format.ip.len > 0) */ result->len += format.ip.len; - + if (format.port.len > 0) result->len += 1 + format.port.len; //: if (format.protocol.len > 0) result->len += 1 + 10 + format.protocol.len; //;transport= - + /* adding one comes from * */ - result->s = pkg_malloc (result->len); + result->s = pkg_malloc (result->len + 1); /* NULL termination */ if (result->s == NULL) { LOG(L_ERR,"ERROR: decode_contact: Unable to allocate memory\n"); @@ -640,7 +640,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) pos = result->s; memcpy (pos, uri->s, format.first); /* till sip: */ pos = pos + format.first; - + if (format.username.len > 0) { memcpy (pos, format.username.s, format.username.len); @@ -662,7 +662,7 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.ip.s, format.ip.len); pos = pos + format.ip.len; - + if (format.port.len > 0) { memcpy (pos, ":", 1); @@ -677,9 +677,11 @@ decode_uri (str* uri, char separator, str * result, str* dst_uri) memcpy (pos, format.protocol.s, format.protocol.len); pos = pos + format.protocol.len; } - + memcpy (pos, uri->s + format.second, uri->len - format.second); /* till end: */ - + + result->s[result->len] = '\0'; + /* dst_uri */ if (dst_uri && format.rcv_ip.s){ dst_uri->len=4 /* sip: */ + format.rcv_ip.len;

3 years, 7 months

git:5.4:b739727c: siputils: 0-ending value on deconding uri

by Ovidiu Sas

Module: kamailio Branch: 5.4 Commit: b739727cfb66eb56683d236540d8463b870080f5 URL: https://github.com/kamailio/kamailio/commit/b739727cfb66eb56683d236540d8463… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-16T13:17:15-04:00 siputils: 0-ending value on deconding uri (cherry picked from commit 735911fcced21eb5c66393045bc143bd953d08bb) --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/b739727cfb66eb56683d236540d8463… Patch: https://github.com/kamailio/kamailio/commit/b739727cfb66eb56683d236540d8463… --- diff --git a/src/modules/siputils/contact_ops.c b/src/modules/siputils/contact_ops.c index f21d7705b3..1964ef59ee 100644 --- a/src/modules/siputils/contact_ops.c +++ b/src/modules/siputils/contact_ops.c @@ -165,12 +165,14 @@ int ki_decode_contact(sip_msg_t *msg) return res; } else { /* we do not modify the original first line */ - if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) + if((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) { msg->new_uri = newUri; - else { + } else { pkg_free(msg->new_uri.s); msg->new_uri = newUri; } + msg->parsed_uri_ok=0; + ruri_mark_new(); } return 1; } @@ -577,7 +579,7 @@ int decode_uri(str uri, char separator, str *result) uri.len); /* adding one comes from * */ - result->s = pkg_malloc(result->len); + result->s = pkg_malloc(result->len + 1); /* NULL termination */ if(result->s == NULL) { LM_ERR("unable to allocate pkg memory\n"); return -4; @@ -626,6 +628,7 @@ int decode_uri(str uri, char separator, str *result) memcpy(pos, uri.s + format.second, uri.len - format.second); /* till end: */ + result->s[result->len] = '\0'; LM_DBG("New decoded uri [%.*s]\n", result->len, result->s); return 0;

3 years, 7 months

Errored: kamailio/kamailio#9971 (master - a089d62)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #9971 Status: Errored Duration: 6 mins and 19 secs Commit: a089d62 (master) Author: Daniel-Constantin Mierla Message: dmq: docs - examples with TLS URI for nodes View the changeset: https://github.com/kamailio/kamailio/compare/b06ed377323c...a089d62b59a3 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/763114493?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

3 years, 7 months

git:master:b06927cd: modules: readme files regenerated - dmq ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b06927cdc8d4a5444be0a584ecf02f6a48105e59 URL: https://github.com/kamailio/kamailio/commit/b06927cdc8d4a5444be0a584ecf02f6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-16T14:31:18+01:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/b06927cdc8d4a5444be0a584ecf02f6… Patch: https://github.com/kamailio/kamailio/commit/b06927cdc8d4a5444be0a584ecf02f6… --- diff --git a/src/modules/dmq/README b/src/modules/dmq/README index 2ea40a2642..085fe3c9df 100644 --- a/src/modules/dmq/README +++ b/src/modules/dmq/README @@ -216,6 +216,8 @@ sip:192.168.40.17:5060;status=active ... modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... +modparam("dmq", "server_address", "sip:10.0.0.20:5061;transport=tls") +... 3.2. notification_address(str) @@ -228,6 +230,8 @@ modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... modparam("dmq", "notification_address", "sip:10.0.0.21:5060") ... +modparam("dmq", "notification_address", "sip:10.0.0.21:5061;transport=tls") +... 3.3. notification_channel(str)

3 years, 7 months

git:master:a089d62b: dmq: docs - examples with TLS URI for nodes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a089d62b59a31b943bb273d996636a58a3e96133 URL: https://github.com/kamailio/kamailio/commit/a089d62b59a31b943bb273d996636a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T14:25:22+01:00 dmq: docs - examples with TLS URI for nodes --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a089d62b59a31b943bb273d996636a5… Patch: https://github.com/kamailio/kamailio/commit/a089d62b59a31b943bb273d996636a5… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 3b4121fdb3..d8b94614e2 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -132,6 +132,8 @@ sip:192.168.40.17:5060;status=active ... modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... +modparam("dmq", "server_address", "sip:10.0.0.20:5061;transport=tls") +... </programlisting> </example> </section> @@ -149,6 +151,8 @@ modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... modparam("dmq", "notification_address", "sip:10.0.0.21:5060") ... +modparam("dmq", "notification_address", "sip:10.0.0.21:5061;transport=tls") +... </programlisting> </example> </section>

3 years, 7 months

git:master:b06ed377: dmq: request nodes list in worker one init callback instead of main proc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b06ed377323ce11a8ae0442af6558b453c4872bb URL: https://github.com/kamailio/kamailio/commit/b06ed377323ce11a8ae0442af6558b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T13:40:03+01:00 dmq: request nodes list in worker one init callback instead of main proc - ensure availability of all transports --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/b06ed377323ce11a8ae0442af6558b4… Patch: https://github.com/kamailio/kamailio/commit/b06ed377323ce11a8ae0442af6558b4… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 0a807a983f..06e091038a 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -286,6 +286,11 @@ static int child_init(int rank) { int i, newpid; + if(rank == PROC_TCP_MAIN) { + /* do nothing for the tcp main process */ + return 0; + } + if(rank == PROC_INIT) { for(i = 0; i < dmq_num_workers; i++) { if (init_worker(&dmq_workers[i]) < 0) { @@ -312,6 +317,10 @@ static int child_init(int rank) dmq_workers[i].pid = newpid; } } + return 0; + } + + if(rank == PROC_SIPINIT) { /* notification_node - the node from which the Kamailio instance * gets the server list on startup. * the address is given as a module parameter in dmq_notification_address @@ -326,11 +335,6 @@ static int child_init(int rank) STR_FMT(&dmq_notification_address)); } } - return 0; - } - if(rank == PROC_TCP_MAIN) { - /* do nothing for the tcp main process */ - return 0; } dmq_pid = my_pid();

3 years, 7 months

git:master:4cf65a7e: dmq: init internal tcp socket and global cfg structure for worker

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4cf65a7ee1f1803c7c1471f35dcddc8f55c958b1 URL: https://github.com/kamailio/kamailio/commit/4cf65a7ee1f1803c7c1471f35dcddc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T13:11:09+01:00 dmq: init internal tcp socket and global cfg structure for worker --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/4cf65a7ee1f1803c7c1471f35dcddc8… Patch: https://github.com/kamailio/kamailio/commit/4cf65a7ee1f1803c7c1471f35dcddc8… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 4230e48a7f..0a807a983f 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -37,6 +37,7 @@ #include "../../core/pt.h" #include "../../core/hashes.h" #include "../../core/mod_fix.h" +#include "../../core/cfg/cfg_struct.h" #include "../../core/rpc_lookup.h" #include "../../core/kemi.h" @@ -299,11 +300,12 @@ static int child_init(int rank) /* fork worker processes */ for(i = 0; i < dmq_num_workers; i++) { LM_DBG("starting worker process %d\n", i); - newpid = fork_process(PROC_RPC, "DMQ WORKER", 0); + newpid = fork_process(PROC_RPC, "DMQ WORKER", 1); if(newpid < 0) { LM_ERR("failed to fork worker process %d\n", i); return -1; } else if(newpid == 0) { + if (cfg_child_init()) return -1; /* child - this will loop forever */ worker_loop(i); } else { @@ -327,7 +329,7 @@ static int child_init(int rank) return 0; } if(rank == PROC_TCP_MAIN) { - /* do nothing for the main process */ + /* do nothing for the tcp main process */ return 0; } diff --git a/src/modules/dmq/worker.c b/src/modules/dmq/worker.c index 43d76da309..fa4025fff2 100644 --- a/src/modules/dmq/worker.c +++ b/src/modules/dmq/worker.c @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -29,6 +29,7 @@ #include "../../core/sip_msg_clone.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" +#include "../../core/cfg/cfg_struct.h" /** * @brief set the body of a response @@ -88,6 +89,7 @@ void worker_loop(int id) } else { sleep_us(dmq_worker_usleep); } + cfg_update(); /* remove from queue until empty */ while(job_queue_size(worker->queue) > 0) {

3 years, 7 months

git:master:8ced2d76: dmq: log the address of notification peer on failure callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8ced2d76fda260f7a3a746a9d4820f84eb260618 URL: https://github.com/kamailio/kamailio/commit/8ced2d76fda260f7a3a746a9d4820f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-16T12:55:46+01:00 dmq: log the address of notification peer on failure callback --- Modified: src/modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/8ced2d76fda260f7a3a746a9d4820f8… Patch: https://github.com/kamailio/kamailio/commit/8ced2d76fda260f7a3a746a9d4820f8… --- diff --git a/src/modules/dmq/notification_peer.c b/src/modules/dmq/notification_peer.c index 83da389269..c991acbf5f 100644 --- a/src/modules/dmq/notification_peer.c +++ b/src/modules/dmq/notification_peer.c @@ -600,13 +600,14 @@ int notification_resp_callback_f( } } else if(code == 408) { if(STR_EQ(node->orig_uri, dmq_notification_address)) { - LM_ERR("not deleting notification_peer\n"); - update_dmq_node_status(dmq_node_list, node, DMQ_NODE_PENDING); + LM_ERR("not deleting notification peer [%.*s]\n", + STR_FMT(&dmq_notification_address)); + update_dmq_node_status(dmq_node_list, node, DMQ_NODE_PENDING); return 0; } if (node->status == DMQ_NODE_DISABLED) { /* deleting node - the server did not respond */ - LM_ERR("deleting server %.*s because of failed request\n", + LM_ERR("deleting server node %.*s because of failed request\n", STR_FMT(&node->orig_uri)); ret = del_dmq_node(dmq_node_list, node); LM_DBG("del_dmq_node returned %d\n", ret);

3 years, 7 months

← Newer
1
...
31
32
33
34
35
36
37
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021