sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
368 discussions

[kamailio/kamailio] json: add transformation (#1404)

by Emmanuel Schmidbauer

this was borrowed from the `kazoo` and `nsq` module json transformations i think it makes the most sense in this module as I'd like to use the transformation without loading the `kazoo` or `nsq` modules. It can be very useful for parsing json data from pseudo-variables like $rb. if this can be merged, I will deprecate the transformation in `nsq` and maintain this code. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1404 -- Commit Summary -- * json: add transformation -- File Changes -- M src/modules/json/doc/json_admin.xml (26) M src/modules/json/json_funcs.c (283) M src/modules/json/json_funcs.h (27) M src/modules/json/json_mod.c (40) A src/modules/json/json_trans.c (451) A src/modules/json/json_trans.h (51) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1404.patch https://github.com/kamailio/kamailio/pull/1404.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/1404

6 years, 7 months

Errored: kamailio/kamailio#5420 (master - e62fa8f)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #5420 Status: Errored Duration: 11 minutes and 17 seconds Commit: e62fa8f (master) Author: Daniel-Constantin Mierla Message: sipt: Makefile - define KAMAILIO_MOD_INTERFACE View the changeset: https://github.com/kamailio/kamailio/compare/43434ee8a1d6...e62fa8f7813a View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/332676623?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

6 years, 7 months

git:master:e62fa8f7: sipt: Makefile - define KAMAILIO_MOD_INTERFACE

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e62fa8f7813a0d22f4db30a99bcee541103f21b3 URL: https://github.com/kamailio/kamailio/commit/e62fa8f7813a0d22f4db30a99bcee54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T09:21:30+01:00 sipt: Makefile - define KAMAILIO_MOD_INTERFACE --- Modified: src/modules/sipt/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/e62fa8f7813a0d22f4db30a99bcee54… Patch: https://github.com/kamailio/kamailio/commit/e62fa8f7813a0d22f4db30a99bcee54… --- diff --git a/src/modules/sipt/Makefile b/src/modules/sipt/Makefile index 93defc7f01..86edf13735 100644 --- a/src/modules/sipt/Makefile +++ b/src/modules/sipt/Makefile @@ -1,7 +1,7 @@ # # sipt module makefile # -# +# # WARNING: do not run this directly, it should be run by the master Makefile include ../../Makefile.defs @@ -10,7 +10,7 @@ NAME=sipt.so LIBS= -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE include ../../Makefile.modules

6 years, 7 months

git:master:cd0e1bd2: janssonrpcc: Makefile - define KAMAILIO_MOD_INTERFACE

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cd0e1bd26cc31c001707ce98d084310979071fb0 URL: https://github.com/kamailio/kamailio/commit/cd0e1bd26cc31c001707ce98d084310… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T09:21:17+01:00 janssonrpcc: Makefile - define KAMAILIO_MOD_INTERFACE --- Modified: src/modules/janssonrpcc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/cd0e1bd26cc31c001707ce98d084310… Patch: https://github.com/kamailio/kamailio/commit/cd0e1bd26cc31c001707ce98d084310… --- diff --git a/src/modules/janssonrpcc/Makefile b/src/modules/janssonrpcc/Makefile index 596b3d42f5..10ea4446ce 100644 --- a/src/modules/janssonrpcc/Makefile +++ b/src/modules/janssonrpcc/Makefile @@ -1,5 +1,5 @@ # -# janssonrpc-c module makefile +# janssonrpcc module makefile # # # WARNING: do not run this directly, it should be run by the master Makefile @@ -20,7 +20,7 @@ else LIBS+= $(shell pkg-config --libs libevent) endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib include ../../Makefile.modules

6 years, 7 months

git:master:86589cdd: jansson: Makefile - define KAMAILIO_MOD_INTERFACE

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 86589cdda4f5390099165670d68d49f5c8b44af1 URL: https://github.com/kamailio/kamailio/commit/86589cdda4f5390099165670d68d49f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T09:21:05+01:00 jansson: Makefile - define KAMAILIO_MOD_INTERFACE --- Modified: src/modules/jansson/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/86589cdda4f5390099165670d68d49f… Patch: https://github.com/kamailio/kamailio/commit/86589cdda4f5390099165670d68d49f… --- diff --git a/src/modules/jansson/Makefile b/src/modules/jansson/Makefile index 7680f71819..f3a18c5b83 100644 --- a/src/modules/jansson/Makefile +++ b/src/modules/jansson/Makefile @@ -23,7 +23,7 @@ else LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -ljansson endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib include ../../Makefile.modules

6 years, 7 months

git:master:22421845: cnxcc: Makefile - define KAMAILIO_MOD_INTERFACE

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 22421845cfcc0eab194ac510bfc378f72765a059 URL: https://github.com/kamailio/kamailio/commit/22421845cfcc0eab194ac510bfc378f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T09:20:33+01:00 cnxcc: Makefile - define KAMAILIO_MOD_INTERFACE --- Modified: src/modules/cnxcc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/22421845cfcc0eab194ac510bfc378f… Patch: https://github.com/kamailio/kamailio/commit/22421845cfcc0eab194ac510bfc378f… --- diff --git a/src/modules/cnxcc/Makefile b/src/modules/cnxcc/Makefile index 73b5408dbd..41803d1383 100644 --- a/src/modules/cnxcc/Makefile +++ b/src/modules/cnxcc/Makefile @@ -47,7 +47,7 @@ endif DEFS+=$(HIREDISDEFS) $(LEVENTDEFS) LIBS=$(HIREDISLIBS) $(LEVENTLIBS) -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules

6 years, 7 months

git:master:43434ee8: modules: readme files regenerated - cfg_rpc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 43434ee8a1d65276dfbfce2f866f91d4bf0682fc URL: https://github.com/kamailio/kamailio/commit/43434ee8a1d65276dfbfce2f866f91d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-23T17:46:38+01:00 modules: readme files regenerated - cfg_rpc ... [skip ci] --- Modified: src/modules/cfg_rpc/README --- Diff: https://github.com/kamailio/kamailio/commit/43434ee8a1d65276dfbfce2f866f91d… Patch: https://github.com/kamailio/kamailio/commit/43434ee8a1d65276dfbfce2f866f91d… --- diff --git a/src/modules/cfg_rpc/README b/src/modules/cfg_rpc/README index 93d31e0a0c..9f3c25820a 100644 --- a/src/modules/cfg_rpc/README +++ b/src/modules/cfg_rpc/README @@ -147,12 +147,15 @@ Chapter 1. Admin Guide 3.2. cfg.get cfg.get - Get the value of a configuration variable. The function - accepts two parameters: group name, variable name. The group name can - optionally contain the group instance id, for example foo[5]. + accepts two parameters: group name, variable name, but if all the + elements belonging to a certain group is wanted to be retrieved then + only the group name would suffice as the function parameter. The group + name can optionally contain the group instance id, for example foo[5]. Example 1.2. Use cfg.get RPC command ... # kamcmd cfg.get core debug +# kamcmd cfg.get tm ... 3.3. cfg.seti

6 years, 7 months

[kamailio/kamailio] cfg_rpc: extending the functionality of cfg.get command (#1321)

by hdikme

- rpc_get function can be also called with only entering the group name information. Before it used to work only with group name and variable name and returning the value for a variable. With the enhancement, it is also possible to retrieve all variable values belonging to a specific group. e.g.: kamcmd cfg.get core. Above given example will print the values of all variables of the configuration group "core".   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  rpc_get function can be also called with only entering the group name information. Before it used to work only with group name and variable name and returning the value for a variable. With the enhancement, it is also possible to retrieve all variable values belonging to a specific group. e.g.: kamcmd cfg.get core. Above given example will print the values of all variables of the configuration group "core". You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1321 -- Commit Summary -- * cfg_rpc: extending the functionality of cfg.get command -- File Changes -- M src/modules/cfg_rpc/cfg_rpc.c (112) M src/modules/cfg_rpc/doc/rpc.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1321.patch https://github.com/kamailio/kamailio/pull/1321.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/1321

6 years, 7 months

git:master:a9972863: ctl: proper handling of optional param specifier (*) in rpc scan

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a9972863681059c647af4bafd0d9a20f7648c801 URL: https://github.com/kamailio/kamailio/commit/a9972863681059c647af4bafd0d9a20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-23T17:33:39+01:00 ctl: proper handling of optional param specifier (*) in rpc scan --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/a9972863681059c647af4bafd0d9a20… Patch: https://github.com/kamailio/kamailio/commit/a9972863681059c647af4bafd0d9a20… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 74d71dc8f9..efff292081 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -841,11 +841,11 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) /* clear the previously saved error code */ rpc_fault_reset(ctx); - va_start(ap, fmt); orig_fmt=fmt; nofault = 0; modifiers=0; autoconv=autoconvert; + va_start(ap, fmt); for (;*fmt; fmt++){ switch(*fmt){ case '*': /* start of optional parameters */ @@ -918,7 +918,7 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) error_read: /* Do not immediately send out the error message, the user might retry the scan with different parameters */ - if(nofault==0 || ((err!=E_BINRPC_MORE_DATA) && (err!=E_BINRPC_EOP))) + if(nofault==0 || ((err!=E_BINRPC_MORE_DATA) && (err!=E_BINRPC_EOP))) { rpc_fault_prepare(ctx, 400, "error at parameter %d: expected %s type but" " %s", ctx->in.record_no, rpc_type_name(v.type), binrpc_error(err)); @@ -927,6 +927,11 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) ": %s", ctx->in.record_no, ctx->in.ctx.offset, v.type, binrpc_error(err)); */ + } + if(nofault==1 && (err==E_BINRPC_MORE_DATA || err==E_BINRPC_EOP)) { + va_end(ap); + return (int)(fmt-orig_fmt)-modifiers; + } goto error_ret; error_not_supported: rpc_fault(ctx, 500, "internal server error, type %d not supported",

6 years, 7 months

git:master:95e82d91: cfg_rcp: allow getting 0 values in rpc cfg.get

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 95e82d9135180be519192029d3f6edcf56eddb59 URL: https://github.com/kamailio/kamailio/commit/95e82d9135180be519192029d3f6edc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-23T17:32:23+01:00 cfg_rcp: allow getting 0 values in rpc cfg.get - issue introduced in previous commit - log message for dynamic values to be skipped --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/95e82d9135180be519192029d3f6edc… Patch: https://github.com/kamailio/kamailio/commit/95e82d9135180be519192029d3f6edc… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index a2d44e3acc..d865eae561 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -381,18 +381,20 @@ static void rpc_get(rpc_t* rpc, void* c) for (i=0; def[i].name; i++) { var.s = def[i].name; var.len = (int)strlen(def[i].name); - LM_DBG("getting value for variable: %.*s.%.*s\n", group.len, group.s, - var.len, var.s); + LM_DBG("getting value for variable: %.*s.%.*s\n", + group.len, group.s, var.len, var.s); val = NULL; ret = cfg_get_by_name(ctx, &group, group_id, &var, &val, &val_type); if (ret < 0) { rpc->fault(c, 400, "Failed to get the variable"); return; - } else if (ret > 0 || val==NULL) { + } else if (ret > 0) { + LM_DBG("skipping dynamic (callback) value for variable:" + " %.*s.%.*s (%p/%d)\n", + group.len, group.s, var.len, var.s, val, ret); continue; } - LM_DBG("type: %d value: %p\n", val_type, val); switch (val_type) { case CFG_VAR_INT: rpc->struct_add(rh, "d", var.s, (int)(long)val);

6 years, 7 months

← Newer
1
...
14
15
16
17
18
19
20
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2018