sr-dev May 2017

sr-dev@lists.kamailio.org

32 participants
298 discussions

[kamailio/kamailio] kazoo: backports & fixes (#1118)

by lazedo

lots of fixes needed for proper operation You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1118 -- Commit Summary -- * kazoo: backports & fixes -- File Changes -- M modules/kazoo/defs.h (13) M modules/kazoo/kazoo.c (51) M modules/kazoo/kz_amqp.c (995) M modules/kazoo/kz_amqp.h (85) M modules/kazoo/kz_hash.c (4) M modules/kazoo/kz_json.c (89) M modules/kazoo/kz_json.h (80) M modules/kazoo/kz_pua.c (593) M modules/kazoo/kz_pua.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1118.patch https://github.com/kamailio/kamailio/pull/1118.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/1118

7 years

git:4.4:548acd5f: kazoo: backports & fixes

by lazedo

Module: kamailio Branch: 4.4 Commit: 548acd5f024c655ac1bc8f8bc31b3fe9ce79ebaf URL: https://github.com/kamailio/kamailio/commit/548acd5f024c655ac1bc8f8bc31b3fe… Author: Luis Azedo <luis(a)2600hz.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T16:50:12+01:00 kazoo: backports & fixes --- Modified: modules/kazoo/defs.h Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c Modified: modules/kazoo/kz_amqp.h Modified: modules/kazoo/kz_json.c Modified: modules/kazoo/kz_json.h Modified: modules/kazoo/kz_pua.c Modified: modules/kazoo/kz_pua.h --- Diff: https://github.com/kamailio/kamailio/commit/548acd5f024c655ac1bc8f8bc31b3fe… Patch: https://github.com/kamailio/kamailio/commit/548acd5f024c655ac1bc8f8bc31b3fe…

7 years

git:master:e69579bc: rtpengine: Allow override of call_id, from/to tags

by Richard Fuchs

Module: kamailio Branch: master Commit: e69579bca5b0e08187481f228e621ece0d1b79d5 URL: https://github.com/kamailio/kamailio/commit/e69579bca5b0e08187481f228e621ec… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2017-05-04T11:48:35-04:00 rtpengine: Allow override of call_id, from/to tags closes #1103 --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e69579bca5b0e08187481f228e621ec… Patch: https://github.com/kamailio/kamailio/commit/e69579bca5b0e08187481f228e621ec…

7 years

[kamailio/kamailio] rtpengine: Delete flags & delete handling improvement (#1103)

by hdikme

-Extending rtpengine_delete() in order to enable specifying Call-ID, To-Tag and From-Tag for timed out dialogs. -Matching the calls to rtpengine machine correctly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1103 -- Commit Summary -- * rtpengine: Delete flags & delete handling improvement -- File Changes -- M src/modules/rtpengine/rtpengine.c (28) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1103.patch https://github.com/kamailio/kamailio/pull/1103.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/1103

7 years

git:master:c65f6393: kazoo: split exchange/queue declarations

by lazedo

Module: kamailio Branch: master Commit: c65f63934b294f39becc383f0482354c00fd9806 URL: https://github.com/kamailio/kamailio/commit/c65f63934b294f39becc383f0482354… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-04T15:53:17+01:00 kazoo: split exchange/queue declarations --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/c65f63934b294f39becc383f0482354… Patch: https://github.com/kamailio/kamailio/commit/c65f63934b294f39becc383f0482354… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 4664c25..f7fc8c1 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1848,8 +1848,17 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) routing = kz_amqp_routing_new(""); } - exchange = kz_amqp_exchange_from_json(&exchange_s, json_obj); - queue = kz_amqp_queue_from_json(&queue_s, json_obj); + tmpObj = kz_json_get_object(json_obj, "exchange-def"); + if(tmpObj == NULL) { + tmpObj = json_obj; + } + exchange = kz_amqp_exchange_from_json(&exchange_s, tmpObj); + + tmpObj = kz_json_get_object(json_obj, "queue-def"); + if(tmpObj == NULL) { + tmpObj = json_obj; + } + queue = kz_amqp_queue_from_json(&queue_s, tmpObj); kz_amqp_bind_ptr bind = kz_amqp_bind_alloc(exchange, exchange_binding, queue, routing, event_key, event_subkey); if(bind == NULL) {

7 years

questions about FL_RPL flag in dmq_usrloc

by 张顺通

In dmq_usrloc, a ucontact_t with FL_RPL flag will not send it's modify to other kamailio. For example, I have one edge and three kamailio(for register, name A B C). And First SIP REGISTER send to edge, and edge forward to register kamailio A, then kamailio B & C have FL_RPL flag, kamailio A do not have FL_RPL flag. In this situation, If kamailio A is crash, the second SIP REGISTER(same call-id and tag) forward to kamailio B, kamailio B will not replicate reg info to C, because kamailio B have FL_RPL flag. What is the suggestion in this case? Thanks

7 years

git:master:3ce13be0: auth: exported has_credentials() to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3ce13be06217e7d49a5e4362bf5cf6e53ec584ac URL: https://github.com/kamailio/kamailio/commit/3ce13be06217e7d49a5e4362bf5cf6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-04T07:31:41+02:00 auth: exported has_credentials() to kemi framework --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3ce13be06217e7d49a5e4362bf5cf6e… Patch: https://github.com/kamailio/kamailio/commit/3ce13be06217e7d49a5e4362bf5cf6e… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index cc66651..bdb0d7a 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -444,33 +444,40 @@ int w_consume_credentials(struct sip_msg* msg, char* s1, char* s2) /** * */ -int w_has_credentials(sip_msg_t *msg, char* realm, char* s2) +int ki_has_credentials(sip_msg_t *msg, str* srealm) { - str srealm = {0, 0}; hdr_field_t *hdr = NULL; int ret; - if (fixup_get_svalue(msg, (gparam_t*)realm, &srealm) < 0) { - LM_ERR("failed to get realm value\n"); - return -1; - } - - ret = find_credentials(msg, &srealm, HDR_PROXYAUTH_T, &hdr); + ret = find_credentials(msg, srealm, HDR_PROXYAUTH_T, &hdr); if(ret==0) { - LM_DBG("found www credentials with realm [%.*s]\n", srealm.len, srealm.s); + LM_DBG("found www credentials with realm [%.*s]\n", srealm->len, srealm->s); return 1; } - ret = find_credentials(msg, &srealm, HDR_AUTHORIZATION_T, &hdr); + ret = find_credentials(msg, srealm, HDR_AUTHORIZATION_T, &hdr); if(ret==0) { - LM_DBG("found proxy credentials with realm [%.*s]\n", srealm.len, srealm.s); + LM_DBG("found proxy credentials with realm [%.*s]\n", srealm->len, srealm->s); return 1; } - LM_DBG("no credentials with realm [%.*s]\n", srealm.len, srealm.s); + LM_DBG("no credentials with realm [%.*s]\n", srealm->len, srealm->s); return -1; } /** + * + */ +int w_has_credentials(sip_msg_t *msg, char* realm, char* s2) +{ + str srealm = {0, 0}; + + if (fixup_get_svalue(msg, (gparam_t*)realm, &srealm) < 0) { + LM_ERR("failed to get realm value\n"); + return -1; + } + return ki_has_credentials(msg, &srealm); +} +/** * @brief do WWW-Digest authentication with password taken from cfg var */ int pv_authenticate(struct sip_msg *msg, str *realm, str *passwd, @@ -1220,6 +1227,11 @@ static sr_kemi_t sr_kemi_auth_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth"), str_init("has_credentials"), + SR_KEMIP_INT, ki_has_credentials, + { SR_KEMIP_STR, 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 } } };

7 years

git:master:82794924: call_control: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 82794924a2368e671ebdfbc4156010e5d40ea699 URL: https://github.com/kamailio/kamailio/commit/82794924a2368e671ebdfbc4156010e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-04T07:31:01+02:00 call_control: exported functions to kemi framework --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/82794924a2368e671ebdfbc4156010e… Patch: https://github.com/kamailio/kamailio/commit/82794924a2368e671ebdfbc4156010e… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index 53b9464..a31892c 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -43,6 +43,7 @@ #include "../../core/script_cb.h" #include "../../core/parser/digest/digest.h" #include "../../core/parser/parse_from.h" +#include "../../core/kemi.h" #include "../dialog/dlg_load.h" #include "../dialog/dlg_hash.h" @@ -1031,8 +1032,7 @@ __dialog_loaded(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) // -2 - Locked // -3 - No provider // -5 - Internal error (message parsing, communication, ...) -static int -CallControl(struct sip_msg *msg, char *str1, char *str2) +static int ki_call_control(sip_msg_t *msg) { int result; @@ -1054,6 +1054,11 @@ CallControl(struct sip_msg *msg, char *str1, char *str2) return result; } +static int +CallControl(struct sip_msg *msg, char *str1, char *str2) +{ + return ki_call_control(msg); +} // Module management: initialization/destroy/function-parameter-fixing/... // @@ -1206,4 +1211,26 @@ postprocess_request(struct sip_msg *msg, unsigned int flags, void *_param) return 1; } +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_call_control_exports[] = { + { str_init("call_control"), str_init("call_control"), + SR_KEMIP_INT, ki_call_control, + { 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 */ +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_call_control_exports); + return 0; +} \ No newline at end of file

7 years

git:5.0:d69c9ce3: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.0 Commit: d69c9ce30f0f8b50f4b0d308df14f5994e3d2fbe URL: https://github.com/kamailio/kamailio/commit/d69c9ce30f0f8b50f4b0d308df14f59… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-03T14:31:13+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/auth_ephemeral/README --- Diff: https://github.com/kamailio/kamailio/commit/d69c9ce30f0f8b50f4b0d308df14f59… Patch: https://github.com/kamailio/kamailio/commit/d69c9ce30f0f8b50f4b0d308df14f59… --- diff --git a/src/modules/auth_ephemeral/README b/src/modules/auth_ephemeral/README index 88a4af9..72b8c6d 100644 --- a/src/modules/auth_ephemeral/README +++ b/src/modules/auth_ephemeral/README @@ -228,7 +228,8 @@ modparam("auth_ephemeral", "username_format", 0) * 0 - SHA1 (default, as per IETF/RFC) * 1 - SHA256 - * 2 - SHA512 + * 2 - SHA384 + * 3 - SHA512 Example 1.5. sha_algorithm parameter usage ...

7 years

git:5.0:5f82475f: auth_ephemeral: Some more safety checks, added SHA384 as an option

by Carsten Bock

Module: kamailio Branch: 5.0 Commit: 5f82475f12baf669ec92e39442206c32d066f081 URL: https://github.com/kamailio/kamailio/commit/5f82475f12baf669ec92e39442206c3… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-05-03T14:16:34+02:00 auth_ephemeral: Some more safety checks, added SHA384 as an option --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.h Modified: src/modules/auth_ephemeral/authorize.c Modified: src/modules/auth_ephemeral/doc/auth_ephemeral_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5f82475f12baf669ec92e39442206c3… Patch: https://github.com/kamailio/kamailio/commit/5f82475f12baf669ec92e39442206c3…

7 years

← Newer
1
...
22
23
24
25
26
27
28
29
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2017