sr-dev December 2019

sr-dev@lists.kamailio.org

19 participants
280 discussions

git:master:d5030adf: rr: new function rr_next_hop_route()
by Daniel-Constantin Mierla 13 Dec '19

13 Dec '19

Module: kamailio Branch: master Commit: d5030adfaab5627791ea31a26141719349dba4b2 URL: https://github.com/kamailio/kamailio/commit/d5030adfaab5627791ea31a26141719… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-13T16:09:03+01:00 rr: new function rr_next_hop_route() - return 1 (true) if there is a route header for next hop address --- Modified: src/modules/rr/loose.c Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d5030adfaab5627791ea31a26141719… Patch: https://github.com/kamailio/kamailio/commit/d5030adfaab5627791ea31a26141719… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index 1440b6da98..28bc700941 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -893,6 +893,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) uri.len, ZSW(uri.s)); return RR_ERROR; } + _m->msg_flags |= FL_ROUTE_ADDR; } else { #ifdef ENABLE_USER_CHECK /* check if it the ignored user */ diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index 5b742223f9..fa8345e36c 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -80,6 +80,7 @@ static int w_add_rr_param(struct sip_msg *,char *, char *); static int w_check_route_param(struct sip_msg *,char *, char *); static int w_is_direction(struct sip_msg *,char *, char *); static int w_remove_record_route(sip_msg_t*, char*, char*); +static int w_rr_next_hop_route(sip_msg_t *, char *, char *); /* PV functions */ static int pv_get_route_uri_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int pv_get_from_tag_initial(sip_msg_t *msg, pv_param_t *param, @@ -113,6 +114,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE}, {"remove_record_route", w_remove_record_route, 0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"rr_next_hop_route", (cmd_function)w_rr_next_hop_route, 0, 0, 0, + ANY_ROUTE}, {"load_rr", (cmd_function)load_rr, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -756,6 +759,26 @@ static int pv_get_rdir(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } + +/** + * + */ +static int ki_rr_next_hop_route(sip_msg_t *msg) +{ + if(msg->msg_flags & FL_ROUTE_ADDR) { + return 1; + } + return -1; +} + +/** + * + */ +static int w_rr_next_hop_route(sip_msg_t *msg, char *p1, char *p2) +{ + return ki_rr_next_hop_route(msg); +} + /** * */ @@ -806,6 +829,11 @@ static sr_kemi_t sr_kemi_rr_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("rr"), str_init("next_hop_route"), + SR_KEMIP_INT, ki_rr_next_hop_route, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */

1 0

git:master:24afe136: core: internal flag to mark sip request if there is a route for next hop
by Daniel-Constantin Mierla 13 Dec '19

13 Dec '19

Module: kamailio Branch: master Commit: 24afe136361402f49f62aadc4401706c77a6b253 URL: https://github.com/kamailio/kamailio/commit/24afe136361402f49f62aadc4401706… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-13T16:07:55+01:00 core: internal flag to mark sip request if there is a route for next hop --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/24afe136361402f49f62aadc4401706… Patch: https://github.com/kamailio/kamailio/commit/24afe136361402f49f62aadc4401706… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 0b0f5044ed..f3ea088eb8 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -109,6 +109,7 @@ typedef enum request_method { #define FL_USE_XAVP_VIA_FIELDS (1<<22) /*!< use xavp fields for local via attrs */ #define FL_MSG_NOREPLY (1<<23) /*!< do not send sip reply for request */ #define FL_SIPTRACE (1<<24) /*!< message to be traced in stateless replies */ +#define FL_ROUTE_ADDR (1<<25) /*!< request has Route address for next hop */ /* WARNING: Value (1 << 28) is temporarily reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */

1 0

git:master:c0ef9323: modules: readme files regenerated - keepalive ... [skip ci]
by Kamailio Dev 12 Dec '19

12 Dec '19

Module: kamailio Branch: master Commit: c0ef932324db091d8e0a14ac1287973db5bf08da URL: https://github.com/kamailio/kamailio/commit/c0ef932324db091d8e0a14ac1287973… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-12T12:16:14+01:00 modules: readme files regenerated - keepalive ... [skip ci] --- Modified: src/modules/keepalive/README --- Diff: https://github.com/kamailio/kamailio/commit/c0ef932324db091d8e0a14ac1287973… Patch: https://github.com/kamailio/kamailio/commit/c0ef932324db091d8e0a14ac1287973…

1 0

[kamailio/kamailio] keepalive : added new function del_destination and added .cfg functions (#2133)
by Yasin CANER 12 Dec '19

12 Dec '19

#### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description added new function del_destination that deletes sip address from list added add_destination module functions for kamailio.cfg added counter parameter for attempt count. after count pass, module dont try until it adds again. added kemi interfaces both of them added lock to stack added find_destination function You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2133 -- Commit Summary -- * keepalive : added new function del_destination and added .cfg functions -- File Changes -- M src/modules/keepalive/api.h (4) M src/modules/keepalive/keepalive.h (10) M src/modules/keepalive/keepalive_api.c (117) M src/modules/keepalive/keepalive_core.c (14) M src/modules/keepalive/keepalive_mod.c (93) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2133.patch https://github.com/kamailio/kamailio/pull/2133.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/2133

3 12

git:master:e8bd86d7: keepalive : added new function del_destination and added cfg functions (#2133)
by Daniel-Constantin Mierla 12 Dec '19

12 Dec '19

Module: kamailio Branch: master Commit: e8bd86d764eca0b9554f9eee665ba786d76230e7 URL: https://github.com/kamailio/kamailio/commit/e8bd86d764eca0b9554f9eee665ba78… Author: Yasin CANER <caner_yaso(a)hotmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-12T12:06:24+01:00 keepalive : added new function del_destination and added cfg functions (#2133) * keepalive : added new function del_destination and added .cfg functions added new function del_destination that deletes sip address from list added add_destination module functions for kamailio.cfg added counter parameter for attempt count. after count pass, module dont try until it adds again. added kemi interfaces both of them added lock to stack added find_destination function * keepalive : fixed function names and re-placed un/lock functions fixed function names and re-placed un/lock functions * keepalive : added doc for exported new functions ka_add_destination and ka_del_destination [skip ci] added documents for exported new function ka_add_destination and ka_del_destination renamed in documents from is_alive to ka_is_alive added missing rpc command in documents --- Modified: src/modules/keepalive/api.h Modified: src/modules/keepalive/doc/keepalive.xml Modified: src/modules/keepalive/doc/keepalive_admin.xml Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e8bd86d764eca0b9554f9eee665ba78… Patch: https://github.com/kamailio/kamailio/commit/e8bd86d764eca0b9554f9eee665ba78…

1 0

git:master:ae08b595: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 12 Dec '19

12 Dec '19

Module: kamailio Branch: master Commit: ae08b5955935466c401709903b38491aba7ec33e URL: https://github.com/kamailio/kamailio/commit/ae08b5955935466c401709903b38491… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-12T08:46:16+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/ae08b5955935466c401709903b38491… Patch: https://github.com/kamailio/kamailio/commit/ae08b5955935466c401709903b38491… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 3607b3969b..4b23eacb58 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1937,17 +1937,20 @@ branch_route[1] { the only way a script can add a new transaction in an atomic way. Typically, it is used to deploy a UAS. - Note that any flag operations (e.g. for accounting) after this function - has been called will be ignored. You can use the the tmx module - function t_flush_flags() to flush the altered flags to the already - created transaction. + Note: once the t_newtran() is executed, the new message flag operations + (i.e., setflag() and resetflag()) are not syncronized to the + transaction, being stored only in the private memory SIP message + structure. Use the tmx module function t_flush_flags() to synchronize + the modified message flags to the already created transaction. Example 1.56. t_newtran usage ... if (t_newtran()) { - log("UAS logic"); + xlog("the transaction has been created\n"); t_reply("999","hello"); -} else sl_reply_error(); +} else { + sl_reply_error(); +} ... See misc/examples/mixed/uas.cfg for more examples.

1 0

git:master:9a0c850f: tm: clarification that the sip message flags operations after t_newtran()
by Daniel-Constantin Mierla 12 Dec '19

12 Dec '19

Module: kamailio Branch: master Commit: 9a0c850f98063da145120f90d2c5c2a43e76b976 URL: https://github.com/kamailio/kamailio/commit/9a0c850f98063da145120f90d2c5c2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-12T08:42:06+01:00 tm: clarification that the sip message flags operations after t_newtran() - they are not reflected in transaction, only in local sip message structure --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/9a0c850f98063da145120f90d2c5c2a… Patch: https://github.com/kamailio/kamailio/commit/9a0c850f98063da145120f90d2c5c2a… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index 82647117cd..489147afd1 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -303,19 +303,22 @@ branch_route[1] { way. Typically, it is used to deploy a UAS. </para> <para> - Note that any flag operations (e.g. for accounting) after this - function has been called will be ignored. You can use the the tmx - module function t_flush_flags() to flush the altered flags to the - already created transaction. + Note: once the t_newtran() is executed, the new message flag operations + (i.e., setflag() and resetflag()) are not syncronized to the transaction, + being stored only in the private memory SIP message structure. Use the + tmx module function t_flush_flags() to synchronize the modified message + flags to the already created transaction. </para> <example> <title><function>t_newtran</function> usage</title> <programlisting> ... -if (t_newtran()) { - log("UAS logic"); - t_reply("999","hello"); -} else sl_reply_error(); +if (t_newtran()) { + xlog("the transaction has been created\n"); + t_reply("999","hello"); +} else { + sl_reply_error(); +} ... </programlisting> </example>

1 0

git:master:9b97d01e: kamailio.cfg: replaced xmlrpc with jsonrpc in default config
by Daniel-Constantin Mierla 11 Dec '19

11 Dec '19

Module: kamailio Branch: master Commit: 9b97d01e90963851eaa698b2ab1e04fe43822b98 URL: https://github.com/kamailio/kamailio/commit/9b97d01e90963851eaa698b2ab1e04f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-12-11T12:28:20+01:00 kamailio.cfg: replaced xmlrpc with jsonrpc in default config --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/9b97d01e90963851eaa698b2ab1e04f… Patch: https://github.com/kamailio/kamailio/commit/9b97d01e90963851eaa698b2ab1e04f… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index ee3ec9e63d..01e56b66ae 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -77,9 +77,9 @@ # - adjust CFGDIR/tls.cfg as needed # - define WITH_TLS # -# *** To enable XMLRPC support execute: -# - define WITH_XMLRPC -# - adjust route[XMLRPC] for access policy +# *** To enable JSONRPC over HTTP(S) support execute: +# - define WITH_JSONRPC +# - adjust route[JSONRPC] for access policy # # *** To enable anti-flood detection execute: # - adjust pike and htable=>ipban settings as needed (default is @@ -199,6 +199,10 @@ enable_tls=yes tls_max_connections=2048 #!endif +#!ifdef WITH_JSONRPC +tcp_accept_no_cl=yes +#!endif + ####### Custom Parameters ######### /* These parameters can be modified runtime via RPC interface @@ -235,6 +239,9 @@ voicemail.srv_port = "5060" desc "VoiceMail Port" loadmodule "db_mysql.so" #!endif +#!ifdef WITH_JSONRPC +loadmodule "xhttp.so" +#!endif loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" @@ -298,10 +305,6 @@ loadmodule "htable.so" loadmodule "pike.so" #!endif -#!ifdef WITH_XMLRPC -loadmodule "xmlrpc.so" -#!endif - #!ifdef WITH_DEBUG loadmodule "debugger.so" #!endif @@ -315,6 +318,9 @@ modparam("jsonrpcs", "pretty_format", 1) # modparam("jsonrpcs", "fifo_name", "/run/kamailio/kamailio_rpc.fifo") /* set the path to RPC unix socket control file */ # modparam("jsonrpcs", "dgram_socket", "/run/kamailio/kamailio_rpc.sock") +#!ifdef WITH_JSONRPC +modparam("jsonrpcs", "transport", 7) +#!endif # ----- ctl params ----- /* set the path to RPC unix socket control file */ @@ -461,12 +467,6 @@ modparam("pike", "remove_latency", 4) modparam("htable", "htable", "ipban=>size=8;autoexpire=300;") #!endif -#!ifdef WITH_XMLRPC -# ----- xmlrpc params ----- -modparam("xmlrpc", "route", "XMLRPC"); -modparam("xmlrpc", "url_match", "^/RPC") -#!endif - #!ifdef WITH_DEBUG # ----- debugger params ----- modparam("debugger", "cfgtrace", 1) @@ -922,22 +922,24 @@ route[PSTN] { return; } -# XMLRPC routing -#!ifdef WITH_XMLRPC -route[XMLRPC] { - # allow XMLRPC from localhost - if ((method=="POST" || method=="GET") - && (src_ip==127.0.0.1)) { - # close connection only for xmlrpclib user agents (there is a bug in - # xmlrpclib: it waits for EOF before interpreting the response). - if ($hdr(User-Agent) =~ "xmlrpclib") - set_reply_close(); - set_reply_no_connect(); - dispatch_rpc(); +# JSONRPC over HTTP(S) routing +#!ifdef WITH_JSONRPC +event_route[xhttp:request] { + set_reply_close(); + set_reply_no_connect(); + if(src_ip!=127.0.0.1) { + xhttp_reply("403", "Forbidden", "text/html", + "<html><body>Not allowed from $si</body></html>"); exit; } - send_reply("403", "Forbidden"); - exit; + if ($hu =~ "^/RPC") { + jsonrpc_dispatch(); + exit; + } + + xhttp_reply("200", "OK", "text/html", + "<html><body>Wrong URL $hu</body></html>"); + exit; } #!endif

1 0

git:master:4b7a2d5b: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 11 Dec '19

11 Dec '19

Module: kamailio Branch: master Commit: 4b7a2d5bd9848e367f201b45fc8727a7fa8bae26 URL: https://github.com/kamailio/kamailio/commit/4b7a2d5bd9848e367f201b45fc8727a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-12-11T11:46:24+01:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/4b7a2d5bd9848e367f201b45fc8727a… Patch: https://github.com/kamailio/kamailio/commit/4b7a2d5bd9848e367f201b45fc8727a…

1 0

git:master:58021b2e: registrar: add documentation for xavp_rcd_mask parameter
by Victor Seva 11 Dec '19

11 Dec '19

Module: kamailio Branch: master Commit: 58021b2e94c3f98048470d83fe9e331ebb8e725f URL: https://github.com/kamailio/kamailio/commit/58021b2e94c3f98048470d83fe9e331… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-12-11T11:40:30+01:00 registrar: add documentation for xavp_rcd_mask parameter --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/58021b2e94c3f98048470d83fe9e331… Patch: https://github.com/kamailio/kamailio/commit/58021b2e94c3f98048470d83fe9e331… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index e8b1a75716..eb87035f02 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -809,6 +809,37 @@ modparam("registrar", "xavp_rcd", "ulrcd") </example> </section> + <section id="registrar.p.xavp_rcd_mask"> + <title><varname>xavp_rcd_mask</varname> (int)</title> + <para> + Defines what values to skip when xavp_rcd is stored. + </para> + <itemizedlist> + <listitem><para>1 - <emphasis>ruid</emphasis></para></listitem> + <listitem><para>2 - <emphasis>contact</emphasis></para></listitem> + <listitem><para>4 - <emphasis>expires</emphasis></para></listitem> + <listitem><para>8 - <emphasis>received</emphasis></para></listitem> + <listitem><para>16 - <emphasis>path</emphasis></para></listitem> + </itemizedlist> + <para> + <emphasis> + Default value is 0 (none). + </emphasis> + </para> + <example> + <title>Set <varname>xavp_rcd_mask</varname> parameter</title> + <programlisting format="linespecific"> +... +# skip path value +modparam("registrar", "xavp_rcd_mask", 16) +... +# skip path and expires values +modparam("registrar", "xavp_rcd_mask", 20) +... + </programlisting> + </example> + </section> + <section id="registrar.p.gruu_enabled"> <title><varname>gruu_enabled</varname> (integer)</title> <para>

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2019