sr-dev February 2016

sr-dev@lists.kamailio.org

28 participants
302 discussions

git:master:76835b62: kamctl: updates to sql creation scripts for rtpegine
by Daniel-Constantin Mierla 02 Feb '16

02 Feb '16

Module: kamailio Branch: master Commit: 76835b62986d2bb05b34c870b362126290b15317 URL: https://github.com/kamailio/kamailio/commit/76835b62986d2bb05b34c870b362126… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-02T16:46:49+01:00 kamctl: updates to sql creation scripts for rtpegine --- Modified: utils/kamctl/db_sqlite/rtpengine-create.sql Modified: utils/kamctl/mysql/rtpengine-create.sql Modified: utils/kamctl/oracle/rtpengine-create.sql Modified: utils/kamctl/postgres/rtpengine-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/76835b62986d2bb05b34c870b362126… Patch: https://github.com/kamailio/kamailio/commit/76835b62986d2bb05b34c870b362126… --- diff --git a/utils/kamctl/db_sqlite/rtpengine-create.sql b/utils/kamctl/db_sqlite/rtpengine-create.sql index 20c7358..c7bebb6 100644 --- a/utils/kamctl/db_sqlite/rtpengine-create.sql +++ b/utils/kamctl/db_sqlite/rtpengine-create.sql @@ -1,4 +1,3 @@ -INSERT INTO version (table_name, table_version) values ('rtpengine','1'); CREATE TABLE rtpengine ( setid INTEGER DEFAULT 0 NOT NULL, url VARCHAR(64) NOT NULL, @@ -7,3 +6,5 @@ CREATE TABLE rtpengine ( CONSTRAINT rtpengine_rtpengine_nodes PRIMARY KEY (setid, url) ); +INSERT INTO version (table_name, table_version) values ('rtpengine','1'); + diff --git a/utils/kamctl/mysql/rtpengine-create.sql b/utils/kamctl/mysql/rtpengine-create.sql index 55662ae..156f1f4 100644 --- a/utils/kamctl/mysql/rtpengine-create.sql +++ b/utils/kamctl/mysql/rtpengine-create.sql @@ -1,4 +1,3 @@ -INSERT INTO version (table_name, table_version) values ('rtpengine','1'); CREATE TABLE `rtpengine` ( `setid` INT(10) UNSIGNED DEFAULT 0 NOT NULL, `url` VARCHAR(64) NOT NULL, @@ -7,3 +6,5 @@ CREATE TABLE `rtpengine` ( CONSTRAINT rtpengine_nodes PRIMARY KEY (`setid`, `url`) ); +INSERT INTO version (table_name, table_version) values ('rtpengine','1'); + diff --git a/utils/kamctl/oracle/rtpengine-create.sql b/utils/kamctl/oracle/rtpengine-create.sql index 202764b..ab8eda9 100644 --- a/utils/kamctl/oracle/rtpengine-create.sql +++ b/utils/kamctl/oracle/rtpengine-create.sql @@ -1,4 +1,3 @@ -INSERT INTO version (table_name, table_version) values ('rtpengine','1'); CREATE TABLE rtpengine ( setid NUMBER(10) DEFAULT 0 NOT NULL, url VARCHAR2(64), @@ -15,3 +14,5 @@ END rtpengine_tr; / BEGIN map2users('rtpengine'); END; / +INSERT INTO version (table_name, table_version) values ('rtpengine','1'); + diff --git a/utils/kamctl/postgres/rtpengine-create.sql b/utils/kamctl/postgres/rtpengine-create.sql index 20c7358..c7bebb6 100644 --- a/utils/kamctl/postgres/rtpengine-create.sql +++ b/utils/kamctl/postgres/rtpengine-create.sql @@ -1,4 +1,3 @@ -INSERT INTO version (table_name, table_version) values ('rtpengine','1'); CREATE TABLE rtpengine ( setid INTEGER DEFAULT 0 NOT NULL, url VARCHAR(64) NOT NULL, @@ -7,3 +6,5 @@ CREATE TABLE rtpengine ( CONSTRAINT rtpengine_rtpengine_nodes PRIMARY KEY (setid, url) ); +INSERT INTO version (table_name, table_version) values ('rtpengine','1'); +

1 0

git:master:049a2738: core: parser - typedef'ed via header structures
by Daniel-Constantin Mierla 02 Feb '16

02 Feb '16

Module: kamailio Branch: master Commit: 049a27385904189682fc9c461d3fd31f3afab17e URL: https://github.com/kamailio/kamailio/commit/049a27385904189682fc9c461d3fd31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-02T16:46:48+01:00 core: parser - typedef'ed via header structures --- Modified: parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/049a27385904189682fc9c461d3fd31… Patch: https://github.com/kamailio/kamailio/commit/049a27385904189682fc9c461d3fd31… --- diff --git a/parser/parse_via.h b/parser/parse_via.h index 684be32..fca486e 100644 --- a/parser/parse_via.h +++ b/parser/parse_via.h @@ -47,7 +47,7 @@ enum { -struct via_param { +typedef struct via_param { int type; /* Type of the parameter */ str name; /* Name of the parameter */ str value; /* Value of the parameter */ @@ -56,12 +56,12 @@ struct via_param { int size; /* total size, including preceding and trailing * white space */ struct via_param* next; /* Next parameter in the list */ -}; +} via_param_t; /* Format: name/version/transport host:port;params comment */ /* WARNING: keep in sync with tm/sip_msg.c via_body_cloner */ -struct via_body { +typedef struct via_body { int error; str hdr; /* Contains "Via" or "v" */ str name; @@ -92,7 +92,7 @@ struct via_body { #endif struct via_body* next; /* pointer to next via body string if compact via or null */ -}; +} via_body_t; /*

1 0

git:master:de3afab1: http_client Update TODO
by Olle E. Johansson 02 Feb '16

02 Feb '16

Module: kamailio Branch: master Commit: de3afab1631fc6c617b66d03ebf173bbfe10a144 URL: https://github.com/kamailio/kamailio/commit/de3afab1631fc6c617b66d03ebf173b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-02-02T15:24:21+01:00 http_client Update TODO Add note about stuff that needs a per-process handling (referring to a discussion between HW and OEJ this weekend at Fosdem) --- Modified: modules/http_client/TODO.txt --- Diff: https://github.com/kamailio/kamailio/commit/de3afab1631fc6c617b66d03ebf173b… Patch: https://github.com/kamailio/kamailio/commit/de3afab1631fc6c617b66d03ebf173b… --- diff --git a/modules/http_client/TODO.txt b/modules/http_client/TODO.txt index 1635b0c..8d8f347 100644 --- a/modules/http_client/TODO.txt +++ b/modules/http_client/TODO.txt @@ -1,4 +1,4 @@ -The curl module - todo +The http_client module - todo ====================== - connection parameters @@ -25,8 +25,10 @@ The curl module - todo - if 5xx response or timeout set flag - function in dialplan - curlcon_exist(object) - pv $curlstatus(object) ?? + - this is per process !!! - Figure out a way to communicate back the content-type of the response. Another pvar arg? + - This is per process! - pv for curl error codes (result < 100) $curlerror(code) Result string - DONE

1 0

git:master:78712dfc: http_client Rename include file
by Olle E. Johansson 02 Feb '16

02 Feb '16

Module: kamailio Branch: master Commit: 78712dfc770c39742336f34375b967a88c7313d9 URL: https://github.com/kamailio/kamailio/commit/78712dfc770c39742336f34375b967a… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-02-02T15:02:50+01:00 http_client Rename include file --- Added: modules/http_client/http_client.h Modified: modules/http_client/curl_api.c Modified: modules/http_client/curl_api.h Modified: modules/http_client/curlcon.c Modified: modules/http_client/curlcon.h Modified: modules/http_client/curlrpc.c Modified: modules/http_client/curlrpc.h Modified: modules/http_client/functions.c Modified: modules/http_client/functions.h Removed: modules/http_client/curl.h --- Diff: https://github.com/kamailio/kamailio/commit/78712dfc770c39742336f34375b967a… Patch: https://github.com/kamailio/kamailio/commit/78712dfc770c39742336f34375b967a…

1 0

git:master:fea3b93d: http_client Rename module file
by Olle E. Johansson 02 Feb '16

02 Feb '16

Module: kamailio Branch: master Commit: fea3b93d4d6ac2d7bdc918560d5ced0f0f652591 URL: https://github.com/kamailio/kamailio/commit/fea3b93d4d6ac2d7bdc918560d5ced0… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-02-02T14:58:48+01:00 http_client Rename module file --- Added: modules/http_client/http_client.c Removed: modules/http_client/curl.c --- Diff: https://github.com/kamailio/kamailio/commit/fea3b93d4d6ac2d7bdc918560d5ced0… Patch: https://github.com/kamailio/kamailio/commit/fea3b93d4d6ac2d7bdc918560d5ced0…

1 0

git:master:fb1ffeaf: http_client Update README files
by Olle E. Johansson 02 Feb '16

02 Feb '16

Module: kamailio Branch: master Commit: fb1ffeaf7bb1e309278459c77f586ac0d2f46cb1 URL: https://github.com/kamailio/kamailio/commit/fb1ffeaf7bb1e309278459c77f586ac… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-02-02T14:57:13+01:00 http_client Update README files --- Modified: modules/http_client/Makefile Modified: modules/http_client/README Modified: modules/http_client/doc/http_client.xml Modified: modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fb1ffeaf7bb1e309278459c77f586ac… Patch: https://github.com/kamailio/kamailio/commit/fb1ffeaf7bb1e309278459c77f586ac…

1 0

git:master:4e7921a5: http_client Rename doc files
by Olle E. Johansson 02 Feb '16

02 Feb '16

Module: kamailio Branch: master Commit: 4e7921a50e9bc375e9de29d2d6dc22fba5cea5b7 URL: https://github.com/kamailio/kamailio/commit/4e7921a50e9bc375e9de29d2d6dc22f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-02-02T14:52:14+01:00 http_client Rename doc files --- Added: modules/http_client/doc/http_client.xml Added: modules/http_client/doc/http_client_admin.xml Modified: modules/http_client/doc/Makefile Removed: modules/http_client/doc/curl.xml Removed: modules/http_client/doc/curl_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4e7921a50e9bc375e9de29d2d6dc22f… Patch: https://github.com/kamailio/kamailio/commit/4e7921a50e9bc375e9de29d2d6dc22f…

1 0

git:master:eb2f18e3: curl Rename module to http_client
by Olle E. Johansson 02 Feb '16

02 Feb '16

Module: kamailio Branch: master Commit: eb2f18e3a157512175cdb84b05455ab22db72655 URL: https://github.com/kamailio/kamailio/commit/eb2f18e3a157512175cdb84b05455ab… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-02-02T14:49:32+01:00 curl Rename module to http_client --- Added: modules/http_client/Makefile Added: modules/http_client/README Added: modules/http_client/TODO.txt Added: modules/http_client/curl.c Added: modules/http_client/curl.h Added: modules/http_client/curl_api.c Added: modules/http_client/curl_api.h Added: modules/http_client/curlcon.c Added: modules/http_client/curlcon.h Added: modules/http_client/curlrpc.c Added: modules/http_client/curlrpc.h Added: modules/http_client/doc/Makefile Added: modules/http_client/doc/curl.xml Added: modules/http_client/doc/curl_admin.xml Added: modules/http_client/functions.c Added: modules/http_client/functions.h Removed: modules/curl/Makefile Removed: modules/curl/README Removed: modules/curl/TODO.txt Removed: modules/curl/curl.c Removed: modules/curl/curl.h Removed: modules/curl/curl_api.c Removed: modules/curl/curl_api.h Removed: modules/curl/curlcon.c Removed: modules/curl/curlcon.h Removed: modules/curl/curlrpc.c Removed: modules/curl/curlrpc.h Removed: modules/curl/doc/Makefile Removed: modules/curl/doc/curl.xml Removed: modules/curl/doc/curl_admin.xml Removed: modules/curl/functions.c Removed: modules/curl/functions.h --- Diff: https://github.com/kamailio/kamailio/commit/eb2f18e3a157512175cdb84b05455ab… Patch: https://github.com/kamailio/kamailio/commit/eb2f18e3a157512175cdb84b05455ab…

1 0

git:master:319904b7: Merge pull request #494 from grumvalski/cnxcc_log
by Federico Cabiddu 02 Feb '16

02 Feb '16

Module: kamailio Branch: master Commit: 319904b7fb674855d72461550c40f0c3adeab5cc URL: https://github.com/kamailio/kamailio/commit/319904b7fb674855d72461550c40f0c… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2016-02-02T13:06:35+01:00 Merge pull request #494 from grumvalski/cnxcc_log cnxcc: change some log levels from INFO to DBG --- Modified: modules/cnxcc/cnxcc_check.c Modified: modules/cnxcc/cnxcc_redis.c Modified: modules/cnxcc/cnxcc_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/319904b7fb674855d72461550c40f0c… Patch: https://github.com/kamailio/kamailio/commit/319904b7fb674855d72461550c40f0c… --- diff --git a/modules/cnxcc/cnxcc_check.c b/modules/cnxcc/cnxcc_check.c index 4a534ed..e2ca54c 100644 --- a/modules/cnxcc/cnxcc_check.c +++ b/modules/cnxcc/cnxcc_check.c @@ -90,7 +90,7 @@ void check_calls_by_money(unsigned int ticks, void *param) { } if (_data.redis) { - LM_INFO("ec=%f, ca=%f, ca2=%f", credit_data->ended_calls_consumed_amount, total_consumed_money, credit_data->consumed_amount); + LM_DBG("ec=%f, ca=%f, ca2=%f", credit_data->ended_calls_consumed_amount, total_consumed_money, credit_data->consumed_amount); consumption_diff = credit_data->ended_calls_consumed_amount + total_consumed_money - credit_data->consumed_amount; if (consumption_diff > 0) diff --git a/modules/cnxcc/cnxcc_redis.c b/modules/cnxcc/cnxcc_redis.c index e5ea991..cb074af 100644 --- a/modules/cnxcc/cnxcc_redis.c +++ b/modules/cnxcc/cnxcc_redis.c @@ -65,11 +65,11 @@ int redis_get_or_create_credit_data(credit_data_t *credit_data) { goto error; if (!exists) { // doesn't exist - LM_INFO("credit_data with ID=[%s] DOES NOT exist in the cluster, creating it...\n", credit_data->str_id); + LM_DBG("credit_data with ID=[%s] DOES NOT exist in the cluster, creating it...\n", credit_data->str_id); return redis_insert_credit_data(credit_data); } - LM_INFO("credit_data with ID=[%s] DOES exist in the cluster, retrieving it...\n", credit_data->str_id); + LM_DBG("credit_data with ID=[%s] DOES exist in the cluster, retrieving it...\n", credit_data->str_id); if (redis_get_double(credit_data, "HGET", "consumed_amount", &credit_data->consumed_amount) < 0) goto error; @@ -332,7 +332,7 @@ int redis_get_str(credit_data_t *credit_data, const char *instruction, const cha } if (rpl->type == REDIS_REPLY_NIL) { - LM_INFO("Value of %s is (nil)\n", key); + LM_DBG("Value of %s is (nil)\n", key); goto done; } @@ -348,7 +348,7 @@ int redis_get_str(credit_data_t *credit_data, const char *instruction, const cha done: freeReplyObject(rpl); - LM_INFO("Got STRING value: %s=[%.*s]\n", key, value->len, value->s); + LM_DBG("Got STRING value: %s=[%.*s]\n", key, value->len, value->s); return 1; } diff --git a/modules/cnxcc/cnxcc_rpc.c b/modules/cnxcc/cnxcc_rpc.c index 49de2c2..e0f3887 100644 --- a/modules/cnxcc/cnxcc_rpc.c +++ b/modules/cnxcc/cnxcc_rpc.c @@ -90,7 +90,7 @@ void rpc_check_client_stats(rpc_t* rpc, void* ctx) { if (credit_data->number_of_calls <= 0) { cnxcc_unlock(credit_data->lock); - LM_INFO("No calls for current client\n"); + LM_DBG("No calls for current client\n"); return; }

1 0

git:master:f604bc4b: cnxcc: change some log levels from INFO to DBG
by Federico Cabiddu 02 Feb '16

02 Feb '16

Module: kamailio Branch: master Commit: f604bc4baf7b3332e661dba1c935a259112a4e72 URL: https://github.com/kamailio/kamailio/commit/f604bc4baf7b3332e661dba1c935a25… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2016-02-02T12:48:35+01:00 cnxcc: change some log levels from INFO to DBG --- Modified: modules/cnxcc/cnxcc_check.c Modified: modules/cnxcc/cnxcc_redis.c Modified: modules/cnxcc/cnxcc_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/f604bc4baf7b3332e661dba1c935a25… Patch: https://github.com/kamailio/kamailio/commit/f604bc4baf7b3332e661dba1c935a25… --- diff --git a/modules/cnxcc/cnxcc_check.c b/modules/cnxcc/cnxcc_check.c index 4a534ed..e2ca54c 100644 --- a/modules/cnxcc/cnxcc_check.c +++ b/modules/cnxcc/cnxcc_check.c @@ -90,7 +90,7 @@ void check_calls_by_money(unsigned int ticks, void *param) { } if (_data.redis) { - LM_INFO("ec=%f, ca=%f, ca2=%f", credit_data->ended_calls_consumed_amount, total_consumed_money, credit_data->consumed_amount); + LM_DBG("ec=%f, ca=%f, ca2=%f", credit_data->ended_calls_consumed_amount, total_consumed_money, credit_data->consumed_amount); consumption_diff = credit_data->ended_calls_consumed_amount + total_consumed_money - credit_data->consumed_amount; if (consumption_diff > 0) diff --git a/modules/cnxcc/cnxcc_redis.c b/modules/cnxcc/cnxcc_redis.c index e5ea991..cb074af 100644 --- a/modules/cnxcc/cnxcc_redis.c +++ b/modules/cnxcc/cnxcc_redis.c @@ -65,11 +65,11 @@ int redis_get_or_create_credit_data(credit_data_t *credit_data) { goto error; if (!exists) { // doesn't exist - LM_INFO("credit_data with ID=[%s] DOES NOT exist in the cluster, creating it...\n", credit_data->str_id); + LM_DBG("credit_data with ID=[%s] DOES NOT exist in the cluster, creating it...\n", credit_data->str_id); return redis_insert_credit_data(credit_data); } - LM_INFO("credit_data with ID=[%s] DOES exist in the cluster, retrieving it...\n", credit_data->str_id); + LM_DBG("credit_data with ID=[%s] DOES exist in the cluster, retrieving it...\n", credit_data->str_id); if (redis_get_double(credit_data, "HGET", "consumed_amount", &credit_data->consumed_amount) < 0) goto error; @@ -332,7 +332,7 @@ int redis_get_str(credit_data_t *credit_data, const char *instruction, const cha } if (rpl->type == REDIS_REPLY_NIL) { - LM_INFO("Value of %s is (nil)\n", key); + LM_DBG("Value of %s is (nil)\n", key); goto done; } @@ -348,7 +348,7 @@ int redis_get_str(credit_data_t *credit_data, const char *instruction, const cha done: freeReplyObject(rpl); - LM_INFO("Got STRING value: %s=[%.*s]\n", key, value->len, value->s); + LM_DBG("Got STRING value: %s=[%.*s]\n", key, value->len, value->s); return 1; } diff --git a/modules/cnxcc/cnxcc_rpc.c b/modules/cnxcc/cnxcc_rpc.c index 49de2c2..e0f3887 100644 --- a/modules/cnxcc/cnxcc_rpc.c +++ b/modules/cnxcc/cnxcc_rpc.c @@ -90,7 +90,7 @@ void rpc_check_client_stats(rpc_t* rpc, void* ctx) { if (credit_data->number_of_calls <= 0) { cnxcc_unlock(credit_data->lock); - LM_INFO("No calls for current client\n"); + LM_DBG("No calls for current client\n"); return; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2016