sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

git:master:da59f7a2: dmq: fixed KEMI export for handle_message() after last commit adding int param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: da59f7a2bb32b6c5995313249475207f9ca22790 URL: https://github.com/kamailio/kamailio/commit/da59f7a2bb32b6c5995313249475207… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-07T09:00:50+02:00 dmq: fixed KEMI export for handle_message() after last commit adding int param - new function handle_message_rc(...) exported to kemi --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/message.c Modified: src/modules/dmq/message.h --- Diff: https://github.com/kamailio/kamailio/commit/da59f7a2bb32b6c5995313249475207… Patch: https://github.com/kamailio/kamailio/commit/da59f7a2bb32b6c5995313249475207… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index d28686da9c..4c772e1481 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -380,6 +380,11 @@ static sr_kemi_t sr_kemi_dmq_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("dmq"), str_init("handle_message_rc"), + SR_KEMIP_INT, ki_dmq_handle_message_rc, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("dmq"), str_init("is_from_node"), SR_KEMIP_INT, is_from_remote_node, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, diff --git a/src/modules/dmq/message.c b/src/modules/dmq/message.c index 2293cc3600..bce42d6ffd 100644 --- a/src/modules/dmq/message.c +++ b/src/modules/dmq/message.c @@ -40,7 +40,7 @@ str dmq_404_rpl = str_init("User Not Found"); /** * @brief config function to handle dmq messages */ -int ki_dmq_handle_message(sip_msg_t *msg, int returnval) +int ki_dmq_handle_message_rc(sip_msg_t *msg, int returnval) { dmq_peer_t *peer; if((parse_sip_msg_uri(msg) < 0) || (!msg->parsed_uri.user.s)) { @@ -73,6 +73,12 @@ int ki_dmq_handle_message(sip_msg_t *msg, int returnval) return -1; } + +int ki_dmq_handle_message(sip_msg_t *msg) +{ + return ki_dmq_handle_message_rc(msg, 0); +} + int w_dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) { int i = 0; @@ -80,10 +86,10 @@ int w_dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) if(get_int_fparam(&i, msg, (fparam_t*)str1)<0) return -1; } if(i>1) i = 1; - return ki_dmq_handle_message(msg, i); + return ki_dmq_handle_message_rc(msg, i); } int dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) { - return ki_dmq_handle_message(msg, 0); + return ki_dmq_handle_message_rc(msg, 0); } diff --git a/src/modules/dmq/message.h b/src/modules/dmq/message.h index 9c9f835745..d47e421c6e 100644 --- a/src/modules/dmq/message.h +++ b/src/modules/dmq/message.h @@ -26,6 +26,7 @@ int w_dmq_handle_message(struct sip_msg *, char *str1, char *str2); int dmq_handle_message(struct sip_msg *, char *str1, char *str2); -int ki_dmq_handle_message(sip_msg_t *msg, int returnval); +int ki_dmq_handle_message(sip_msg_t *msg); +int ki_dmq_handle_message_rc(sip_msg_t *msg, int returnval); #endif

5 years, 8 months

git:master:b80400e5: modules: readme files regenerated - rtpengine ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b80400e59aa4ef0e148335e3532ff33f7b371904 URL: https://github.com/kamailio/kamailio/commit/b80400e59aa4ef0e148335e3532ff33… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-06T15:46:29+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/b80400e59aa4ef0e148335e3532ff33… Patch: https://github.com/kamailio/kamailio/commit/b80400e59aa4ef0e148335e3532ff33…

5 years, 8 months

git:master:66245384: modules: readme files regenerated - rtpengine ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 66245384f4598350699228249c7e79e37d30a5ff URL: https://github.com/kamailio/kamailio/commit/66245384f4598350699228249c7e79e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-06T16:16:23+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/66245384f4598350699228249c7e79e… Patch: https://github.com/kamailio/kamailio/commit/66245384f4598350699228249c7e79e…

5 years, 8 months

git:master:6bb63e2a: rtpengine: fix docs xml (broken in e528fce)

by Richard Fuchs

Module: kamailio Branch: master Commit: 6bb63e2a59b795d19b24acc67adb9335c6abd363 URL: https://github.com/kamailio/kamailio/commit/6bb63e2a59b795d19b24acc67adb933… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-09-06T10:07:10-04:00 rtpengine: fix docs xml (broken in e528fce) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6bb63e2a59b795d19b24acc67adb933… Patch: https://github.com/kamailio/kamailio/commit/6bb63e2a59b795d19b24acc67adb933… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index bb85885183..15449dbe19 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2613,6 +2613,7 @@ block_dtmf(); </title> <para> Reverses the effects of a previously issued <function>block_dtmf</function> call. + </para> <example> <title><function>unblock_dtmf</function> usage</title> <programlisting format="linespecific">

5 years, 8 months

git:master:e528fce4: rtpengine: add block_dtmf and unblock_dtmf

by Richard Fuchs

Module: kamailio Branch: master Commit: e528fce4b61112f78b0081fcb0d53ef440cafce7 URL: https://github.com/kamailio/kamailio/commit/e528fce4b61112f78b0081fcb0d53ef… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-09-06T09:40:14-04:00 rtpengine: add block_dtmf and unblock_dtmf --- Modified: src/modules/rtpengine/doc/rtpengine.xml Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/e528fce4b61112f78b0081fcb0d53ef… Patch: https://github.com/kamailio/kamailio/commit/e528fce4b61112f78b0081fcb0d53ef…

5 years, 8 months

git:master:4625c750: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 4625c7509e60a087389d22267c8cc10595593a54 URL: https://github.com/kamailio/kamailio/commit/4625c7509e60a087389d22267c8cc10… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-06T13:16:28+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/4625c7509e60a087389d22267c8cc10… Patch: https://github.com/kamailio/kamailio/commit/4625c7509e60a087389d22267c8cc10… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 733e0a8109..90faef20ac 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1469,6 +1469,8 @@ kamcmd dispatcher.ping_active 0 type). * 'socket' - used to set the sending socket for the gateway. It is used for sending the SIP traffic as well as OPTIONS keepalives. + * 'ping_from' - used to set the From URI in OPTIONS keepalives. It + overwrites the general ds_ping_from parameter. 6.1.2. File Format @@ -1479,7 +1481,8 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) Full line example: ... -1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz +1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz;ping_from +=sip:myproxy.com ... For database, each element of a line resides in a different column. @@ -1523,7 +1526,7 @@ r,opt) # - web: http://www.kamailio.org # - git: http://github.com/kamailio/ # -# Direct your questions about this file to: sr-users(a)lists.sip-router.org +# Direct your questions about this file to: sr-users(a)lists.kamailio.org # # Refer to the Core CookBook at http://www.kamailio.org/dokuwiki/doku.php # for an explanation of possible statements, functions and parameters. @@ -1584,11 +1587,12 @@ sip_warning=no ####### Modules Section ######## # set module path -mpath="/usr/local/lib/kamailio/modules/" +#mpath="/usr/local/lib/kamailio/modules/" loadmodule "db_mysql.so" loadmodule "jsonrpcs.so" loadmodule "kex.so" +loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" @@ -1671,8 +1675,9 @@ request_route { # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); - if (is_method("INVITE|SUBSCRIBE")) + if (is_method("INVITE|SUBSCRIBE")) { record_route(); + } # account only INVITEs if (is_method("INVITE")) { @@ -1757,6 +1762,7 @@ gnore and discard. route[REGISTRAR] { if(!is_method("REGISTER")) return; + sl_send_reply("404", "No registrar"); exit; }

5 years, 8 months

git:master:8a64560e: Merge pull request #1636 from kamailio/gv/ds_ping_from

by GitHub

Module: kamailio Branch: master Commit: 8a64560e1037afe723dbd8c3c26ce198258f35fb URL: https://github.com/kamailio/kamailio/commit/8a64560e1037afe723dbd8c3c26ce19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-06T13:15:00+02:00 Merge pull request #1636 from kamailio/gv/ds_ping_from dispatcher: add ping_from attribute --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8a64560e1037afe723dbd8c3c26ce19… Patch: https://github.com/kamailio/kamailio/commit/8a64560e1037afe723dbd8c3c26ce19… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index cb87392eb8..0422cd6b20 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -300,6 +300,9 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) } else { LM_ERR("rweight %d not in 1-100 range; skipped", tmp_rweight); } + } else if(pit->name.len == 9 + && strncasecmp(pit->name.s, "ping_from", 9) == 0) { + dest->attrs.ping_from = pit->body; } } if(params_list) @@ -3020,6 +3023,7 @@ void ds_ping_set(ds_set_t *node) { uac_req_t uac_r; int i, j; + str ping_from; if(!node) return; @@ -3051,10 +3055,21 @@ void ds_ping_set(ds_set_t *node) uac_r.ssock = &ds_default_socket; } + /* Overwrite default ping From URI with attribute */ + if(node->dlist[j].attrs.ping_from.s != NULL + && node->dlist[j].attrs.ping_from.len > 0) { + ping_from = node->dlist[j].attrs.ping_from; + LM_DBG("ping_from: %.*s\n", ping_from.len, ping_from.s); + } + else { + ping_from = ds_ping_from; + LM_DBG("Default ping_from: %.*s\n", ping_from.len, ping_from.s); + } + gettimeofday(&node->dlist[j].latency_stats.start, NULL); if(tmb.t_request(&uac_r, &node->dlist[j].uri, &node->dlist[j].uri, - &ds_ping_from, &ds_outbound_proxy) + &ping_from, &ds_outbound_proxy) < 0) { LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, node->dlist[j].uri.s); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 7845616714..7a798fc162 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -169,6 +169,7 @@ typedef struct _ds_attrs { int weight; int rweight; int congestion_control; + str ping_from; } ds_attrs_t; typedef struct _ds_latency_stats { diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index b113b284fd..b409c5208d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1829,6 +1829,10 @@ onreply_route { It is used for sending the SIP traffic as well as OPTIONS keepalives. </listitem> + <listitem> + 'ping_from' - used to set the From URI in OPTIONS keepalives. + It overwrites the general ds_ping_from parameter. + </listitem> </itemizedlist> </para> </section> @@ -1848,7 +1852,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) </para> <programlisting format="linespecific"> ... -1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz +1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz;ping_from=sip:myproxy.com ... </programlisting>

5 years, 8 months

git:master:3f9c38be: dispatcher: add ping_from attribute

by Giacomo Vacca

Module: kamailio Branch: master Commit: 3f9c38be11416f7abe5c4448088ba66d2d3e6aad URL: https://github.com/kamailio/kamailio/commit/3f9c38be11416f7abe5c4448088ba66… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2018-09-05T14:35:52+02:00 dispatcher: add ping_from attribute --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3f9c38be11416f7abe5c4448088ba66… Patch: https://github.com/kamailio/kamailio/commit/3f9c38be11416f7abe5c4448088ba66… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index cb87392eb8..0422cd6b20 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -300,6 +300,9 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) } else { LM_ERR("rweight %d not in 1-100 range; skipped", tmp_rweight); } + } else if(pit->name.len == 9 + && strncasecmp(pit->name.s, "ping_from", 9) == 0) { + dest->attrs.ping_from = pit->body; } } if(params_list) @@ -3020,6 +3023,7 @@ void ds_ping_set(ds_set_t *node) { uac_req_t uac_r; int i, j; + str ping_from; if(!node) return; @@ -3051,10 +3055,21 @@ void ds_ping_set(ds_set_t *node) uac_r.ssock = &ds_default_socket; } + /* Overwrite default ping From URI with attribute */ + if(node->dlist[j].attrs.ping_from.s != NULL + && node->dlist[j].attrs.ping_from.len > 0) { + ping_from = node->dlist[j].attrs.ping_from; + LM_DBG("ping_from: %.*s\n", ping_from.len, ping_from.s); + } + else { + ping_from = ds_ping_from; + LM_DBG("Default ping_from: %.*s\n", ping_from.len, ping_from.s); + } + gettimeofday(&node->dlist[j].latency_stats.start, NULL); if(tmb.t_request(&uac_r, &node->dlist[j].uri, &node->dlist[j].uri, - &ds_ping_from, &ds_outbound_proxy) + &ping_from, &ds_outbound_proxy) < 0) { LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, node->dlist[j].uri.s); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 7845616714..7a798fc162 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -169,6 +169,7 @@ typedef struct _ds_attrs { int weight; int rweight; int congestion_control; + str ping_from; } ds_attrs_t; typedef struct _ds_latency_stats { diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index b113b284fd..b409c5208d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1829,6 +1829,10 @@ onreply_route { It is used for sending the SIP traffic as well as OPTIONS keepalives. </listitem> + <listitem> + 'ping_from' - used to set the From URI in OPTIONS keepalives. + It overwrites the general ds_ping_from parameter. + </listitem> </itemizedlist> </para> </section> @@ -1848,7 +1852,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) </para> <programlisting format="linespecific"> ... -1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz +1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz;ping_from=sip:myproxy.com ... </programlisting>

5 years, 8 months

[kamailio/kamailio] dispatcher: add ping_from attribute (#1636)

by Giacomo Vacca

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  I was looking for a solution to set a dedicated From URI in OPTIONS requests to a specific dispatcher target. ds_ping_from ( https://www.kamailio.org/docs/modules/devel/modules/dispatcher.html#dispatc…) applies globally, while I needed the granularity of a single target. I can just add an attribute to the others, e.g. instead of ``` 1 sip:127.0.0.1:7070 <http://127.0.0.1:7070> 0 1 ``` something like: ``` 1 sip:127.0.0.1:7070 <http://127.0.0.1:7070> 0 1 ping_from=sip.custom.com ``` When the ping_from attribute is not specified, the general ds_ping_from applies and is used. This would save me from a solution like intercepting the outgoing OPTIONS and manipulating the From header. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1636 -- Commit Summary -- * dispatcher: add ping_from attribute -- File Changes -- M src/modules/dispatcher/dispatch.c (17) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/doc/dispatcher_admin.xml (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1636.patch https://github.com/kamailio/kamailio/pull/1636.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/1636

5 years, 8 months

git:5.1:216f8de9: Merge pull request #1637 from sergey-safarov/spec_update

by GitHub

Module: kamailio Branch: 5.1 Commit: 216f8de9cac6d611f6465ff007afa0bfdfe626ca URL: https://github.com/kamailio/kamailio/commit/216f8de9cac6d611f6465ff007afa0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-06T13:00:27+02:00 Merge pull request #1637 from sergey-safarov/spec_update [5.1] pkg/docker: Updated submodule --- Added: pkg/kamailio/Makefile Added: pkg/kamailio/README.md Modified: pkg/docker Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/216f8de9cac6d611f6465ff007afa0b… Patch: https://github.com/kamailio/kamailio/commit/216f8de9cac6d611f6465ff007afa0b…

5 years, 8 months

← Newer
1
...
25
26
27
28
29
30
31
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2018