sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
248 discussions

git:master:c7fdbbf2: lib: wrapper function to get next faked msg

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c7fdbbf2dceee2d93902274c0c5da2766b928cbf URL: https://github.com/kamailio/kamailio/commit/c7fdbbf2dceee2d93902274c0c5da27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-18T14:20:13+02:00 lib: wrapper function to get next faked msg - does initialization of faked msg if not done before --- Modified: lib/kcore/faked_msg.c Modified: lib/kcore/faked_msg.h --- Diff: https://github.com/kamailio/kamailio/commit/c7fdbbf2dceee2d93902274c0c5da27… Patch: https://github.com/kamailio/kamailio/commit/c7fdbbf2dceee2d93902274c0c5da27… --- diff --git a/lib/kcore/faked_msg.c b/lib/kcore/faked_msg.c index 1132a9b..ae010e9 100644 --- a/lib/kcore/faked_msg.c +++ b/lib/kcore/faked_msg.c @@ -71,7 +71,7 @@ int faked_msg_init(void) return 0; } -struct sip_msg* faked_msg_next(void) +sip_msg_t* faked_msg_next(void) { _faked_msg.id = 1 + _faked_msg_no++; _faked_msg.pid = my_pid(); @@ -79,3 +79,9 @@ struct sip_msg* faked_msg_next(void) clear_branches(); return &_faked_msg; } + +sip_msg_t* faked_msg_get_next(void) +{ + faked_msg_init(); + return faked_msg_next(); +} diff --git a/lib/kcore/faked_msg.h b/lib/kcore/faked_msg.h index 31718a8..fe704ca 100644 --- a/lib/kcore/faked_msg.h +++ b/lib/kcore/faked_msg.h @@ -25,6 +25,7 @@ #include "../../parser/msg_parser.h" int faked_msg_init(void); -struct sip_msg* faked_msg_next(void); +sip_msg_t* faked_msg_next(void); +sip_msg_t* faked_msg_get_next(void); #endif

9 years, 7 months

git:master:38bf1ef0: app_lua: exported ndb_mongodb cmd to lua

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 38bf1ef014ce39454a602a34045a3eb247c18201 URL: https://github.com/kamailio/kamailio/commit/38bf1ef014ce39454a602a34045a3eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-18T11:32:33+02:00 app_lua: exported ndb_mongodb cmd to lua --- Modified: modules/app_lua/app_lua_exp.c --- Diff: https://github.com/kamailio/kamailio/commit/38bf1ef014ce39454a602a34045a3eb… Patch: https://github.com/kamailio/kamailio/commit/38bf1ef014ce39454a602a34045a3eb… --- diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index d2d0188..540d5bf 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -55,6 +55,7 @@ #include "../../modules/cfgutils/api.h" #include "../../modules/tmx/api.h" #include "../../modules/mqueue/api.h" +#include "../../modules/ndb_mongodb/api.h" #include "app_lua_api.h" @@ -82,6 +83,7 @@ #define SR_LUA_EXP_MOD_CFGUTILS (1<<21) #define SR_LUA_EXP_MOD_TMX (1<<22) #define SR_LUA_EXP_MOD_MQUEUE (1<<23) +#define SR_LUA_EXP_MOD_NDB_MONGODB (1<<24) /** * @@ -210,6 +212,12 @@ static tmx_api_t _lua_tmxb; static mq_api_t _lua_mqb; /** + * mqueue + */ +static ndb_mongodb_api_t _lua_ndb_mongodbb; + + +/** * */ static int lua_sr_sl_send_reply (lua_State *L) @@ -2604,6 +2612,48 @@ static const luaL_Reg _sr_mqueue_Map [] = { /** * */ +static int lua_sr_ndb_mongodb_cmd(lua_State *L) +{ + int ret; + str param[6]; + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_NDB_MONGODB)) + { + LM_WARN("weird: ndb_mongodb function executed but module not registered\n"); + return app_lua_return_error(L); + } + if(lua_gettop(L)!=5) + { + LM_WARN("invalid number of parameters from Lua\n"); + return app_lua_return_error(L); + } + + param[0].s = (char *) lua_tostring(L, -5); + param[0].len = strlen(param[0].s); + param[1].s = (char *) lua_tostring(L, -4); + param[1].len = strlen(param[1].s); + param[2].s = (char *) lua_tostring(L, -3); + param[2].len = strlen(param[2].s); + param[3].s = (char *) lua_tostring(L, -2); + param[3].len = strlen(param[3].s); + param[4].s = (char *) lua_tostring(L, -1); + param[4].len = strlen(param[4].s); + + ret = _lua_ndb_mongodbb.cmd(&param[0], &param[1], &param[2], &param[3], &param[4]); + return app_lua_return_int(L, ret); +} + +/** + * + */ +static const luaL_Reg _sr_ndb_mongodb_Map [] = { + {"cmd", lua_sr_ndb_mongodb_cmd}, + {NULL, NULL} +}; + +/** + * + */ int lua_sr_exp_init_mod(void) { if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL) @@ -2852,6 +2902,17 @@ int lua_sr_exp_init_mod(void) } LM_DBG("loaded mqueue api\n"); } + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_NDB_MONGODB) + { + /* bind the NDB_MONGODB API */ + if (ndb_mongodb_load_api(&_lua_ndb_mongodbb) < 0) + { + LM_ERR("cannot bind to NDB_MONGODB API\n"); + return -1; + } + LM_DBG("loaded ndb_mongodb api\n"); + } + return 0; } @@ -2937,6 +2998,9 @@ int lua_sr_exp_register_mod(char *mname) } else if(len==6 && strcmp(mname, "mqueue")==0) { _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_MQUEUE; return 0; + } else if(len==11 && strcmp(mname, "ndb_mongodb")==0) { + _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_NDB_MONGODB; + return 0; } return -1; @@ -2995,5 +3059,7 @@ void lua_sr_exp_openlibs(lua_State *L) luaL_openlib(L, "sr.tmx", _sr_tmx_Map, 0); if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_MQUEUE) luaL_openlib(L, "sr.mq", _sr_mqueue_Map, 0); + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_NDB_MONGODB) + luaL_openlib(L, "sr.ndb_mongodb", _sr_ndb_mongodb_Map, 0); }

9 years, 7 months

git:master:dcce311f: ndb_mongodb: exported inter-module api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dcce311f4fd4a3a330d80294fc1137b66ea1f7d9 URL: https://github.com/kamailio/kamailio/commit/dcce311f4fd4a3a330d80294fc1137b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-17T15:46:06+02:00 ndb_mongodb: exported inter-module api --- Added: modules/ndb_mongodb/api.h Modified: modules/ndb_mongodb/mongodb_client.c Modified: modules/ndb_mongodb/ndb_mongodb_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dcce311f4fd4a3a330d80294fc1137b… Patch: https://github.com/kamailio/kamailio/commit/dcce311f4fd4a3a330d80294fc1137b… --- diff --git a/modules/ndb_mongodb/api.h b/modules/ndb_mongodb/api.h new file mode 100644 index 0000000..4ffd43f --- /dev/null +++ b/modules/ndb_mongodb/api.h @@ -0,0 +1,69 @@ +/** + * ndb_mongodb module + * + * Copyright (C) 2015 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 _NDB_MONGODB_API_H_ +#define _NDB_MONGODB_API_H_ + +#include "../../sr_module.h" + +typedef int (*mongodbc_exec_simple_f)(str *srv, str *dname, str *cname, str *cmd, str *res); +typedef int (*mongodbc_exec_f)(str *srv, str *dname, str *cname, str *cmd, str *res); +typedef int (*mongodbc_find_f)(str *srv, str *dname, str *cname, str *cmd, str *res); +typedef int (*mongodbc_find_one_f)(str *srv, str *dname, str *cname, str *cmd, str *res); +typedef int (*mongodbc_next_reply_f)(str *name); +typedef int (*mongodbc_free_reply_f)(str *name); + + +typedef struct ndb_mongodb_api { + mongodbc_exec_simple_f cmd_simple; + mongodbc_exec_f cmd; + mongodbc_find_f find; + mongodbc_find_one_f find_one; + mongodbc_next_reply_f next_reply; + mongodbc_next_reply_f free_reply; +} ndb_mongodb_api_t; + +typedef int (*bind_ndb_mongodb_f)(ndb_mongodb_api_t* api); +int bind_ndb_mongodb(ndb_mongodb_api_t* api); + +/** + * @brief Load the dispatcher API + */ +static inline int ndb_mongodb_load_api(ndb_mongodb_api_t *api) +{ + bind_ndb_mongodb_f bindndbmongodb; + + bindndbmongodb = (bind_ndb_mongodb_f)find_export("bind_ndb_mongodb", 0, 0); + if(bindndbmongodb == 0) { + LM_ERR("cannot find bind_ndb_mongodb\n"); + return -1; + } + if(bindndbmongodb(api)<0) + { + LM_ERR("cannot bind ndb mongodb api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/modules/ndb_mongodb/mongodb_client.c b/modules/ndb_mongodb/mongodb_client.c index 5b82c44..5765a1a 100644 --- a/modules/ndb_mongodb/mongodb_client.c +++ b/modules/ndb_mongodb/mongodb_client.c @@ -32,6 +32,7 @@ #include "../../ut.h" #include "mongodb_client.h" +#include "api.h" static mongodbc_server_t *_mongodbc_srv_list=NULL; @@ -489,3 +490,25 @@ int mongodbc_next_reply(str *name) LM_DBG("next cursor result: [[%s]]\n", (rpl->jsonrpl.s)?rpl->jsonrpl.s:"<null>"); return 0; } + +/** + * + */ +int bind_ndb_mongodb(ndb_mongodb_api_t* api) +{ + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + + memset(api, 0, sizeof(ndb_mongodb_api_t)); + api->cmd = mongodbc_exec; + api->cmd_simple = mongodbc_exec_simple; + api->find = mongodbc_find; + api->find_one = mongodbc_find_one; + api->next_reply = mongodbc_next_reply; + api->free_reply = mongodbc_free_reply; + + return 0; +} + diff --git a/modules/ndb_mongodb/ndb_mongodb_mod.c b/modules/ndb_mongodb/ndb_mongodb_mod.c index 25c7fef..775ff6f 100644 --- a/modules/ndb_mongodb/ndb_mongodb_mod.c +++ b/modules/ndb_mongodb/ndb_mongodb_mod.c @@ -31,6 +31,7 @@ #include "../../trim.h" #include "mongodb_client.h" +#include "api.h" MODULE_VERSION @@ -76,6 +77,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"mongodb_next", (cmd_function)w_mongodb_next_reply, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"bind_ndb_mongodb", (cmd_function)bind_ndb_mongodb, 0, + 0, 0, 0}, {0, 0, 0, 0, 0, 0} };

9 years, 7 months

git:master:32b15359: Merge pull request #130 from linuxmaniac/vseva/travis_install

by Victor Seva

Module: kamailio Branch: master Commit: 32b153592f6ec0d7ef8037731102a27c166a9220 URL: https://github.com/kamailio/kamailio/commit/32b153592f6ec0d7ef8037731102a27… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-17T10:11:02+02:00 Merge pull request #130 from linuxmaniac/vseva/travis_install test/travis: add installation to the test --- Modified: test/travis/build_travis.sh --- Diff: https://github.com/kamailio/kamailio/commit/32b153592f6ec0d7ef8037731102a27… Patch: https://github.com/kamailio/kamailio/commit/32b153592f6ec0d7ef8037731102a27… --- diff --git a/test/travis/build_travis.sh b/test/travis/build_travis.sh index 0bb04ca..04b4b2c 100755 --- a/test/travis/build_travis.sh +++ b/test/travis/build_travis.sh @@ -23,3 +23,9 @@ for grp in ${PACKAGE_GROUPS}; do done #echo "unit tests" #make -C test/unit +if [[ "$CC" =~ "gcc" ]] ; then + echo "make install" + sudo make install +else + echo "skip make install step" +fi

9 years, 7 months

git:master:d67c0040: test/travis: add installation to the test

by Victor Seva

Module: kamailio Branch: master Commit: d67c0040058035088fd299f122cb37ba55c3256f URL: https://github.com/kamailio/kamailio/commit/d67c0040058035088fd299f122cb37b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-17T10:00:14+02:00 test/travis: add installation to the test - only for gcc. It seems to fail on travis with clang o_0 --- Modified: test/travis/build_travis.sh --- Diff: https://github.com/kamailio/kamailio/commit/d67c0040058035088fd299f122cb37b… Patch: https://github.com/kamailio/kamailio/commit/d67c0040058035088fd299f122cb37b… --- diff --git a/test/travis/build_travis.sh b/test/travis/build_travis.sh index 0bb04ca..04b4b2c 100755 --- a/test/travis/build_travis.sh +++ b/test/travis/build_travis.sh @@ -23,3 +23,9 @@ for grp in ${PACKAGE_GROUPS}; do done #echo "unit tests" #make -C test/unit +if [[ "$CC" =~ "gcc" ]] ; then + echo "make install" + sudo make install +else + echo "skip make install step" +fi

9 years, 7 months

[kamailio] test/travis: add installation to the test (#130)

by Victor Seva

We should test if the install process is working too You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/130 -- Commit Summary -- * test/travis: add installation to the test -- File Changes -- M test/travis/build_travis.sh (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/130.patch https://github.com/kamailio/kamailio/pull/130.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/130

9 years, 7 months

git:master:f09551a9: cr: add param to avoid failed dests

by lucian balanceanu

Module: kamailio Branch: master Commit: f09551a9a806d404e77bff4710c2410a1d9887ee URL: https://github.com/kamailio/kamailio/commit/f09551a9a806d404e77bff4710c2410… Author: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: 2015-04-16T18:48:04+03:00 cr: add param to avoid failed dests - adding config param avoid_failed_destinations to toggle on/off the avoidance of already failed destinations in cr_route --- Modified: modules/carrierroute/carrierroute.c Modified: modules/carrierroute/carrierroute.h Modified: modules/carrierroute/cr_func.c Modified: modules/carrierroute/doc/carrierroute_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f09551a9a806d404e77bff4710c2410… Patch: https://github.com/kamailio/kamailio/commit/f09551a9a806d404e77bff4710c2410…

9 years, 7 months

git:master:ffe18c08: modules/ims_qos: release dialog after referencing it in lookup

by jaybeepee

Module: kamailio Branch: master Commit: ffe18c0876dc0dec39ad9581fe20b53166ed6ff0 URL: https://github.com/kamailio/kamailio/commit/ffe18c0876dc0dec39ad9581fe20b53… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-04-16T15:29:10+02:00 modules/ims_qos: release dialog after referencing it in lookup --- Modified: modules/ims_qos/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ffe18c0876dc0dec39ad9581fe20b53… Patch: https://github.com/kamailio/kamailio/commit/ffe18c0876dc0dec39ad9581fe20b53…

9 years, 7 months

git:master:d323d0cf: Makefile: runbasedir should not use PREFIX.

by Victor Seva

Module: kamailio Branch: master Commit: d323d0cfdf3d100bd14fa01f631e2d65ed1ede95 URL: https://github.com/kamailio/kamailio/commit/d323d0cfdf3d100bd14fa01f631e2d6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-16T14:37:50+02:00 Makefile: runbasedir should not use PREFIX. kamcmd: add missing new RUN_DIR definition --- Modified: Makefile.defs Modified: utils/kamcmd/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d323d0cfdf3d100bd14fa01f631e2d6… Patch: https://github.com/kamailio/kamailio/commit/d323d0cfdf3d100bd14fa01f631e2d6… --- diff --git a/Makefile.defs b/Makefile.defs index 943da47..fb5e41c 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -431,14 +431,7 @@ doxygen_dir=doc/doxygen BASEDIR ?= $(DESTDIR) basedir = $(BASEDIR) - -ifeq ($(BASEDIR),) -RUNBASEDIR ?= $(PREFIX) -else -RUNBASEDIR ?= $(BASEDIR)/$(PREFIX) -endif - -runbasedir = $(RUNBASEDIR) +runbasedir = $(BASEDIR) # install location PREFIX ?= $(LOCALBASE) diff --git a/utils/kamcmd/Makefile b/utils/kamcmd/Makefile index cd3c5d3..60fe5e3 100644 --- a/utils/kamcmd/Makefile +++ b/utils/kamcmd/Makefile @@ -28,6 +28,7 @@ endif #ifneq (,$(MAKECMDGOALS)) # erase common DEFS (not needed) C_DEFS:= DEFS:= -DNAME='"$(NAME)"' -DSRNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -D__OS_$(OS) \ + -DRUN_DIR='"$(run_target)"' \ $(filter -D%HAVE -DARCH% -DOS% -D__CPU% -D__OS%, $(DEFS)) # use proper libs (we can't rely on LIBS value since we might be called

9 years, 7 months

git:master:b5d6699d: ctl: fix DEFAULT_CTL_SOCKER path

by Victor Seva

Module: kamailio Branch: master Commit: b5d6699d413c201a092d1c080e5f414417c89a18 URL: https://github.com/kamailio/kamailio/commit/b5d6699d413c201a092d1c080e5f414… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-16T14:36:43+02:00 ctl: fix DEFAULT_CTL_SOCKER path --- Modified: modules/ctl/ctl_defaults.h --- Diff: https://github.com/kamailio/kamailio/commit/b5d6699d413c201a092d1c080e5f414… Patch: https://github.com/kamailio/kamailio/commit/b5d6699d413c201a092d1c080e5f414… --- diff --git a/modules/ctl/ctl_defaults.h b/modules/ctl/ctl_defaults.h index 10498e3..b41aa53 100644 --- a/modules/ctl/ctl_defaults.h +++ b/modules/ctl/ctl_defaults.h @@ -4,7 +4,7 @@ /*listen by default on: */ #ifdef SRNAME /* this is used when compiling sercmd tool */ -#define DEFAULT_CTL_SOCKET "unixs:" RUN_DIR "/" SRNAME "/" SRNAME "_ctl" +#define DEFAULT_CTL_SOCKET "unixs:" RUN_DIR "/" SRNAME "_ctl" #else /* this is used when compiling sip server */ #define DEFAULT_CTL_SOCKET "unixs:" RUN_DIR "/" NAME "_ctl"

9 years, 7 months

← Newer
1
...
12
13
14
15
16
17
18
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2015