sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
298 discussions

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Richard Good 06 Mar '14

06 Mar '14

Module: sip-router Branch: master Commit: 7488a1daf3f53a0bfdb8deb1baafa0798de99380 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7488a1d… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Mar 6 11:18:28 2014 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

1 0

git:master: modules/ims_qos: use cscf_get_public_identity instead of cscf_get_to_uri in ex_aar.c
by Richard Good 06 Mar '14

06 Mar '14

Module: sip-router Branch: master Commit: 38f8a8e2151337c1515bd50a888c450399a9da9d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=38f8a8e… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Mar 6 11:00:24 2014 +0200 modules/ims_qos: use cscf_get_public_identity instead of cscf_get_to_uri in ex_aar.c When getting public identity from To header use ims_getters method instead of reading directly from message This allows ims_qos to identify subscribers to authorize even when clients add extra info (e.g. phone context) after the identity in the request URI --- modules/ims_qos/rx_aar.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index 3d7fc22..8d59b69 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -509,11 +509,7 @@ int rx_send_aar(struct sip_msg *req, struct sip_msg *res, if ((identifier = cscf_get_asserted_identity(res, 0)).len == 0) { LM_DBG("No P-Asserted-Identity hdr found in response. Using To hdr in resp"); - - if (!cscf_get_to_uri(res, &identifier)) { - LM_ERR("Error assigning P-Asserted-Identity using To hdr in resp"); - goto error; - } + identifier = cscf_get_public_identity(res); //get public identity from to header } }

1 0

git:master: modules/ims_charging: use cscf_get_public_identity_from_requri instead of msg->first_line.u. request.uri in mod.c and ims_charging.c
by Richard Good 06 Mar '14

06 Mar '14

Module: sip-router Branch: master Commit: 871ca61d1fac900b17d9c6857012e3bf90a71e1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=871ca61… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Mar 6 10:58:52 2014 +0200 modules/ims_charging: use cscf_get_public_identity_from_requri instead of msg->first_line.u.request.uri in mod.c and ims_charging.c When getting public identity from Req URI use ims_getters method instead of reading directly from message This allows ims_charging to identify subscribers to charge even when clients add extra info (e.g. phone context) after the identity in the request URI --- modules/ims_charging/ims_ro.c | 6 +++++- modules/ims_charging/mod.c | 37 ++++++++++++++++++++++++++----------- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index 650aad6..ae13389 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -944,6 +944,7 @@ int Ro_Send_CCR(struct sip_msg *msg, struct dlg_cell *dlg, int dir, str* charge_ int cc_event_number = 0; //According to IOT tests this should start at 0 int cc_event_type = RO_CC_START; + int free_called_asserted_identity = 0; //getting asserted identity if ((asserted_identity = cscf_get_asserted_identity(msg, 0)).len == 0) { @@ -955,7 +956,8 @@ int Ro_Send_CCR(struct sip_msg *msg, struct dlg_cell *dlg, int dir, str* charge_ //getting called asserted identity if ((called_asserted_identity = cscf_get_called_party_id(msg, &h)).len == 0) { LM_DBG("No P-Called-Identity hdr found. Using request URI for called_asserted_identity"); - called_asserted_identity = msg->first_line.u.request.uri; + called_asserted_identity = cscf_get_public_identity_from_requri(msg); + free_called_asserted_identity = 1; } if (dir == RO_ORIG_DIRECTION) { @@ -1066,9 +1068,11 @@ int Ro_Send_CCR(struct sip_msg *msg, struct dlg_cell *dlg, int dir, str* charge_ update_stat(initial_ccrs, 1); + if(free_called_asserted_identity) shm_free(called_asserted_identity.s);// shm_malloc in cscf_get_public_identity_from_requri return RO_RETURN_BREAK; error: + if(free_called_asserted_identity) shm_free(called_asserted_identity.s);// shm_malloc in cscf_get_public_identity_from_requri Ro_free_CCR(ro_ccr_data); if (cc_acc_session) { cdpb.AAASessionsUnlock(cc_acc_session->hash); diff --git a/modules/ims_charging/mod.c b/modules/ims_charging/mod.c index e1256a1..4fb423f 100644 --- a/modules/ims_charging/mod.c +++ b/modules/ims_charging/mod.c @@ -324,6 +324,7 @@ static int w_ro_ccr(struct sip_msg *msg, str* route_name, str* direction, str* c struct dlg_cell* dlg; unsigned int len; struct ro_session *ro_session = 0; + int free_contact = 0; LM_DBG("Ro CCR initiated: direction:%.*s, charge_type:%.*s, unit_type:%.*s, reservation_units:%i, route_name:%.*s", direction->len, direction->s, @@ -366,19 +367,24 @@ static int w_ro_ccr(struct sip_msg *msg, str* route_name, str* direction, str* c goto send_ccr; } //get callee contact from request URI - contact = msg->first_line.u.request.uri; + contact = cscf_get_public_identity_from_requri(msg); + free_contact = 1; } else { LM_CRIT("don't know what to do in unknown mode - should we even get here\n"); - return RO_RETURN_ERROR; + ret = RO_RETURN_ERROR; + goto done; } + LM_DBG("IMPU data to pass to usrloc: contact <%.*s> identity <%.*s>\n", contact.len, contact.s, identity.len, identity.s); + //create impu_data_parcel len = identity.len + contact.len + sizeof (struct impu_data); impu_data = (struct impu_data*) shm_malloc(len); if (!impu_data) { LM_ERR("Unable to allocate memory for impu_data, trying to send CCR\n"); - return RO_RETURN_ERROR; + ret = RO_RETURN_ERROR; + goto done; } memset(impu_data, 0, len); @@ -398,19 +404,22 @@ static int w_ro_ccr(struct sip_msg *msg, str* route_name, str* direction, str* c if (p != (((char*) impu_data) + len)) { LM_ERR("buffer overflow creating impu data, trying to send CCR\n"); shm_free(impu_data); - return RO_RETURN_ERROR; + ret = RO_RETURN_ERROR; + goto done; } //reg for callbacks on confirmed and terminated if (dlgb.register_dlgcb(dlg, /* DLGCB_RESPONSE_FWDED */ DLGCB_CONFIRMED, add_dlg_data_to_contact, (void*)impu_data ,NULL ) != 0) { LM_CRIT("cannot register callback for dialog confirmation\n"); - return RO_RETURN_ERROR; + ret = RO_RETURN_ERROR; + goto done; } if (dlgb.register_dlgcb(dlg, DLGCB_TERMINATED | DLGCB_FAILED | DLGCB_EXPIRED /*| DLGCB_DESTROY */, remove_dlg_data_from_contact, (void*)impu_data, NULL ) != 0) { LM_CRIT("cannot register callback for dialog termination\n"); - return RO_RETURN_ERROR; + ret = RO_RETURN_ERROR; + goto done; } send_ccr: @@ -429,13 +438,15 @@ send_ccr: int ri = route_get(&main_rt, route_name->s); if (ri < 0) { LM_ERR("unable to find route block [%.*s]\n", route_name->len, route_name->s); - return RO_RETURN_ERROR; + ret = RO_RETURN_ERROR; + goto done; } cfg_action = main_rt.rlist[ri]; if (!cfg_action) { LM_ERR("empty action lists in route block [%.*s]\n", route_name->len, route_name->s); - return RO_RETURN_ERROR; + ret = RO_RETURN_ERROR; + goto done; } //before we send lets suspend the transaction @@ -443,19 +454,22 @@ send_ccr: if (t == NULL || t == T_UNDEFINED) { if (tmb.t_newtran(msg) < 0) { LM_ERR("cannot create the transaction for CCR async\n"); - return RO_RETURN_ERROR; + ret = RO_RETURN_ERROR; + goto done; } t = tmb.t_gett(); if (t == NULL || t == T_UNDEFINED) { LM_ERR("cannot lookup the transaction\n"); - return RO_RETURN_ERROR; + ret = RO_RETURN_ERROR; + goto done; } } LM_DBG("Suspending SIP TM transaction\n"); if (tmb.t_suspend(msg, &tindex, &tlabel) < 0) { LM_ERR("failed to suspend the TM processing\n"); - return RO_RETURN_ERROR; + ret = RO_RETURN_ERROR; + goto done; } ret = Ro_Send_CCR(msg, dlg, dir, charge_type, unit_type, reservation_units, cfg_action, tindex, tlabel); @@ -466,6 +480,7 @@ send_ccr: } done: + if(free_contact) shm_free(contact.s);// shm_malloc in cscf_get_public_identity_from_requri return ret; }

1 0

git:master: db_cassandra: return 0 in case of successful operations
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: master Commit: f475f2886f37b2a9cb5782ef1f5b9a6e94cee4dc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f475f28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 09:49:51 2014 +0100 db_cassandra: return 0 in case of successful operations - following better DB APIv1 convention and avoiding inappropriate failure detection in some modules - reported and patch by Jay Binks --- modules/db_cassandra/dbcassa_base.cpp | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/db_cassandra/dbcassa_base.cpp b/modules/db_cassandra/dbcassa_base.cpp index 1a721bb..77cb12e 100644 --- a/modules/db_cassandra/dbcassa_base.cpp +++ b/modules/db_cassandra/dbcassa_base.cpp @@ -570,7 +570,7 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, } dbcassa_reconnect(CON_CASSA(_h)); } while(cassa_auto_reconnect && retr++ < cassa_retries); - + LM_ERR("Failed to connect, retries exceeded.\n"); } catch (const oac::InvalidRequestException ir) { LM_ERR("Failed Invalid query request: %s\n", ir.why.c_str()); } catch (const at::TException &tx) { @@ -1062,7 +1062,7 @@ int db_cassa_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, done: *_r = db_res; LM_DBG("Exited with success\n"); - return 1; + return 0; error: if(db_res) @@ -1208,14 +1208,14 @@ int db_cassa_modify(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, if(CON_CASSA(_h)->con) { try{ CON_CASSA(_h)->con->batch_mutate(CFMap, oac::ConsistencyLevel::ONE); - return 1; + return 0; } catch (const att::TTransportException &tx) { LM_ERR("Failed to query: %s\n", tx.what()); } } dbcassa_reconnect(CON_CASSA(_h)); } while (cassa_auto_reconnect && retr++ < cassa_retries); - + LM_ERR("Failed to connect, retries exceeded.\n"); } catch (const oac::InvalidRequestException ir) { LM_ERR("Failed Invalid query request: %s\n", ir.why.c_str()); } catch (const at::TException &tx) { @@ -1336,13 +1336,14 @@ int db_cassa_delete(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, if(CON_CASSA(_h)->con) { try { cassa_client->remove(row_key, cp, (int64_t)time(0), oac::ConsistencyLevel::ONE); - return 1; + return 0; } catch (const att::TTransportException &tx) { LM_ERR("Failed to query: %s\n", tx.what()); } } dbcassa_reconnect(CON_CASSA(_h)); } while(cassa_auto_reconnect && retr++ < cassa_retries); + LM_ERR("Failed to connect, retries exceeded.\n"); } else { if(!seckey_len) { @@ -1395,7 +1396,7 @@ int db_cassa_delete(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, if(CON_CASSA(_h)->con) { try { cassa_client->batch_mutate(CFMap, oac::ConsistencyLevel::ONE); - return 1; + return 0; } catch (const att::TTransportException &tx) { LM_ERR("Failed to query: %s\n", tx.what()); } @@ -1403,7 +1404,7 @@ int db_cassa_delete(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, dbcassa_reconnect(CON_CASSA(_h)); } while(cassa_auto_reconnect && retr++ < cassa_retries); } - return 1; + LM_ERR("Failed to connect, retries exceeded.\n"); } catch (const oac::InvalidRequestException ir) { LM_ERR("Invalid query: %s\n", ir.why.c_str()); } catch (const at::TException &tx) {

1 0

[tracker] Task closed: Coredump on using jsonrpc_request
by sip-router 06 Mar '14

06 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#404 - Coredump on using jsonrpc_request User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=404 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.

1 0

[tracker] Comment added: Coredump on using jsonrpc_request
by sip-router 06 Mar '14

06 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#404 - Coredump on using jsonrpc_request User who did this - Daniel-Constantin Mierla (miconda) ---------- Looking at the source code, if the function execution was ok, then it does an exit from config. The request is suspended and should not be processed anymore. It will go over it in the case of an internal error. This is how the function was developed, many other functions do internal config exit. I am closing this one, if you find something else, open a new one. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=404#comment1338 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.

1 0

[tracker] Task closed: Kamailio doesn't to handle any SIP message at all after several dialogs... (CPU high usage)
by sip-router 06 Mar '14

06 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#397 - Kamailio doesn't to handle any SIP message at all after several dialogs... (CPU high usage) User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=397 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.

1 0

Releasing 4.1.2, 4.0.6 and 3.3.7
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Hello, we are considering to release new versions from stable branches of Kamailio starting with Thursday, March 6. First is v4.1.2 from latest stable branch and if the time allows in the same day, the v4.0.6. The reason to release v3.3.7 is to have a proper debian packages built and hosted on the new repositories -- the specs had a conflict for latest 3.3 version of some sub-packages. If there are known issues that were not addressed, please report them to the tracker. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference - April 2-4, 2014, in Berlin, Germany http://www.kamailioworld.com

1 1

error during build
by Juha Heinanen 06 Mar '14

06 Mar '14

i'm getting this kind of error during build: I/O error : Attempt to load network entity http://www.oasis-open.org/docbookid/id/g/4.5/docbookx.dtd auth.xml:3: warning: failed to load external entity "http://www.oasis-open.org/docbookid/id/g/4.5/docbookx.dtd" "http://www.oasis-open.org/docbookid/id/g/4.5/docbookx.dtd"> ^ is it only me or have others seen it too? -- juha

2 1

[tracker] Comment added: Kamailio doesn't to handle any SIP message at all after several dialogs... (CPU high usage)
by sip-router 06 Mar '14

06 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#397 - Kamailio doesn't to handle any SIP message at all after several dialogs... (CPU high usage) User who did this - Jack Wang (GoGoJack) ---------- I've tested over one day and it still works well - with the right make procedure of compiling kamailio :) Thanks for your help very much ! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=397#comment1337 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.

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2014