sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
248 discussions

git:master:6d45054c: Merge pull request #132 from seudin/module_erlang
by Daniel-Constantin Mierla 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: 6d45054c3c886c0a28efa860d8f26d8c877cdd21 URL: https://github.com/kamailio/kamailio/commit/6d45054c3c886c0a28efa860d8f26d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-04-21T19:02:58+02:00 Merge pull request #132 from seudin/module_erlang ERLANG module --- Added: modules/erlang/Makefile Added: modules/erlang/README Added: modules/erlang/cnode.c Added: modules/erlang/cnode.h Added: modules/erlang/doc/Makefile Added: modules/erlang/doc/erlang.xml Added: modules/erlang/doc/erlang_admin.xml Added: modules/erlang/doc/erlang_devel.xml Added: modules/erlang/doc/erlang_use.xml Added: modules/erlang/epmd.c Added: modules/erlang/epmd.h Added: modules/erlang/erl_api.c Added: modules/erlang/erl_api.h Added: modules/erlang/erl_helpers.c Added: modules/erlang/erl_helpers.h Added: modules/erlang/handle_emsg.c Added: modules/erlang/handle_emsg.h Added: modules/erlang/handle_rpc.c Added: modules/erlang/handle_rpc.h Added: modules/erlang/mod_erlang.c Added: modules/erlang/mod_erlang.h Added: modules/erlang/pv_atom.c Added: modules/erlang/pv_atom.h Added: modules/erlang/pv_list.c Added: modules/erlang/pv_list.h Added: modules/erlang/pv_tuple.c Added: modules/erlang/pv_tuple.h Added: modules/erlang/pv_xbuff.c Added: modules/erlang/pv_xbuff.h Added: modules/erlang/worker.c Added: modules/erlang/worker.h --- Diff: https://github.com/kamailio/kamailio/commit/6d45054c3c886c0a28efa860d8f26d8… Patch: https://github.com/kamailio/kamailio/commit/6d45054c3c886c0a28efa860d8f26d8…

1 0

git:master:b3e7a54e: ERLANG module
by Seudin Kasumovic 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: b3e7a54e22c3cbdf6422860974c76e43e70013cb URL: https://github.com/kamailio/kamailio/commit/b3e7a54e22c3cbdf6422860974c76e4… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-04-21T11:03:52+02:00 ERLANG module This module provides interact with Erlang node. The module allows sending, receiving Erlang messages and RPC calls between each other. --- Added: modules/erlang/Makefile Added: modules/erlang/README Added: modules/erlang/cnode.c Added: modules/erlang/cnode.h Added: modules/erlang/doc/Makefile Added: modules/erlang/doc/erlang.xml Added: modules/erlang/doc/erlang_admin.xml Added: modules/erlang/doc/erlang_devel.xml Added: modules/erlang/doc/erlang_use.xml Added: modules/erlang/epmd.c Added: modules/erlang/epmd.h Added: modules/erlang/erl_api.c Added: modules/erlang/erl_api.h Added: modules/erlang/erl_helpers.c Added: modules/erlang/erl_helpers.h Added: modules/erlang/handle_emsg.c Added: modules/erlang/handle_emsg.h Added: modules/erlang/handle_rpc.c Added: modules/erlang/handle_rpc.h Added: modules/erlang/mod_erlang.c Added: modules/erlang/mod_erlang.h Added: modules/erlang/pv_atom.c Added: modules/erlang/pv_atom.h Added: modules/erlang/pv_list.c Added: modules/erlang/pv_list.h Added: modules/erlang/pv_tuple.c Added: modules/erlang/pv_tuple.h Added: modules/erlang/pv_xbuff.c Added: modules/erlang/pv_xbuff.h Added: modules/erlang/worker.c Added: modules/erlang/worker.h --- Diff: https://github.com/kamailio/kamailio/commit/b3e7a54e22c3cbdf6422860974c76e4… Patch: https://github.com/kamailio/kamailio/commit/b3e7a54e22c3cbdf6422860974c76e4…

1 0

git:master:7d4d360c: modules/tsilo: README update
by Federico Cabiddu 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: 7d4d360cf9bdf2f8096147faaad5ca14f54a75f8 URL: https://github.com/kamailio/kamailio/commit/7d4d360cf9bdf2f8096147faaad5ca1… Author: Federico Cabiddu <fcabiddu(a)orange-vallee.net> Committer: Federico Cabiddu <fcabiddu(a)orange-vallee.net> Date: 2015-04-21T16:44:53+02:00 modules/tsilo: README update --- Modified: modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/7d4d360cf9bdf2f8096147faaad5ca1… Patch: https://github.com/kamailio/kamailio/commit/7d4d360cf9bdf2f8096147faaad5ca1… --- diff --git a/modules/tsilo/README b/modules/tsilo/README index dec3682..5baafd8 100644 --- a/modules/tsilo/README +++ b/modules/tsilo/README @@ -10,7 +10,7 @@ Federico Cabiddu <federico.cabiddu(a)gmail.com> - Copyright © 2014 Federico Cabiddu + Copyright Â© 2015 Federico Cabiddu __________________________________________________________________ Table of Contents @@ -72,16 +72,18 @@ Chapter 1. Admin Guide 1. Overview - This modules provides transaction storage for the Kamailio SIP Server + This module provides transaction storage for the Kamailio SIP Server Platform. It stores in an internal table transactions for a Request-URI (R-URI) and add branches to them later if new contacts for the AOR are added. - When the ts_store function is called, the modules stores the current + When the ts_store function is called, the module stores the current transaction R-URI URI, index and label. Two functions (ts_append and ts_append_to) provide the ability to add new branches either to a specific transaction or to all of the transactions stored for a given - R-URI. + R-URI. If USRLOC's use_domain option is true, the domain part of the + R-URI is used to store the transaction, otherwise only the username + part is used. When a transaction is destroyed by the TM module, it is removed from the module's table too. @@ -97,6 +99,9 @@ Chapter 1. Admin Guide * REGISTRAR--registrar module-- used to lookup for new contacts and update the dset for the r-uri. * TM--transaction module-- used to send SIP requests. + * USRLOC--usrloc module-- according to the value of use_domain + option, domain part of the r-uri will be used to store the + transaction. * SL 2.2. External libraries or applications @@ -116,7 +121,7 @@ Chapter 1. Admin Guide must be a power of two, otherwise it will be rounded down to the nearest power of two. - Default value is "2048". + Default value is â2048â. Example 1.1. Set hash_size parameter ... @@ -163,7 +168,7 @@ if (is_method("INVITE")) { Example 1.3. ts_append usage ... if (is_method("REGISTER")) { - ts_append("location", "$tu"); + ts_append("location", "$tU"); } ...

1 0

git:master:97345fc3: modules/tsilo: documentation update
by Federico Cabiddu 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: 97345fc366b51c4c24128be39cc6b689fc254a10 URL: https://github.com/kamailio/kamailio/commit/97345fc366b51c4c24128be39cc6b68… Author: Federico Cabiddu <fcabiddu(a)orange-vallee.net> Committer: Federico Cabiddu <fcabiddu(a)orange-vallee.net> Date: 2015-04-21T16:44:19+02:00 modules/tsilo: documentation update --- Modified: modules/tsilo/doc/tsilo.xml Modified: modules/tsilo/doc/tsilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97345fc366b51c4c24128be39cc6b68… Patch: https://github.com/kamailio/kamailio/commit/97345fc366b51c4c24128be39cc6b68… --- diff --git a/modules/tsilo/doc/tsilo.xml b/modules/tsilo/doc/tsilo.xml index 4feb719..4a5a00e 100644 --- a/modules/tsilo/doc/tsilo.xml +++ b/modules/tsilo/doc/tsilo.xml @@ -25,7 +25,7 @@ </editor> </authorgroup> <copyright> - <year>2014</year> + <year>2015</year> <holder>Federico Cabiddu</holder> </copyright> </bookinfo> diff --git a/modules/tsilo/doc/tsilo_admin.xml b/modules/tsilo/doc/tsilo_admin.xml index 9c08931..7625059 100644 --- a/modules/tsilo/doc/tsilo_admin.xml +++ b/modules/tsilo/doc/tsilo_admin.xml @@ -16,12 +16,12 @@ <section> <title>Overview</title> <para> - This modules provides transaction storage for the &kamailioname;. It + This module provides transaction storage for the &kamailioname;. It stores in an internal table transactions for a Request-URI (R-URI) and add branches to them later if new contacts for the AOR are added. </para> <para> - When the <emphasis>ts_store</emphasis> function is called, the modules stores the current transaction R-URI &uri;, index and label. Two functions (<emphasis>ts_append</emphasis> and <emphasis>ts_append_to</emphasis>) provide the ability to add new branches either to a specific transaction or to all of the transactions stored for a given R-URI. + When the <emphasis>ts_store</emphasis> function is called, the module stores the current transaction R-URI &uri;, index and label. Two functions (<emphasis>ts_append</emphasis> and <emphasis>ts_append_to</emphasis>) provide the ability to add new branches either to a specific transaction or to all of the transactions stored for a given R-URI. If USRLOC's <emphasis>use_domain</emphasis> option is true, the domain part of the R-URI is used to store the transaction, otherwise only the username part is used. </para> <para> When a transaction is destroyed by the <emphasis>TM</emphasis> module, @@ -49,6 +49,11 @@ </listitem> <listitem> <para> + <emphasis>USRLOC</emphasis>--usrloc module-- according to the value of <emphasis>use_domain</emphasis> option, domain part of the r-uri will be used to store the transaction. + </para> + </listitem> + <listitem> + <para> <emphasis>SL</emphasis> </para> </listitem> @@ -151,7 +156,7 @@ if (is_method("INVITE")) { <programlisting format="linespecific"> ... if (is_method("REGISTER")) { - ts_append("location", "$tu"); + ts_append("location", "$tU"); } ... </programlisting>

1 0

git:master:b1f4cdf5: Merge branch 'master' of ssh+git://github.com/kamailio/kamailio
by Federico Cabiddu 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: b1f4cdf542e4f1436888a3420bbeac0dbe3adee7 URL: https://github.com/kamailio/kamailio/commit/b1f4cdf542e4f1436888a3420bbeac0… Author: Federico Cabiddu <fcabiddu(a)orange-vallee.net> Committer: Federico Cabiddu <fcabiddu(a)orange-vallee.net> Date: 2015-04-21T16:43:16+02:00 Merge branch 'master' of ssh+git://github.com/kamailio/kamailio --- Modified: lib/srdb1/schema/acc_cdrs.xml Modified: lib/srdb1/schema/silo.xml Modified: utils/kamctl/db_berkeley/kamailio/acc_cdrs Modified: utils/kamctl/db_berkeley/kamailio/silo Modified: utils/kamctl/db_sqlite/acc-create.sql Modified: utils/kamctl/db_sqlite/msilo-create.sql Modified: utils/kamctl/dbtext/kamailio/silo Modified: utils/kamctl/mysql/acc-create.sql Modified: utils/kamctl/mysql/msilo-create.sql Modified: utils/kamctl/oracle/acc-create.sql Modified: utils/kamctl/oracle/msilo-create.sql Modified: utils/kamctl/postgres/acc-create.sql Modified: utils/kamctl/postgres/msilo-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/b1f4cdf542e4f1436888a3420bbeac0… Patch: https://github.com/kamailio/kamailio/commit/b1f4cdf542e4f1436888a3420bbeac0…

1 0

git:master:d7bac1de: modules/tsilo: use use_domain inherited from usrloc
by Federico Cabiddu 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: d7bac1deed7c543f9d9d9ec140f9c37725cc92ab URL: https://github.com/kamailio/kamailio/commit/d7bac1deed7c543f9d9d9ec140f9c37… Author: Federico Cabiddu <fcabiddu(a)orange-vallee.net> Committer: Federico Cabiddu <fcabiddu(a)orange-vallee.net> Date: 2015-04-21T16:41:29+02:00 modules/tsilo: use use_domain inherited from usrloc - if usrloc use_domain is set, use the domain part of the ruri to store the transaction, otherwise (the default) use only the username part. --- Modified: modules/tsilo/ts_store.c Modified: modules/tsilo/tsilo.c Modified: modules/tsilo/tsilo.h --- Diff: https://github.com/kamailio/kamailio/commit/d7bac1deed7c543f9d9d9ec140f9c37… Patch: https://github.com/kamailio/kamailio/commit/d7bac1deed7c543f9d9d9ec140f9c37… --- diff --git a/modules/tsilo/ts_store.c b/modules/tsilo/ts_store.c index 48d1441..67dc2d6 100644 --- a/modules/tsilo/ts_store.c +++ b/modules/tsilo/ts_store.c @@ -37,44 +37,62 @@ #include "ts_hash.h" #include "ts_store.h" +extern int use_domain; + int ts_store(struct sip_msg* msg) { - struct cell *t; - str ruri; + struct cell *t; + str aor; + struct sip_uri ruri; + ts_urecord_t* r; int res; - t = _tmb.t_gett(); - ruri = msg->first_line.u.request.uri; + + if (use_domain) { + aor = msg->first_line.u.request.uri; + } + else { + if (parse_uri(msg->first_line.u.request.uri.s, msg->first_line.u.request.uri.len, &ruri)!=0) + { + LM_ERR("bad uri [%.*s]\n", + msg->first_line.u.request.uri.len, + msg->first_line.u.request.uri.s); + return -1; + } + aor = ruri.user; + } + + t = _tmb.t_gett(); if (!t || t==T_UNDEFINED) { - LM_ERR("no transaction defined for %.*s\n", ruri.len, ruri.s); + LM_ERR("no transaction defined for %.*s\n", aor.len, aor.s); return -1; } - - LM_DBG("storing transaction %u:%u for r-uri: %.*s\n", t->hash_index, t->label, ruri.len, ruri.s); - lock_entry_by_ruri(&ruri); + LM_DBG("storing transaction %u:%u for r-uri: %.*s\n", t->hash_index, t->label, aor.len, aor.s); + + lock_entry_by_ruri(&aor); - res = get_ts_urecord(&ruri, &r); + res = get_ts_urecord(&aor, &r); if (res < 0) { - LM_ERR("failed to retrieve record for %.*s\n", ruri.len, ruri.s); - unlock_entry_by_ruri(&ruri); + LM_ERR("failed to retrieve record for %.*s\n", aor.len, aor.s); + unlock_entry_by_ruri(&aor); return -1; } if (res != 0) { /* entry not found for the ruri */ - if (insert_ts_urecord(&ruri, &r) < 0) { + if (insert_ts_urecord(&aor, &r) < 0) { LM_ERR("failed to insert new record structure\n"); - unlock_entry_by_ruri(&ruri); + unlock_entry_by_ruri(&aor); return -1; } } insert_ts_transaction(t, msg, r); - unlock_entry_by_ruri(&ruri); + unlock_entry_by_ruri(&aor); - LM_DBG("transaction %u:%u (ruri: %.*s) inserted\n", t->hash_index, t->label, ruri.len, ruri.s); + LM_DBG("transaction %u:%u (ruri: %.*s) inserted\n", t->hash_index, t->label, aor.len, aor.s); return 1; } diff --git a/modules/tsilo/tsilo.c b/modules/tsilo/tsilo.c index fd38deb..7dbce56 100644 --- a/modules/tsilo/tsilo.c +++ b/modules/tsilo/tsilo.c @@ -30,6 +30,7 @@ #include "../../script_cb.h" #include "../../modules/tm/tm_load.h" #include "../../modules/registrar/api.h" +#include "../../modules/usrloc/usrloc.h" #include "../../dset.h" #include "../../rpc_lookup.h" @@ -46,6 +47,10 @@ MODULE_VERSION struct tm_binds _tmb; /** REGISTRAR bind **/ registrar_api_t _regapi; +/** USRLOC BIND **/ +usrloc_api_t _ul; + +int use_domain = 0; /** parameters */ static int hash_size = 2048; @@ -98,6 +103,7 @@ struct module_exports exports= { static int mod_init(void) { unsigned int n; + bind_usrloc_t bind_usrloc; /* register the RPC methods */ if(rpc_register_array(rpc_methods)!=0) @@ -116,6 +122,20 @@ static int mod_init(void) LM_ERR("cannot load REGISTRAR API\n"); return -1; } + /* load UL-Bindings */ + bind_usrloc = (bind_usrloc_t)find_export("ul_bind_usrloc", 1, 0); + + if (!bind_usrloc) { + LM_ERR("could not load the USRLOC API\n"); + return -1; + } + + if (bind_usrloc(&_ul) < 0) { + LM_ERR("could not load the USRLOC API\n"); + return -1; + } + + use_domain = _ul.use_domain; /* sanitize hash_size */ if (hash_size < 1){ LM_WARN("hash_size is smaller " diff --git a/modules/tsilo/tsilo.h b/modules/tsilo/tsilo.h index 511cb72..90c965c 100644 --- a/modules/tsilo/tsilo.h +++ b/modules/tsilo/tsilo.h @@ -23,10 +23,15 @@ #include "../../modules/tm/tm_load.h" #include "../../modules/registrar/api.h" +#include "../../modules/usrloc/usrloc.h" /** TM bind */ extern struct tm_binds _tmb; /** REGISTRAR bind */ extern registrar_api_t _regapi; +/** USRLOC BIND **/ +extern usrloc_api_t _ul; + +extern int use_domain; #endif

1 0

git:master:40730e28: Merge pull request #134 from linuxmaniac/vseva/mysql_errors
by Victor Seva 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: 40730e28f1a6c469a034e61698265cff37277284 URL: https://github.com/kamailio/kamailio/commit/40730e28f1a6c469a034e61698265cf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-21T16:40:21+02:00 Merge pull request #134 from linuxmaniac/vseva/mysql_errors kamctl: fixing mysql creation errors --- Modified: lib/srdb1/schema/acc_cdrs.xml Modified: lib/srdb1/schema/silo.xml Modified: utils/kamctl/db_berkeley/kamailio/acc_cdrs Modified: utils/kamctl/db_berkeley/kamailio/silo Modified: utils/kamctl/db_sqlite/acc-create.sql Modified: utils/kamctl/db_sqlite/msilo-create.sql Modified: utils/kamctl/dbtext/kamailio/silo Modified: utils/kamctl/mysql/acc-create.sql Modified: utils/kamctl/mysql/msilo-create.sql Modified: utils/kamctl/oracle/acc-create.sql Modified: utils/kamctl/oracle/msilo-create.sql Modified: utils/kamctl/postgres/acc-create.sql Modified: utils/kamctl/postgres/msilo-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/40730e28f1a6c469a034e61698265cf… Patch: https://github.com/kamailio/kamailio/commit/40730e28f1a6c469a034e61698265cf…

1 0

git:master:f5e02f7b: lib/srdb1/schema: silo removed BLOB/TEXT defaults
by Victor Seva 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: f5e02f7be4fcf629728254afff2e1c4c257d563c URL: https://github.com/kamailio/kamailio/commit/f5e02f7be4fcf629728254afff2e1c4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-21T16:23:00+02:00 lib/srdb1/schema: silo removed BLOB/TEXT defaults >From https://dev.mysql.com/doc/refman/5.0/en/blob.html "BLOB and TEXT columns cannot have DEFAULT values." --- Modified: lib/srdb1/schema/silo.xml --- Diff: https://github.com/kamailio/kamailio/commit/f5e02f7be4fcf629728254afff2e1c4… Patch: https://github.com/kamailio/kamailio/commit/f5e02f7be4fcf629728254afff2e1c4… --- diff --git a/lib/srdb1/schema/silo.xml b/lib/srdb1/schema/silo.xml index 67eeb67..3702173 100644 --- a/lib/srdb1/schema/silo.xml +++ b/lib/srdb1/schema/silo.xml @@ -92,14 +92,14 @@ <column> <name>body</name> <type>binary</type> - <default/> + <null/> <description>Body of the message</description> </column> <column> <name>extra_hdrs</name> <type>text</type> - <default/> + <null/> <description>Extra headers that must be restored</description> </column>

1 0

git:master:b847ff22: kamctl: upgrade schema for acc
by Victor Seva 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: b847ff224ac8e738e07f9631cb7ba27091d9b22b URL: https://github.com/kamailio/kamailio/commit/b847ff224ac8e738e07f9631cb7ba27… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-21T16:18:39+02:00 kamctl: upgrade schema for acc --- Modified: utils/kamctl/db_berkeley/kamailio/acc_cdrs Modified: utils/kamctl/db_sqlite/acc-create.sql Modified: utils/kamctl/mysql/acc-create.sql Modified: utils/kamctl/oracle/acc-create.sql Modified: utils/kamctl/postgres/acc-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/b847ff224ac8e738e07f9631cb7ba27… Patch: https://github.com/kamailio/kamailio/commit/b847ff224ac8e738e07f9631cb7ba27… --- diff --git a/utils/kamctl/db_berkeley/kamailio/acc_cdrs b/utils/kamctl/db_berkeley/kamailio/acc_cdrs index 8eb3cbb..57ab533 100644 --- a/utils/kamctl/db_berkeley/kamailio/acc_cdrs +++ b/utils/kamctl/db_berkeley/kamailio/acc_cdrs @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|'' +NIL|'2000-01-01 00:00:00'|'2000-01-01 00:00:00'|0 diff --git a/utils/kamctl/db_sqlite/acc-create.sql b/utils/kamctl/db_sqlite/acc-create.sql index d27d307..60b4193 100644 --- a/utils/kamctl/db_sqlite/acc-create.sql +++ b/utils/kamctl/db_sqlite/acc-create.sql @@ -15,9 +15,9 @@ CREATE INDEX acc_callid_idx ON acc (callid); INSERT INTO version (table_name, table_version) values ('acc_cdrs','2'); CREATE TABLE acc_cdrs ( id INTEGER PRIMARY KEY NOT NULL, - start_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '' NOT NULL, - end_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '' NOT NULL, - duration REAL DEFAULT '' NOT NULL + start_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:00' NOT NULL, + end_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:00' NOT NULL, + duration REAL DEFAULT 0 NOT NULL ); CREATE INDEX acc_cdrs_start_time_idx ON acc_cdrs (start_time); diff --git a/utils/kamctl/mysql/acc-create.sql b/utils/kamctl/mysql/acc-create.sql index c088ca4..0d02811 100644 --- a/utils/kamctl/mysql/acc-create.sql +++ b/utils/kamctl/mysql/acc-create.sql @@ -15,9 +15,9 @@ CREATE INDEX callid_idx ON acc (callid); INSERT INTO version (table_name, table_version) values ('acc_cdrs','2'); CREATE TABLE acc_cdrs ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - start_time DATETIME DEFAULT '' NOT NULL, - end_time DATETIME DEFAULT '' NOT NULL, - duration FLOAT(10,3) DEFAULT '' NOT NULL + start_time DATETIME DEFAULT '2000-01-01 00:00:00' NOT NULL, + end_time DATETIME DEFAULT '2000-01-01 00:00:00' NOT NULL, + duration FLOAT(10,3) DEFAULT 0 NOT NULL ); CREATE INDEX start_time_idx ON acc_cdrs (start_time); diff --git a/utils/kamctl/oracle/acc-create.sql b/utils/kamctl/oracle/acc-create.sql index b84a97b..2a71e85 100644 --- a/utils/kamctl/oracle/acc-create.sql +++ b/utils/kamctl/oracle/acc-create.sql @@ -23,9 +23,9 @@ CREATE INDEX acc_callid_idx ON acc (callid); INSERT INTO version (table_name, table_version) values ('acc_cdrs','2'); CREATE TABLE acc_cdrs ( id NUMBER(10) PRIMARY KEY, - start_time DATE DEFAULT '', - end_time DATE DEFAULT '', - duration NUMBER(10,3) DEFAULT '' + start_time DATE DEFAULT '2000-01-01 00:00:00', + end_time DATE DEFAULT '2000-01-01 00:00:00', + duration NUMBER(10,3) DEFAULT 0 NOT NULL ); CREATE OR REPLACE TRIGGER acc_cdrs_tr diff --git a/utils/kamctl/postgres/acc-create.sql b/utils/kamctl/postgres/acc-create.sql index 8ae4336..713514f 100644 --- a/utils/kamctl/postgres/acc-create.sql +++ b/utils/kamctl/postgres/acc-create.sql @@ -15,9 +15,9 @@ CREATE INDEX acc_callid_idx ON acc (callid); INSERT INTO version (table_name, table_version) values ('acc_cdrs','2'); CREATE TABLE acc_cdrs ( id SERIAL PRIMARY KEY NOT NULL, - start_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '' NOT NULL, - end_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '' NOT NULL, - duration REAL DEFAULT '' NOT NULL + start_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:00' NOT NULL, + end_time TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:00' NOT NULL, + duration REAL DEFAULT 0 NOT NULL ); CREATE INDEX acc_cdrs_start_time_idx ON acc_cdrs (start_time);

1 0

git:master:4295f797: lib/srdb1/schema: fix defaults acc_cdrs introduced by 045e2f5
by Victor Seva 21 Apr '15

21 Apr '15

Module: kamailio Branch: master Commit: 4295f7977a5696be9f381058cc2dcdbb6d6af3d6 URL: https://github.com/kamailio/kamailio/commit/4295f7977a5696be9f381058cc2dcdb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-04-21T16:15:19+02:00 lib/srdb1/schema: fix defaults acc_cdrs introduced by 045e2f5 --- Modified: lib/srdb1/schema/acc_cdrs.xml --- Diff: https://github.com/kamailio/kamailio/commit/4295f7977a5696be9f381058cc2dcdb… Patch: https://github.com/kamailio/kamailio/commit/4295f7977a5696be9f381058cc2dcdb… --- diff --git a/lib/srdb1/schema/acc_cdrs.xml b/lib/srdb1/schema/acc_cdrs.xml index 84bb678..1fe7447 100644 --- a/lib/srdb1/schema/acc_cdrs.xml +++ b/lib/srdb1/schema/acc_cdrs.xml @@ -30,14 +30,14 @@ <name>start_time</name> <type>datetime</type> <description>Start date and time</description> - <default/> + <default>2000-01-01 00:00:00</default> </column> <column> <name>end_time</name> <type>datetime</type> <description>End date and time</description> - <default/> + <default>2000-01-01 00:00:00</default> </column> <column> @@ -45,7 +45,7 @@ <type>float</type> <size>10,3</size> <description>Duration</description> - <default/> + <default>0</default> </column> <index>

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2015