sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
368 discussions

Ann: Registration to Kamailio World 2018 is open!

by Daniel-Constantin Mierla

Hello, a quick note to the community forums to announce that the registration to next Kamailio World Conference (May 14-17, 2018, in Berlin, Germany) is now open! More details are available at: * https://www.kamailioworld.com/k06/registration/ In a matter of several days, we expect to publish the details about the first group of accepted speakers. Looking forward to meeting many of you in Berlin! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - March 5-7, 2018, Berlin - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

6 years, 7 months

Errored: kamailio/kamailio#5447 (master - d40c65a)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #5447 Status: Errored Duration: 12 minutes and 34 seconds Commit: d40c65a (master) Author: Daniel-Constantin Mierla Message: modules/ims*: Makefile updates - use KAMAILIO mod interface define - bits of updates in the comments View the changeset: https://github.com/kamailio/kamailio/compare/9f896a11d920...d40c65a9834d View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/334600997?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:d40c65a9: modules/ims*: Makefile updates

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d40c65a9834d6e0c12ee24e0fde5b75be94593e5 URL: https://github.com/kamailio/kamailio/commit/d40c65a9834d6e0c12ee24e0fde5b75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-29T09:14:40+01:00 modules/ims*: Makefile updates - use KAMAILIO mod interface define - bits of updates in the comments --- Modified: src/modules/ims_charging/Makefile Modified: src/modules/ims_diameter_server/Makefile Modified: src/modules/ims_icscf/Makefile Modified: src/modules/ims_qos/Makefile Modified: src/modules/ims_registrar_pcscf/Makefile Modified: src/modules/ims_registrar_scscf/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d40c65a9834d6e0c12ee24e0fde5b75… Patch: https://github.com/kamailio/kamailio/commit/d40c65a9834d6e0c12ee24e0fde5b75… --- diff --git a/src/modules/ims_charging/Makefile b/src/modules/ims_charging/Makefile index 47767af2c7..3d95425135 100644 --- a/src/modules/ims_charging/Makefile +++ b/src/modules/ims_charging/Makefile @@ -8,7 +8,7 @@ auto_gen= NAME=ims_charging.so LIBS= -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_diameter_server/Makefile b/src/modules/ims_diameter_server/Makefile index cc7a9fd702..e9c454dd71 100644 --- a/src/modules/ims_diameter_server/Makefile +++ b/src/modules/ims_diameter_server/Makefile @@ -1,14 +1,14 @@ # -# ims_qos make file +# ims_diameter_server make file +# # -# include ../../Makefile.defs auto_gen= NAME=ims_diameter_server.so LIBS=-lm -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_icscf/Makefile b/src/modules/ims_icscf/Makefile index 2a1490699e..0e8e2486a2 100644 --- a/src/modules/ims_icscf/Makefile +++ b/src/modules/ims_icscf/Makefile @@ -20,7 +20,7 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif -DEFS += -DOPENSER_MOD_INTERFACE +DEFS += -DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 diff --git a/src/modules/ims_qos/Makefile b/src/modules/ims_qos/Makefile index 1aec80850d..86d1646691 100644 --- a/src/modules/ims_qos/Makefile +++ b/src/modules/ims_qos/Makefile @@ -8,7 +8,7 @@ auto_gen= NAME=ims_qos.so LIBS= -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_registrar_pcscf/Makefile b/src/modules/ims_registrar_pcscf/Makefile index a02fa4a88a..8de914fbb2 100644 --- a/src/modules/ims_registrar_pcscf/Makefile +++ b/src/modules/ims_registrar_pcscf/Makefile @@ -1,5 +1,5 @@ # -# registrar module makefile +# ims registrar module makefile # # # WARNING: do not run this directly, it should be run by the master Makefile @@ -26,7 +26,7 @@ ifneq ($(OS),darwin) LIBS += -lpthread endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_registrar_scscf/Makefile b/src/modules/ims_registrar_scscf/Makefile index 77fe9c2fe2..34e738a275 100644 --- a/src/modules/ims_registrar_scscf/Makefile +++ b/src/modules/ims_registrar_scscf/Makefile @@ -1,5 +1,5 @@ # -# registrar module makefile +# ims registrar module makefile # # # WARNING: do not run this directly, it should be run by the master Makefile @@ -21,7 +21,7 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims

6 years, 7 months

git:master:072b9adc: utils: kamdbctl - version set to 5.2.0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 072b9adcb267d8ff21d356bdcd57881d9576c336 URL: https://github.com/kamailio/kamailio/commit/072b9adcb267d8ff21d356bdcd57881… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-29T09:11:24+01:00 utils: kamdbctl - version set to 5.2.0 --- Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/072b9adcb267d8ff21d356bdcd57881… Patch: https://github.com/kamailio/kamailio/commit/072b9adcb267d8ff21d356bdcd57881… --- diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index 224111b9fb..dece5b60c5 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -1,11 +1,11 @@ -#!/bin/bash +#!/bin/bash # # control tool for maintaining Kamailio databases # #=================================================================== ### version for this script -VERSION='4.4.0' +VERSION='5.2.0' PATH=$PATH:/usr/local/sbin/

6 years, 7 months

Errored: kamailio/kamailio#5446 (master - 9f896a1)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #5446 Status: Errored Duration: 11 minutes and 3 seconds Commit: 9f896a1 (master) Author: Daniel-Constantin Mierla Message: utils/kamctl: version set to 5.2.0 View the changeset: https://github.com/kamailio/kamailio/compare/014958e62302...9f896a11d920 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/334426881?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:9f896a11: utils/kamctl: version set to 5.2.0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9f896a11d920523ab3616b8cae795cb44aaf6328 URL: https://github.com/kamailio/kamailio/commit/9f896a11d920523ab3616b8cae795cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-28T18:56:44+01:00 utils/kamctl: version set to 5.2.0 --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/9f896a11d920523ab3616b8cae795cb… Patch: https://github.com/kamailio/kamailio/commit/9f896a11d920523ab3616b8cae795cb… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index f82f6f540a..de667187d6 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.0.0' +VERSION='5.2.0' PATH=$PATH:/usr/local/sbin/

6 years, 7 months

Errored: kamailio/kamailio#5444 (master - 2f04f05)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #5444 Status: Errored Duration: 10 minutes and 47 seconds Commit: 2f04f05 (master) Author: Daniel-Constantin Mierla Message: Merge pull request #1416 from kamailio/json-api json: add API for json_parse and json_extract_field View the changeset: https://github.com/kamailio/kamailio/compare/038c3f16d9a8...2f04f057c503 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/334120210?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:014958e6: modules/ims*: define KAMAILIO_MOD_INTERFACE instead of the old variant

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 014958e62302819630ead306baa8e765b062196f URL: https://github.com/kamailio/kamailio/commit/014958e62302819630ead306baa8e76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-27T16:26:04+01:00 modules/ims*: define KAMAILIO_MOD_INTERFACE instead of the old variant --- Modified: src/modules/ims_auth/Makefile Modified: src/modules/ims_isc/Makefile Modified: src/modules/ims_ocs/Makefile Modified: src/modules/ims_usrloc_pcscf/Makefile Modified: src/modules/ims_usrloc_scscf/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/014958e62302819630ead306baa8e76… Patch: https://github.com/kamailio/kamailio/commit/014958e62302819630ead306baa8e76… --- diff --git a/src/modules/ims_auth/Makefile b/src/modules/ims_auth/Makefile index 967adddc90..1b44fef604 100644 --- a/src/modules/ims_auth/Makefile +++ b/src/modules/ims_auth/Makefile @@ -25,7 +25,7 @@ ifneq ($(OS),darwin) LIBS += -lrt endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_isc/Makefile b/src/modules/ims_isc/Makefile index 1fe2ee4ab0..828a6d0673 100644 --- a/src/modules/ims_isc/Makefile +++ b/src/modules/ims_isc/Makefile @@ -1,7 +1,7 @@ # # ims_isc make file # -# +# include ../../Makefile.defs auto_gen= @@ -20,7 +20,7 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_ocs/Makefile b/src/modules/ims_ocs/Makefile index e4b03f10ec..9efb049f4b 100644 --- a/src/modules/ims_ocs/Makefile +++ b/src/modules/ims_ocs/Makefile @@ -1,5 +1,5 @@ # -# ims_qos make file +# ims_ocs make file # # @@ -8,7 +8,7 @@ auto_gen= NAME=ims_ocs.so LIBS= -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_usrloc_pcscf/Makefile b/src/modules/ims_usrloc_pcscf/Makefile index 0c156de9f2..0b3acb1629 100644 --- a/src/modules/ims_usrloc_pcscf/Makefile +++ b/src/modules/ims_usrloc_pcscf/Makefile @@ -8,7 +8,7 @@ include ../../Makefile.defs auto_gen= NAME=ims_usrloc_pcscf.so -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 diff --git a/src/modules/ims_usrloc_scscf/Makefile b/src/modules/ims_usrloc_scscf/Makefile index 0c7556fb2c..3a45896f5f 100644 --- a/src/modules/ims_usrloc_scscf/Makefile +++ b/src/modules/ims_usrloc_scscf/Makefile @@ -8,7 +8,7 @@ include ../../Makefile.defs auto_gen= NAME=ims_usrloc_scscf.so -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1

6 years, 7 months

git:master:2f04f057: Merge pull request #1416 from kamailio/json-api

by GitHub

Module: kamailio Branch: master Commit: 2f04f057c50344b6e204862b40e2bab83431912f URL: https://github.com/kamailio/kamailio/commit/2f04f057c50344b6e204862b40e2bab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-27T16:22:19+01:00 Merge pull request #1416 from kamailio/json-api json: add API for json_parse and json_extract_field --- Added: src/modules/json/api.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2f04f057c50344b6e204862b40e2bab… Patch: https://github.com/kamailio/kamailio/commit/2f04f057c50344b6e204862b40e2bab… --- diff --git a/src/modules/json/api.h b/src/modules/json/api.h new file mode 100644 index 0000000000..80d18c2c25 --- /dev/null +++ b/src/modules/json/api.h @@ -0,0 +1,57 @@ +/** + * + * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of kamailio, a free SIP server. + * + * kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _JSON_API_H_ +#define _JSON_API_H_ + +#include "../../core/sr_module.h" + +typedef struct json_object *(*json_parse_f) (const char *str); +typedef str (*json_extract_field_f)( + struct json_object *json_obj, char *json_name); + +typedef struct json_api { + json_parse_f json_parse; + json_extract_field_f extract_field; +} json_api_t; + +typedef int (*bind_json_f) (json_api_t *api); +int bind_json(json_api_t *api); + +/** + * @brief Load the JSON API + */ +static inline int json_load_api(json_api_t *api) { + bind_json_f bindjson; + + bindjson = (bind_json_f)find_export("bind_json", 0, 0); + if (bindjson == 0) { + LM_ERR("cannot find bind_json\n"); + return -1; + } + if (bindjson(api) < 0) { + LM_ERR("cannot bind json api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index 4ab9ab1829..a008c13085 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -27,6 +27,7 @@ #include "../../core/mod_fix.h" #include "../../core/sr_module.h" +#include "api.h" #include "json_funcs.h" #include "json_trans.h" @@ -41,11 +42,11 @@ char tr_json_escape_char = '%'; static tr_export_t mod_trans[] = { {{"json", sizeof("json") - 1}, json_tr_parse}, {{0, 0}, 0}}; -static cmd_export_t cmds[]={ - {"json_get_field", (cmd_function)json_get_field, 3, - fixup_get_field, fixup_get_field_free, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0} -}; +static cmd_export_t cmds[] = { + {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, + {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = { {"json_escape_char", PARAM_STR, &tr_json_escape_str}, {0, 0, 0}}; @@ -64,6 +65,26 @@ struct module_exports exports = { 0 /* per-child init function */ }; +str _json_extract_field(struct json_object *json_obj, char *json_name) +{ + str val; + json_extract_field(json_name, val); + return val; +} + +/** + * + */ +int bind_json(json_api_t *api) { + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->json_parse = json_parse; + api->extract_field = _json_extract_field; + return 0; +} + int mod_register(char *path, int *dlflags, void *p1, void *p2) { if(json_tr_init_buffers() < 0) {

6 years, 7 months

git:master:a9b8682f: json: add API

by Emmanuel Schmidbauer

Module: kamailio Branch: master Commit: a9b8682f522f46c56144e61ff029cb1ab0413274 URL: https://github.com/kamailio/kamailio/commit/a9b8682f522f46c56144e61ff029cb1… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-01-26T09:20:40-07:00 json: add API --- Added: src/modules/json/api.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a9b8682f522f46c56144e61ff029cb1… Patch: https://github.com/kamailio/kamailio/commit/a9b8682f522f46c56144e61ff029cb1… --- diff --git a/src/modules/json/api.h b/src/modules/json/api.h new file mode 100644 index 0000000000..80d18c2c25 --- /dev/null +++ b/src/modules/json/api.h @@ -0,0 +1,57 @@ +/** + * + * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of kamailio, a free SIP server. + * + * kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _JSON_API_H_ +#define _JSON_API_H_ + +#include "../../core/sr_module.h" + +typedef struct json_object *(*json_parse_f) (const char *str); +typedef str (*json_extract_field_f)( + struct json_object *json_obj, char *json_name); + +typedef struct json_api { + json_parse_f json_parse; + json_extract_field_f extract_field; +} json_api_t; + +typedef int (*bind_json_f) (json_api_t *api); +int bind_json(json_api_t *api); + +/** + * @brief Load the JSON API + */ +static inline int json_load_api(json_api_t *api) { + bind_json_f bindjson; + + bindjson = (bind_json_f)find_export("bind_json", 0, 0); + if (bindjson == 0) { + LM_ERR("cannot find bind_json\n"); + return -1; + } + if (bindjson(api) < 0) { + LM_ERR("cannot bind json api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index 4ab9ab1829..a008c13085 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -27,6 +27,7 @@ #include "../../core/mod_fix.h" #include "../../core/sr_module.h" +#include "api.h" #include "json_funcs.h" #include "json_trans.h" @@ -41,11 +42,11 @@ char tr_json_escape_char = '%'; static tr_export_t mod_trans[] = { {{"json", sizeof("json") - 1}, json_tr_parse}, {{0, 0}, 0}}; -static cmd_export_t cmds[]={ - {"json_get_field", (cmd_function)json_get_field, 3, - fixup_get_field, fixup_get_field_free, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0} -}; +static cmd_export_t cmds[] = { + {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, + {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = { {"json_escape_char", PARAM_STR, &tr_json_escape_str}, {0, 0, 0}}; @@ -64,6 +65,26 @@ struct module_exports exports = { 0 /* per-child init function */ }; +str _json_extract_field(struct json_object *json_obj, char *json_name) +{ + str val; + json_extract_field(json_name, val); + return val; +} + +/** + * + */ +int bind_json(json_api_t *api) { + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->json_parse = json_parse; + api->extract_field = _json_extract_field; + return 0; +} + int mod_register(char *path, int *dlflags, void *p1, void *p2) { if(json_tr_init_buffers() < 0) {

6 years, 7 months

← Newer
1
...
9
10
11
12
13
14
15
...
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