sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
538 discussions

git:master:18e3327b: kamctl: added DBPORT option

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 18e3327bedc1647a5abe0d377b15b74b2e860ef4 URL: https://github.com/kamailio/kamailio/commit/18e3327bedc1647a5abe0d377b15b74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-09T20:35:47+01:00 kamctl: added DBPORT option - allows to specify database engine (mysql/psql) port - requested by GH #916 --- Modified: utils/kamctl/kamctl.mysql Modified: utils/kamctl/kamctl.pgsql Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.mysql Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/18e3327bedc1647a5abe0d377b15b74… Patch: https://github.com/kamailio/kamailio/commit/18e3327bedc1647a5abe0d377b15b74…

7 years, 11 months

git:master:dad79f34: kamcmd: add /usr/local to C defs and libs if readline is detected in the path

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dad79f34077eb818604293fe90b6565fa6a4f365 URL: https://github.com/kamailio/kamailio/commit/dad79f34077eb818604293fe90b6565… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-09T18:18:18+01:00 kamcmd: add /usr/local to C defs and libs if readline is detected in the path - reported by GH#920 --- Modified: utils/kamcmd/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/dad79f34077eb818604293fe90b6565… Patch: https://github.com/kamailio/kamailio/commit/dad79f34077eb818604293fe90b6565… --- diff --git a/utils/kamcmd/Makefile b/utils/kamcmd/Makefile index 1af68e2..aae4f13 100644 --- a/utils/kamcmd/Makefile +++ b/utils/kamcmd/Makefile @@ -14,8 +14,9 @@ else NAME?=kamcmd endif +readline_localpath=$(LOCALBASE)/include/readline/readline.h readline_locations= /usr/include/readline/readline.h \ - $(LOCALBASE)/include/readline/readline.h + $(readline_localpath) use_readline ?= ifneq (,$(MAKECMDGOALS)) @@ -58,7 +59,7 @@ endif ifeq ($(OS), darwin) readline_locations= /opt/local/include/readline/readline.h \ /usr/include/readline/readline.h \ - $(LOCALBASE)/include/readline/readline.h + $(readline_localpath) LIBS:= -lresolv endif ifneq (,$(findstring cygwin, $(OS))) @@ -77,13 +78,21 @@ endif endif ifeq ($(use_readline),1) + ifneq (,$(findstring opt, $(readline_path))) DEFS+=-DUSE_READLINE -I /opt/local/include - LIBS+=-L /opt/local/lib -lreadline -lncurses + LIBS+=-L/opt/local/lib -lreadline -lncurses else + +ifeq ($(readline_path),$(readline_localpath)) + DEFS+=-I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib +endif + DEFS+=-DUSE_READLINE LIBS+=-lreadline -lncurses endif + endif

7 years, 11 months

git:master:bbee3295: examples: kemi - update lua script to use KSR.x.exit()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bbee329599b1a3a7575723dc08d5bf86e5d4eb0f URL: https://github.com/kamailio/kamailio/commit/bbee329599b1a3a7575723dc08d5bf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-09T14:39:10+01:00 examples: kemi - update lua script to use KSR.x.exit() --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/bbee329599b1a3a7575723dc08d5bf8… Patch: https://github.com/kamailio/kamailio/commit/bbee329599b1a3a7575723dc08d5bf8…

7 years, 11 months

git:master:b511d907: app_lua: aligned kemi api for KSR.x.drop()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b511d90766c3dcf5643c8a29d02eb382b740a413 URL: https://github.com/kamailio/kamailio/commit/b511d90766c3dcf5643c8a29d02eb38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-09T14:18:23+01:00 app_lua: aligned kemi api for KSR.x.drop() --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/b511d90766c3dcf5643c8a29d02eb38… Patch: https://github.com/kamailio/kamailio/commit/b511d90766c3dcf5643c8a29d02eb38… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index b5d8e67..3b18ff5 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1745,9 +1745,26 @@ static int sr_kemi_lua_exit (lua_State *L) /** * */ +static int sr_kemi_lua_drop (lua_State *L) +{ + str *s; + + LM_DBG("script drop call\n"); + sr_kemi_core_drop(NULL); + s = sr_kemi_lua_exit_string_get(); + lua_getglobal(L, "error"); + lua_pushstring(L, s->s); + lua_call(L, 1, 0); + return 0; +} + +/** + * + */ static const luaL_Reg _sr_kemi_x_Map [] = { {"modf", lua_sr_modf}, {"exit", sr_kemi_lua_exit}, + {"drop", sr_kemi_lua_drop}, {NULL, NULL} };

7 years, 11 months

git:master:6830fbf1: app_lua: enable compat mode for newer lua versions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6830fbf17b37a2860827171dd99304bf0975ebf7 URL: https://github.com/kamailio/kamailio/commit/6830fbf17b37a2860827171dd99304b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-09T14:15:27+01:00 app_lua: enable compat mode for newer lua versions --- Modified: src/modules/app_lua/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/6830fbf17b37a2860827171dd99304b… Patch: https://github.com/kamailio/kamailio/commit/6830fbf17b37a2860827171dd99304b… --- diff --git a/src/modules/app_lua/Makefile b/src/modules/app_lua/Makefile index 0292c32..0b630e6 100644 --- a/src/modules/app_lua/Makefile +++ b/src/modules/app_lua/Makefile @@ -26,7 +26,7 @@ ifeq ($(BUILDER),) DEFS+= -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include/lua5.2 LIBS+= -llua5.2 else - DEFS+= -I$(LOCALBASE)/include/lua + DEFS+= -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include/lua LIBS+= -llua endif endif @@ -62,7 +62,7 @@ ifeq ($(BUILDER),) DEFS+= -DLUA_COMPAT_MODULE -I/usr/include/lua5.2 LIBS = -llua5.2 -lm else - DEFS+= -I/usr/include/lua + DEFS+= -DLUA_COMPAT_MODULE -I/usr/include/lua LIBS = -llua -lm endif endif @@ -76,9 +76,11 @@ ifeq ($(BUILDER),) LIBS = $(shell pkg-config --libs lua-5.1) else ifeq ($(LUAVER),52) - DEFS+= -DLUA_COMPAT_MODULE $(shell pkg-config --cflags lua5.2) + DEFS+= -DLUA_COMPAT_MODULE + DEFS+= $(shell pkg-config --cflags lua5.2) LIBS = $(shell pkg-config --libs lua5.2) else + DEFS+= -DLUA_COMPAT_MODULE DEFS+= $(shell pkg-config --cflags lua) LIBS = $(shell pkg-config --libs lua) endif

7 years, 11 months

git:master:2c1a3d12: Merge pull request #917 from kamailio/cchance/presence

by GitHub

Module: kamailio Branch: master Commit: 2c1a3d122a7fc18f1563a3cc4bec27604e0adb5a URL: https://github.com/kamailio/kamailio/commit/2c1a3d122a7fc18f1563a3cc4bec276… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-09T10:41:16Z Merge pull request #917 from kamailio/cchance/presence presence: delay aux_body_processing until after subscription has been updated --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/notify.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/2c1a3d122a7fc18f1563a3cc4bec276… Patch: https://github.com/kamailio/kamailio/commit/2c1a3d122a7fc18f1563a3cc4bec276…

7 years, 11 months

git:master:b429f625: presence: delay aux_body_processing until after subscription has been updated

by Charles Chance

Module: kamailio Branch: master Commit: b429f625ba409cb668b00155996a5f4a4f1733d8 URL: https://github.com/kamailio/kamailio/commit/b429f625ba409cb668b00155996a5f4… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-01-06T23:21:52Z presence: delay aux_body_processing until after subscription has been updated - fixes out-of-sequence version when subs_db_mode <> 3 and fast_notify is enabled --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/notify.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/b429f625ba409cb668b00155996a5f4… Patch: https://github.com/kamailio/kamailio/commit/b429f625ba409cb668b00155996a5f4…

7 years, 11 months

git:master:0b4c0450: modules: readme files regenerated - sqlops ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 0b4c045052943893e22a935f933e4699e4f9d593 URL: https://github.com/kamailio/kamailio/commit/0b4c045052943893e22a935f933e469… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-01-08T22:31:15+01:00 modules: readme files regenerated - sqlops ... --- Modified: src/modules/sqlops/README --- Diff: https://github.com/kamailio/kamailio/commit/0b4c045052943893e22a935f933e469… Patch: https://github.com/kamailio/kamailio/commit/0b4c045052943893e22a935f933e469… --- diff --git a/src/modules/sqlops/README b/src/modules/sqlops/README index b04f8ea..7e919f1 100644 --- a/src/modules/sqlops/README +++ b/src/modules/sqlops/README @@ -28,6 +28,7 @@ Daniel-Constantin Mierla 3.1. sqlcon (str) 3.2. sqlres (str) + 3.3. tr_buf_size (int) 4. Functions @@ -46,13 +47,14 @@ Daniel-Constantin Mierla 1.1. Set sqlcon parameter 1.2. Set sqlres parameter - 1.3. sql_query() usage - 1.4. sql_xquery() usage - 1.5. sql_pvquery() usage - 1.6. sql_result_free() usage - 1.7. sql_query_async() usage - 1.8. $dbr(result=>key) usage - 1.9. $sqlrows(con) usage + 1.3. Set tr_buf_size parameter + 1.4. sql_query() usage + 1.5. sql_xquery() usage + 1.6. sql_pvquery() usage + 1.7. sql_result_free() usage + 1.8. sql_query_async() usage + 1.9. $dbr(result=>key) usage + 1.10. $sqlrows(con) usage Chapter 1. Admin Guide @@ -68,6 +70,7 @@ Chapter 1. Admin Guide 3.1. sqlcon (str) 3.2. sqlres (str) + 3.3. tr_buf_size (int) 4. Functions @@ -128,6 +131,7 @@ Chapter 1. Admin Guide 3.1. sqlcon (str) 3.2. sqlres (str) + 3.3. tr_buf_size (int) 3.1. sqlcon (str) @@ -166,6 +170,17 @@ modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") modparam("sqlops", "sqlres", "ra") ... +3.3. tr_buf_size (int) + + The size of the transformations for SQL operations. + + Default value is 2048. + + Example 1.3. Set tr_buf_size parameter +... +modparam("sqlops", "tr_buf_size", 4096) +... + 4. Functions 4.1. sql_query(connection, query[, result]) @@ -194,7 +209,7 @@ modparam("sqlops", "sqlres", "ra") This function can be used from ANY_ROUTE. - Example 1.3. sql_query() usage + Example 1.4. sql_query() usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... @@ -214,7 +229,7 @@ sql_result_free("ra"); This function can be used from ANY_ROUTE. - Example 1.4. sql_xquery() usage + Example 1.5. sql_xquery() usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... @@ -252,7 +267,7 @@ if (sql_xquery("ca", "select * from domain", "ra") == 1) { successful query, 2 if query provided no result set, 3 if result is ignored (no result parameter given) - Example 1.5. sql_pvquery() usage + Example 1.6. sql_pvquery() usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... @@ -266,7 +281,7 @@ sql_pvquery("ca", "select 'col1', 2, NULL, 'sip:test@example.com'", This function can be used from ANY_ROUTE. - Example 1.6. sql_result_free() usage + Example 1.7. sql_result_free() usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... @@ -290,7 +305,7 @@ sql_result_free("ra"); This function can be used from ANY_ROUTE. - Example 1.7. sql_query_async() usage + Example 1.8. sql_query_async() usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... @@ -317,7 +332,7 @@ sql_query_async("ca", "delete from domain"); integer. * colname[N] - return the name of the N-th column in the result set. - Example 1.8. $dbr(result=>key) usage + Example 1.9. $dbr(result=>key) usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... @@ -376,7 +391,7 @@ if (sql_xquery("ca", "select * from domain", "ra") == 1) “con” must be the name identifying a DB connection. - Example 1.9. $sqlrows(con) usage + Example 1.10. $sqlrows(con) usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ...

7 years, 11 months

git:master:ac566990: sqlops: allow to set the size of sql escape buffer for transformations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ac5669901693a67051775673763fde6eb8f37c38 URL: https://github.com/kamailio/kamailio/commit/ac5669901693a67051775673763fde6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-08T22:10:59+01:00 sqlops: allow to set the size of sql escape buffer for transformations - alternative to GH #899 --- Modified: src/modules/sqlops/doc/sqlops_admin.xml Modified: src/modules/sqlops/sql_trans.c Modified: src/modules/sqlops/sql_trans.h Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/ac5669901693a67051775673763fde6… Patch: https://github.com/kamailio/kamailio/commit/ac5669901693a67051775673763fde6…

7 years, 11 months

git:master:9077a879: app_jsdt: exposed KSR.x.drop()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9077a87978ff57ff369f8fbc103d8c52b92be622 URL: https://github.com/kamailio/kamailio/commit/9077a87978ff57ff369f8fbc103d8c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-08T14:01:58+01:00 app_jsdt: exposed KSR.x.drop() --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/9077a87978ff57ff369f8fbc103d8c5… Patch: https://github.com/kamailio/kamailio/commit/9077a87978ff57ff369f8fbc103d8c5… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index bf6686a..a903375 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -411,6 +411,17 @@ static int jsdt_sr_exit (duk_context *J) /** * */ +static int jsdt_sr_drop (duk_context *J) +{ + sr_kemi_core_drop(NULL); + duk_eval_string_noresult(J, JSDT_SR_EXIT_EXEC_STR); + return 0; +} + + +/** + * + */ static int jsdt_sr_modf (duk_context *J) { int ret; @@ -572,6 +583,7 @@ static int jsdt_sr_modf (duk_context *J) const duk_function_list_entry _sr_kemi_x_J_Map[] = { { "exit", jsdt_sr_exit, 0 /* 0 args */ }, + { "drop", jsdt_sr_drop, 0 /* 0 args */ }, { "modf", jsdt_sr_modf, DUK_VARARGS /* var args */ }, { NULL, NULL, 0 } };

7 years, 11 months

← Newer
1
...
30
31
32
33
34
35
36
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017