sr-dev August 2017

sr-dev@lists.kamailio.org

24 participants
306 discussions

git:master:afc678e9: dialog: documentation for dlg_set_ruri()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: afc678e9db29f3cf83aff0f24d7affdae5be6cba URL: https://github.com/kamailio/kamailio/commit/afc678e9db29f3cf83aff0f24d7affd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-17T07:28:07+02:00 dialog: documentation for dlg_set_ruri() --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/afc678e9db29f3cf83aff0f24d7affd… Patch: https://github.com/kamailio/kamailio/commit/afc678e9db29f3cf83aff0f24d7affd… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 45ce5cc690..e451ce4b9d 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -32,7 +32,7 @@ The dialog module provides dialog awareness for the &kamailio; proxy. It's functionality is to keep track of the current dialogs, to offer information about them (e.g. how many dialogs are active), and to manage various - characteristics of dialogs. The module exports several functions that can be + characteristics of dialogs. The module exports several functions that can be used directly from the configuration route script as well as functions for the RPC interface. </para> @@ -1955,24 +1955,24 @@ if(dlg_get("abcdef", "123", "456")) </programlisting> </example> </section> - + <section id="dialog.f.is_known_dlg"> <title> <function moreinfo="none">is_known_dlg()</function> </title> <para> This function checks if the current SIP message being processed - belongs to any transaction within an active dialog that the - dialog module is currently tracking. This is a check for + belongs to any transaction within an active dialog that the + dialog module is currently tracking. This is a check for tracking of any kind, without regard to profiles. </para> <para> This function has numerous potential applications, among which - is that it can be used to strengthen security for + is that it can be used to strengthen security for loose-routing sequential (in-dialog) requests or responses to them, as by providing a preventative check against spoofing on the proxy level instead of leaving the issue - purely to the receiving UA. + purely to the receiving UA. </para> <para> This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, @@ -2041,7 +2041,7 @@ if(dlg_set_timeout("180", "123", "456")) <function moreinfo="none">dlg_set_timeout_by_profile(profile, [value], timeout)</function> </title> <para> - Like <emphasis>dlg_set_timeout()</emphasis>, but + Like <emphasis>dlg_set_timeout()</emphasis>, but simultaneously sets the timeout of all dialogs in a given profile. Can be constrained by profile value. </para> @@ -2064,7 +2064,7 @@ if(dlg_set_timeout("180", "123", "456")) <title><function>dlg_set_timeout_by_profile</function> usage</title> <programlisting format="linespecific"> ... -# All dialogs belonging to user abc123 (tracked via set_dlg_profile()) +# All dialogs belonging to user abc123 (tracked via set_dlg_profile()) # will be timed out in 3 seconds. dlg_set_timeout_by_profile("users", "abc123", "3"); @@ -2178,6 +2178,30 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); </programlisting> </example> </section> + <section id="dialog.f.dlg_set_ruri"> + <title> + <function moreinfo="none">dlg_set_ruri()</function> + </title> + <para> + This function sets the R-URI with the corresponding endpoint address + stored in dialog structure (i.e., its Contact field). + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>dlg_set_ruri()</function> usage</title> + <programlisting format="linespecific"> +... +if(has_totag() and is_present_hf("Route") and uri==myself ) { + if(dlg_set_ruri()) { + xlog("Request URI changed from [$ou] to dlg value: [$ru]\n"); + } +} +... +</programlisting> + </example> + </section> </section>

7 years, 4 months

git:master:87ca7a1b: dialog: added dlg_set_ruri()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 87ca7a1b078f0c8d85b0d7e1cc43773cd238037e URL: https://github.com/kamailio/kamailio/commit/87ca7a1b078f0c8d85b0d7e1cc43773… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-17T07:17:49+02:00 dialog: added dlg_set_ruri() - sets the r-uri of requests within dialog with the correspondong contact address stored in dialog structure - convenient function as alternative to checking direction and then setting by assigning to $ru from $dlg(*contact) --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_profile.c Modified: src/modules/dialog/dlg_profile.h --- Diff: https://github.com/kamailio/kamailio/commit/87ca7a1b078f0c8d85b0d7e1cc43773… Patch: https://github.com/kamailio/kamailio/commit/87ca7a1b078f0c8d85b0d7e1cc43773…

7 years, 4 months

[kamailio/kamailio] ims_auth: fixed rare core dump, due to null ptr check (#1213)

by Christoph VALENTIN

The ims_auth module reads the value from the Content-Length header of a REGISTER request, before decoding the message body. Due to a missing null pointer check, reading this value leads to core dump in case the Content-Length header is missing.   #### 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 #XXXX (replace XXXX with an open issue number) #### Description  Added a null pointer check in function ims_get_body() - file utils.c of module ims_auth - to check whether Content-Length Header was present in REGISTER message. If Content-Length Header is not present, a Default value of 0 will be assumed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1213 -- Commit Summary -- * ims_auth: fixed rare core dump, due to null ptr check -- File Changes -- M src/modules/ims_auth/utils.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1213.patch https://github.com/kamailio/kamailio/pull/1213.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/1213

7 years, 4 months

git:master:05988455: core: updated mailing list address in CONTRIBUTING.md

by GitHub

Module: kamailio Branch: master Commit: 059884554528731261d600adc9bc2f1a75583bfb URL: https://github.com/kamailio/kamailio/commit/059884554528731261d600adc9bc2f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-16T12:33:51+02:00 core: updated mailing list address in CONTRIBUTING.md --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/059884554528731261d600adc9bc2f1… Patch: https://github.com/kamailio/kamailio/commit/059884554528731261d600adc9bc2f1… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1b23d8c52e..e74babc78f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -169,4 +169,4 @@ released under BSD must be done under BSD as well. For any question, do not hesitate to contact other developers via mailing list: - * **[sr-dev [at] lists.sip-router.org](http://lists.sip-router.org/cgi-bin/mailman/listinfo/… + * **[sr-dev [at] lists.kamailio.org](http://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-d…

7 years, 4 months

[kamailio/kamailio] Wishlist #234: URI transformation to pick up URI scheme (#592)

by Olle E. Johansson

I would like the URI transformations to be more generic so one can pick up the URI scheme, like HTTP: or TEL: Just an idea --- 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/592

7 years, 4 months

git:master:893c68d5: pv: implemented {uri.scheme} transformation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 893c68d5cbbab35d842aa7275c57d692770e0fff URL: https://github.com/kamailio/kamailio/commit/893c68d5cbbab35d842aa7275c57d69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-16T09:15:03+02:00 pv: implemented {uri.scheme} transformation - GH #592 --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/893c68d5cbbab35d842aa7275c57d69… Patch: https://github.com/kamailio/kamailio/commit/893c68d5cbbab35d842aa7275c57d69… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 62574c46f5..eccf3b6377 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1292,6 +1292,16 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs = (_tr_parsed_uri.r2_val.s)? _tr_parsed_uri.r2_val:_tr_empty; break; + case TR_URI_SCHEME: + val->rs.s = _tr_uri.s; + val->rs.len = 0; + while(val->rs.len<_tr_uri.len) { + if(_tr_uri.s[val->rs.len]==':') { + break; + } + val->rs.len++; + } + break; default: LM_ERR("unknown subtype %d\n", subtype); @@ -2529,6 +2539,9 @@ char* tr_parse_uri(str* in, trans_t *t) } else if(name.len==2 && strncasecmp(name.s, "r2", 2)==0) { t->subtype = TR_URI_R2; goto done; + } else if(name.len==6 && strncasecmp(name.s, "scheme", 6)==0) { + t->subtype = TR_URI_SCHEME; + goto done; } LM_ERR("unknown transformation: %.*s/%.*s!\n", in->len, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 7b7b15fb03..764653e5e3 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -47,7 +47,7 @@ enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT, TR_URI_PARAMS, TR_URI_PARAM, TR_URI_HEADERS, TR_URI_TRANSPORT, TR_URI_TTL, TR_URI_UPARAM, TR_URI_MADDR, TR_URI_METHOD, TR_URI_LR, - TR_URI_R2 + TR_URI_R2, TR_URI_SCHEME }; enum _tr_param_subtype { TR_PL_NONE=0, TR_PL_VALUE, TR_PL_VALUEAT, TR_PL_NAME, TR_PL_COUNT

7 years, 4 months

git:master:539a6eef: app_sqlang:

by Henning Westerholt

Module: kamailio Branch: master Commit: 539a6eefa469a4394f4e6dfbe6a9affba3e2f440 URL: https://github.com/kamailio/kamailio/commit/539a6eefa469a4394f4e6dfbe6a9aff… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2017-08-15T15:28:02+02:00 app_sqlang: - fix a few copy and paste errors in the docs (probably from app_jsdt) - regenerate README --- Modified: src/modules/app_sqlang/README Modified: src/modules/app_sqlang/doc/app_sqlang_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/539a6eefa469a4394f4e6dfbe6a9aff… Patch: https://github.com/kamailio/kamailio/commit/539a6eefa469a4394f4e6dfbe6a9aff…

7 years, 4 months

git:master:219ddbb5: uac: use kam_rand() instead of rand()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 219ddbb54bb787a8f0673014c16e749eef40bdf4 URL: https://github.com/kamailio/kamailio/commit/219ddbb54bb787a8f0673014c16e749… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-15T15:48:50+02:00 uac: use kam_rand() instead of rand() - do kam_srand() when module is initialized --- Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/219ddbb54bb787a8f0673014c16e749… Patch: https://github.com/kamailio/kamailio/commit/219ddbb54bb787a8f0673014c16e749… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index d5ac59201d..844b6025ff 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -50,6 +50,7 @@ #include "../../core/kemi.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" +#include "../../core/rand/kam_rand.h" #include "../../core/cfg/cfg_struct.h" #include "../dialog/dlg_load.h" @@ -305,6 +306,7 @@ static int mod_init(void) if(reg_db_url.s && reg_db_url.len>=0) { + kam_srand(17 * getpid() + time(0)); if(!reg_contact_addr.s || reg_contact_addr.len<=0) { LM_ERR("contact address parameter not set\n"); @@ -343,6 +345,9 @@ static int mod_init(void) static int child_init(int rank) { int pid; + + kam_srand((11 + rank) * getpid() * 17 + time(0)); + if (rank!=PROC_MAIN) return 0; @@ -361,6 +366,7 @@ static int child_init(int rank) if (cfg_child_init()) return -1; + kam_srand(getpid() * 17 + time(0)); uac_reg_load_db(); uac_reg_timer(0); for(;;){ diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index cb7e4786af..d85d51c6a0 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -43,6 +43,7 @@ #include "../../core/parser/contact/parse_contact.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" +#include "../../core/rand/kam_rand.h" #include "../../modules/tm/tm_load.h" @@ -538,7 +539,7 @@ int reg_ht_add(reg_uac_t *reg) if (reg->reg_delay) nr->reg_delay = reg->reg_delay; else if (reg_random_delay>0) - nr->reg_delay = rand() % reg_random_delay; + nr->reg_delay = kam_rand() % reg_random_delay; nr->reg_init = time(NULL); nr->h_uuid = reg_compute_hash(&reg->l_uuid); nr->h_user = reg_compute_hash(&reg->l_username);

7 years, 4 months

git:master:f3f3ed2b: modules: readme files regenerated - tls ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: f3f3ed2b343fc2f33f14e903f927a138e3c3adb4 URL: https://github.com/kamailio/kamailio/commit/f3f3ed2b343fc2f33f14e903f927a13… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-15T15:16:24+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/f3f3ed2b343fc2f33f14e903f927a13… Patch: https://github.com/kamailio/kamailio/commit/f3f3ed2b343fc2f33f14e903f927a13… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index f0d36b2758..dcdbfed6de 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -63,6 +63,7 @@ Olle E. Johansson 9.30. renegotiation (boolean) 9.31. config (string) 9.32. xavp_cfg (string) + 9.33. event_callback (str) 10. Functions @@ -80,6 +81,10 @@ Olle E. Johansson 12.1. License 12.2. History + 13. Event Routes + + 13.1. event_route[tls:connection-out] + List of Examples 1.1. Quick start config @@ -125,7 +130,9 @@ Olle E. Johansson 1.41. Set config parameter 1.42. Change and reload the TLS configuration at runtime 1.43. Set xavp_cfg parameter - 1.44. is_peer_verified usage + 1.44. Set event_callback parameter + 1.45. is_peer_verified usage + 1.46. Use of event_route[tls:connection-out] Chapter 1. Admin Guide @@ -173,6 +180,7 @@ Chapter 1. Admin Guide 9.30. renegotiation (boolean) 9.31. config (string) 9.32. xavp_cfg (string) + 9.33. event_callback (str) 10. Functions @@ -190,6 +198,10 @@ Chapter 1. Admin Guide 12.1. License 12.2. History + 13. Event Routes + + 13.1. event_route[tls:connection-out] + 1. Overview This module implements the TLS transport for Kamailio using the OpenSSL @@ -520,6 +532,7 @@ Revoking a certificate and using a CRL 9.30. renegotiation (boolean) 9.31. config (string) 9.32. xavp_cfg (string) + 9.33. event_callback (str) 9.1. tls_method (string) @@ -1267,6 +1280,28 @@ modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg") route(RELAY); ... +9.33. event_callback (str) + + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead of + event_route[...] blocks specific for tls module. + + The function has one string parameter, the value is the name of the + event_route block, respectively "tls:connection-out". + + Default value is 'empty' (no function is executed for events). + + Example 1.44. Set event_callback parameter +... +modparam("tls", "event_callback", "ksr_tls_event") +... +-- event callback function implemented in Lua +function ksr_tls_event(evname) + KSR.info("===== tls module triggered event: " .. evname .. "\n"); + return 1; +end +... + 10. Functions 10.1. is_peer_verified() @@ -1277,7 +1312,7 @@ modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg") , the peer presented an X509 certificate and the certificate chain verified ok. It can be used only in a request route. - Example 1.44. is_peer_verified usage + Example 1.45. is_peer_verified usage if (proto==TLS && !is_peer_verified()){ sl_send_reply("400", "No certificate or verification failed"); drop; @@ -1343,3 +1378,22 @@ modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg") Install does not generate self-signed certificates by default anymore. In order to generate them now you should do "make install-tls-cert" + +13. Event Routes + + 13.1. event_route[tls:connection-out] + +13.1. event_route[tls:connection-out] + + Event route to be executed when a TLS connection is opened by Kamailio. + If drop() is executed in the event route, then the data is no longer + sent over the connection. + + Example 1.46. Use of event_route[tls:connection-out] +... +event_route[tls:connection-out] { + if($sndto(ip)=="1.2.3.4") { + drop; + } +} +...

7 years, 4 months

git:master:cb7810c9: tls: docs for event_route[tls:connection-out] and event_callback param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cb7810c939da9c8f4385b530539487528ac8705d URL: https://github.com/kamailio/kamailio/commit/cb7810c939da9c8f4385b5305394875… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-15T15:09:37+02:00 tls: docs for event_route[tls:connection-out] and event_callback param --- Modified: src/modules/tls/doc/params.xml Modified: src/modules/tls/doc/rpc.xml Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/cb7810c939da9c8f4385b5305394875… Patch: https://github.com/kamailio/kamailio/commit/cb7810c939da9c8f4385b5305394875… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 5ab2426e7b..e3d236dea4 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1164,5 +1164,36 @@ modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg") </programlisting> </example> </section> + <section id="tls.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[...] blocks specific for tls module. + </para> + <para> + The function has one string parameter, the value is the name of + the event_route block, respectively "tls:connection-out". + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("tls", "event_callback", "ksr_tls_event") +... +-- event callback function implemented in Lua +function ksr_tls_event(evname) + KSR.info("===== tls module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> </section> diff --git a/src/modules/tls/doc/rpc.xml b/src/modules/tls/doc/rpc.xml index cd432d85d9..8f3070648b 100644 --- a/src/modules/tls/doc/rpc.xml +++ b/src/modules/tls/doc/rpc.xml @@ -15,8 +15,8 @@ <section id="tls.r.tls.info"> <title><function>tls.info</function></title> <para> - List internal information related to the TLS module in - a short list - max connections, open connections and the + List internal information related to the TLS module in + a short list - max connections, open connections and the write queue size. </para> <para>Parameters: </para> @@ -53,7 +53,7 @@ <section id="tls.r.tls.reload"> <title><function>tls.reload</function></title> <para> - Reload the external TLS configuration file (aka tls.cfg). It does not reload + Reload the external TLS configuration file (aka tls.cfg). It does not reload modparam() parameters. Note that existing active TLS connections are not terminated and they continue to use the old certificates. The new configuration will be used for new connections. diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index 11c4aa7318..0c8fce400f 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -275,6 +275,31 @@ make -C modules/tls extra_defs="-DTLS_WR_DEBUG -DTLS_RD_DEBUG" <xi:include href="functions.xml"/> <xi:include href="rpc.xml"/> <xi:include href="history.xml"/> + + <section id="tls.event_routes"> + <title>Event Routes</title> + <section id="tls.evrt.connection_out"> + <title>event_route[tls:connection-out]</title> + <para> + Event route to be executed when a TLS connection is opened by + &kamailio;. If drop() is executed in the event route, then the + data is no longer sent over the connection. + </para> + <example> + <title>Use of <varname>event_route[tls:connection-out]</varname></title> + <programlisting> +... +event_route[tls:connection-out] { + if($sndto(ip)=="1.2.3.4") { + drop; + } +} +... + </programlisting> + </example> + + </section> + </section> </chapter> </book>

7 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2017