sr-dev January 2014

sr-dev@lists.kamailio.org

27 participants
210 discussions

git:4.1: modules/sipt: optional pointer should be updated when modifying called party

by Torrey Searle

Module: sip-router Branch: 4.1 Commit: e48703bd1cb12d5e8f2c29baf90d0c5e6af09b32 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e48703b… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Thu Jan 16 12:02:09 2014 +0100 modules/sipt: optional pointer should be updated when modifying called party (cherry picked from commit ed33effd4a65302cd893ef2e8f0f8fcc3e88fb57) --- modules/sipt/ss7_parser.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/sipt/ss7_parser.c b/modules/sipt/ss7_parser.c index c8fc239..3c6d8ff 100644 --- a/modules/sipt/ss7_parser.c +++ b/modules/sipt/ss7_parser.c @@ -308,11 +308,15 @@ int isup_update_destination(struct sdp_mangler * mangle, char * dest, int hops, // modify the mandatory fixed header - res2 = encode_called_party(dest, buf+offset+1, nai, tmp_buf+1, 255-1); - tmp_buf[0] = (char)res2; + res2 = encode_called_party(dest, buf+offset+1, nai, tmp_buf+2, 255-1); + tmp_buf[1] = (char)res2; res = buf[offset]+1; + + // set the new optional part pointer + tmp_buf[0] = (char)res2+2; - replace_body_segment(mangle, offset,res,tmp_buf, res2+1); + // replace the mandatory fixed header + optional pointer + replace_body_segment(mangle, offset - 1,res+1,tmp_buf, res2+2); offset += res; len -= res;

10 years, 10 months

git:master: modules/tm: fixed bug where AVPs are not restored correctly if async used within failure route

by Jason Penton

Module: sip-router Branch: master Commit: f3f2f09beda60e1f7f4e6dfc0359f788991aeef6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3f2f09… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Jan 16 13:08:29 2014 +0200 modules/tm: fixed bug where AVPs are not restored correctly if async used within failure route - related to mail by José Seabra on Jan 10 2014 entitiled - kamailio-4.1.1 avp issue within failure routes --- modules/tm/t_reply.c | 93 +++++++++++++++++++++++-------------------------- 1 files changed, 44 insertions(+), 49 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 4d9901d..f6fc568 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -856,62 +856,57 @@ void faked_env(struct cell *t, struct sip_msg *msg, int is_async_env) { * otherwise the actions would attempt to look the transaction * up (unnecessary overhead, refcounting) */ - if (!is_async_env) { - /* backup */ - backup_t = get_t(); - backup_branch = get_t_branch(); - backup_msgid = global_msg_id; - /* fake transaction and message id */ - global_msg_id = msg->id; + + /* backup */ + backup_t = get_t(); + backup_branch = get_t_branch(); + backup_msgid = global_msg_id; + /* fake transaction and message id */ + global_msg_id = msg->id; + + if (is_async_env) { + set_t(t, t->async_backup.backup_branch); + } else { set_t(t, T_BR_UNDEFINED); + } - /* make available the avp list from transaction */ - backup_uri_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); - backup_uri_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); - backup_user_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); - backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); - backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); - backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); + /* make available the avp list from transaction */ + backup_uri_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); + backup_uri_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); + backup_user_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); + backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); + backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); + backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); #ifdef WITH_XAVP - backup_xavps = xavp_set_list(&t->xavps_list); + backup_xavps = xavp_set_list(&t->xavps_list); #endif - /* set default send address to the saved value */ - backup_si = bind_address; - bind_address = t->uac[0].request.dst.send_sock; - /* backup lump lists */ - backup_add_rm = t->uas.request->add_rm; - backup_body_lumps = t->uas.request->body_lumps; - backup_reply_lump = t->uas.request->reply_lump; - } else { - global_msg_id = msg->id; - set_t(t, t->async_backup.backup_branch); - } + /* set default send address to the saved value */ + backup_si = bind_address; + bind_address = t->uac[0].request.dst.send_sock; + /* backup lump lists */ + backup_add_rm = t->uas.request->add_rm; + backup_body_lumps = t->uas.request->body_lumps; + backup_reply_lump = t->uas.request->reply_lump; } else { - if (!is_async_env) { - /* restore original environment */ - set_t(backup_t, backup_branch); - global_msg_id = backup_msgid; - set_route_type(backup_route_type); - /* restore original avp list */ - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, backup_user_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, backup_user_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, backup_domain_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to); + /* restore original environment */ + set_t(backup_t, backup_branch); + global_msg_id = backup_msgid; + set_route_type(backup_route_type); + /* restore original avp list */ + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, backup_user_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, backup_user_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, backup_domain_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to); #ifdef WITH_XAVP - xavp_set_list(backup_xavps); + xavp_set_list(backup_xavps); #endif - bind_address = backup_si; - /* restore lump lists */ - t->uas.request->add_rm = backup_add_rm; - t->uas.request->body_lumps = backup_body_lumps; - t->uas.request->reply_lump = backup_reply_lump; - } else { - /*we don't need to restore anything as there was no "environment" prior - to continuing (we are in a different process)*/ - LOG(L_DBG, "nothing to restore in async continue, useless call\n"); - } + bind_address = backup_si; + /* restore lump lists */ + t->uas.request->add_rm = backup_add_rm; + t->uas.request->body_lumps = backup_body_lumps; + t->uas.request->reply_lump = backup_reply_lump; } }

10 years, 10 months

git:master: modules/sipt: optional pointer should be updated when modifying called party

by Torrey Searle

Module: sip-router Branch: master Commit: ed33effd4a65302cd893ef2e8f0f8fcc3e88fb57 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed33eff… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Thu Jan 16 12:02:09 2014 +0100 modules/sipt: optional pointer should be updated when modifying called party --- modules/sipt/ss7_parser.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/sipt/ss7_parser.c b/modules/sipt/ss7_parser.c index c8fc239..3c6d8ff 100644 --- a/modules/sipt/ss7_parser.c +++ b/modules/sipt/ss7_parser.c @@ -308,11 +308,15 @@ int isup_update_destination(struct sdp_mangler * mangle, char * dest, int hops, // modify the mandatory fixed header - res2 = encode_called_party(dest, buf+offset+1, nai, tmp_buf+1, 255-1); - tmp_buf[0] = (char)res2; + res2 = encode_called_party(dest, buf+offset+1, nai, tmp_buf+2, 255-1); + tmp_buf[1] = (char)res2; res = buf[offset]+1; + + // set the new optional part pointer + tmp_buf[0] = (char)res2+2; - replace_body_segment(mangle, offset,res,tmp_buf, res2+1); + // replace the mandatory fixed header + optional pointer + replace_body_segment(mangle, offset - 1,res+1,tmp_buf, res2+2); offset += res; len -= res;

10 years, 10 months

git:master: dispatcher: readme regenerated with updated config example

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 662bfcf71aae0ec7aa74996a447e48f82fb5dfdc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=662bfcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 15 17:01:07 2014 +0100 dispatcher: readme regenerated with updated config example --- modules/dispatcher/README | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/dispatcher/README b/modules/dispatcher/README index edd9801..c488359 100644 --- a/modules/dispatcher/README +++ b/modules/dispatcher/README @@ -1081,6 +1081,9 @@ r,opt) # - define WITH_DEBUG # +#!ifndef DBURL +#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" +#!endif ####### Global Parameters ######### @@ -1168,8 +1171,7 @@ modparam("tm", "fr_timer", 2000) modparam("tm", "fr_inv_timer", 40000) # ----- dispatcher params ----- -modparam("dispatcher", "db_url", - "mysql://openser:openserro@localhost/openser") +modparam("dispatcher", "db_url", DBURL) modparam("dispatcher", "table_name", "dispatcher") modparam("dispatcher", "flags", 2) modparam("dispatcher", "dst_avp", "$avp(AVP_DST)") @@ -1228,8 +1230,6 @@ route { # dispatch destinations route(DISPATCH); - - route(RELAY); } @@ -1317,7 +1317,8 @@ route[DISPATCH] { } xlog("L_DBG", "--- SCRIPT: going to <$ru> via <$du>\n"); t_on_failure("RTF_DISPATCH"); - return; + route(RELAY); + exit; } # Sample failure route

10 years, 10 months

git:master: dispatcher: updated example config to use new db url attributes

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a248b53249d76e6b53f72bc64acd4c14fb5db660 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a248b53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 15 17:00:45 2014 +0100 dispatcher: updated example config to use new db url attributes --- modules/dispatcher/doc/dispatcher.cfg | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/dispatcher/doc/dispatcher.cfg b/modules/dispatcher/doc/dispatcher.cfg index b573df5..8c0fc4c 100644 --- a/modules/dispatcher/doc/dispatcher.cfg +++ b/modules/dispatcher/doc/dispatcher.cfg @@ -20,6 +20,9 @@ # - define WITH_DEBUG # +#!ifndef DBURL +#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" +#!endif ####### Global Parameters ######### @@ -106,8 +109,7 @@ modparam("tm", "fr_timer", 2000) modparam("tm", "fr_inv_timer", 40000) # ----- dispatcher params ----- -modparam("dispatcher", "db_url", - "mysql://openser:openserro@localhost/openser") +modparam("dispatcher", "db_url", DBURL) modparam("dispatcher", "table_name", "dispatcher") modparam("dispatcher", "flags", 2) modparam("dispatcher", "dst_avp", "$avp(AVP_DST)") @@ -166,8 +168,6 @@ route { # dispatch destinations route(DISPATCH); - - route(RELAY); } @@ -253,7 +253,8 @@ route[DISPATCH] { } xlog("L_DBG", "--- SCRIPT: going to <$ru> via <$du>\n"); t_on_failure("RTF_DISPATCH"); - return; + route(RELAY); + exit; } # Sample failure route

10 years, 10 months

[tracker] Task opened: MI datagram replies with wrong udp-port

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Per Carlen (peca) Attached to Project - sip-router Summary - MI datagram replies with wrong udp-port Task Type - Bug Report Category - Modules kamailio Status - Unconfirmed Assigned To - Operating System - Linux Severity - Low Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - When a udp-packet is sent to the address and port specified in kamailio.cfg, the response contains wrong source-port. The result is that external functions will be able to get responses. In the following trace, mi_datagram listens on 127.0.0.1:9998. A perl-script sent a command to this port and never got the response back, since the portnumber had changed. 127.0.0.1.45047 > 127.0.0.1.9998 127.0.0.1.51988 > 127.0.0.1.45047 I had a brief look in the source-code, and it looks like a new socket is created for responses. Shouldn't the "server socket" be used for sending responses? More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=387 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years, 10 months

Re: [sr-dev] [SR-Users] Registration to Kamailio World 2014 is open

by Daniel-Constantin Mierla

Hello, from distance point of view, both airports Berlin Tegel (TXL) and Berlin Schonefeld (SXF) are more or less the same. From each, one can take public transport, with a price of about 3Euro per ticket. The trip is about 25 minutes. TXL is the main airport right now and where most of the flights are coming to Berlin, there is a special bus line that goes from TXL (named also TXL) to Alexanderplatz, from where is walking distance (5min) to conference location, bus is running like every 10min. From SXF, one has to take S-Bahn (surface city train) line S9 and change once for another S-Bahn at Ostkreuz (there are many lines that can be taken from there towards Alexanderplatz, like S5). We will prepare more details and put on the Venue page of website, the public transport company of Berlin has a lot of details in English, for those that explore more: - http://www.bvg.de/index.php/en/index.html Cheers, Daniel On 14/01/14 15:05, arun Jayaprakash wrote: > What is the airport that I will need to fly into? Just checking on > some ticket prices. > > Thanks, > Arun > > ------------------------------------------------------------------------ > *From:* Daniel-Constantin Mierla <miconda(a)gmail.com> > *To:* Kamailio (SER) - Users Mailing List > <sr-users(a)lists.sip-router.org>; sr-dev <sr-dev(a)lists.sip-router.org>; > business(a)lists.kamailio.org > *Sent:* Tuesday, January 14, 2014 5:42 AM > *Subject:* [SR-Users] Registration to Kamailio World 2014 is open > > Hello, > > I would like to announce that the registration to Kamailio World 2014 is > now open. This year there is also a pre-conference event for half a day > on April 2, with technical tutorials for those looking on more practical > and hands-on content. > > You can see more details on the web site at: > - http://conference.kamailio.com/k02/registration/ > - http://conference.kamailio.com/k02/2014/01/registration-is-open/ > > Looking forward to meeting many of you in Berlin during April 2-4, 2014. > > Daniel > > -- > Daniel-Constantin Mierla - http://www.asipto.com <http://www.asipto.com/> > http://twitter.com/#!/miconda <http://twitter.com/#%21/miconda>- > http://www.linkedin.com/in/miconda > > > _______________________________________________ > SIP Express Router (SER) and Kamailio (OpenSER) - sr-users mailing list > sr-users(a)lists.sip-router.org <mailto:sr-users@lists.sip-router.org> > http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users > > -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

10 years, 10 months

git:master: db_cassandra: bug fixes for raw queries using sqlops

by Carlos Ruiz Diaz

Module: sip-router Branch: master Commit: 2f9e8d2e122edc5b7950ee6ab0991851c9cd7bbd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f9e8d2… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Tue Jan 14 10:04:53 2014 -0300 db_cassandra: bug fixes for raw queries using sqlops --- modules/db_cassandra/dbcassa_base.cpp | 210 +++++++++++++++++++++++++++------ 1 files changed, 175 insertions(+), 35 deletions(-) diff --git a/modules/db_cassandra/dbcassa_base.cpp b/modules/db_cassandra/dbcassa_base.cpp index e9d3a32..ffa9e3b 100644 --- a/modules/db_cassandra/dbcassa_base.cpp +++ b/modules/db_cassandra/dbcassa_base.cpp @@ -252,6 +252,7 @@ static int cassa_convert_result(db_key_t qcol, std::vector<oac::ColumnOrSuperCol res_col = result[idx_rescol].column; col_val.s = (char*)res_col.value.c_str(); + if(!col_val.s) { LM_DBG("Column not found in result %.*s- NULL\n", qcol->len, qcol->s); sr_cell->nul = 1; @@ -585,7 +586,7 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, * \param _r result set for storage * \return zero on success, negative value on failure */ -int cql_get_columns(oac::CqlResult& _cql_res, db1_res_t* _r) +int cql_get_columns(oac::CqlResult& _cql_res, db1_res_t* _r, dbcassa_table_p tbc) { std::vector<oac::CqlRow> res_cql_rows = _cql_res.rows; int rows_no = res_cql_rows.size(); @@ -630,14 +631,86 @@ int cql_get_columns(oac::CqlResult& _cql_res, db1_res_t* _r) /* The pointer that is here returned is part of the result structure. */ RES_NAMES(_r)[col]->s = (char*) res_cql_rows[0].columns[col].name.c_str(); RES_NAMES(_r)[col]->len = strlen(RES_NAMES(_r)[col]->s); - RES_TYPES(_r)[col] = DB1_STR; + /* search the column in table schema to get the type */ + dbcassa_column_p colp = cassa_search_col(tbc, (db_key_t) RES_NAMES(_r)[col]); + if(!colp) { + LM_ERR("No column with name [%.*s] found\n", RES_NAMES(_r)[col]->len, RES_NAMES(_r)[col]->s); + RES_COL_N(_r) = col; + db_free_columns(_r); + return -4; + } + + RES_TYPES(_r)[col] = colp->type; + + LM_DBG("Column with name [%.*s] found: %d\n", RES_NAMES(_r)[col]->len, RES_NAMES(_r)[col]->s, colp->type); LM_DBG("RES_NAMES(%p)[%d]=[%.*s]\n", RES_NAMES(_r)[col], col, RES_NAMES(_r)[col]->len, RES_NAMES(_r)[col]->s); } return 0; } +static int cassa_convert_result_raw(db_val_t* sr_cell, str *col_val) { + + if(!col_val->s) { + LM_DBG("Column not found in result - NULL\n"); + sr_cell->nul = 1; + return 0; + } + col_val->len = strlen(col_val->s); + + sr_cell->nul = 0; + sr_cell->free = 0; + + switch (sr_cell->type) { + case DB1_INT: + if(str2int(col_val, (unsigned int*)&sr_cell->val.int_val) < 0) { + LM_ERR("Wrong value [%s] - len=%d, expected integer\n", col_val->s, col_val->len); + return -1; + } + break; + case DB1_BIGINT: + if(sscanf(col_val->s, "%lld", &sr_cell->val.ll_val) < 0) { + LM_ERR("Wrong value [%s], expected integer\n", col_val->s); + return -1; + } + break; + case DB1_DOUBLE: + if(sscanf(col_val->s, "%lf", &sr_cell->val.double_val) < 0) { + LM_ERR("Wrong value [%s], expected integer\n", col_val->s); + return -1; + } + break; + case DB1_STR: + pkg_str_dup(&sr_cell->val.str_val, col_val); + sr_cell->free = 1; + break; + case DB1_STRING: + col_val->len++; + pkg_str_dup(&sr_cell->val.str_val, col_val); + sr_cell->val.str_val.len--; + sr_cell->val.str_val.s[col_val->len-1]='\0'; + sr_cell->free = 1; + break; + case DB1_BLOB: + pkg_str_dup(&sr_cell->val.blob_val, col_val); + sr_cell->free = 1; + break; + case DB1_BITMAP: + if(str2int(col_val, &sr_cell->val.bitmap_val) < 0) { + LM_ERR("Wrong value [%s], expected integer\n", col_val->s); + return -1; + } + break; + case DB1_DATETIME: + if(sscanf(col_val->s, "%ld", (long int*)&sr_cell->val.time_val) < 0) { + LM_ERR("Wrong value [%s], expected integer\n", col_val->s); + return -1; + } + break; + } + return 0; +} /** @@ -649,35 +722,33 @@ int cql_get_columns(oac::CqlResult& _cql_res, db1_res_t* _r) * \param _r result set for storage * \return zero on success, negative value on failure */ + int cql_convert_row(oac::CqlResult& _cql_res, db1_res_t* _r) { std::vector<oac::CqlRow> res_cql_rows = _cql_res.rows; - int rows_no = res_cql_rows.size(); - int cols_no = res_cql_rows[0].columns.size(); - str col_val; - - RES_ROW_N(_r) = rows_no; - - if (db_allocate_rows(_r) < 0) { - LM_ERR("Could not allocate rows.\n"); - return -1; - } - - for(int ri=0; ri < rows_no; ri++) { - if (db_allocate_row(_r, &(RES_ROWS(_r)[ri])) != 0) { - LM_ERR("Could not allocate row.\n"); - return -2; - } - - /* complete the row with the columns */ + int rows_no = res_cql_rows.size(); + int cols_no = res_cql_rows[0].columns.size(); + str col_val; + RES_ROW_N(_r) = rows_no; + + if (db_allocate_rows(_r) < 0) { + LM_ERR("Could not allocate rows.\n"); + return -1; + } + + for(int ri=0; ri < rows_no; ri++) { + if (db_allocate_row(_r, &(RES_ROWS(_r)[ri])) != 0) { + LM_ERR("Could not allocate row.\n"); + return -2; + } + + // complete the row with the columns for(int col = 0; col< cols_no; col++) { - RES_ROWS(_r)[ri].values[col].type = DB1_STR; - col_val.s = (char*)res_cql_rows[ri].columns[col].value.c_str(); - col_val.len = strlen(col_val.s); - pkg_str_dup(&RES_ROWS(_r)[ri].values[col].val.str_val, &col_val); - RES_ROWS(_r)[ri].values[col].free = 1; - RES_ROWS(_r)[ri].values[col].nul = 0; + col_val.len = strlen(col_val.s); + + RES_ROWS(_r)[ri].values[col].type = RES_TYPES(_r)[col]; + cassa_convert_result_raw(&RES_ROWS(_r)[ri].values[col], &col_val); LM_DBG("Field index %d. %s = %s.\n", col, res_cql_rows[ri].columns[col].name.c_str(), @@ -685,13 +756,62 @@ int cql_convert_row(oac::CqlResult& _cql_res, db1_res_t* _r) } } return 0; -} - +} /* * The functions for the DB Operations: query, delete, update. * */ +/* + * Extracts table name from DML query being used + * + * */ +static int get_table_from_query(const str *cql, str *table) { + + char *ptr = cql->s, + *begin = NULL; + + if (cql->s[0] == 's' || cql->s[0] == 'S') { + ptr = strcasestr(cql->s, "from"); + ptr += sizeof(char) * 4; + } + else if (cql->s[0] == 'u' || cql->s[0] == 'U') { + ptr = cql->s + sizeof("update") - 1; + } + else if (cql->s[0] == 'd' || cql->s[0] == 'D') { + ptr = strcasestr(cql->s, "from"); + ptr += sizeof(char) * 4; + } + else if (cql->s[0] == 'i' || cql->s[0] == 'I') { + ptr = strcasestr(cql->s, "into"); + ptr += sizeof(char) * 4; + } + else + goto error; + + while (*ptr == ' ' && (ptr - cql->s) <= cql->len) { + ptr++; + } + + begin = ptr; + ptr = strchr(begin, ' '); + + if (ptr == NULL) + ptr = cql->s + cql->len; + + if (ptr - begin <= 0) + goto error; + + table->s = begin; + table->len = ptr - begin; + + return 0; + +error: + LM_ERR("Unable to determine operation in cql [%*s]\n", cql->len, cql->s); + return -1; +} + /** * Execute a raw SQL query. * \param _h handle for the database @@ -702,14 +822,29 @@ int cql_convert_row(oac::CqlResult& _cql_res, db1_res_t* _r) int db_cassa_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) { db1_res_t* db_res = 0; + str table_name; + dbcassa_table_p tbc; + std::vector<oac::CqlRow> res_cql_rows; - if (!_h || !CON_TABLE(_h) || !_r) { + if (!_h || !_r) { LM_ERR("Invalid parameter value\n"); return -1; } - LM_DBG("query table=%s\n", _h->table->s); + + if (get_table_from_query(_s, &table_name) < 0) { + LM_ERR("Error parsing table name in CQL string"); + return -1; + } + + LM_DBG("query table=%.*s\n", table_name.len, table_name.s); LM_DBG("CQL=%s\n", _s->s); + tbc = dbcassa_db_get_table(&CON_CASSA(_h)->db_name, &table_name); + if(!tbc) { + LM_ERR("table %.*s does not exist!\n", table_name.len, table_name.s); + return -1; + } + std::string cql_query(_s->s); oac::CqlResult cassa_cql_res; @@ -728,9 +863,11 @@ int db_cassa_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) if (!cassa_cql_res.__isset.rows) { LM_ERR("The resultype rows was not set, no point trying to parse result.\n"); - return -1; + goto error; } + res_cql_rows = cassa_cql_res.rows; + /* TODO Handle the other types */ switch(cassa_cql_res.type) { case 1: LM_DBG("Result set is an ROW Type.\n"); @@ -741,8 +878,6 @@ int db_cassa_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) break; } - std::vector<oac::CqlRow> res_cql_rows = cassa_cql_res.rows; - db_res = db_new_result(); if (!db_res) { LM_ERR("no memory left\n"); @@ -754,10 +889,10 @@ int db_cassa_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) RES_ROW_N(db_res) = 0; RES_COL_N(db_res)= 0; *_r = db_res; - return 0; + goto done; } - if (cql_get_columns(cassa_cql_res, db_res) < 0) { + if (cql_get_columns(cassa_cql_res, db_res, tbc) < 0) { LM_ERR("Error getting column names."); goto error; } @@ -768,12 +903,17 @@ int db_cassa_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r) } *_r = db_res; +done: + dbcassa_lock_release(tbc); + LM_DBG("Exited with success\n"); return 0; error: if(db_res) db_free_result(db_res); + + dbcassa_lock_release(tbc); return -1; }

10 years, 10 months

Registration to Kamailio World 2014 is open

by Daniel-Constantin Mierla

Hello, I would like to announce that the registration to Kamailio World 2014 is now open. This year there is also a pre-conference event for half a day on April 2, with technical tutorials for those looking on more practical and hands-on content. You can see more details on the web site at: - http://conference.kamailio.com/k02/registration/ - http://conference.kamailio.com/k02/2014/01/registration-is-open/ Looking forward to meeting many of you in Berlin during April 2-4, 2014. Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

10 years, 10 months

git:master: modules/ims_qos: added -lpthread to Makefile to fix on Ubuntu 12

by Richard Good

Module: sip-router Branch: master Commit: d3ddb1766fad5f197023a7d6a18cfce64cdb9f8d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3ddb17… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jan 14 12:29:58 2014 +0200 modules/ims_qos: added -lpthread to Makefile to fix on Ubuntu 12 --- modules/ims_qos/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/ims_qos/Makefile b/modules/ims_qos/Makefile index 147f162..d9a9926 100644 --- a/modules/ims_qos/Makefile +++ b/modules/ims_qos/Makefile @@ -17,6 +17,7 @@ SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims ifneq ($(OS),darwin) LIBS += -lrt + LIBS += -lpthread endif include ../../Makefile.modules

10 years, 10 months

← Newer
1
...
6
7
8
9
10
11
12
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2014