sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
427 discussions

git:master:7e447329: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: 7e447329d1a1281cdb84238dacdc5e045b9637d6 URL: https://github.com/kamailio/kamailio/commit/7e447329d1a1281cdb84238dacdc5e0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-04-29T11:31:26+02:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:e31516ec: presence: more functions exported to kemi framework
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: e31516ec061d19c83870044292d8e7c665e89c8e URL: https://github.com/kamailio/kamailio/commit/e31516ec061d19c83870044292d8e7c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T11:25:51+02:00 presence: more functions exported to kemi framework --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:7cccc82f: presence: documentation updates for pres_auth_status()
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: 7cccc82f1bdb8132d150f291158731b5c1aaa91e URL: https://github.com/kamailio/kamailio/commit/7cccc82f1bdb8132d150f291158731b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T11:21:35+02:00 presence: documentation updates for pres_auth_status() --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:750a3707: presence: use spve fixup for pres_auth_status()
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: 750a37076517c227af8fa1666229652e026b9b69 URL: https://github.com/kamailio/kamailio/commit/750a37076517c227af8fa1666229652… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T11:07:46+02:00 presence: use spve fixup for pres_auth_status() - flexibility to provide static string values or variable parameters --- Modified: src/modules/presence/presence.c --- Diff: … [View More] https://github.com/kamailio/kamailio/commit/750a37076517c227af8fa1666229652… Patch: https://github.com/kamailio/kamailio/commit/750a37076517c227af8fa1666229652… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 3b131ba..116c37f 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -185,7 +185,7 @@ static cmd_export_t cmds[]= {"handle_subscribe", (cmd_function)w_handle_subscribe, 1, fixup_subscribe, 0, REQUEST_ROUTE}, {"pres_auth_status", (cmd_function)w_pres_auth_status, 2, - fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE}, + fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE}, {"pres_refresh_watchers", (cmd_function)w_pres_refresh_watchers, 3, fixup_refresh_watchers, 0, ANY_ROUTE}, {"pres_refresh_watchers", (cmd_function)w_pres_refresh_watchers5,5, @@ -1406,52 +1406,33 @@ static int update_pw_dialogs(subs_t* subs, unsigned int hash_code, subs_t** subs return 0; } -static int w_pres_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2) +static int w_pres_auth_status(struct sip_msg *_msg, char *_sp1, char *_sp2) { - pv_spec_t *sp; - pv_value_t pv_val; str watcher_uri, presentity_uri; - sp = (pv_spec_t *)_sp1; + if(fixup_get_svalue(_msg, (gparam_t *)_sp1, &watcher_uri) != 0) { + LM_ERR("invalid watcher uri parameter"); + return -1; + } - if (sp && (pv_get_spec_value(_msg, sp, &pv_val) == 0)) { - if (pv_val.flags & PV_VAL_STR) { - watcher_uri = pv_val.rs; - if (watcher_uri.len == 0 || watcher_uri.s == NULL) { - LM_ERR("missing watcher uri\n"); - return -1; - } - } else { - LM_ERR("watcher pseudo variable value is not string\n"); - return -1; - } - } else { - LM_ERR("cannot get watcher pseudo variable value\n"); + if(fixup_get_svalue(_msg, (gparam_t *)_sp2, &presentity_uri) != 0) { + LM_ERR("invalid presentity uri parameter"); return -1; } - sp = (pv_spec_t *)_sp2; + if(watcher_uri.len == 0 || watcher_uri.s == NULL) { + LM_ERR("missing watcher uri\n"); + return -1; + } - if (sp && (pv_get_spec_value(_msg, sp, &pv_val) == 0)) { - if (pv_val.flags & PV_VAL_STR) { - presentity_uri = pv_val.rs; - if (presentity_uri.len == 0 || presentity_uri.s == NULL) { - LM_DBG("missing presentity uri\n"); - return -1; - } - } else { - LM_ERR("presentity pseudo variable value is not string\n"); - return -1; - } - } else { - LM_ERR("cannot get presentity pseudo variable value\n"); + if(presentity_uri.len == 0 || presentity_uri.s == NULL) { + LM_DBG("missing presentity uri\n"); return -1; } return pres_auth_status(_msg, watcher_uri, presentity_uri); } - int pres_auth_status(struct sip_msg* msg, str watcher_uri, str presentity_uri) { str event; [View Less]

1 0

git:master:eada34c7: tls: exported functions to kemi framework
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: eada34c70aeeab42c7e4ccd5a36601d7bf666c17 URL: https://github.com/kamailio/kamailio/commit/eada34c70aeeab42c7e4ccd5a36601d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T08:33:34+02:00 tls: exported functions to kemi framework --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eada34c70aeeab42c7e4ccd5a36601d… … [View More]Patch: https://github.com/kamailio/kamailio/commit/eada34c70aeeab42c7e4ccd5a36601d… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 0fd00eb..6c16c3b 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -40,6 +40,7 @@ #include "../../core/rpc_lookup.h" #include "../../core/cfg/cfg.h" #include "../../core/dprint.h" +#include "../../core/kemi.h" #include "tls_init.h" #include "tls_server.h" #include "tls_domain.h" @@ -77,7 +78,7 @@ static int mod_init(void); static int mod_child(int rank); static void destroy(void); -static int is_peer_verified(struct sip_msg* msg, char* foo, char* foo2); +static int w_is_peer_verified(struct sip_msg* msg, char* p1, char* p2); MODULE_VERSION @@ -166,7 +167,7 @@ int sr_tls_renegotiation = 0; * Exported functions */ static cmd_export_t cmds[] = { - {"is_peer_verified", (cmd_function)is_peer_verified, 0, 0, 0, + {"is_peer_verified", (cmd_function)w_is_peer_verified, 0, 0, 0, REQUEST_ROUTE}, {0,0,0,0,0,0} }; @@ -261,25 +262,6 @@ static tls_domains_cfg_t* tls_use_modparams(void) } #endif -int mod_register(char *path, int *dlflags, void *p1, void *p2) -{ - if (tls_disable) { - LOG(L_WARN, "tls support is disabled " - "(set enable_tls=1 in the config to enable it)\n"); - return 0; - } - - /* shm is used, be sure it is initialized */ - if(!shm_initialized() && init_shm()<0) - return -1; - - if(tls_pre_init()<0) - return -1; - - register_tls_hooks(&tls_h); - - return 0; -} static int mod_init(void) { @@ -403,7 +385,7 @@ static void destroy(void) } -static int is_peer_verified(struct sip_msg* msg, char* foo, char* foo2) +static int ki_is_peer_verified(sip_msg_t* msg) { struct tcp_connection *c; SSL *ssl; @@ -466,3 +448,47 @@ static int is_peer_verified(struct sip_msg* msg, char* foo, char* foo2) "...done\n"); return 1; } + +static int w_is_peer_verified(struct sip_msg* msg, char* foo, char* foo2) +{ + return ki_is_peer_verified(msg); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_tls_exports[] = { + { str_init("tls"), str_init("is_peer_verified"), + SR_KEMIP_INT, ki_is_peer_verified, + { 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) +{ + if (tls_disable) { + LOG(L_WARN, "tls support is disabled " + "(set enable_tls=1 in the config to enable it)\n"); + return 0; + } + + /* shm is used, be sure it is initialized */ + if(!shm_initialized() && init_shm()<0) + return -1; + + if(tls_pre_init()<0) + return -1; + + register_tls_hooks(&tls_h); + sr_kemi_modules_add(sr_kemi_tls_exports); + + return 0; +} \ No newline at end of file [View Less]

1 0

git:master:8201472d: pua_usrloc: exported functions to kemi framework
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: 8201472d2c1550dffa60e9b0c6548b8340740061 URL: https://github.com/kamailio/kamailio/commit/8201472d2c1550dffa60e9b0c6548b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T08:33:07+02:00 pua_usrloc: exported functions to kemi framework --- Modified: src/modules/pua_usrloc/pua_usrloc.c Modified: src/modules/pua_usrloc/pua_usrloc.h Modified: src/modules/… [View More]pua_usrloc/ul_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/8201472d2c1550dffa60e9b0c6548b8… Patch: https://github.com/kamailio/kamailio/commit/8201472d2c1550dffa60e9b0c6548b8… --- diff --git a/src/modules/pua_usrloc/pua_usrloc.c b/src/modules/pua_usrloc/pua_usrloc.c index b393ef2..66a1450 100644 --- a/src/modules/pua_usrloc/pua_usrloc.c +++ b/src/modules/pua_usrloc/pua_usrloc.c @@ -44,6 +44,7 @@ #include "../../core/str.h" #include "../../core/mem/mem.h" #include "../../core/pt.h" +#include "../../core/kemi.h" #include "../usrloc/usrloc_mod.h" #include "../usrloc/usrloc.h" #include "../usrloc/ul_callback.h" @@ -69,11 +70,9 @@ usrloc_api_t ul; static int mod_init(void); -int pua_set_publish(struct sip_msg* , char*, char*); - static cmd_export_t cmds[]= { - {"pua_set_publish", (cmd_function)pua_set_publish, 0, 0, 0, REQUEST_ROUTE}, + {"pua_set_publish", (cmd_function)w_pua_set_publish, 0, 0, 0, REQUEST_ROUTE}, {"bind_pua_usrloc", (cmd_function)bind_pua_usrloc, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -204,6 +203,30 @@ int bind_pua_usrloc(struct pua_usrloc_binds *pxb) return -1; } - pxb->pua_set_publish = pua_set_publish; + pxb->pua_set_publish = w_pua_set_publish; return 0; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_pua_usrloc_exports[] = { + { str_init("pua"), str_init("pua_set_publish"), + SR_KEMIP_INT, ki_pua_set_publish, + { 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_pua_usrloc_exports); + return 0; +} \ No newline at end of file diff --git a/src/modules/pua_usrloc/pua_usrloc.h b/src/modules/pua_usrloc/pua_usrloc.h index 89ceee5..93a918c 100644 --- a/src/modules/pua_usrloc/pua_usrloc.h +++ b/src/modules/pua_usrloc/pua_usrloc.h @@ -33,6 +33,8 @@ #include "../pua/pua_bind.h" void ul_publish(ucontact_t* c, int type, void* param); +int w_pua_set_publish(sip_msg_t*, char*, char*); +int ki_pua_set_publish(sip_msg_t*); int pua_unset_publish(struct sip_msg* msg, unsigned int flags, void* param); extern str pres_prefix; diff --git a/src/modules/pua_usrloc/ul_publish.c b/src/modules/pua_usrloc/ul_publish.c index 59417c2..14b318f 100644 --- a/src/modules/pua_usrloc/ul_publish.c +++ b/src/modules/pua_usrloc/ul_publish.c @@ -45,7 +45,7 @@ #include "pua_usrloc.h" #define BUF_LEN 256 -int pua_set_publish(struct sip_msg* msg , char* s1, char* s2) +int ki_pua_set_publish(sip_msg_t* msg) { LM_DBG("set send publish\n"); pua_ul_publish= 1; @@ -54,6 +54,11 @@ int pua_set_publish(struct sip_msg* msg , char* s1, char* s2) return 1; } +int w_pua_set_publish(struct sip_msg* msg , char* s1, char* s2) +{ + return ki_pua_set_publish(msg); +} + int pua_unset_publish(struct sip_msg* msg, unsigned int flags, void* param) { pua_ul_publish= 0; [View Less]

1 0

git:master:5b0449b5: pua: exported functions to kemi framework
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: 5b0449b583f722b070e59b0735e26aa16ca413ee URL: https://github.com/kamailio/kamailio/commit/5b0449b583f722b070e59b0735e26aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T08:32:21+02:00 pua: exported functions to kemi framework --- Modified: src/modules/pua/hash.c Modified: src/modules/pua/hash.h Modified: src/modules/pua/pua.c --- Diff: https://github.com/… [View More]kamailio/kamailio/commit/5b0449b583f722b070e59b0735e26aa… Patch: https://github.com/kamailio/kamailio/commit/5b0449b583f722b070e59b0735e26aa… --- diff --git a/src/modules/pua/hash.c b/src/modules/pua/hash.c index d364651..de818e5 100644 --- a/src/modules/pua/hash.c +++ b/src/modules/pua/hash.c @@ -504,7 +504,7 @@ int is_dialog(ua_pres_t* dialog) } -int update_contact(struct sip_msg* msg, char* str1, char* str2) +int ki_pua_update_contact(struct sip_msg* msg) { ua_pres_t* p, hentity; str contact; @@ -636,6 +636,11 @@ int update_contact(struct sip_msg* msg, char* str1, char* str2) return -1; } +int w_pua_update_contact(struct sip_msg* msg, char* str1, char* str2) +{ + return ki_pua_update_contact(msg); +} + list_entry_t *get_subs_list(str *did) { int i; diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h index b9a81b4..ee4c01f 100644 --- a/src/modules/pua/hash.h +++ b/src/modules/pua/hash.h @@ -178,6 +178,7 @@ static inline int get_event_flag(str* event) return -1; } -int update_contact(struct sip_msg* msg, char* str1, char* str2); +int w_pua_update_contact(struct sip_msg* msg, char* str1, char* str2); +int ki_pua_update_contact(struct sip_msg* msg); #endif diff --git a/src/modules/pua/pua.c b/src/modules/pua/pua.c index 360ba2d..e86c54d 100644 --- a/src/modules/pua/pua.c +++ b/src/modules/pua/pua.c @@ -36,6 +36,7 @@ #include "../../core/str.h" #include "../../core/mem/mem.h" #include "../../core/pt.h" +#include "../../core/kemi.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" #include "../../lib/srdb1/db.h" @@ -114,10 +115,10 @@ static int pua_rpc_init(void); static cmd_export_t cmds[]= { - {"bind_libxml_api", (cmd_function)bind_libxml_api, 1, 0, 0, 0}, - {"bind_pua", (cmd_function)bind_pua, 1, 0, 0, 0}, - {"pua_update_contact", (cmd_function)update_contact, 0, 0, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0} + {"pua_update_contact", (cmd_function)w_pua_update_contact, 0, 0, 0, REQUEST_ROUTE}, + {"bind_libxml_api", (cmd_function)bind_libxml_api, 1, 0, 0, 0}, + {"bind_pua", (cmd_function)bind_pua, 1, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} }; static param_export_t params[]={ @@ -1231,3 +1232,27 @@ static int pua_rpc_init(void) } return 0; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_pua_exports[] = { + { str_init("pua"), str_init("pua_update_contact"), + SR_KEMIP_INT, ki_pua_update_contact, + { 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_pua_exports); + return 0; +} \ No newline at end of file [View Less]

1 0

git:master:c5429ebe: presence_xml: exported functions to kemi framework
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: c5429ebe40b0e8dea71bca3fa348d61584bdac30 URL: https://github.com/kamailio/kamailio/commit/c5429ebe40b0e8dea71bca3fa348d61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T08:31:36+02:00 presence_xml: exported functions to kemi framework --- Modified: src/modules/presence_xml/presence_xml.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:da8690dd: presence: exported functions to kemi framework
by Daniel-Constantin Mierla 29 Apr '17

29 Apr '17

Module: kamailio Branch: master Commit: da8690ddce4bff65a251351a1df588e31b266c26 URL: https://github.com/kamailio/kamailio/commit/da8690ddce4bff65a251351a1df588e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-29T08:31:15+02:00 presence: exported functions to kemi framework --- Modified: src/modules/presence/bind_presence.c Modified: src/modules/presence/presence.c Modified: src/modules/presence/… [View More]

1 0

git:5.0:5738001c: topos: proper storing of b-side record routing
by Daniel-Constantin Mierla 28 Apr '17

28 Apr '17

Module: kamailio Branch: 5.0 Commit: 5738001c0f2ab2c1fd6bee9dbfdec5414fb9bce0 URL: https://github.com/kamailio/kamailio/commit/5738001c0f2ab2c1fd6bee9dbfdec54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T18:55:59+02:00 topos: proper storing of b-side record routing - special credits to Sergey Basov for troubleshooting (cherry picked from commit fec80f51a64ab102aca79c44d61c6c783b0baa46) --- … [View More]

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
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 2017