sr-dev April 2018

sr-dev@lists.kamailio.org

19 participants
256 discussions

git:master:6f79e7cc: modules: readme files regenerated - acc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 6f79e7ccf985ea06e9f50862b59ef7e5b535fe54 URL: https://github.com/kamailio/kamailio/commit/6f79e7ccf985ea06e9f50862b59ef7e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-03T21:46:45+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/app_perl/README Modified: src/modules/cdp/README Modified: src/modules/cdp_avp/README Modified: src/modules/dialog/README Modified: src/modules/dispatcher/README Modified: src/modules/ims_dialog/README Modified: src/modules/ims_registrar_scscf/README Modified: src/modules/ims_usrloc_pcscf/README Modified: src/modules/nathelper/README Modified: src/modules/registrar/README Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README Modified: src/modules/snmpstats/README --- Diff: https://github.com/kamailio/kamailio/commit/6f79e7ccf985ea06e9f50862b59ef7e… Patch: https://github.com/kamailio/kamailio/commit/6f79e7ccf985ea06e9f50862b59ef7e…

6 years, 8 months

git:master:049dbce5: modules doc FAQ: change private contact to include only security issues

by Henning Westerholt

Module: kamailio Branch: master Commit: 049dbce568eafe985539675a935f0a46a128ea5f URL: https://github.com/kamailio/kamailio/commit/049dbce568eafe985539675a935f0a4… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-03T21:37:15+02:00 modules doc FAQ: change private contact to include only security issues --- Modified: src/modules/acc/doc/acc_faq.xml Modified: src/modules/app_perl/doc/app_perl_faq.xml Modified: src/modules/cdp/doc/cdp_faq.xml Modified: src/modules/cdp_avp/doc/cdp_avp_faq.xml Modified: src/modules/dialog/doc/dialog_faq.xml Modified: src/modules/dispatcher/doc/dispatcher_faq.xml Modified: src/modules/ims_dialog/doc/ims_dialog_faq.xml Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_faq.xml Modified: src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_faq.xml Modified: src/modules/nathelper/doc/nathelper_faq.xml Modified: src/modules/registrar/doc/registrar_faq.xml Modified: src/modules/rtpengine/doc/rtpengine_faq.xml Modified: src/modules/rtpproxy/doc/rtpproxy_faq.xml Modified: src/modules/snmpstats/doc/snmpstats_faq.xml --- Diff: https://github.com/kamailio/kamailio/commit/049dbce568eafe985539675a935f0a4… Patch: https://github.com/kamailio/kamailio/commit/049dbce568eafe985539675a935f0a4…

6 years, 8 months

git:master:1af3caf4: core: removed invalid lock release introduced by commit f775e4000e

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1af3caf427d3268fe7caa8d8dbd4ff2f6f3ec59d URL: https://github.com/kamailio/kamailio/commit/1af3caf427d3268fe7caa8d8dbd4ff2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-03T18:03:55+02:00 core: removed invalid lock release introduced by commit f775e4000e --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/1af3caf427d3268fe7caa8d8dbd4ff2… Patch: https://github.com/kamailio/kamailio/commit/1af3caf427d3268fe7caa8d8dbd4ff2… --- diff --git a/src/core/receive.c b/src/core/receive.c index 27d4bd9986..2b8b2c7f56 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -395,11 +395,10 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) rec_lock_set_get(ksr_route_locks_set, cidlockidx); ret = keng->froute(msg, CORE_ONREPLY_ROUTE, NULL, NULL); rec_lock_set_release(ksr_route_locks_set, cidlockidx); - sr_kemi_act_ctx_set(bctx); } else { ret = keng->froute(msg, CORE_ONREPLY_ROUTE, NULL, NULL); - rec_lock_set_release(ksr_route_locks_set, cidlockidx); } + sr_kemi_act_ctx_set(bctx); } else { if(unlikely(cidlockset)) { rec_lock_set_get(ksr_route_locks_set, cidlockidx);

6 years, 8 months

git:master:4c4a8e3f: app_sqlang: updated to use kemi api sr_kemi_core_set_drop()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4c4a8e3fcf4492b9acc87ff47df63b7ab0b35429 URL: https://github.com/kamailio/kamailio/commit/4c4a8e3fcf4492b9acc87ff47df63b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-03T10:12:03+02:00 app_sqlang: updated to use kemi api sr_kemi_core_set_drop() --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/4c4a8e3fcf4492b9acc87ff47df63b7… Patch: https://github.com/kamailio/kamailio/commit/4c4a8e3fcf4492b9acc87ff47df63b7… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index f41e665358..624e13908f 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -538,7 +538,7 @@ static SQInteger sqlang_sr_drop (HSQUIRRELVM J) } else { _sr_J_env.J_exit = 1; } - sr_kemi_core_drop(NULL); + sr_kemi_core_set_drop(NULL); return sq_throwerror(J, _SC("~~ksr~exit~~")); }

6 years, 8 months

git:master:42f53e1c: app_lua: updated to use kemi api sr_kemi_core_set_drop()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 42f53e1ca7b0a5e246d470f7cf0b26aeca9b9c2a URL: https://github.com/kamailio/kamailio/commit/42f53e1ca7b0a5e246d470f7cf0b26a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-03T10:11:51+02:00 app_lua: updated to use kemi api sr_kemi_core_set_drop() --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/42f53e1ca7b0a5e246d470f7cf0b26a… Patch: https://github.com/kamailio/kamailio/commit/42f53e1ca7b0a5e246d470f7cf0b26a… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 72d2eb0ddf..f6155dc741 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1769,7 +1769,7 @@ static int sr_kemi_lua_drop (lua_State *L) str *s; LM_DBG("script drop call\n"); - sr_kemi_core_drop(NULL); + sr_kemi_core_set_drop(NULL); s = sr_kemi_lua_exit_string_get(); lua_getglobal(L, "error"); lua_pushstring(L, s->s);

6 years, 8 months

git:master:84bf4ccb: app_jsdt: updated to use kemi api sr_kemi_core_set_drop()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 84bf4ccbbaef10718853453c577202b241101684 URL: https://github.com/kamailio/kamailio/commit/84bf4ccbbaef10718853453c577202b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-03T10:11:08+02:00 app_jsdt: updated to use kemi api sr_kemi_core_set_drop() --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/84bf4ccbbaef10718853453c577202b… Patch: https://github.com/kamailio/kamailio/commit/84bf4ccbbaef10718853453c577202b… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 0657507f12..8f4f3de18c 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -413,7 +413,7 @@ static int jsdt_sr_exit (duk_context *J) */ static int jsdt_sr_drop (duk_context *J) { - sr_kemi_core_drop(NULL); + sr_kemi_core_set_drop(NULL); duk_eval_string_noresult(J, JSDT_SR_EXIT_EXEC_STR); return 0; }

6 years, 8 months

git:master:f5be7179: core: kemi - renamed drop prototype to sr_kemi_core_set_drop()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f5be717996b6e3ad6c9d98f1d856e48414faa405 URL: https://github.com/kamailio/kamailio/commit/f5be717996b6e3ad6c9d98f1d856e48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-03T10:08:51+02:00 core: kemi - renamed drop prototype to sr_kemi_core_set_drop() - match the implementation after kemi API update for drop --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/f5be717996b6e3ad6c9d98f1d856e48… Patch: https://github.com/kamailio/kamailio/commit/f5be717996b6e3ad6c9d98f1d856e48… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index db8595977d..d19e094c63 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -128,6 +128,6 @@ run_act_ctx_t* sr_kemi_act_ctx_get(void); str *sr_kemi_param_map_get_name(int ptype); str *sr_kemi_param_map_get_params(int *ptypes); -int sr_kemi_core_drop(sip_msg_t *msg); +int sr_kemi_core_set_drop(sip_msg_t *msg); #endif

6 years, 8 months

git:master:a5dd60c8: ipops: mask subnet address for ipv6 comparison

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a5dd60c8d7e04731f12108838a3c82149e04ef9c URL: https://github.com/kamailio/kamailio/commit/a5dd60c8d7e04731f12108838a3c821… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-03T09:27:19+02:00 ipops: mask subnet address for ipv6 comparison - coherent with ipv4 behaviour --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a5dd60c8d7e04731f12108838a3c821… Patch: https://github.com/kamailio/kamailio/commit/a5dd60c8d7e04731f12108838a3c821… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index e2a25f38f9..262f4a8494 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -415,6 +415,7 @@ int _ip_is_in_subnet_v6(struct in6_addr *ip, char *net, size_t netlen, else ipv6_mask[i] = 0x00; } for (i=0; i<16; i++) ip->s6_addr[i] &= ipv6_mask[i]; + for (i=0; i<16; i++) net_addr.s6_addr[i] &= ipv6_mask[i]; if (memcmp(ip->s6_addr, net_addr.s6_addr, sizeof(net_addr.s6_addr)) == 0) return 1; return 0;

6 years, 8 months

git:master:162c304d: ipops: use proper variable for ipv6 subnet comparison

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 162c304d1264044ac1a46a379b75bafb4c91bcfd URL: https://github.com/kamailio/kamailio/commit/162c304d1264044ac1a46a379b75baf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-03T09:24:11+02:00 ipops: use proper variable for ipv6 subnet comparison --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/162c304d1264044ac1a46a379b75baf… Patch: https://github.com/kamailio/kamailio/commit/162c304d1264044ac1a46a379b75baf… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index dd783180a6..e2a25f38f9 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -415,7 +415,7 @@ int _ip_is_in_subnet_v6(struct in6_addr *ip, char *net, size_t netlen, else ipv6_mask[i] = 0x00; } for (i=0; i<16; i++) ip->s6_addr[i] &= ipv6_mask[i]; - if (memcmp(ip->s6_addr, ip->s6_addr, sizeof(net_addr.s6_addr)) == 0) + if (memcmp(ip->s6_addr, net_addr.s6_addr, sizeof(net_addr.s6_addr)) == 0) return 1; return 0; }

6 years, 8 months

[kamailio/kamailio] IPOPS is_in_subnet function doesn't match host address in cidr notation (#1250)

by kbdfck

### Description is_in_subnet function requires subnet param to be network address and fails for host address in cidr notation despite it is contained in corresponding subnet. For example, is_in_subnet("1.2.3.2", "1.2.3.0/30") returns true but is_in_subnet("1.2.3.2", "1.2.3.2/30") returns false, although 1.2.3.2 is present in 1.2.3.2/30 and 1.2.3.2 is allowed IP of 1.2.3.0/30 Of course, "1.2.3.2/30" this is not actually a subnet specification and rather is IP in CIDR notation, but sometimes it is required to check if some IP matches specified IP with CIDR. ### Possible Solutions It would be cool if is_in_subnet take such cases as matches. I think this should not break anything, because host IP and CIDR always define network containing specified host. Another solution would be separate function with more relaxed behavior... This happens on Kamailio 5.1 devel. -- 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/1250

6 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2018