sr-dev May 2018

sr-dev@lists.kamailio.org

22 participants
214 discussions

git:master:1a15e985: db_perlvdb: updated code and documentation for latest db api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1a15e985de8cc4a5c836dacd0df4afdb6b6efb1b URL: https://github.com/kamailio/kamailio/commit/1a15e985de8cc4a5c836dacd0df4afd… Author: Muhammad Shahzad <shaheryarkh(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-08T08:15:47+02:00 db_perlvdb: updated code and documentation for latest db api - GH #1525 --- Modified: src/modules/db_perlvdb/db_perlvdb.c Modified: src/modules/db_perlvdb/doc/db_perlvdb_admin.xml Modified: src/modules/db_perlvdb/doc/db_perlvdb_devel.xml Modified: src/modules/db_perlvdb/perlvdb_conv.c Modified: src/modules/db_perlvdb/perlvdb_conv.h Modified: src/modules/db_perlvdb/perlvdbfunc.c Modified: src/modules/db_perlvdb/perlvdbfunc.h --- Diff: https://github.com/kamailio/kamailio/commit/1a15e985de8cc4a5c836dacd0df4afd… Patch: https://github.com/kamailio/kamailio/commit/1a15e985de8cc4a5c836dacd0df4afd…

6 years, 9 months

Problem load db_perlvdb.so module

by M S

Hi, I am trying to load db_perlvdb.so module using latest Kamailio branch v5.0.6 with git revision 49bd81ad7856dac9b2efd53597fb1c182de7440b on Debian Wheezy 32bit. The compilation and installation went successful however the module gives following error. -- May 4 19:03:59 webrtc[8895]: INFO: app_perl [app_perl_mod.c:351]: mod_init(): perl interpreter has been initialized (1525453439.237584 => 1525453439.454432) May 4 19:03:59 webrtc[8895]: CRITICAL: db_perlvdb [db_perlvdb.c:79]: mod_init(): perl module not loaded. Exiting. May 4 19:03:59 webrtc[8895]: ERROR: <core> [core/sr_module.c:970]: init_mod(): Error while initializing module db_perlvdb (/usr/local/adx-webrtc/lib/kamailio/modules/db_perlvdb.so) -- I tried to find module perl.so in modules folder of kamailio installation but there is none. Then i looked through the source code but no success. After some googling, i found following link which states that perl.so was remained to app_perl.so since v4.x. I have created a small patch for db_perlvdb.c which corrects this error. -- diff --git a/src/modules/db_perlvdb/db_perlvdb.c b/src/modules/db_perlvdb/db_perlvdb.c index 7a2b63e..266ece2 100644 --- a/src/modules/db_perlvdb/db_perlvdb.c +++ b/src/modules/db_perlvdb/db_perlvdb.c @@ -75,8 +75,8 @@ struct module_exports exports = { static int mod_init(void) { - if (!module_loaded("perl")) { - LM_CRIT("perl module not loaded. Exiting.\n"); + if (!module_loaded("app_perl")) { + LM_CRIT("app_perl module not loaded. Exiting.\n"); return -1; } -- Kindly update Kamailio master and branch trunks. Thank you.

6 years, 9 months

[kamailio/kamailio] examples: Removed mi_fifo.so/mi_rpc.so modules (Deprecated in 5.X) and added jsonrpcs.so. (#1524)

by uts09

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  mi_fifo.so and mi_rpc.so modules are deprecated in v5.0 release and jsonrpcs.so has been introduced. Source: [https://www.kamailio.org/wiki/install/upgrade/4.4.x-to-5.0.0](url) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1524 -- Commit Summary -- * Update kamailio.cfg * Update kamailio.cfg * Update kamailio.cfg -- File Changes -- M misc/examples/ims/icscf/kamailio.cfg (14) M misc/examples/ims/pcscf/kamailio.cfg (16) M misc/examples/ims/scscf/kamailio.cfg (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1524.patch https://github.com/kamailio/kamailio/pull/1524.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/1524

6 years, 9 months

git:master:e17853d8: misc/examples/ims: replaced deprecated mi_fifo with jsonrpcs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e17853d8804fa7f10688676d313014ac6e313215 URL: https://github.com/kamailio/kamailio/commit/e17853d8804fa7f10688676d313014a… Author: uts09 <uttamhoode(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-07T22:30:04+02:00 misc/examples/ims: replaced deprecated mi_fifo with jsonrpcs - submitted via PR #1524 --- Modified: misc/examples/ims/icscf/kamailio.cfg Modified: misc/examples/ims/pcscf/kamailio.cfg Modified: misc/examples/ims/scscf/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e17853d8804fa7f10688676d313014a… Patch: https://github.com/kamailio/kamailio/commit/e17853d8804fa7f10688676d313014a… --- diff --git a/misc/examples/ims/icscf/kamailio.cfg b/misc/examples/ims/icscf/kamailio.cfg index c694074c05..27fc8234f9 100644 --- a/misc/examples/ims/icscf/kamailio.cfg +++ b/misc/examples/ims/icscf/kamailio.cfg @@ -102,8 +102,6 @@ loadmodule "corex" # Control interfaces: loadmodule "ctl" loadmodule "cfg_rpc" -loadmodule "mi_rpc" -loadmodule "mi_fifo" #!ifdef WITH_XMLRPC loadmodule "xmlrpc" #!endif @@ -144,11 +142,13 @@ modparam("db_cluster", "connection", DB_URL2) modparam("db_cluster", "cluster", "cluster1=>con1=2s2s;con2=1s1s") #!endif -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "fifo_mode", 0666) -modparam("mi_fifo", "fifo_user", "kamailio") -modparam("mi_fifo", "fifo_group", "kamailio") +loadmodule "jsonrpcs.so" +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) +/* set the path to RPC fifo control file */ +# modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") +/* set the path to RPC unix socket control file */ +# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # -- rr params -- # add value to ;lr param to make some broken UAs happy diff --git a/misc/examples/ims/pcscf/kamailio.cfg b/misc/examples/ims/pcscf/kamailio.cfg index aaa1fa894d..8502ce6dc0 100644 --- a/misc/examples/ims/pcscf/kamailio.cfg +++ b/misc/examples/ims/pcscf/kamailio.cfg @@ -152,9 +152,7 @@ loadmodule "textopsx" loadmodule "siputils" loadmodule "sanity" loadmodule "ctl" -loadmodule "mi_rpc" loadmodule "cfg_rpc" -loadmodule "mi_fifo" loadmodule "xlog" loadmodule "auth" loadmodule "dispatcher" @@ -237,11 +235,13 @@ modparam("debugger", "mod_level", "rtpengine=3") modparam("debugger", "cfgtrace", 1) #!endif -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "fifo_mode", 0666) -modparam("mi_fifo", "fifo_user", "kamailio") -modparam("mi_fifo", "fifo_group", "kamailio") +loadmodule "jsonrpcs.so" +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) +/* set the path to RPC fifo control file */ +# modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") +/* set the path to RPC unix socket control file */ +# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # ----------------- setting module-specific parameters --------------- #!ifdef DB_URL2 @@ -905,5 +905,3 @@ include_file "route/register.cfg" include_file "route/rtp.cfg" include_file "route/mo.cfg" include_file "route/mt.cfg" - - diff --git a/misc/examples/ims/scscf/kamailio.cfg b/misc/examples/ims/scscf/kamailio.cfg index 9d06af488c..97edf14350 100644 --- a/misc/examples/ims/scscf/kamailio.cfg +++ b/misc/examples/ims/scscf/kamailio.cfg @@ -135,8 +135,6 @@ loadmodule "uac" # Control interfaces: loadmodule "ctl" loadmodule "cfg_rpc" -loadmodule "mi_rpc" -loadmodule "mi_fifo" #!ifdef WITH_XMLRPC loadmodule "xmlrpc" #!endif @@ -188,17 +186,13 @@ modparam("presence", "db_url", DB_URL) modparam("presence", "db_update_period", 20) #!endif -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "fifo_mode", 0666) -modparam("mi_fifo", "fifo_user", "kamailio") -modparam("mi_fifo", "fifo_group", "kamailio") - -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "fifo_mode", 0666) -modparam("mi_fifo", "fifo_user", "kamailio") -modparam("mi_fifo", "fifo_group", "kamailio") +loadmodule "jsonrpcs.so" +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) +/* set the path to RPC fifo control file */ +# modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") +/* set the path to RPC unix socket control file */ +# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- modparam("ctl", "binrpc", "unix:/var/run/kamailio_scscf/kamailio_ctl") @@ -1227,4 +1221,3 @@ failure_route[PSTN_failure] { exit; } } -

6 years, 9 months

git:5.1:03dd5924: core: improve to header check guards, str consists of length and pointer

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: 03dd59249d17c55c749d4a4e806843f7f407e4ea URL: https://github.com/kamailio/kamailio/commit/03dd59249d17c55c749d4a4e806843f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-07T20:20:49+02:00 core: improve to header check guards, str consists of length and pointer (cherry picked from commit 281a6c6b6eaaf30058b603325e8ded20b99e1456) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/03dd59249d17c55c749d4a4e806843f… Patch: https://github.com/kamailio/kamailio/commit/03dd59249d17c55c749d4a4e806843f… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index ca0f9fa521..201e3a5e1d 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2367,7 +2367,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, case HDR_TO_T: if (new_tag && new_tag->len) { to_tag=get_to(msg)->tag_value; - if ( to_tag.len || to_tag.s ) + if ( to_tag.len && to_tag.s ) len+=new_tag->len-to_tag.len; else len+=new_tag->len+TOTAG_TOKEN_LEN/*";tag="*/; @@ -2495,7 +2495,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, break; case HDR_TO_T: if (new_tag && new_tag->len){ - if (to_tag.s ) { /* replacement */ + if (to_tag.len && to_tag.s) { /* replacement */ /* before to-tag */ append_str( p, hdr->name.s, to_tag.s-hdr->name.s); /* to tag replacement */

6 years, 9 months

git:5.0:73125bd9: core: improve to header check guards, str consists of length and pointer

by Henning Westerholt

Module: kamailio Branch: 5.0 Commit: 73125bd9cc191b8fba779fa7e0386f4e5a1941c5 URL: https://github.com/kamailio/kamailio/commit/73125bd9cc191b8fba779fa7e0386f4… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-07T20:20:02+02:00 core: improve to header check guards, str consists of length and pointer (cherry picked from commit 281a6c6b6eaaf30058b603325e8ded20b99e1456) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/73125bd9cc191b8fba779fa7e0386f4… Patch: https://github.com/kamailio/kamailio/commit/73125bd9cc191b8fba779fa7e0386f4… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index ca0f9fa521..201e3a5e1d 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2367,7 +2367,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, case HDR_TO_T: if (new_tag && new_tag->len) { to_tag=get_to(msg)->tag_value; - if ( to_tag.len || to_tag.s ) + if ( to_tag.len && to_tag.s ) len+=new_tag->len-to_tag.len; else len+=new_tag->len+TOTAG_TOKEN_LEN/*";tag="*/; @@ -2495,7 +2495,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, break; case HDR_TO_T: if (new_tag && new_tag->len){ - if (to_tag.s ) { /* replacement */ + if (to_tag.len && to_tag.s) { /* replacement */ /* before to-tag */ append_str( p, hdr->name.s, to_tag.s-hdr->name.s); /* to tag replacement */

6 years, 9 months

git:master:5ef91a63: core: improve existing DBG message, also output to tag

by Henning Westerholt

Module: kamailio Branch: master Commit: 5ef91a63b8cd83daf51f195171f3ccbb14f02e6e URL: https://github.com/kamailio/kamailio/commit/5ef91a63b8cd83daf51f195171f3ccb… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-07T09:39:08+02:00 core: improve existing DBG message, also output to tag --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/5ef91a63b8cd83daf51f195171f3ccb… Patch: https://github.com/kamailio/kamailio/commit/5ef91a63b8cd83daf51f195171f3ccb… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 2a3d3b1de5..0420dcd172 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -169,7 +169,7 @@ char* get_hdr_field(char* const buf, char* const end, struct hdr_field* const hd hdr->body.len=tmp-hdr->body.s; DBG("<%.*s> [%d]; uri=[%.*s]\n", hdr->name.len, ZSW(hdr->name.s), hdr->body.len, to_b->uri.len, ZSW(to_b->uri.s)); - DBG("to body [%.*s]\n", to_b->body.len, ZSW(to_b->body.s)); + DBG("to body [%.*s], to tag [%.*s]\n", to_b->body.len, ZSW(to_b->body.s), to_b->tag_value.len, ZSW(to_b->tag_value.s)); break; case HDR_CONTENTLENGTH_T: hdr->body.s=tmp;

6 years, 9 months

git:master:281a6c6b: core: improve to header check guards, str consists of length and pointer

by Henning Westerholt

Module: kamailio Branch: master Commit: 281a6c6b6eaaf30058b603325e8ded20b99e1456 URL: https://github.com/kamailio/kamailio/commit/281a6c6b6eaaf30058b603325e8ded2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-07T09:36:53+02:00 core: improve to header check guards, str consists of length and pointer --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/281a6c6b6eaaf30058b603325e8ded2… Patch: https://github.com/kamailio/kamailio/commit/281a6c6b6eaaf30058b603325e8ded2… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 22122768a1..4dd648e874 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2369,7 +2369,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, case HDR_TO_T: if (new_tag && new_tag->len) { to_tag=get_to(msg)->tag_value; - if ( to_tag.len || to_tag.s ) + if ( to_tag.len && to_tag.s ) len+=new_tag->len-to_tag.len; else len+=new_tag->len+TOTAG_TOKEN_LEN/*";tag="*/; @@ -2497,7 +2497,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, break; case HDR_TO_T: if (new_tag && new_tag->len){ - if (to_tag.s ) { /* replacement */ + if (to_tag.len && to_tag.s) { /* replacement */ /* before to-tag */ append_str( p, hdr->name.s, to_tag.s-hdr->name.s); /* to tag replacement */

6 years, 9 months

git:master:6a152024: db_perlvdb: added const specifiers to get rid of warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6a152024a40abdb89842aaee418088fe3fb23ae2 URL: https://github.com/kamailio/kamailio/commit/6a152024a40abdb89842aaee418088f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-07T08:55:46+02:00 db_perlvdb: added const specifiers to get rid of warnings --- Modified: src/modules/db_perlvdb/perlvdb_conv.c Modified: src/modules/db_perlvdb/perlvdb_conv.h Modified: src/modules/db_perlvdb/perlvdbfunc.c --- Diff: https://github.com/kamailio/kamailio/commit/6a152024a40abdb89842aaee418088f… Patch: https://github.com/kamailio/kamailio/commit/6a152024a40abdb89842aaee418088f… --- diff --git a/src/modules/db_perlvdb/perlvdb_conv.c b/src/modules/db_perlvdb/perlvdb_conv.c index c3f1e6800b..5c1c33ddfd 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.c +++ b/src/modules/db_perlvdb/perlvdb_conv.c @@ -33,7 +33,7 @@ /* Converts a set of pairs to perl SVs. * For insert, and update (second half) */ -AV *pairs2perlarray(db_key_t* keys, db_val_t* vals, int n) { +AV *pairs2perlarray(const db_key_t* keys, const db_val_t* vals, const int n) { AV *array = newAV(); SV *element; @@ -50,7 +50,7 @@ AV *pairs2perlarray(db_key_t* keys, db_val_t* vals, int n) { /* Converts a set of cond's to perl SVs. * For delete, update (first half), query */ -AV *conds2perlarray(db_key_t* keys, db_op_t* ops, db_val_t* vals, int n) { +AV *conds2perlarray(const db_key_t* keys, const db_op_t* ops, const db_val_t* vals, const int n) { AV *array = newAV(); SV *element = NULL; int i = 0; @@ -80,7 +80,7 @@ AV *conds2perlarray(db_key_t* keys, db_op_t* ops, db_val_t* vals, int n) { /* Converts a set of key names to a perl array. * Needed in query. */ -AV *keys2perlarray(db_key_t* keys, int n) { +AV *keys2perlarray(const db_key_t* keys, const int n) { AV *array = newAV(); SV *element; int i; @@ -92,7 +92,7 @@ AV *keys2perlarray(db_key_t* keys, int n) { return array; } -SV *valdata(db_val_t* val) { +SV *valdata(const db_val_t* val) { SV *data = &PL_sv_undef; const char* stringval; @@ -167,7 +167,7 @@ SV *val2perlval(db_val_t* val) { } -SV *pair2perlpair(db_key_t key, db_val_t* val) { +SV *pair2perlpair(db_key_t key, const db_val_t* val) { SV* retval; SV *class; @@ -190,7 +190,7 @@ SV *pair2perlpair(db_key_t key, db_val_t* val) { } -SV *cond2perlcond(db_key_t key, db_op_t op, db_val_t* val) { +SV *cond2perlcond(const db_key_t key, const db_op_t op, const db_val_t* val) { SV* retval; SV *class; diff --git a/src/modules/db_perlvdb/perlvdb_conv.h b/src/modules/db_perlvdb/perlvdb_conv.h index 9018305a22..96666f90c5 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.h +++ b/src/modules/db_perlvdb/perlvdb_conv.h @@ -44,21 +44,21 @@ /* Converts a set of pairs to perl SVs. * For insert, and update (second half) */ -AV *pairs2perlarray(db_key_t* keys, db_val_t* vals, int n); +AV *pairs2perlarray(const db_key_t* keys, const db_val_t* vals, const int n); /* Converts a set of cond's to perl SVs. * For delete, update (first half), query */ -AV *conds2perlarray(db_key_t* keys, db_op_t* ops, db_val_t* vals, int n); +AV *conds2perlarray(const db_key_t* keys, const db_op_t* ops, const db_val_t* vals, const int n); /* Converts a set of key names to a perl array. * Needed in query. */ -AV *keys2perlarray(db_key_t* keys, int n); +AV *keys2perlarray(const db_key_t* keys, const int n); SV *val2perlval(db_val_t* val); -SV *pair2perlpair(db_key_t key, db_val_t* val); -SV *cond2perlcond(db_key_t key, db_op_t op, db_val_t* val); +SV *pair2perlpair(db_key_t key, const db_val_t* val); +SV *cond2perlcond(const db_key_t key, const db_op_t op, const db_val_t* val); int perlresult2dbres(SV *perlres, db1_res_t **r); diff --git a/src/modules/db_perlvdb/perlvdbfunc.c b/src/modules/db_perlvdb/perlvdbfunc.c index 73a7b1c9dd..7518fcdac5 100644 --- a/src/modules/db_perlvdb/perlvdbfunc.c +++ b/src/modules/db_perlvdb/perlvdbfunc.c @@ -76,7 +76,7 @@ SV *newvdbobj(const char* cn) { return obj; } -SV *getobj(db1_con_t *con) { +SV *getobj(const db1_con_t *con) { return ((SV*)CON_TAIL(con)); } @@ -179,8 +179,8 @@ void perlvdb_db_close(db1_con_t* h) { * v: values of the keys * n: number of key=value pairs */ -int perlvdb_db_insertreplace(db1_con_t* h, db_key_t* k, db_val_t* v, - int n, char *insertreplace) { +int perlvdb_db_insertreplace(const db1_con_t* h, const db_key_t* k, const db_val_t* v, + const int n, char *insertreplace) { AV *arr; SV *arrref; SV *ret;

6 years, 9 months

git:master:1822d974: core: dns cache - print status as field in rpc structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1822d974ff1704cca3a1db5fce0507be47af3928 URL: https://github.com/kamailio/kamailio/commit/1822d974ff1704cca3a1db5fce0507b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-06T22:52:46+02:00 core: dns cache - print status as field in rpc structure --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/1822d974ff1704cca3a1db5fce0507b… Patch: https://github.com/kamailio/kamailio/commit/1822d974ff1704cca3a1db5fce0507b… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 88c0ae244f..908c378aad 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -4030,24 +4030,44 @@ void dns_cache_flush(int del_permanent) /* deletes all the non-permanent entries from the cache */ void dns_cache_delete_all(rpc_t* rpc, void* ctx) { + void *th; + if (!cfg_get(core, core_cfg, use_dns_cache)){ rpc->fault(ctx, 500, "dns cache support disabled (see use_dns_cache)"); return; } dns_cache_flush(0); - rpc->rpl_printf(ctx, "OK"); + + if(rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error - root structure"); + return; + } + if(rpc->struct_add(th, "s", "status", "ok") < 0) { + rpc->fault(ctx, 500, "Internal error - status"); + return; + } } /* deletes all the entries from the cache, * even the permanent ones */ void dns_cache_delete_all_force(rpc_t* rpc, void* ctx) { + void *th; + if (!cfg_get(core, core_cfg, use_dns_cache)){ rpc->fault(ctx, 500, "dns cache support disabled (see use_dns_cache)"); return; } dns_cache_flush(1); - rpc->rpl_printf(ctx, "OK"); + + if(rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error - root structure"); + return; + } + if(rpc->struct_add(th, "s", "status", "ok") < 0) { + rpc->fault(ctx, 500, "Internal error - status"); + return; + } } /* clones an entry and extends its memory area to hold a new rr.

6 years, 9 months

← Newer
1
...
15
16
17
18
19
20
21
22
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 2018