sr-dev August 2012

sr-dev@lists.kamailio.org

30 participants
169 discussions

git:master: corex: a new module to collect reimplemented core cfg functions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e4ecf49add0e62330e1db071106806e35e9b078a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4ecf49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 30 22:38:11 2012 +0200 corex: a new module to collect reimplemented core cfg functions - old core functions for cofiguration file do not take variables in the parameters, working only with static strings or integers - some of them will be reimplemented in corex moduel to add support for variables, making the parameters to be dynamic at runtime - append_branch(...) was reimplemented at this moment, allowing URI and Q parameters to contain variables - there are also brand new features - two RPC commands, one to list the listen sockets and the other to list the hostname aliases - name of the module comes from CORE eXtensions --- modules/corex/Makefile | 12 +++ modules/corex/README | 130 ++++++++++++++++++++++++++++ modules/corex/corex_lib.c | 90 ++++++++++++++++++++ modules/corex/corex_lib.h | 29 +++++++ modules/corex/corex_mod.c | 115 +++++++++++++++++++++++++ modules/corex/corex_rpc.c | 168 +++++++++++++++++++++++++++++++++++++ modules/corex/corex_rpc.h | 27 ++++++ modules/corex/doc/Makefile | 4 + modules/corex/doc/corex.xml | 37 ++++++++ modules/corex/doc/corex_admin.xml | 142 +++++++++++++++++++++++++++++++ 10 files changed, 754 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e4e…

12 years, 2 months

git:master: kex: removed km_append_branch() cfg funtion

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: eb73f14958ede24928f312fa0e44d171fa7bf373 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb73f14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 30 22:34:40 2012 +0200 kex: removed km_append_branch() cfg funtion - functionalty being replaced by append_branch() from corex module which can take also Q as parameter --- modules_k/kex/README | 62 +++++++++++++++------------------------ modules_k/kex/doc/kex_admin.xml | 39 +++++------------------- modules_k/kex/kex_mod.c | 4 -- modules_k/kex/km_core.c | 34 --------------------- modules_k/kex/km_core.h | 1 - 5 files changed, 32 insertions(+), 108 deletions(-) diff --git a/modules_k/kex/README b/modules_k/kex/README index 9c88c6b..89b3197 100644 --- a/modules_k/kex/README +++ b/modules_k/kex/README @@ -11,7 +11,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2009 Daniel-Constantin Mierla + Copyright � 2009 Daniel-Constantin Mierla __________________________________________________________________ Table of Contents @@ -62,14 +62,13 @@ Daniel-Constantin Mierla 1.4. setbflag usage 1.5. setbflag usage 1.6. resetsflag usage - 1.7. km_append_branch usage - 1.8. >setdsturi usage - 1.9. >resetdsturi usage - 1.10. >isdsturiset usage - 1.11. >pv_printf usage - 1.12. >is_myself usage - 1.13. setdebug usage - 1.14. >resetdebug usage + 1.7. setdsturi usage + 1.8. resetdsturi usage + 1.9. isdsturiset usage + 1.10. pv_printf usage + 1.11. is_myself usage + 1.12. setdebug usage + 1.13. resetdebug usage Chapter 1. Admin Guide @@ -263,21 +262,8 @@ resetbflag("1"); 3.7. km_append_branch([uri]) - Append a new branch to SIP request. - - Meaning of the parameters is as follows: - * uri - SIP URI of the new destination. If omitted then the R-URI is - used. It can be static string or a string with pseudo-variables - that will be evaluated at runtime. - - This function can be used from REQUEST_ROUTE and FAILURE_ROUTE. - - Example 1.7. km_append_branch usage -... -km_append_branch(); -... -km_append_branch("sip:alice@sip-router.org"); -... + It was replaced by append_branch() from corex module, starting with + version 3.4.0. 3.8. setdsturi(uri) @@ -291,7 +277,7 @@ km_append_branch("sip:alice@sip-router.org"); This function can be used from ANY_ROUTE. - Example 1.8. >setdsturi usage + Example 1.7. setdsturi usage ... setdsturi("sip:10.0.0.10"); ... @@ -302,7 +288,7 @@ setdsturi("sip:10.0.0.10"); This function can be used from ANY_ROUTE. - Example 1.9. >resetdsturi usage + Example 1.8. resetdsturi usage ... resetdsturi(); ... @@ -313,7 +299,7 @@ resetdsturi(); This function can be used from ANY_ROUTE. - Example 1.10. >isdsturiset usage + Example 1.9. isdsturiset usage ... if(isdsturiset()) { @@ -334,7 +320,7 @@ if(isdsturiset()) This function can be used from ANY_ROUTE. - Example 1.11. >pv_printf usage + Example 1.10. pv_printf usage ... pv_printf("$ru", "sip:$rU@$fd"); pv_printf("$avp(x)", "From: $fU - To: $tU"); @@ -352,7 +338,7 @@ pv_printf("$avp(x)", "From: $fU - To: $tU"); This function can be used from ANY_ROUTE. - Example 1.12. >is_myself usage + Example 1.11. is_myself usage ... if(is_myself("$fu")) { ... @@ -369,7 +355,7 @@ if(is_myself("$fu")) { This function can be used from ANY_ROUTE. - Example 1.13. setdebug usage + Example 1.12. setdebug usage ... setdebug("1"); ... @@ -384,7 +370,7 @@ setdebug("$var(level)"); This function can be used from ANY_ROUTE. - Example 1.14. >resetdebug usage + Example 1.13. resetdebug usage ... resetdebug(); ... @@ -398,7 +384,7 @@ resetdebug(); 4.5. version 4.6. which -4.1. arg +4.1. arg Print command line arguments. @@ -410,7 +396,7 @@ resetdebug(); :arg:_reply_fifo_file_ _empty_line_ -4.2. kill +4.2. kill Kill the application. @@ -422,7 +408,7 @@ resetdebug(); :kill:_reply_fifo_file_ _empty_line_ -4.3. pwd +4.3. pwd Print working directory. @@ -434,7 +420,7 @@ resetdebug(); :pwd:_reply_fifo_file_ _empty_line_ -4.4. uptime +4.4. uptime Print uptime. @@ -446,7 +432,7 @@ resetdebug(); :uptime:_reply_fifo_file_ _empty_line_ -4.5. version +4.5. version Print version information. @@ -458,7 +444,7 @@ resetdebug(); :version:_reply_fifo_file_ _empty_line_ -4.6. which +4.6. which Print list of available MI commands. @@ -474,7 +460,7 @@ resetdebug(); 5.1. pkg.stats -5.1. pkg.stats +5.1. pkg.stats Print private memory (pkg) usage statistics per process. It can take optinally a filter to print statistics only for a specific process or diff --git a/modules_k/kex/doc/kex_admin.xml b/modules_k/kex/doc/kex_admin.xml index f651361..02a27a6 100644 --- a/modules_k/kex/doc/kex_admin.xml +++ b/modules_k/kex/doc/kex_admin.xml @@ -250,32 +250,9 @@ resetbflag("1"); <section> <title><function moreinfo="none">km_append_branch([uri])</function></title> <para> - Append a new branch to SIP request. + It was replaced by append_branch() from corex module, starting with + version 3.4.0. </para> - <para>Meaning of the parameters is as follows:</para> - <itemizedlist> - <listitem> - <para> - <emphasis>uri</emphasis> - SIP URI of the new destination. If - omitted then the R-URI is used. It can be static string or - a string with pseudo-variables that will be evaluated at - runtime. - </para> - </listitem> - </itemizedlist> - <para> - This function can be used from REQUEST_ROUTE and FAILURE_ROUTE. - </para> - <example> - <title><function>km_append_branch</function> usage</title> - <programlisting format="linespecific"> -... -km_append_branch(); -... -km_append_branch("sip:alice@sip-router.org"); -... -</programlisting> - </example> </section> <section> <title><function moreinfo="none">setdsturi(uri)</function></title> @@ -297,7 +274,7 @@ km_append_branch("sip:alice@sip-router.org"); This function can be used from ANY_ROUTE. </para> <example> - <title><function>>setdsturi</function> usage</title> + <title><function>setdsturi</function> usage</title> <programlisting format="linespecific"> ... setdsturi("sip:10.0.0.10"); @@ -314,7 +291,7 @@ setdsturi("sip:10.0.0.10"); This function can be used from ANY_ROUTE. </para> <example> - <title><function>>resetdsturi</function> usage</title> + <title><function>resetdsturi</function> usage</title> <programlisting format="linespecific"> ... resetdsturi(); @@ -332,7 +309,7 @@ resetdsturi(); This function can be used from ANY_ROUTE. </para> <example> - <title><function>>isdsturiset</function> usage</title> + <title><function>isdsturiset</function> usage</title> <programlisting format="linespecific"> ... if(isdsturiset()) @@ -368,7 +345,7 @@ if(isdsturiset()) This function can be used from ANY_ROUTE. </para> <example> - <title><function>>pv_printf</function> usage</title> + <title><function>pv_printf</function> usage</title> <programlisting format="linespecific"> ... pv_printf("$ru", "sip:$rU@$fd"); @@ -397,7 +374,7 @@ pv_printf("$avp(x)", "From: $fU - To: $tU"); This function can be used from ANY_ROUTE. </para> <example> - <title><function>>is_myself</function> usage</title> + <title><function>is_myself</function> usage</title> <programlisting format="linespecific"> ... if(is_myself("$fu")) { @@ -446,7 +423,7 @@ setdebug("$var(level)"); This function can be used from ANY_ROUTE. </para> <example> - <title><function>>resetdebug</function> usage</title> + <title><function>resetdebug</function> usage</title> <programlisting format="linespecific"> ... resetdebug(); diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index ad3cc1d..8dafb7f 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -87,10 +87,6 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"isbflagset", (cmd_function)w_isbflagset, 2,fixup_igp_igp, 0, ANY_ROUTE }, - {"km_append_branch", (cmd_function)w_km_append_branch, 0, 0, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"km_append_branch", (cmd_function)w_km_append_branch, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"setdsturi", (cmd_function)w_setdsturi, 1, 0, 0, ANY_ROUTE }, {"resetdsturi", (cmd_function)w_resetdsturi, 0, 0, diff --git a/modules_k/kex/km_core.c b/modules_k/kex/km_core.c index 5a0bee6..1e6b0da 100644 --- a/modules_k/kex/km_core.c +++ b/modules_k/kex/km_core.c @@ -32,40 +32,6 @@ #include "../../mod_fix.h" #include "km_core.h" -int w_km_append_branch(struct sip_msg *msg, char *uri, str *sq) -{ - str suri; - int ret; - int q = Q_UNSPECIFIED; - flag_t branch_flags = 0; - - getbflagsval(0, &branch_flags); - if (uri==NULL) { - ret = km_append_branch(msg, 0, &msg->dst_uri, &msg->path_vec, - q, branch_flags, msg->force_send_socket); - /* reset all branch info */ - reset_force_socket(msg); - setbflagsval(0, 0); - if(msg->dst_uri.s!=0) - pkg_free(msg->dst_uri.s); - msg->dst_uri.s = 0; - msg->dst_uri.len = 0; - if(msg->path_vec.s!=0) - pkg_free(msg->path_vec.s); - msg->path_vec.s = 0; - msg->path_vec.len = 0; - } else { - if(fixup_get_svalue(msg, (gparam_p)uri, &suri)!=0) - { - LM_ERR("cannot get the URI parameter\n"); - return -1; - } - ret = km_append_branch(msg, &suri, &msg->dst_uri, - &msg->path_vec, q, branch_flags, - msg->force_send_socket); - } - return ret; -} int w_setdsturi(struct sip_msg *msg, char *uri, str *s2) { diff --git a/modules_k/kex/km_core.h b/modules_k/kex/km_core.h index 5fa08f8..c8e23f3 100644 --- a/modules_k/kex/km_core.h +++ b/modules_k/kex/km_core.h @@ -25,7 +25,6 @@ #include "../../sr_module.h" -int w_km_append_branch(struct sip_msg *msg, char *uri, str *s2); int w_setdsturi(struct sip_msg *msg, char *uri, str *s2); int w_resetdsturi(struct sip_msg *msg, char *uri, str *s2); int w_isdsturiset(struct sip_msg *msg, char *uri, str *s2);

12 years, 2 months

git:master: core: exported get_valid_proto_name() via headers

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 132df8d61eefcc2dbea08ae70db82393803d9488 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=132df8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 30 10:16:04 2012 +0200 core: exported get_valid_proto_name() via headers --- socket_info.c | 2 +- socket_info.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/socket_info.c b/socket_info.c index 766e554..73dbc03 100644 --- a/socket_info.c +++ b/socket_info.c @@ -331,7 +331,7 @@ static void free_sock_info(struct socket_info* si) -static char* get_valid_proto_name(unsigned short proto) +char* get_valid_proto_name(unsigned short proto) { switch(proto){ case PROTO_NONE: diff --git a/socket_info.h b/socket_info.h index 2d46d7d..926b317 100644 --- a/socket_info.h +++ b/socket_info.h @@ -105,6 +105,8 @@ struct socket_info** get_sock_info_list(unsigned short proto); int parse_phostport(char* s, char** host, int* hlen, int* port, int* proto); +char* get_valid_proto_name(unsigned short proto); + /* helper function: * returns next protocol, if the last one is reached return 0 * useful for cycling on the supported protocols

12 years, 2 months

git:master: db_cluster: safety check for existence of several DB API members

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 21583d47751fc7f684dac41a3bfbfc3b2c0bf3a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21583d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 30 10:15:26 2012 +0200 db_cluster: safety check for existence of several DB API members --- modules_k/db_cluster/dbcl_api.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules_k/db_cluster/dbcl_api.c b/modules_k/db_cluster/dbcl_api.c index 20d689c..0269343 100644 --- a/modules_k/db_cluster/dbcl_api.c +++ b/modules_k/db_cluster/dbcl_api.c @@ -309,7 +309,8 @@ int db_cluster_fetch_result(const db1_con_t* _h, db1_res_t** _r, const int nrows dbcl_cls_t *cls=NULL; LM_DBG("executing db cluster fetch-result command\n"); cls = (dbcl_cls_t*)_h->tail; - if(cls->usedcon==NULL || cls->usedcon->dbh==NULL) + if(cls->usedcon==NULL || cls->usedcon->dbh==NULL + || cls->usedcon->dbf.fetch_result==NULL) return -1; return cls->usedcon->dbf.fetch_result(cls->usedcon->dbh, _r, nrows); } @@ -376,7 +377,8 @@ int db_cluster_last_inserted_id(const db1_con_t* _h) dbcl_cls_t *cls=NULL; LM_DBG("executing db cluster last inserted id command\n"); cls = (dbcl_cls_t*)_h->tail; - if(cls->usedcon==NULL || cls->usedcon->dbh==NULL) + if(cls->usedcon==NULL || cls->usedcon->dbh==NULL + || cls->usedcon->dbf.last_inserted_id==NULL) return -1; return cls->usedcon->dbf.last_inserted_id(cls->usedcon->dbh); } @@ -390,7 +392,8 @@ int db_cluster_affected_rows(const db1_con_t* _h) dbcl_cls_t *cls=NULL; LM_DBG("executing db cluster affected-rows command\n"); cls = (dbcl_cls_t*)_h->tail; - if(cls->usedcon==NULL || cls->usedcon->dbh==NULL) + if(cls->usedcon==NULL || cls->usedcon->dbh==NULL + || cls->usedcon->dbf.affected_rows==NULL) return -1; return cls->usedcon->dbf.affected_rows(cls->usedcon->dbh); }

12 years, 2 months

GRUU and publish registration status

by Olle E. Johansson

Hi! Since we've learned that GRUU's are more or less semi-automatic I have of course a few more questions: - Is the usrloc module aware that a specific contact is using GRUU's - If so, is that reachable information for the pua-regloc to publish the gruu's? - For a restart, is that status saved in the db? /O

12 years, 2 months

git:3.3: modules/db_cassandra Updated in doc location table schema

by Anca Vamanu

Module: sip-router Branch: 3.3 Commit: 2665ef8706201ba0e98344fd0e9b455a275a8c53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2665ef8… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Aug 30 17:39:47 2012 +0300 modules/db_cassandra Updated in doc location table schema (cherry picked from commit 82bb7a8b67e488e7089d194fa5f96e9ae61dfb03) --- modules/db_cassandra/README | 3 ++- modules/db_cassandra/doc/db_cassandra_admin.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/db_cassandra/README b/modules/db_cassandra/README index 6bc6f5c..abd2304 100644 --- a/modules/db_cassandra/README +++ b/modules/db_cassandra/README @@ -194,7 +194,8 @@ default_validation_class='UTF8Type' and key_validation_class='UTF8Type'; ... callid(string) cflags(int) contact(string) cseq(int) expires(timestamp) flags (int) last_modified(int) methods(int) path(string) q(double) received(string) so -cket(string) user_agent(string) username(string) +cket(string) user_agent(string) username(string) ruid(string) instance(string) r +eg_id(int) username contact ... diff --git a/modules/db_cassandra/doc/db_cassandra_admin.xml b/modules/db_cassandra/doc/db_cassandra_admin.xml index 1c00067..3bb25b3 100644 --- a/modules/db_cassandra/doc/db_cassandra_admin.xml +++ b/modules/db_cassandra/doc/db_cassandra_admin.xml @@ -214,7 +214,7 @@ default_validation_class='UTF8Type' and key_validation_class='UTF8Type'; <programlisting format="linespecific"> ... - callid(string) cflags(int) contact(string) cseq(int) <emphasis>expires(timestamp)</emphasis> flags(int) last_modified(int) methods(int) path(string) q(double) received(string) socket(string) user_agent(string) username(string) + callid(string) cflags(int) contact(string) cseq(int) <emphasis>expires(timestamp)</emphasis> flags(int) last_modified(int) methods(int) path(string) q(double) received(string) socket(string) user_agent(string) username(string) ruid(string) instance(string) reg_id(int) <emphasis>username</emphasis> <emphasis>contact</emphasis> ...

12 years, 2 months

git:master: modules/db_cassandra Updated in doc location table schema

by Anca Vamanu

Module: sip-router Branch: master Commit: 82bb7a8b67e488e7089d194fa5f96e9ae61dfb03 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82bb7a8… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Aug 30 17:39:47 2012 +0300 modules/db_cassandra Updated in doc location table schema --- modules/db_cassandra/README | 3 ++- modules/db_cassandra/doc/db_cassandra_admin.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/db_cassandra/README b/modules/db_cassandra/README index 6bc6f5c..abd2304 100644 --- a/modules/db_cassandra/README +++ b/modules/db_cassandra/README @@ -194,7 +194,8 @@ default_validation_class='UTF8Type' and key_validation_class='UTF8Type'; ... callid(string) cflags(int) contact(string) cseq(int) expires(timestamp) flags (int) last_modified(int) methods(int) path(string) q(double) received(string) so -cket(string) user_agent(string) username(string) +cket(string) user_agent(string) username(string) ruid(string) instance(string) r +eg_id(int) username contact ... diff --git a/modules/db_cassandra/doc/db_cassandra_admin.xml b/modules/db_cassandra/doc/db_cassandra_admin.xml index 1c00067..3bb25b3 100644 --- a/modules/db_cassandra/doc/db_cassandra_admin.xml +++ b/modules/db_cassandra/doc/db_cassandra_admin.xml @@ -214,7 +214,7 @@ default_validation_class='UTF8Type' and key_validation_class='UTF8Type'; <programlisting format="linespecific"> ... - callid(string) cflags(int) contact(string) cseq(int) <emphasis>expires(timestamp)</emphasis> flags(int) last_modified(int) methods(int) path(string) q(double) received(string) socket(string) user_agent(string) username(string) + callid(string) cflags(int) contact(string) cseq(int) <emphasis>expires(timestamp)</emphasis> flags(int) last_modified(int) methods(int) path(string) q(double) received(string) socket(string) user_agent(string) username(string) ruid(string) instance(string) reg_id(int) <emphasis>username</emphasis> <emphasis>contact</emphasis> ...

12 years, 2 months

git:3.3: modules/db_cassandra: Fixed segmentation fault in case of bad table schema

by Anca Vamanu

Module: sip-router Branch: 3.3 Commit: 26d2413bba1c7b9fbc5bfa84acc3499bf08c5cd6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26d2413… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Aug 30 17:21:29 2012 +0300 modules/db_cassandra: Fixed segmentation fault in case of bad table schema Reported by Boudewyn Ligthart. (cherry picked from commit 0f8f21e390e8442cf1f527d3654dedc5a40bfcea) --- modules/db_cassandra/dbcassa_base.cpp | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/db_cassandra/dbcassa_base.cpp b/modules/db_cassandra/dbcassa_base.cpp index 8a74a96..4cee513 100644 --- a/modules/db_cassandra/dbcassa_base.cpp +++ b/modules/db_cassandra/dbcassa_base.cpp @@ -645,6 +645,7 @@ int db_cassa_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, if (! RES_NAMES(db_res)[col]) { LM_ERR("no private memory left\n"); dbcassa_lock_release(tbc); + RES_COL_N(db_res) = col; db_free_columns(db_res); goto error; } @@ -656,6 +657,7 @@ int db_cassa_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, if(!colp) { LM_ERR("No column with name [%.*s] found\n", _c[col]->len, _c[col]->s); dbcassa_lock_release(tbc); + RES_COL_N(db_res) = col; db_free_columns(db_res); goto error; }

12 years, 2 months

git:master: modules/db_cassandra: Fixed segmentation fault in case of bad table schema

by Anca Vamanu

Module: sip-router Branch: master Commit: 0f8f21e390e8442cf1f527d3654dedc5a40bfcea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f8f21e… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Aug 30 17:21:29 2012 +0300 modules/db_cassandra: Fixed segmentation fault in case of bad table schema Reported by Boudewyn Ligthart. --- modules/db_cassandra/dbcassa_base.cpp | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/db_cassandra/dbcassa_base.cpp b/modules/db_cassandra/dbcassa_base.cpp index 8a74a96..4cee513 100644 --- a/modules/db_cassandra/dbcassa_base.cpp +++ b/modules/db_cassandra/dbcassa_base.cpp @@ -645,6 +645,7 @@ int db_cassa_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, if (! RES_NAMES(db_res)[col]) { LM_ERR("no private memory left\n"); dbcassa_lock_release(tbc); + RES_COL_N(db_res) = col; db_free_columns(db_res); goto error; } @@ -656,6 +657,7 @@ int db_cassa_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, if(!colp) { LM_ERR("No column with name [%.*s] found\n", _c[col]->len, _c[col]->s); dbcassa_lock_release(tbc); + RES_COL_N(db_res) = col; db_free_columns(db_res); goto error; }

12 years, 2 months

git:3.3: modules/db_cassandra: Updated replace function to the new signature

by Anca Vamanu

Module: sip-router Branch: 3.3 Commit: bb0b3b1e3218a2ad919b590ed6961f021fc72857 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb0b3b1… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Aug 30 12:24:24 2012 +0300 modules/db_cassandra: Updated replace function to the new signature (cherry picked from commit 512013f324dd6faa37e26302a267afb07252812a) --- modules/db_cassandra/db_cassandra.c | 2 +- modules/db_cassandra/dbcassa_base.cpp | 8 +++++++- modules/db_cassandra/dbcassa_base.h | 6 ++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/db_cassandra/db_cassandra.c b/modules/db_cassandra/db_cassandra.c index 969123f..119ecca 100644 --- a/modules/db_cassandra/db_cassandra.c +++ b/modules/db_cassandra/db_cassandra.c @@ -136,7 +136,7 @@ int db_cassa_bind_api(db_func_t *dbb) dbb->query = db_cassa_query; dbb->free_result = db_cassa_free_result; dbb->insert = db_cassa_insert; - dbb->replace = db_cassa_insert; + dbb->replace = db_cassa_replace; dbb->insert_update = db_cassa_insert; dbb->delete = db_cassa_delete; dbb->update = db_cassa_update; diff --git a/modules/db_cassandra/dbcassa_base.cpp b/modules/db_cassandra/dbcassa_base.cpp index bd7f057..8a74a96 100644 --- a/modules/db_cassandra/dbcassa_base.cpp +++ b/modules/db_cassandra/dbcassa_base.cpp @@ -535,7 +535,7 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, while(1) { CON_CASSA(_h)->con->get_range_slices(key_slice_vect, cparent, sp, keyRange, oac::ConsistencyLevel::ONE); /* construct cassa_result */ - LM_DBG("Retuned %d key slices\n", key_slice_vect.size()); + LM_DBG("Retuned %d key slices\n", (int)key_slice_vect.size()); for(unsigned int i = 0; i< key_slice_vect.size(); i++) { if(key_slice_vect[i].columns.size()==0) { continue; @@ -881,6 +881,12 @@ int db_cassa_modify(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, return -1; } +int db_cassa_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, + int _n, const int _un, const int _m) +{ + LM_DBG("db_cassa_replace:\n"); + return db_cassa_modify(_h, _k, _v, _k, _v, _n, _n); +} int db_cassa_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, int _n) diff --git a/modules/db_cassandra/dbcassa_base.h b/modules/db_cassandra/dbcassa_base.h index 01b2a31..ea7f213 100644 --- a/modules/db_cassandra/dbcassa_base.h +++ b/modules/db_cassandra/dbcassa_base.h @@ -72,6 +72,12 @@ int db_cassa_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, /* + * Replace a row into table - same as insert for cassandra + */ +int db_cassa_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, + int _n, const int _un, const int _m); + +/* * Delete a row from table */ int db_cassa_delete(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2012