sr-dev June 2019

sr-dev@lists.kamailio.org

19 participants
216 discussions

git:master:2fb642bd: presence: docs for rpc command to update watchers
by Daniel-Constantin Mierla 24 Jun '19

24 Jun '19

Module: kamailio Branch: master Commit: 2fb642bd318884059c2c31487fdba9cc22aed7ef URL: https://github.com/kamailio/kamailio/commit/2fb642bd318884059c2c31487fdba9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-24T09:11:17+02:00 presence: docs for rpc command to update watchers --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2fb642bd318884059c2c31487fdba9c… Patch: https://github.com/kamailio/kamailio/commit/2fb642bd318884059c2c31487fdba9c… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 3ff750d633..c518503f09 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1266,6 +1266,35 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); ... </programlisting> </section> + <section id="presence.rpc.updateWatchers"> + <title>presence.updateWatchers</title> + <para> + Manually triggers updates to watchers (for example, + after the contents of XCAP docs has been updated). + </para> + <para> + Name: <emphasis>presence.updateWatchers</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>uri - the uri of the user who made the changes + and whose watchers should be updated.</para> + </listitem> + <listitem> + <para>event - the event package (e.g. presence). + </para> + </listitem> + </itemizedlist> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +&kamcmd; presence.updateWatchers sip:alice@domain.com presence +... + </programlisting> + </section> </section> <section>

1 0

git:master:832d1e62: presence: new rpc command presence.updateWatchers
by Daniel-Constantin Mierla 24 Jun '19

24 Jun '19

Module: kamailio Branch: master Commit: 832d1e622c5f1c9165540f41ad1e3efa077e49d3 URL: https://github.com/kamailio/kamailio/commit/832d1e622c5f1c9165540f41ad1e3ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-23T11:35:36+02:00 presence: new rpc command presence.updateWatchers - trigger update of watchers via rpc --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/832d1e622c5f1c9165540f41ad1e3ef… Patch: https://github.com/kamailio/kamailio/commit/832d1e622c5f1c9165540f41ad1e3ef… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index dc1e8216f5..26e91970a2 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1728,6 +1728,49 @@ void rpc_presence_refresh_watchers(rpc_t *rpc, void *ctx) static const char *rpc_presence_refresh_watchers_doc[2] = { "Trigger refresh of watchers", 0}; +/*! \brief + * rpc cmd: presence.updateWatchers + * \<presentity_uri> + * \<event> + * * */ +void rpc_presence_update_watchers(rpc_t *rpc, void *ctx) +{ + str pres_uri = {0, 0}; + str event = {0, 0}; + int pn; + + LM_DBG("init update of watchers\n"); + + pn = rpc->scan(ctx, "SS", &pres_uri, &event); + if(pn < 2) { + rpc->fault(ctx, 500, "Not enough parameters"); + return; + } + + if(pres_uri.s == NULL || pres_uri.len == 0) { + LM_ERR("empty uri\n"); + rpc->fault(ctx, 500, "Empty presentity URI"); + return; + } + + if(event.s == NULL || event.len == 0) { + LM_ERR("empty event parameter\n"); + rpc->fault(ctx, 500, "Empty event parameter"); + return; + } + LM_DBG("uri '%.*s' - event '%.*s'\n", pres_uri.len, pres_uri.s, + event.len, event.s); + + if(ki_pres_update_watchers(NULL, &pres_uri, &event)<0) { + rpc->fault(ctx, 500, "Processing error"); + return; + } +} + +static const char *rpc_presence_update_watchers_doc[2] = { + "Trigger update of watchers", 0}; + + void rpc_presence_cleanup(rpc_t *rpc, void *c) { LM_DBG("rpc_presence_cleanup:start\n"); @@ -1749,6 +1792,8 @@ rpc_export_t presence_rpc[] = { {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, {"presence.refreshWatchers", rpc_presence_refresh_watchers, rpc_presence_refresh_watchers_doc, 0}, + {"presence.updateWatchers", rpc_presence_update_watchers, + rpc_presence_update_watchers_doc, 0}, {0, 0, 0, 0}}; static int presence_init_rpc(void)

1 0

git:master:d0464279: Merge pull request #1989 from MrHillo/master
by GitHub 22 Jun '19

22 Jun '19

Module: kamailio Branch: master Commit: d04642793d9465c1c39ca17b899382372b89955e URL: https://github.com/kamailio/kamailio/commit/d04642793d9465c1c39ca17b8993823… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-06-22T19:30:03+02:00 Merge pull request #1989 from MrHillo/master userblacklist: fix double "check_user_blacklist" in module documentation --- Modified: src/modules/userblacklist/doc/userblacklist_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d04642793d9465c1c39ca17b8993823… Patch: https://github.com/kamailio/kamailio/commit/d04642793d9465c1c39ca17b8993823… --- diff --git a/src/modules/userblacklist/doc/userblacklist_admin.xml b/src/modules/userblacklist/doc/userblacklist_admin.xml index bcc48705f2..d68747de31 100644 --- a/src/modules/userblacklist/doc/userblacklist_admin.xml +++ b/src/modules/userblacklist/doc/userblacklist_admin.xml @@ -324,7 +324,7 @@ if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) { parameter can be used to check for example against the from URI user. </para> <example> - <title><function>check_user_blacklist</function> usage</title> + <title><function>check_user_whitelist</function> usage</title> <programlisting format="linespecific"> ... $avp(i:80) = $rU;

1 0

git:master:b7f7efe4: userblacklist: fix double "check_user_blacklist" in module documentation
by Julien Arlt 22 Jun '19

22 Jun '19

Module: kamailio Branch: master Commit: b7f7efe4f952894aa847165cc038cd5af4c3141a URL: https://github.com/kamailio/kamailio/commit/b7f7efe4f952894aa847165cc038cd5… Author: Julien Arlt <julien-arlt(a)gmx.de> Committer: Julien Arlt <julien-arlt(a)gmx.de> Date: 2019-06-21T14:52:11+02:00 userblacklist: fix double "check_user_blacklist" in module documentation --- Modified: src/modules/userblacklist/doc/userblacklist_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b7f7efe4f952894aa847165cc038cd5… Patch: https://github.com/kamailio/kamailio/commit/b7f7efe4f952894aa847165cc038cd5… --- diff --git a/src/modules/userblacklist/doc/userblacklist_admin.xml b/src/modules/userblacklist/doc/userblacklist_admin.xml index bcc48705f2..d68747de31 100644 --- a/src/modules/userblacklist/doc/userblacklist_admin.xml +++ b/src/modules/userblacklist/doc/userblacklist_admin.xml @@ -324,7 +324,7 @@ if (!check_user_blacklist("$avp(i:80)", "$avp(i:82)")) { parameter can be used to check for example against the from URI user. </para> <example> - <title><function>check_user_blacklist</function> usage</title> + <title><function>check_user_whitelist</function> usage</title> <programlisting format="linespecific"> ... $avp(i:80) = $rU;

1 0

[kamailio/kamailio] userblacklist: fix double "check_user_blacklist" in module documentation (#1989)
by Julien Arlt 22 Jun '19

22 Jun '19

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The example for check_user_whitelist is named as check_user_blacklist in documentation You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1989 -- Commit Summary -- * userblacklist: fix double "check_user_blacklist" in module documentation -- File Changes -- M src/modules/userblacklist/doc/userblacklist_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1989.patch https://github.com/kamailio/kamailio/pull/1989.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/1989

2 2

git:master:b465c6e5: Merge pull request #1986 from ionutionita92/rtpengine
by GitHub 22 Jun '19

22 Jun '19

Module: kamailio Branch: master Commit: b465c6e5d0f7583f17a06dde771595ae9e102549 URL: https://github.com/kamailio/kamailio/commit/b465c6e5d0f7583f17a06dde771595a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-06-22T16:40:50+02:00 Merge pull request #1986 from ionutionita92/rtpengine Extend rtpengine hashing algorithms --- Added: src/modules/crypto/api.c Added: src/modules/crypto/api.h Modified: src/modules/crypto/crypto_mod.c Modified: src/modules/crypto/crypto_uuid.c Modified: src/modules/crypto/crypto_uuid.h 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/b465c6e5d0f7583f17a06dde771595a… Patch: https://github.com/kamailio/kamailio/commit/b465c6e5d0f7583f17a06dde771595a…

1 0

git:master:aeec1c26: rtpengine: update README
by iionita 22 Jun '19

22 Jun '19

Module: kamailio Branch: master Commit: aeec1c2620c612bb54ffb4d3347f274e520db072 URL: https://github.com/kamailio/kamailio/commit/aeec1c2620c612bb54ffb4d3347f274… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: iionita <ionut-razvan.ionita(a)1and1.ro> Date: 2019-06-19T11:23:50+03:00 rtpengine: update README --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aeec1c2620c612bb54ffb4d3347f274… Patch: https://github.com/kamailio/kamailio/commit/aeec1c2620c612bb54ffb4d3347f274… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index a690d51469..9866f15fe0 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2008,6 +2008,31 @@ modparam("rtpengine", "control_cmd_tos", "144") </example> </section> + <section id="rtpengine.p.hash_algo"> + <title><varname>hash_algo</varname> (integer)</title> + <para> + Hashing algorithm to be used in node selection algorithm. Now there are 2 possibilities: legacy + alogrithm - 0(very basic hash over callid) or SHA1 - 1(apply sha1 over the callid and calculate hash). + </para> + <para> + Default value is 0, legacy algorithm. + </para> + <para> + The values not falling into the range <quote>0-1</quote> . + </para> + <example> + <title>Set <varname>control_cmd_tos</varname> parameter</title> +<programlisting format="linespecific"> +... +### use SHA1 instead of legacy algorithm +modparam("rtpengine", "hash_algo", "1") +... +</programlisting> + </example> + </section> + + + </section>

1 0

git:master:7b8f1489: rtpengine: add modparam to switch between legacy hashing algorithm and SHA1
by iionita 22 Jun '19

22 Jun '19

Module: kamailio Branch: master Commit: 7b8f14897106db305de9922b93dba2177155b6e6 URL: https://github.com/kamailio/kamailio/commit/7b8f14897106db305de9922b93dba21… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: iionita <ionut-razvan.ionita(a)1and1.ro> Date: 2019-06-07T18:26:27+03:00 rtpengine: add modparam to switch between legacy hashing algorithm and SHA1 --- Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/7b8f14897106db305de9922b93dba21… Patch: https://github.com/kamailio/kamailio/commit/7b8f14897106db305de9922b93dba21… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6af5742b19..fd9e01904e 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -290,6 +290,10 @@ static pv_spec_t *media_duration_pvar = NULL; char* force_send_ip_str=""; int force_send_ip_af = AF_UNSPEC; + + +static enum hash_algo_t hash_algo = RTP_HASH_CALLID; + typedef struct rtpp_set_link { struct rtpp_set *rset; pv_spec_t *rpv; @@ -443,6 +447,7 @@ static param_export_t params[] = { {"hash_table_size", INT_PARAM, &hash_table_size }, {"setid_default", INT_PARAM, &setid_default }, {"media_duration", PARAM_STR, &media_duration_pvar_str}, + {"hash_algo", INT_PARAM, &hash_algo}, /* MOS stats output */ /* global averages */ @@ -1724,9 +1729,11 @@ mod_init(void) return -1; } - if (load_crypto_api(&rtpengine_cb) != 0) { - LM_WARN("Crypto module not loaded! Won't use SHA1 hashing! Distribution " - "algorithm might not perform well under heavy load!\n"); + if (hash_algo == RTP_HASH_SHA1_CALLID) { + if (load_crypto_api(&rtpengine_cb) != 0) { + LM_ERR("Crypto module required in order to have SHA1 hashing!\n"); + return -1; + } } return 0; @@ -2912,13 +2919,27 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** str hash_data; - if (rtpengine_cb.SHA1 == NULL) { - hash_data = callid; - } else { - if (rtpengine_cb.SHA1(&callid, &hash_data) < 0) { - LM_ERR("SHA1 hash in crypto module failed!\n"); + switch (hash_algo) { + case RTP_HASH_CALLID: + hash_data = callid; + + break; + case RTP_HASH_SHA1_CALLID: + if (rtpengine_cb.SHA1 == NULL) { + /* don't throw warning here; there is already a warni*/ + LM_BUG("SHA1 algo set but crypto not loaded! Program shouldn't have started!"); + return NULL; + } + + if (rtpengine_cb.SHA1(&callid, &hash_data) < 0) { + LM_ERR("SHA1 hash in crypto module failed!\n"); + return NULL; + } + + break; + default: + LM_ERR("unknown hashing algo %d\n", hash_algo); return NULL; - } } /* XXX Use quick-and-dirty hashing algo */ @@ -2926,8 +2947,11 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** for(i = 0; i < hash_data.len; i++) sum += hash_data.s[i]; - /* FIXME this seems to affect the algorithm in a negative way */ - // sum &= 0xff; + /* FIXME this seems to affect the algorithm in a negative way + * legacy code uses it; disable it for other algos */ + if (hash_algo == RTP_HASH_CALLID) { + sum &= 0xff; + } retry: weight_sum = 0; diff --git a/src/modules/rtpengine/rtpengine.h b/src/modules/rtpengine/rtpengine.h index 8ec033fc1b..b5314c2c35 100644 --- a/src/modules/rtpengine/rtpengine.h +++ b/src/modules/rtpengine/rtpengine.h @@ -103,5 +103,6 @@ extern str rtpp_url_col; extern str rtpp_weight_col; extern str rtpp_disabled_col; +enum hash_algo_t { RTP_HASH_CALLID, RTP_HASH_SHA1_CALLID}; #endif

1 0

git:master:a508f1a3: rtpengine: use SHA1 over callid for better distribution among nodes
by iionita 22 Jun '19

22 Jun '19

Module: kamailio Branch: master Commit: a508f1a361094f9732bf0a0f18763ed9b7912a17 URL: https://github.com/kamailio/kamailio/commit/a508f1a361094f9732bf0a0f18763ed… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: iionita <ionut-razvan.ionita(a)1and1.ro> Date: 2019-03-29T11:13:01+02:00 rtpengine: use SHA1 over callid for better distribution among nodes --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a508f1a361094f9732bf0a0f18763ed… Patch: https://github.com/kamailio/kamailio/commit/a508f1a361094f9732bf0a0f18763ed… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 21f03775d6..6af5742b19 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -79,6 +79,7 @@ #include "../../core/kemi.h" #include "../../core/char_msg_val.h" #include "../../modules/tm/tm_load.h" +#include "../../modules/crypto/api.h" #include "rtpengine.h" #include "rtpengine_funcs.h" #include "rtpengine_hash.h" @@ -304,6 +305,7 @@ static struct minmax_mos_label_stats global_mos_stats, side_A_mos_stats, side_B_mos_stats; int got_any_mos_pvs; +struct crypto_binds rtpengine_cb; static cmd_export_t cmds[] = { @@ -1722,6 +1724,10 @@ mod_init(void) return -1; } + if (load_crypto_api(&rtpengine_cb) != 0) { + LM_WARN("Crypto module not loaded! Won't use SHA1 hashing! Distribution " + "algorithm might not perform well under heavy load!\n"); + } return 0; } @@ -2904,11 +2910,24 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** unsigned i, sum, sumcut, weight_sum; int was_forced = 0; + str hash_data; + + if (rtpengine_cb.SHA1 == NULL) { + hash_data = callid; + } else { + if (rtpengine_cb.SHA1(&callid, &hash_data) < 0) { + LM_ERR("SHA1 hash in crypto module failed!\n"); + return NULL; + } + } + /* XXX Use quick-and-dirty hashing algo */ sum = 0; - for(i = 0; i < callid.len; i++) - sum += callid.s[i]; - sum &= 0xff; + for(i = 0; i < hash_data.len; i++) + sum += hash_data.s[i]; + + /* FIXME this seems to affect the algorithm in a negative way */ + // sum &= 0xff; retry: weight_sum = 0; @@ -3914,12 +3933,12 @@ static int ki_rtpengine_delete(sip_msg_t *msg, str *flags) } static int ki_rtpengine_query0(sip_msg_t *msg) -{ +{ return rtpengine_rtpp_set_wrap(msg, rtpengine_query_wrap, NULL, 1, OP_ANY); } static int ki_rtpengine_query(sip_msg_t *msg, str *flags) -{ +{ return rtpengine_rtpp_set_wrap(msg, rtpengine_query_wrap, flags->s, 1, OP_ANY); }

1 0

git:master:e18c7442: crypto: add exportable API and expose SHA1 hashing function
by iionita 22 Jun '19

22 Jun '19

Module: kamailio Branch: master Commit: e18c74420c53d8e888400a7154d9a3f8b2f4b176 URL: https://github.com/kamailio/kamailio/commit/e18c74420c53d8e888400a7154d9a3f… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: iionita <ionut-razvan.ionita(a)1and1.ro> Date: 2019-03-28T17:25:38+02:00 crypto: add exportable API and expose SHA1 hashing function --- Added: src/modules/crypto/api.c Added: src/modules/crypto/api.h Modified: src/modules/crypto/crypto_mod.c Modified: src/modules/crypto/crypto_uuid.c Modified: src/modules/crypto/crypto_uuid.h --- Diff: https://github.com/kamailio/kamailio/commit/e18c74420c53d8e888400a7154d9a3f… Patch: https://github.com/kamailio/kamailio/commit/e18c74420c53d8e888400a7154d9a3f…

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2019