sr-dev April 2016

sr-dev@lists.kamailio.org

23 participants
430 discussions

Next Kamailio IRC Devel Meeting, Apr 20, 2016
by Daniel-Constantin Mierla 21 Apr '16

21 Apr '16

Hello, I am proposing a new IRC meeting to discuss the current major issues and the plans for next Kamailio release, on Wednesday, April 20, 2016, with alternative for next day, April 21. If many developers are not available, we can postpone it to another date in the near future (make proposals if that is the case for you). I created a wiki page for it: * https://www.kamailio.org/wiki/devel/irc-meetings/2016a Add there the topics that you want to be discussed. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, Berlin, May 18-20, 2016 - http://www.kamailioworld.com

1 3

git:master:9e331d3f: app_python: kemi handler extensions for 3 and 4 parameters
by Daniel-Constantin Mierla 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 9e331d3f2efa53bbb5831856e21776accb6929bc URL: https://github.com/kamailio/kamailio/commit/9e331d3f2efa53bbb5831856e21776a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-21T15:42:03+02:00 app_python: kemi handler extensions for 3 and 4 parameters --- Modified: modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/9e331d3f2efa53bbb5831856e21776a… Patch: https://github.com/kamailio/kamailio/commit/9e331d3f2efa53bbb5831856e21776a…

1 0

git:master:0b70cc0b: app_lua: extended kemi handler to deal with str-str-int-int params
by Daniel-Constantin Mierla 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 0b70cc0be34fe8cbc4f5335a87131ca21e5491c8 URL: https://github.com/kamailio/kamailio/commit/0b70cc0be34fe8cbc4f5335a87131ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-21T15:41:25+02:00 app_lua: extended kemi handler to deal with str-str-int-int params --- Modified: modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/0b70cc0be34fe8cbc4f5335a87131ca… Patch: https://github.com/kamailio/kamailio/commit/0b70cc0be34fe8cbc4f5335a87131ca… --- diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 256c3b0..a869c52 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -1630,6 +1630,13 @@ int sr_kemi_exec_func(lua_State* L, str *mname, int midx, str *fname) ret = ((sr_kemi_fmssss_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_return(L, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + || ket->ptypes[1]==SR_KEMIP_STR + || ket->ptypes[2]==SR_KEMIP_INT + || ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmssnn_f)(ket->func))(env_L->msg, + &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); + return sr_kemi_return(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s);

1 0

git:master:be167518: core: kemi - prototype for embedded functions with str-str-int-int params
by Daniel-Constantin Mierla 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: be1675185c6b6b18133ac928155ec8559a050bbb URL: https://github.com/kamailio/kamailio/commit/be1675185c6b6b18133ac928155ec85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-21T15:37:52+02:00 core: kemi - prototype for embedded functions with str-str-int-int params --- Modified: kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/be1675185c6b6b18133ac928155ec85… Patch: https://github.com/kamailio/kamailio/commit/be1675185c6b6b18133ac928155ec85… --- diff --git a/kemi.h b/kemi.h index bd3c19d..c1380d5 100644 --- a/kemi.h +++ b/kemi.h @@ -84,6 +84,7 @@ typedef int (*sr_kemi_fmssn_f)(sip_msg_t*, str*, str*, int); typedef int (*sr_kemi_fmsss_f)(sip_msg_t*, str*, str*, str*); typedef int (*sr_kemi_fmssss_f)(sip_msg_t*, str*, str*, str*, str*); +typedef int (*sr_kemi_fmssnn_f)(sip_msg_t*, str*, str*, int, int); typedef int (*sr_kemi_fmsssss_f)(sip_msg_t*, str*, str*, str*, str*, str*); typedef int (*sr_kemi_fmssssss_f)(sip_msg_t*, str*, str*, str*, str*, str*, str*);

1 0

git:master:6b0ea231: auth: exported some functions to kemi
by Daniel-Constantin Mierla 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 6b0ea23166dd567c162b3152167da445f8bd555d URL: https://github.com/kamailio/kamailio/commit/6b0ea23166dd567c162b3152167da44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-21T15:09:07+02:00 auth: exported some functions to kemi - consume_credentials() - auth_challenge(...) - pv_auth_check(...) --- Modified: modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6b0ea23166dd567c162b3152167da44… Patch: https://github.com/kamailio/kamailio/commit/6b0ea23166dd567c162b3152167da44… --- diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c index bb029fc..c4c9619 100644 --- a/modules/auth/auth_mod.c +++ b/modules/auth/auth_mod.c @@ -39,6 +39,7 @@ #include "../../pvapi.h" #include "../../lvalue.h" #include "../../mod_fix.h" +#include "../../kemi.h" #include "../../modules/sl/sl.h" #include "auth_mod.h" #include "challenge.h" @@ -1171,3 +1172,35 @@ static int fixup_auth_get_www_authenticate(void **param, int param_no) } return 0; } + +/** + * + */ +static sr_kemi_t sr_kemi_auth_exports[] = { + { str_init("auth"), str_init("consume_credentials"), + SR_KEMIP_INT, consume_credentials, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("auth"), str_init("auth_challenge"), + SR_KEMIP_INT, auth_challenge, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("auth"), str_init("pv_auth_check"), + SR_KEMIP_INT, pv_auth_check, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_auth_exports); + return 0; +}

1 0

git:master:8c6f6724: app_lua: update existing code for changes inside auth module
by Daniel-Constantin Mierla 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 8c6f6724a45f496a694882b60fe5cc4516f9e8b6 URL: https://github.com/kamailio/kamailio/commit/8c6f6724a45f496a694882b60fe5cc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-21T14:57:27+02:00 app_lua: update existing code for changes inside auth module --- Modified: modules/app_lua/app_lua_exp.c --- Diff: https://github.com/kamailio/kamailio/commit/8c6f6724a45f496a694882b60fe5cc4… Patch: https://github.com/kamailio/kamailio/commit/8c6f6724a45f496a694882b60fe5cc4… --- diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index ae2c8cd..7da5207 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -1102,7 +1102,7 @@ static const luaL_Reg _sr_rr_Map [] = { }; -static int lua_sr_auth_challenge(lua_State *L, int hftype) +static int lua_sr_auth_challenge_hftype(lua_State *L, int hftype) { int ret; str realm = {0, 0}; @@ -1134,7 +1134,7 @@ static int lua_sr_auth_challenge(lua_State *L, int hftype) return app_lua_return_error(L); } realm.len = strlen(realm.s); - ret = _lua_authb.auth_challenge(env_L->msg, &realm, flags, hftype); + ret = _lua_authb.auth_challenge_hftype(env_L->msg, &realm, flags, hftype); return app_lua_return_int(L, ret); } @@ -1144,7 +1144,7 @@ static int lua_sr_auth_challenge(lua_State *L, int hftype) */ static int lua_sr_auth_www_challenge(lua_State *L) { - return lua_sr_auth_challenge(L, HDR_AUTHORIZATION_T); + return lua_sr_auth_challenge_hftype(L, HDR_AUTHORIZATION_T); } /** @@ -1152,7 +1152,7 @@ static int lua_sr_auth_www_challenge(lua_State *L) */ static int lua_sr_auth_proxy_challenge(lua_State *L) { - return lua_sr_auth_challenge(L, HDR_PROXYAUTH_T); + return lua_sr_auth_challenge_hftype(L, HDR_PROXYAUTH_T); } /**

1 0

git:master:019637af: auth: restructuring of code for auth_challenge()
by Daniel-Constantin Mierla 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 019637af117eeab4b0b06e73ac6808b0e42fe760 URL: https://github.com/kamailio/kamailio/commit/019637af117eeab4b0b06e73ac6808b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-21T14:56:56+02:00 auth: restructuring of code for auth_challenge() - split code specific for config and internal API --- Modified: modules/auth/api.c Modified: modules/auth/api.h Modified: modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/019637af117eeab4b0b06e73ac6808b… Patch: https://github.com/kamailio/kamailio/commit/019637af117eeab4b0b06e73ac6808b… --- diff --git a/modules/auth/api.c b/modules/auth/api.c index 0eb438f..d31b099 100644 --- a/modules/auth/api.c +++ b/modules/auth/api.c @@ -226,7 +226,7 @@ int bind_auth_s(auth_api_s_t* api) api->calc_HA1 = calc_HA1; api->calc_response = calc_response; api->check_response = auth_check_response; - api->auth_challenge = auth_challenge; + api->auth_challenge_hftype = auth_challenge_hftype; api->pv_authenticate = pv_authenticate; api->consume_credentials = consume_credentials; return 0; diff --git a/modules/auth/api.h b/modules/auth/api.h index ff8a124..f612923 100644 --- a/modules/auth/api.h +++ b/modules/auth/api.h @@ -105,9 +105,9 @@ auth_result_t post_auth(struct sip_msg* msg, struct hdr_field* hdr); typedef int (*check_response_t)(dig_cred_t* cred, str* method, char* ha1); int auth_check_response(dig_cred_t* cred, str* method, char* ha1); -typedef int (*auth_challenge_f)(struct sip_msg *msg, str *realm, int flags, +typedef int (*auth_challenge_hftype_f)(struct sip_msg *msg, str *realm, int flags, int hftype); -int auth_challenge(struct sip_msg *msg, str *realm, int flags, +int auth_challenge_hftype(struct sip_msg *msg, str *realm, int flags, int hftype); typedef int (*pv_authenticate_f)(struct sip_msg *msg, str *realm, str *passwd, @@ -129,7 +129,7 @@ typedef struct auth_api_s { calc_HA1_t calc_HA1; calc_response_t calc_response; check_response_t check_response; - auth_challenge_f auth_challenge; + auth_challenge_hftype_f auth_challenge_hftype; pv_authenticate_f pv_authenticate; consume_credentials_f consume_credentials; } auth_api_s_t; diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c index 9349b50..bb029fc 100644 --- a/modules/auth/auth_mod.c +++ b/modules/auth/auth_mod.c @@ -942,7 +942,7 @@ int auth_challenge_helper(struct sip_msg *msg, str *realm, int flags, int hftype /** * */ -int auth_challenge(struct sip_msg *msg, str *realm, int flags, int hftype) +int auth_challenge_hftype(struct sip_msg *msg, str *realm, int flags, int hftype) { return auth_challenge_helper(msg, realm, flags, hftype, NULL); } @@ -950,6 +950,23 @@ int auth_challenge(struct sip_msg *msg, str *realm, int flags, int hftype) /** * */ +int auth_challenge(sip_msg_t *msg, str *realm, int flags) +{ + int htype; + + if(msg==NULL) return -1; + + if(msg->REQ_METHOD==METHOD_REGISTER) + htype = HDR_AUTHORIZATION_T; + else + htype = HDR_PROXYAUTH_T; + + return auth_challenge_helper(msg, realm, flags, htype, NULL); +} + +/** + * + */ static int proxy_challenge(struct sip_msg *msg, char* realm, char *flags) { int vflags = 0; @@ -970,7 +987,7 @@ static int proxy_challenge(struct sip_msg *msg, char* realm, char *flags) goto error; } - return auth_challenge(msg, &srealm, vflags, HDR_PROXYAUTH_T); + return auth_challenge_hftype(msg, &srealm, vflags, HDR_PROXYAUTH_T); error: if(!(vflags&4)) { @@ -1003,7 +1020,7 @@ static int www_challenge(struct sip_msg *msg, char* realm, char *flags) goto error; } - return auth_challenge(msg, &srealm, vflags, HDR_AUTHORIZATION_T); + return auth_challenge_hftype(msg, &srealm, vflags, HDR_AUTHORIZATION_T); error: if(!(vflags&4)) { @@ -1041,9 +1058,9 @@ static int w_auth_challenge(struct sip_msg *msg, char* realm, char *flags) } if(msg->REQ_METHOD==METHOD_REGISTER) - return auth_challenge(msg, &srealm, vflags, HDR_AUTHORIZATION_T); + return auth_challenge_hftype(msg, &srealm, vflags, HDR_AUTHORIZATION_T); else - return auth_challenge(msg, &srealm, vflags, HDR_PROXYAUTH_T); + return auth_challenge_hftype(msg, &srealm, vflags, HDR_PROXYAUTH_T); error: if(!(vflags&4)) {

1 0

git:master:4298b94f: auth: split pv_auth_check() to in wrapper for config ops and common function
by Daniel-Constantin Mierla 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 4298b94f80721b1a7161d19f0c0030f5aaf6f4f0 URL: https://github.com/kamailio/kamailio/commit/4298b94f80721b1a7161d19f0c0030f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-21T14:41:16+02:00 auth: split pv_auth_check() to in wrapper for config ops and common function --- Modified: modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4298b94f80721b1a7161d19f0c0030f… Patch: https://github.com/kamailio/kamailio/commit/4298b94f80721b1a7161d19f0c0030f…

1 0

git:master:c4b6428c: auth: coherent indentation and white spacing
by Daniel-Constantin Mierla 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: c4b6428ce71e6d1b18ba2ea6b99c369864b56710 URL: https://github.com/kamailio/kamailio/commit/c4b6428ce71e6d1b18ba2ea6b99c369… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-21T13:25:33+02:00 auth: coherent indentation and white spacing --- Modified: modules/auth/api.c Modified: modules/auth/api.h Modified: modules/auth/auth_mod.c Modified: modules/auth/auth_mod.h Modified: modules/auth/challenge.c Modified: modules/auth/challenge.h Modified: modules/auth/nc.c Modified: modules/auth/nc.h Modified: modules/auth/nid.c Modified: modules/auth/nid.h Modified: modules/auth/nonce.c Modified: modules/auth/nonce.h Modified: modules/auth/ot_nonce.c Modified: modules/auth/ot_nonce.h Modified: modules/auth/rfc2617.c Modified: modules/auth/rfc2617.h --- Diff: https://github.com/kamailio/kamailio/commit/c4b6428ce71e6d1b18ba2ea6b99c369… Patch: https://github.com/kamailio/kamailio/commit/c4b6428ce71e6d1b18ba2ea6b99c369…

1 0

Dispatcher id's question
by Alekzander Spiridonov 21 Apr '16

21 Apr '16

Hi list, I was wondering if any work is in progress making dispatcher operate with non-numeric pool id's? Plans or todo's? Or may be some successor to replace dispatcher? -- Best regards, Alekzander Spiridonov

3 6

← Newer
1
...
15
16
17
18
19
20
21
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2016