sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:4.2:03aa1baf: tm: reset 'found' variable at the beginning of each cycle over the branches
by Federico Cabiddu 09 Sep '15

09 Sep '15

Module: kamailio Branch: 4.2 Commit: 03aa1baf4c934e1bac478e4fde8702c1a6df39f0 URL: https://github.com/kamailio/kamailio/commit/03aa1baf4c934e1bac478e4fde8702c… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-09-09T12:37:53+02:00 tm: reset 'found' variable at the beginning of each cycle over the branches (cherry picked from commit 5a442b219075c18a7e3a5b0942f34d05d8baba60) --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/03aa1baf4c934e1bac478e4fde8702c… Patch: https://github.com/kamailio/kamailio/commit/03aa1baf4c934e1bac478e4fde8702c… --- diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index 16ed9ab..19d0d34 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -111,11 +111,11 @@ int t_append_branches(void) { init_branch_iterator(); - found = 0; while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri, &path, &bflags, &si, &ruid, &instance, &location_ua))) { LM_DBG("Current uri %.*s\n",current_uri.len, current_uri.s); + found = 0; for (i=0; i<outgoings; i++) { if (t->uac[i].ruid.len == ruid.len && !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len)) {

1 0

git:4.3:b0cab148: tm: reset 'found' variable at the beginning of each cycle over the branches
by Federico Cabiddu 09 Sep '15

09 Sep '15

Module: kamailio Branch: 4.3 Commit: b0cab1484979a7d975b56bf8dcf0dbc2e3510732 URL: https://github.com/kamailio/kamailio/commit/b0cab1484979a7d975b56bf8dcf0dbc… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-09-09T12:37:36+02:00 tm: reset 'found' variable at the beginning of each cycle over the branches (cherry picked from commit 5a442b219075c18a7e3a5b0942f34d05d8baba60) --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/b0cab1484979a7d975b56bf8dcf0dbc… Patch: https://github.com/kamailio/kamailio/commit/b0cab1484979a7d975b56bf8dcf0dbc… --- diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index 1cad198..d32ac1a 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -108,11 +108,11 @@ int t_append_branches(void) { init_branch_iterator(); - found = 0; while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri, &path, &bflags, &si, &ruid, &instance, &location_ua))) { LM_DBG("Current uri %.*s\n",current_uri.len, current_uri.s); + found = 0; for (i=0; i<outgoings; i++) { if (t->uac[i].ruid.len == ruid.len && !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len)) {

1 0

git:master:5a442b21: tm: reset 'found' variable at the beginning of each cycle over the branches
by Federico Cabiddu 09 Sep '15

09 Sep '15

Module: kamailio Branch: master Commit: 5a442b219075c18a7e3a5b0942f34d05d8baba60 URL: https://github.com/kamailio/kamailio/commit/5a442b219075c18a7e3a5b0942f34d0… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-09-09T12:35:42+02:00 tm: reset 'found' variable at the beginning of each cycle over the branches --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/5a442b219075c18a7e3a5b0942f34d0… Patch: https://github.com/kamailio/kamailio/commit/5a442b219075c18a7e3a5b0942f34d0… --- diff --git a/modules/tm/t_append_branches.c b/modules/tm/t_append_branches.c index 1cad198..d32ac1a 100644 --- a/modules/tm/t_append_branches.c +++ b/modules/tm/t_append_branches.c @@ -108,11 +108,11 @@ int t_append_branches(void) { init_branch_iterator(); - found = 0; while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri, &path, &bflags, &si, &ruid, &instance, &location_ua))) { LM_DBG("Current uri %.*s\n",current_uri.len, current_uri.s); + found = 0; for (i=0; i<outgoings; i++) { if (t->uac[i].ruid.len == ruid.len && !memcmp(t->uac[i].ruid.s, ruid.s, ruid.len)) {

1 0

git:master:d9ae9bad: kamctl: added mongodb schema files
by Daniel-Constantin Mierla 09 Sep '15

09 Sep '15

Module: kamailio Branch: master Commit: d9ae9badb270891f3b6dd2b64ba88c808c8c70f4 URL: https://github.com/kamailio/kamailio/commit/d9ae9badb270891f3b6dd2b64ba88c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-09T09:21:56+02:00 kamctl: added mongodb schema files - custom json format specifying structure of collections/tables - version-create.mongo - a script with mongo commands to fill the version collection/table --- Added: utils/kamctl/mongodb/kamailio/acc.json Added: utils/kamctl/mongodb/kamailio/acc_cdrs.json Added: utils/kamctl/mongodb/kamailio/active_watchers.json Added: utils/kamctl/mongodb/kamailio/address.json Added: utils/kamctl/mongodb/kamailio/aliases.json Added: utils/kamctl/mongodb/kamailio/carrier_name.json Added: utils/kamctl/mongodb/kamailio/carrierfailureroute.json Added: utils/kamctl/mongodb/kamailio/carrierroute.json Added: utils/kamctl/mongodb/kamailio/cpl.json Added: utils/kamctl/mongodb/kamailio/dbaliases.json Added: utils/kamctl/mongodb/kamailio/dialog.json Added: utils/kamctl/mongodb/kamailio/dialog_vars.json Added: utils/kamctl/mongodb/kamailio/dialplan.json Added: utils/kamctl/mongodb/kamailio/dispatcher.json Added: utils/kamctl/mongodb/kamailio/domain.json Added: utils/kamctl/mongodb/kamailio/domain_attrs.json Added: utils/kamctl/mongodb/kamailio/domain_name.json Added: utils/kamctl/mongodb/kamailio/domainpolicy.json Added: utils/kamctl/mongodb/kamailio/dr_gateways.json Added: utils/kamctl/mongodb/kamailio/dr_groups.json Added: utils/kamctl/mongodb/kamailio/dr_gw_lists.json Added: utils/kamctl/mongodb/kamailio/dr_rules.json Added: utils/kamctl/mongodb/kamailio/globalblacklist.json Added: utils/kamctl/mongodb/kamailio/grp.json Added: utils/kamctl/mongodb/kamailio/htable.json Added: utils/kamctl/mongodb/kamailio/imc_members.json Added: utils/kamctl/mongodb/kamailio/imc_rooms.json Added: utils/kamctl/mongodb/kamailio/lcr_gw.json Added: utils/kamctl/mongodb/kamailio/lcr_rule.json Added: utils/kamctl/mongodb/kamailio/lcr_rule_target.json Added: utils/kamctl/mongodb/kamailio/location.json Added: utils/kamctl/mongodb/kamailio/location_attrs.json Added: utils/kamctl/mongodb/kamailio/matrix.json Added: utils/kamctl/mongodb/kamailio/missed_calls.json Added: utils/kamctl/mongodb/kamailio/mohqcalls.json Added: utils/kamctl/mongodb/kamailio/mohqueues.json Added: utils/kamctl/mongodb/kamailio/mtree.json Added: utils/kamctl/mongodb/kamailio/mtrees.json Added: utils/kamctl/mongodb/kamailio/pdt.json Added: utils/kamctl/mongodb/kamailio/pl_pipes.json Added: utils/kamctl/mongodb/kamailio/presentity.json Added: utils/kamctl/mongodb/kamailio/pua.json Added: utils/kamctl/mongodb/kamailio/purplemap.json Added: utils/kamctl/mongodb/kamailio/re_grp.json Added: utils/kamctl/mongodb/kamailio/rls_presentity.json Added: utils/kamctl/mongodb/kamailio/rls_watchers.json Added: utils/kamctl/mongodb/kamailio/rtpproxy.json Added: utils/kamctl/mongodb/kamailio/sca_subscriptions.json Added: utils/kamctl/mongodb/kamailio/silo.json Added: utils/kamctl/mongodb/kamailio/sip_trace.json Added: utils/kamctl/mongodb/kamailio/speed_dial.json Added: utils/kamctl/mongodb/kamailio/subscriber.json Added: utils/kamctl/mongodb/kamailio/trusted.json Added: utils/kamctl/mongodb/kamailio/uacreg.json Added: utils/kamctl/mongodb/kamailio/uid_credentials.json Added: utils/kamctl/mongodb/kamailio/uid_domain.json Added: utils/kamctl/mongodb/kamailio/uid_domain_attrs.json Added: utils/kamctl/mongodb/kamailio/uid_global_attrs.json Added: utils/kamctl/mongodb/kamailio/uid_uri.json Added: utils/kamctl/mongodb/kamailio/uid_uri_attrs.json Added: utils/kamctl/mongodb/kamailio/uid_user_attrs.json Added: utils/kamctl/mongodb/kamailio/uri.json Added: utils/kamctl/mongodb/kamailio/userblacklist.json Added: utils/kamctl/mongodb/kamailio/usr_preferences.json Added: utils/kamctl/mongodb/kamailio/version-create.mongo Added: utils/kamctl/mongodb/kamailio/version.json Added: utils/kamctl/mongodb/kamailio/watchers.json Added: utils/kamctl/mongodb/kamailio/xcap.json --- Diff: https://github.com/kamailio/kamailio/commit/d9ae9badb270891f3b6dd2b64ba88c8… Patch: https://github.com/kamailio/kamailio/commit/d9ae9badb270891f3b6dd2b64ba88c8…

1 0

git:master:922c4c0d: srdb1/schema: proper path in Makefile to generate mongo script for version table content
by Daniel-Constantin Mierla 09 Sep '15

09 Sep '15

Module: kamailio Branch: master Commit: 922c4c0dd1bc65c9fda6ccad467080132109e815 URL: https://github.com/kamailio/kamailio/commit/922c4c0dd1bc65c9fda6ccad4670801… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-09T09:21:56+02:00 srdb1/schema: proper path in Makefile to generate mongo script for version table content --- Modified: lib/srdb1/schema/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/922c4c0dd1bc65c9fda6ccad4670801… Patch: https://github.com/kamailio/kamailio/commit/922c4c0dd1bc65c9fda6ccad4670801… --- diff --git a/lib/srdb1/schema/Makefile b/lib/srdb1/schema/Makefile index 9eac430..438d253 100644 --- a/lib/srdb1/schema/Makefile +++ b/lib/srdb1/schema/Makefile @@ -209,16 +209,16 @@ mongodb: done @# small hack to create the version table entries, this is here easier as with XSL @echo "use kamailio;" \ - > "$(SCHEME)/dbtext/kamailio/version-create.mongo" ; + > "$(SCHEME)/mongodb/kamailio/version-create.mongo" ; @echo "db.createCollection(\"version\");" \ - >> "$(SCHEME)/dbtext/kamailio/version-create.mongo" ; + >> "$(SCHEME)/mongodb/kamailio/version-create.mongo" ; @for FILE in $(sort $(wildcard $(SCHEME)/mongodb/kamailio/*.json)) ; do \ if [ -f "$$FILE" ]; then \ if [ "$$FILE" != "$(SCHEME)/mongodb/kamailio/version.json" ]; then \ VN=`grep '"version":' "$$FILE" | grep -o -E '[0-9]+'` ; \ FN=`basename $$FILE .json` ;\ echo "db.getCollection(\"version\").insert({ table_name: \"$$FN\", table_version: NumberInt($$VN) });" \ - >> "$(SCHEME)/dbtext/kamailio/version-create.mongo" ; \ + >> "$(SCHEME)/mongodb/kamailio/version-create.mongo" ; \ fi ; \ fi ; \ done ; \

1 0

git:master:3f8ba179: stylesheets/dbschema: xsl file for generating mongodb tables schema
by Daniel-Constantin Mierla 09 Sep '15

09 Sep '15

Module: kamailio Branch: master Commit: 3f8ba179ada8dcfd8ecb4ed1d321c0dc525d55ab URL: https://github.com/kamailio/kamailio/commit/3f8ba179ada8dcfd8ecb4ed1d321c0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-09T09:21:56+02:00 stylesheets/dbschema: xsl file for generating mongodb tables schema - the result is an json file that can be used to understand fields in a mongodb collection (equivalent to sql table) --- Added: doc/stylesheets/dbschema_k/xsl/mongodb.xsl --- Diff: https://github.com/kamailio/kamailio/commit/3f8ba179ada8dcfd8ecb4ed1d321c0d… Patch: https://github.com/kamailio/kamailio/commit/3f8ba179ada8dcfd8ecb4ed1d321c0d…

1 0

git:master:7b0de5ca: srdb1/schema: make target to generate schema for mongodb
by Daniel-Constantin Mierla 09 Sep '15

09 Sep '15

Module: kamailio Branch: master Commit: 7b0de5ca923b4427b669282edffde054c58b682a URL: https://github.com/kamailio/kamailio/commit/7b0de5ca923b4427b669282edffde05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-09T09:21:56+02:00 srdb1/schema: make target to generate schema for mongodb --- Modified: lib/srdb1/schema/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/7b0de5ca923b4427b669282edffde05… Patch: https://github.com/kamailio/kamailio/commit/7b0de5ca923b4427b669282edffde05… --- diff --git a/lib/srdb1/schema/Makefile b/lib/srdb1/schema/Makefile index 3bc39d2..9eac430 100644 --- a/lib/srdb1/schema/Makefile +++ b/lib/srdb1/schema/Makefile @@ -33,6 +33,9 @@ DB_SQLITE_XSL = $(STYLESHEETS)/db_sqlite.xsl # Stylesheet used to generate oracle database schema ORACLE_XSL = $(STYLESHEETS)/oracle.xsl +# Stylesheet used to generate mongodb database schema +MONGODB_XSL = $(STYLESHEETS)/mongodb.xsl + # Stylesheet used to generate docbook documentation DOCBOOK_XSL = $(STYLESHEETS)/docbook.xsl @@ -195,6 +198,35 @@ db_sqlite: db_sqlite_clean: -@rm -f $(SCHEME)/db_sqlite/* +.PHONY: mongodb mongodb_clean +mongodb: + for FILE in $(TABLES); do \ + XML_CATALOG_FILES=$(CATALOG) $(XSLTPROC) $(XSLTPROC_FLAGS) \ + --stringparam dir "$(SCHEME)/mongodb/kamailio" \ + --stringparam prefix "" \ + --stringparam db "mongodb" \ + $(MONGODB_XSL) kamailio-"$$FILE".xml ; \ + done + @# small hack to create the version table entries, this is here easier as with XSL + @echo "use kamailio;" \ + > "$(SCHEME)/dbtext/kamailio/version-create.mongo" ; + @echo "db.createCollection(\"version\");" \ + >> "$(SCHEME)/dbtext/kamailio/version-create.mongo" ; + @for FILE in $(sort $(wildcard $(SCHEME)/mongodb/kamailio/*.json)) ; do \ + if [ -f "$$FILE" ]; then \ + if [ "$$FILE" != "$(SCHEME)/mongodb/kamailio/version.json" ]; then \ + VN=`grep '"version":' "$$FILE" | grep -o -E '[0-9]+'` ; \ + FN=`basename $$FILE .json` ;\ + echo "db.getCollection(\"version\").insert({ table_name: \"$$FN\", table_version: NumberInt($$VN) });" \ + >> "$(SCHEME)/dbtext/kamailio/version-create.mongo" ; \ + fi ; \ + fi ; \ + done ; \ + +mongodb_clean: + -@rm -f $(SCHEME)/mongodb/kamailio/* + + .PHONY: docbook-xml docbook-xml: for FILE in $(TABLES); do \

1 0

git:master:f4b364b9: srdb1/schema: added version attribute to version table schema
by Daniel-Constantin Mierla 09 Sep '15

09 Sep '15

Module: kamailio Branch: master Commit: f4b364b99162670db3eff38bcc67503c86658a22 URL: https://github.com/kamailio/kamailio/commit/f4b364b99162670db3eff38bcc67503… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-09T09:21:56+02:00 srdb1/schema: added version attribute to version table schema - to be coherent with the other tables schema --- Modified: lib/srdb1/schema/version.xml --- Diff: https://github.com/kamailio/kamailio/commit/f4b364b99162670db3eff38bcc67503… Patch: https://github.com/kamailio/kamailio/commit/f4b364b99162670db3eff38bcc67503… --- diff --git a/lib/srdb1/schema/version.xml b/lib/srdb1/schema/version.xml index 298f32a..c18ea3b 100644 --- a/lib/srdb1/schema/version.xml +++ b/lib/srdb1/schema/version.xml @@ -8,6 +8,7 @@ <table id="version" xmlns:xi="http://www.w3.org/2001/XInclude"> <name>version</name> + <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <column id="table_name">

1 0

[kamailio] Update functions.c (#319)
by Laurent Debacker 09 Sep '15

09 Sep '15

http_query Remove leading empty lines in http response, in order to return the first non-empty one. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/319 -- Commit Summary -- * Update functions.c -- File Changes -- M modules/utils/functions.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/319.patch https://github.com/kamailio/kamailio/pull/319.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/319

2 3

git:master:74c84c7c: db_postgres: Fix heap use after free error in db_postgres module
by Carsten Bock 08 Sep '15

08 Sep '15

Module: kamailio Branch: master Commit: 74c84c7cd52347fcd1c90e75dca239b5f758169b URL: https://github.com/kamailio/kamailio/commit/74c84c7cd52347fcd1c90e75dca239b… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2015-08-28T12:11:25+02:00 db_postgres: Fix heap use after free error in db_postgres module The result structure for a query holds a pointer returned by PQfname. When sql_do_query executes the query it gets this database result structure returned but the PQfname pointer has already been free'd by a call to db_postgres_free_query from within db_postgres_store_result. sql_do_query then tries to copy the free'd string into another result structure resulting in a heap use after free. The fix here copies the PQfname result. Fix by Chris Double --- Modified: modules/db_postgres/km_pg_con.c Modified: modules/db_postgres/km_res.c --- Diff: https://github.com/kamailio/kamailio/commit/74c84c7cd52347fcd1c90e75dca239b… Patch: https://github.com/kamailio/kamailio/commit/74c84c7cd52347fcd1c90e75dca239b… --- diff --git a/modules/db_postgres/km_pg_con.c b/modules/db_postgres/km_pg_con.c index ec98add..d053c55 100644 --- a/modules/db_postgres/km_pg_con.c +++ b/modules/db_postgres/km_pg_con.c @@ -71,10 +71,6 @@ struct pg_con* db_postgres_new_connection(struct db_id* id) memset(ptr, 0, sizeof(struct pg_con)); ptr->ref = 1; - memset(keywords, 0, (sizeof(char*) * 10)); - memset(values, 0, (sizeof(char*) * 10)); - memset(to, 0, (sizeof(char) * 16)); - if (id->port) { ports = int2str(id->port, 0); keywords[i] = "port"; diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c index e9aa232..912206b 100644 --- a/modules/db_postgres/km_res.c +++ b/modules/db_postgres/km_res.c @@ -126,8 +126,14 @@ int db_postgres_get_columns(const db1_con_t* _h, db1_res_t* _r) RES_NAMES(_r)[col]); /* The pointer that is here returned is part of the result structure. */ - RES_NAMES(_r)[col]->s = PQfname(CON_RESULT(_h), col); - RES_NAMES(_r)[col]->len = strlen(PQfname(CON_RESULT(_h), col)); + RES_NAMES(_r)[col]->s = pkg_malloc(strlen(PQfname(CON_RESULT(_h), col))+1); + if (! RES_NAMES(_r)[col]->s) { + LM_ERR("no private memory left\n"); + db_free_columns(_r); + return -4; + } + strcpy(RES_NAMES(_r)[col]->s, PQfname(CON_RESULT(_h), col)); + RES_NAMES(_r)[col]->len = strlen(RES_NAMES(_r)[col]->s); LM_DBG("RES_NAMES(%p)[%d]=[%.*s]\n", RES_NAMES(_r)[col], col, RES_NAMES(_r)[col]->len, RES_NAMES(_r)[col]->s);

2 3

← Newer
1
...
28
29
30
31
32
33
34
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015