sr-dev May 2017

sr-dev@lists.kamailio.org

32 participants
298 discussions

git:master:857800a3: pdt: exported functions to kemi interface
by Daniel-Constantin Mierla 28 May '17

28 May '17

Module: kamailio Branch: master Commit: 857800a368c6bb70b5ec057c89ffca7c30556c43 URL: https://github.com/kamailio/kamailio/commit/857800a368c6bb70b5ec057c89ffca7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-28T11:42:04+02:00 pdt: exported functions to kemi interface --- Modified: src/modules/pdt/pdt.c --- Diff: https://github.com/kamailio/kamailio/commit/857800a368c6bb70b5ec057c89ffca7… Patch: https://github.com/kamailio/kamailio/commit/857800a368c6bb70b5ec057c89ffca7… --- diff --git a/src/modules/pdt/pdt.c b/src/modules/pdt/pdt.c index b8d72fe45c..6505d8a3d5 100644 --- a/src/modules/pdt/pdt.c +++ b/src/modules/pdt/pdt.c @@ -44,6 +44,7 @@ #include "../../core/parser/parse_from.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" +#include "../../core/kemi.h" #include "pdtree.h" @@ -304,36 +305,22 @@ static int w_prefix2domain_1(struct sip_msg* msg, char* mode, char* str2) return pd_translate(msg, &sdall, md, 0); } -static int w_prefix2domain_2(struct sip_msg* msg, char* mode, char* sdm) +static int ki_prefix2domain(sip_msg_t* msg, int m, int s) { - int m, s, f; + int f; str sdomain={"*",1}; sip_uri_t *furi; - if(fixup_get_ivalue(msg, (gparam_p)mode, &m)!=0) - { - LM_ERR("no mode value\n"); - return -1; - } - if(m!=1 && m!=2) m = 0; - if(fixup_get_ivalue(msg, (gparam_p)sdm, &s)!=0) - { - LM_ERR("no multi-domain mode value\n"); - return -1; - } - if(s!=1 && s!=2) s = 0; f = 0; - if(s==1 || s==2) - { + if(s==1 || s==2) { /* take the domain from FROM uri as sdomain */ - if((furi = parse_from_uri(msg))==NULL) - { + if((furi = parse_from_uri(msg))==NULL) { LM_ERR("cannot parse FROM header URI\n"); return -1; } @@ -344,6 +331,24 @@ static int w_prefix2domain_2(struct sip_msg* msg, char* mode, char* sdm) return pd_translate(msg, &sdomain, m, f); } +static int w_prefix2domain_2(struct sip_msg* msg, char* mode, char* sdm) +{ + int m, s; + + if(fixup_get_ivalue(msg, (gparam_p)mode, &m)!=0) + { + LM_ERR("no mode value\n"); + return -1; + } + + if(fixup_get_ivalue(msg, (gparam_p)sdm, &s)!=0) + { + LM_ERR("no multi-domain mode value\n"); + return -1; + } + return ki_prefix2domain(msg, m, s); +} + /** * @brief change the r-uri domain based on source domain and prefix * @@ -477,6 +482,17 @@ static int w_pd_translate(sip_msg_t* msg, char* sdomain, char* mode) } /** + * + */ +static int ki_pd_translate(sip_msg_t* msg, str* sd, int md) +{ + if(md!=1 && md!=2) + return pd_translate(msg, sd, 0, 0);; + + return pd_translate(msg, sd, md, 0); +} + +/** * change the uri according to update mode */ static int update_new_uri(struct sip_msg *msg, int plen, str *d, int mode) @@ -901,3 +917,32 @@ static int pdt_init_rpc(void) } return 0; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_pdt_exports[] = { + { str_init("pdt"), str_init("pd_translate"), + SR_KEMIP_INT, ki_pd_translate, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pdt"), str_init("pprefix2domain"), + SR_KEMIP_INT, ki_prefix2domain, + { SR_KEMIP_INT, SR_KEMIP_INT, 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_pdt_exports); + return 0; +} \ No newline at end of file

1 0

git:master:c218e359: pipelimit: exported functions to kemi framework
by Daniel-Constantin Mierla 27 May '17

27 May '17

Module: kamailio Branch: master Commit: c218e3597e734bfe4308ce1911437080637107bd URL: https://github.com/kamailio/kamailio/commit/c218e3597e734bfe4308ce191143708… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-27T21:48:52+02:00 pipelimit: exported functions to kemi framework --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/c218e3597e734bfe4308ce191143708… Patch: https://github.com/kamailio/kamailio/commit/c218e3597e734bfe4308ce191143708… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index 32dec4a55f..702d22f879 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -53,6 +53,7 @@ #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" #include "../../core/rand/kam_rand.h" +#include "../../core/kemi.h" #include "pl_statistics.h" #include "pl_ht.h" @@ -643,13 +644,42 @@ static int w_pl_check(struct sip_msg* msg, char *p1, char *p2) /** * limit checking with creation of pipe if it doesn't exist */ +static int pl_check_limit(sip_msg_t* msg, str *pipeid, str *alg, int limit) +{ + pl_pipe_t *pipe = NULL; + + pipe = pl_pipe_get(pipeid, 1); + if(pipe==NULL) { + LM_DBG("pipe not found [%.*s] - trying to add it\n", + pipeid->len, pipeid->s); + if(pl_pipe_add(pipeid, alg, limit)<0) { + LM_ERR("failed to add pipe [%.*s]\n", + pipeid->len, pipeid->s); + return -2; + } + pipe = pl_pipe_get(pipeid, 0); + if(pipe==NULL) { + LM_ERR("failed to retrieve pipe [%.*s]\n", + pipeid->len, pipeid->s); + return -2; + } + } else { + if(limit>0) pipe->limit = limit; + pl_pipe_release(&pipe->name); + } + + return pl_check(msg, pipeid); +} + +/** + * limit checking with creation of pipe if it doesn't exist + */ static int w_pl_check3(struct sip_msg* msg, char *p1pipe, char *p2alg, char *p3limit) { int limit; str pipeid = {0, 0}; str alg = {0, 0}; - pl_pipe_t *pipe = NULL; if(msg==NULL) return -1; @@ -674,30 +704,7 @@ static int w_pl_check3(struct sip_msg* msg, char *p1pipe, char *p2alg, return -1; } - pipe = pl_pipe_get(&pipeid, 1); - if(pipe==NULL) - { - LM_DBG("pipe not found [%.*s] - trying to add it\n", - pipeid.len, pipeid.s); - if(pl_pipe_add(&pipeid, &alg, limit)<0) - { - LM_ERR("failed to add pipe [%.*s]\n", - pipeid.len, pipeid.s); - return -2; - } - pipe = pl_pipe_get(&pipeid, 0); - if(pipe==NULL) - { - LM_ERR("failed to retrieve pipe [%.*s]\n", - pipeid.len, pipeid.s); - return -2; - } - } else { - if(limit>0) pipe->limit = limit; - pl_pipe_release(&pipe->name); - } - - return pl_check(msg, &pipeid); + return pl_check_limit(msg, &pipeid, &alg, limit); } static int fixup_pl_check3(void** param, int param_no) @@ -805,3 +812,61 @@ static rpc_export_t rpc_methods[] = { {0, 0, 0, 0} }; +static int ki_pl_drop(sip_msg_t* msg) +{ + return pl_drop(msg, 0, 0); +} + +static int ki_pl_drop_retry(sip_msg_t* msg, int rafter) +{ + return pl_drop(msg, rafter, rafter); +} + +static int ki_pl_drop_range(sip_msg_t* msg, int rmin, int rmax) +{ + return pl_drop(msg, rmin, rmax); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_pipelimit_exports[] = { + { str_init("pipelimit"), str_init("pl_check"), + SR_KEMIP_INT, pl_check, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pipelimit"), str_init("pl_check_limit"), + SR_KEMIP_INT, pl_check_limit, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pipelimit"), str_init("pl_drop"), + SR_KEMIP_INT, ki_pl_drop, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pipelimit"), str_init("pl_drop_retry"), + SR_KEMIP_INT, ki_pl_drop_retry, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pipelimit"), str_init("pl_drop_range"), + SR_KEMIP_INT, ki_pl_drop_range, + { SR_KEMIP_INT, SR_KEMIP_INT, 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_pipelimit_exports); + return 0; +} \ No newline at end of file

1 0

git:master:6a92bbca: dmq_usrloc: properly initialize usrloc_dmq_recv
by Charles Chance 27 May '17

27 May '17

Module: kamailio Branch: master Commit: 6a92bbcac7b111fa51114ef2d2876c4c4ebfa013 URL: https://github.com/kamailio/kamailio/commit/6a92bbcac7b111fa51114ef2d2876c4… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-05-27T15:23:13+01:00 dmq_usrloc: properly initialize usrloc_dmq_recv --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/6a92bbcac7b111fa51114ef2d2876c4… Patch: https://github.com/kamailio/kamailio/commit/6a92bbcac7b111fa51114ef2d2876c4… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 1b08329158..96d879e74f 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -428,6 +428,7 @@ static int init_usrloc_dmq_recv() { LM_ERR("no more pkg memory\n"); return -1; } + *usrloc_dmq_recv = 0; } return 0; }

1 0

git:master:4351c222: dmq: update output format of dmq.list_nodes
by shuntongzhang 27 May '17

27 May '17

Module: kamailio Branch: master Commit: 4351c22298fadfcb638dbeb6dba0933f30a829ce URL: https://github.com/kamailio/kamailio/commit/4351c22298fadfcb638dbeb6dba0933… Author: shuntongzhang <shuntongzhang(a)gmail.com> Committer: shuntongzhang <shuntongzhang(a)gmail.com> Date: 2017-05-27T13:30:21+08:00 dmq: update output format of dmq.list_nodes --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/4351c22298fadfcb638dbeb6dba0933… Patch: https://github.com/kamailio/kamailio/commit/4351c22298fadfcb638dbeb6dba0933… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index c88afd57a0..f06111f830 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -354,11 +354,11 @@ static void dmq_rpc_list_nodes(rpc_t *rpc, void *c) memset(ip, 0, IP6_MAX_STR_SIZE + 1); ip_addr2sbuf(&cur->ip_address, ip, IP6_MAX_STR_SIZE); if (rpc->add(c, "{", &h) < 0) goto error; - if (rpc->struct_add(h, "SSsddd", + if (rpc->struct_add(h, "SSsSdd", "host", &cur->uri.host, "port", &cur->uri.port, "resolved_ip", ip, - "status", cur->status, + "status", get_status_str(cur->status), "last_notification", cur->last_notification, "local", cur->local) < 0) goto error; cur = cur->next;

1 0

git:master:0ef77595: Merge pull request #1139 from zhangst/master
by GitHub 27 May '17

27 May '17

Module: kamailio Branch: master Commit: 0ef775950e35505279715cd5546e70ed26a44c08 URL: https://github.com/kamailio/kamailio/commit/0ef775950e35505279715cd5546e70e… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-27T11:54:25+01:00 Merge pull request #1139 from zhangst/master dmq: update output format of dmq.list_nodes --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/0ef775950e35505279715cd5546e70e… Patch: https://github.com/kamailio/kamailio/commit/0ef775950e35505279715cd5546e70e… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index c88afd57a0..f06111f830 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -354,11 +354,11 @@ static void dmq_rpc_list_nodes(rpc_t *rpc, void *c) memset(ip, 0, IP6_MAX_STR_SIZE + 1); ip_addr2sbuf(&cur->ip_address, ip, IP6_MAX_STR_SIZE); if (rpc->add(c, "{", &h) < 0) goto error; - if (rpc->struct_add(h, "SSsddd", + if (rpc->struct_add(h, "SSsSdd", "host", &cur->uri.host, "port", &cur->uri.port, "resolved_ip", ip, - "status", cur->status, + "status", get_status_str(cur->status), "last_notification", cur->last_notification, "local", cur->local) < 0) goto error; cur = cur->next;

1 0

[kamailio/kamailio] dmq: update output format of dmq.list_nodes (#1139)
by 张顺通 27 May '17

27 May '17

change status from int to readable text You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1139 -- Commit Summary -- * dmq: update output format of dmq.list_nodes -- File Changes -- M src/modules/dmq/dmq.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1139.patch https://github.com/kamailio/kamailio/pull/1139.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/1139

2 2

git:master:b5f94a95: dmq_usrloc: always replicate contact updates made locally
by Charles Chance 27 May '17

27 May '17

Module: kamailio Branch: master Commit: b5f94a9596721acb1f49e4ab011ddfd6333b7936 URL: https://github.com/kamailio/kamailio/commit/b5f94a9596721acb1f49e4ab011ddfd… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-05-27T11:18:36+01:00 dmq_usrloc: always replicate contact updates made locally - fixes issue reported by shuntongzhang(a)gmail.com on sr-dev - we no longer set FL_RPL since it is otherwise meaningless - dmq replicated contacts are no different now to those from a shared DB --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/b5f94a9596721acb1f49e4ab011ddfd… Patch: https://github.com/kamailio/kamailio/commit/b5f94a9596721acb1f49e4ab011ddfd…

1 0

Unable to make SIP Calls (403 Forbidden - Domain not served)
by Prasannakumar Merugu 26 May '17

26 May '17

Hello All, We have Installed Kamailio in Debain 8. All p,s,i and hss servers are in one PC. We are able to register the users(Alice and Bob). When initiate call from Alice , INVITE is passing through Alice -> p-cscf -> i-cscs -> s-cscf -> i-cscf -> s-cscf when it is reaching again s-cscf server, we are getting error .(403 Forbidden - Domain not served) We are attaching all logs and wireshark logs. Kindly let us know, where and why it is failing. regards, Prasannakumar.

1 2

git:master:7f034e8b: debugger: exported pv dump function to kemi framework
by Daniel-Constantin Mierla 26 May '17

26 May '17

Module: kamailio Branch: master Commit: 7f034e8bac8f56e91a4a0c56c21b91f9a8f8657a URL: https://github.com/kamailio/kamailio/commit/7f034e8bac8f56e91a4a0c56c21b91f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-26T06:08:22+02:00 debugger: exported pv dump function to kemi framework --- Modified: src/modules/debugger/debugger_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7f034e8bac8f56e91a4a0c56c21b91f… Patch: https://github.com/kamailio/kamailio/commit/7f034e8bac8f56e91a4a0c56c21b91f… --- diff --git a/src/modules/debugger/debugger_mod.c b/src/modules/debugger/debugger_mod.c index 845e262f14..bbbd535aef 100644 --- a/src/modules/debugger/debugger_mod.c +++ b/src/modules/debugger/debugger_mod.c @@ -34,6 +34,7 @@ #include "../../core/shm_init.h" #include "../../core/script_cb.h" #include "../../core/msg_translator.h" +#include "../../core/kemi.h" #include "debugger_api.h" #include "debugger_config.h" @@ -590,3 +591,50 @@ static int w_dbg_sip_msg(struct sip_msg* msg, char *level, char *facility) return 1; } + +/** + * dump pv_cache contents as json + */ +static int ki_dbg_pv_dump(sip_msg_t* msg, char* mask, char* level) +{ + dbg_dump_json(msg, DBG_DP_ALL, DBG_DP_ALL); + return 1; +} + +/** + * dump pv_cache contents as json + */ +static int ki_dbg_pv_dump_ex(sip_msg_t* msg, int mask, int level) +{ + dbg_dump_json(msg, (unsigned int)mask, level); + return 1; +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_debugger_exports[] = { + { str_init("debugger"), str_init("dbg_pv_dump"), + SR_KEMIP_INT, ki_dbg_pv_dump, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("debugger"), str_init("dbg_pv_dump_ex"), + SR_KEMIP_INT, ki_dbg_pv_dump, + { SR_KEMIP_INT, SR_KEMIP_INT, 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_debugger_exports); + return 0; +}

1 0

git:master:234d795f: core: coherent whitespacing and indentation
by Daniel-Constantin Mierla 25 May '17

25 May '17

Module: kamailio Branch: master Commit: 234d795f4eac54c1bdfe065960c6db176212a938 URL: https://github.com/kamailio/kamailio/commit/234d795f4eac54c1bdfe065960c6db1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-25T05:29:13+02:00 core: coherent whitespacing and indentation --- Modified: src/core/daemonize.c Modified: src/core/daemonize.h Modified: src/core/proxy.c Modified: src/core/proxy.h Modified: src/core/shm_init.c Modified: src/core/shm_init.h Modified: src/core/signals.c Modified: src/core/signals.h Modified: src/core/tls_hooks.h --- Diff: https://github.com/kamailio/kamailio/commit/234d795f4eac54c1bdfe065960c6db1… Patch: https://github.com/kamailio/kamailio/commit/234d795f4eac54c1bdfe065960c6db1…

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2017