sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
320 discussions

git:master:67d60fca: ims_charging: updated to use new name for ims_dialog api
by Daniel-Constantin Mierla 15 Sep '16

15 Sep '16

Module: kamailio Branch: master Commit: 67d60fcace6e06b3efa948a01f6eff05379c707a URL: https://github.com/kamailio/kamailio/commit/67d60fcace6e06b3efa948a01f6eff0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T12:25:19+02:00 ims_charging: updated to use new name for ims_dialog api --- Modified: modules/ims_charging/ims_ro.c Modified: modules/ims_charging/mod.c Modified: modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/67d60fcace6e06b3efa948a01f6eff0… Patch: https://github.com/kamailio/kamailio/commit/67d60fcace6e06b3efa948a01f6eff0… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index c0c586f..222aa35 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -37,7 +37,7 @@ extern struct tm_binds tmb; extern struct cdp_binds cdpb; extern client_ro_cfg cfg; -extern struct dlg_binds dlgb; +extern ims_dlg_api_t dlgb; extern cdp_avp_bind_t *cdp_avp; extern str ro_forced_peer; extern int ro_db_mode; diff --git a/modules/ims_charging/mod.c b/modules/ims_charging/mod.c index f1f8242..3e927bd 100644 --- a/modules/ims_charging/mod.c +++ b/modules/ims_charging/mod.c @@ -63,7 +63,7 @@ client_ro_cfg cfg = { str_init(""), extern struct ims_charging_counters_h ims_charging_cnts_h; struct cdp_binds cdpb; -struct dlg_binds dlgb; +ims_dlg_api_t dlgb; cdp_avp_bind_t *cdp_avp; struct tm_binds tmb; @@ -198,7 +198,7 @@ static int mod_init(void) { goto error; } - if (load_dlg_api(&dlgb) != 0) { /* load the dialog API */ + if (load_ims_dlg_api(&dlgb) != 0) { /* load the dialog API */ LM_ERR("can't load Dialog API\n"); goto error; } diff --git a/modules/ims_charging/ro_timer.c b/modules/ims_charging/ro_timer.c index 57bf55c..78e8242 100644 --- a/modules/ims_charging/ro_timer.c +++ b/modules/ims_charging/ro_timer.c @@ -23,7 +23,7 @@ extern int interim_request_credits; extern int ro_timer_buffer; extern int ro_db_mode; -extern struct dlg_binds dlgb; +extern ims_dlg_api_t dlgb; extern struct ims_charging_counters_h ims_charging_cnts_h; /*! global dialog timer */

1 0

git:master:f2848074: ims_dialog: fixed check for null of via branch value in condition
by Daniel-Constantin Mierla 15 Sep '16

15 Sep '16

Module: kamailio Branch: master Commit: f2848074fd4f62196b4669354c61bd686854aa45 URL: https://github.com/kamailio/kamailio/commit/f2848074fd4f62196b4669354c61bd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T12:09:53+02:00 ims_dialog: fixed check for null of via branch value in condition --- Modified: modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/f2848074fd4f62196b4669354c61bd6… Patch: https://github.com/kamailio/kamailio/commit/f2848074fd4f62196b4669354c61bd6… --- diff --git a/modules/ims_dialog/dlg_handlers.c b/modules/ims_dialog/dlg_handlers.c index 394c779..9575b0a 100644 --- a/modules/ims_dialog/dlg_handlers.c +++ b/modules/ims_dialog/dlg_handlers.c @@ -1342,7 +1342,7 @@ void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { if (!dlg_out) { if (rpl->first_line.u.reply.statuscode < 299) { /*we don't care about failure responses to dialog - not necessary to create dialog out...*/ - if (rpl->via1->branch && (&rpl->via1->branch->value) && (rpl->via1->branch->value.len > 0)) { + if (rpl->via1->branch && (rpl->via1->branch->value.s) && (rpl->via1->branch->value.len > 0)) { branch = rpl->via1->branch->value; }

1 0

git:master:30cff728: ims_dialog: renamed exported api to reflect ims_dialog name
by Daniel-Constantin Mierla 15 Sep '16

15 Sep '16

Module: kamailio Branch: master Commit: 30cff728566be7589b70f72744dbd0d8ddb415e3 URL: https://github.com/kamailio/kamailio/commit/30cff728566be7589b70f72744dbd0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T12:07:50+02:00 ims_dialog: renamed exported api to reflect ims_dialog name - it is no longer compatible with the dialog module api and can result in crashes at runtime given the object names matches but the content is different --- Modified: modules/ims_dialog/dlg_cb.h Modified: modules/ims_dialog/dlg_load.h Modified: modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/30cff728566be7589b70f72744dbd0d… Patch: https://github.com/kamailio/kamailio/commit/30cff728566be7589b70f72744dbd0d…

1 0

[kamailio/kamailio] presentity table with 2 entry (#783)
by jresende 15 Sep '16

15 Sep '16

I'm testing kamailio with a SIP client with presence support, when I get two logins of the same user I insert two different entry in the presentity database. Exists a way to define this? or it is a bug? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/783

2 3

git:master:770bae3c: presence: expire value kept and printed in logs as unsigned int
by Daniel-Constantin Mierla 15 Sep '16

15 Sep '16

Module: kamailio Branch: master Commit: 770bae3ce1e1f561d575df689df067a7639f64c4 URL: https://github.com/kamailio/kamailio/commit/770bae3ce1e1f561d575df689df067a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-15T11:16:12+02:00 presence: expire value kept and printed in logs as unsigned int - code compacted for extracting subscription data --- Modified: modules/presence/event_list.h Modified: modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/770bae3ce1e1f561d575df689df067a… Patch: https://github.com/kamailio/kamailio/commit/770bae3ce1e1f561d575df689df067a…

1 0

git:master:f93b336b: ims_usrloc_pcscf: corrected logic of service-route inner-most for-loop check
by jaybeepee 15 Sep '16

15 Sep '16

Module: kamailio Branch: master Commit: f93b336bf15ebe949ab3a2a484f5341281279d0f URL: https://github.com/kamailio/kamailio/commit/f93b336bf15ebe949ab3a2a484f5341… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-15T09:14:15+02:00 ims_usrloc_pcscf: corrected logic of service-route inner-most for-loop check --- Modified: modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/f93b336bf15ebe949ab3a2a484f5341… Patch: https://github.com/kamailio/kamailio/commit/f93b336bf15ebe949ab3a2a484f5341… --- diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index 03f619c..b3c99b0 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -451,6 +451,7 @@ int get_pcontact(udomain_t* _d, pcontact_info_t* contact_info, struct pcontact** unsigned int sl, i, j, aorhash, params_len, has_rinstance=0; struct pcontact* c; struct sip_uri needle_uri; + int serviceroutematch; char *params, *sep; str rinstance = {0, 0}; @@ -535,16 +536,22 @@ int get_pcontact(udomain_t* _d, pcontact_info_t* contact_info, struct pcontact** LM_DBG("number of service routes do not match - failing\n"); continue; } + + serviceroutematch = 1; for (j=0; j<contact_info->num_service_routes; j++) { if (contact_info->service_routes[j].len != c->service_routes[j].len || memcmp(contact_info->service_routes[j].s, c->service_routes[j].s, c->service_routes[j].len) != 0) { - LM_DBG("service route at position %d does not match - looking for [%.*s] and contact has [%.*s]... continuing\n", + LM_DBG("service route at position %d does not match - looking for [%.*s] and contact has [%.*s]... continuing to next contact check\n", j, contact_info->service_routes[j].len, contact_info->service_routes[j].s, c->service_routes[j].len, c->service_routes[j].s); - c = c->next; - continue; + serviceroutematch = 0; + break; } } + if (serviceroutematch == 0) { + c = c->next; + continue; + } } //finally check state being searched for

1 0

git:master:791b2884: Merge pull request #778 from linuxmaniac/vseva/2387
by GitHub 15 Sep '16

15 Sep '16

Module: kamailio Branch: master Commit: 791b288448db7aa71100b719dca4b2c10f19e910 URL: https://github.com/kamailio/kamailio/commit/791b288448db7aa71100b719dca4b2c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: GitHub <noreply(a)github.com> Date: 2016-09-15T08:39:44+02:00 Merge pull request #778 from linuxmaniac/vseva/2387 sca: sca_handle_subscribe() get actual ruri --- Modified: modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/791b288448db7aa71100b719dca4b2c… Patch: https://github.com/kamailio/kamailio/commit/791b288448db7aa71100b719dca4b2c… --- diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 046442b..b0a9d27 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -952,6 +952,7 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, unsigned int expires = 0, max_expires; unsigned int cseq; + str *ruri = NULL; assert(req_sub != NULL); @@ -1032,6 +1033,12 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, to = &tmp_to; } + if (parse_sip_msg_uri(msg) < 0) { + LM_ERR("Error while parsing the Request-URI\n"); + goto error; + } + ruri = GET_RURI(msg); + to_tag = to->tag_value; if (to_tag.s == NULL) { // XXX need hook to detect when we have a subscription and the @@ -1039,7 +1046,7 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, // old subscription should be dumped & appropriate NOTIFYs sent. if (scam->sl_api->get_reply_totag(msg, &to_tag) < 0) { LM_ERR("Failed to generate to-tag for reply to SUBSCRIBE %.*s\n", - STR_FMT(&REQ_LINE(msg).uri)); + STR_FMT(ruri)); goto error; } @@ -1048,7 +1055,7 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, LM_ERR("Failed to parse Record-Route header %.*s in " "SUBSCRIBE %.*s from %.*s\n", STR_FMT(&msg->record_route->body), - STR_FMT(&REQ_LINE(msg).uri), + STR_FMT(ruri), STR_FMT(&contact_uri)); goto error; } @@ -1056,9 +1063,9 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, } req_sub->subscriber = contact_uri; - if (sca_uri_extract_aor(&REQ_LINE(msg).uri, &req_sub->target_aor) < 0) { + if (sca_uri_extract_aor(ruri, &req_sub->target_aor) < 0) { LM_ERR("Failed to extract AoR from RURI %.*s\n", - STR_FMT(&REQ_LINE(msg).uri)); + STR_FMT(ruri)); goto error; } req_sub->event = event_type;

1 0

git:master:179bfcd7: sca: sca_handle_subscribe() get actual ruri
by Victor Seva 15 Sep '16

15 Sep '16

Module: kamailio Branch: master Commit: 179bfcd7eabde187b70e7deceb93c576b17ecc75 URL: https://github.com/kamailio/kamailio/commit/179bfcd7eabde187b70e7deceb93c57… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-09-14T18:22:51+02:00 sca: sca_handle_subscribe() get actual ruri Fix #777 --- Modified: modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/179bfcd7eabde187b70e7deceb93c57… Patch: https://github.com/kamailio/kamailio/commit/179bfcd7eabde187b70e7deceb93c57… --- diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 046442b..b0a9d27 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -952,6 +952,7 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, unsigned int expires = 0, max_expires; unsigned int cseq; + str *ruri = NULL; assert(req_sub != NULL); @@ -1032,6 +1033,12 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, to = &tmp_to; } + if (parse_sip_msg_uri(msg) < 0) { + LM_ERR("Error while parsing the Request-URI\n"); + goto error; + } + ruri = GET_RURI(msg); + to_tag = to->tag_value; if (to_tag.s == NULL) { // XXX need hook to detect when we have a subscription and the @@ -1039,7 +1046,7 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, // old subscription should be dumped & appropriate NOTIFYs sent. if (scam->sl_api->get_reply_totag(msg, &to_tag) < 0) { LM_ERR("Failed to generate to-tag for reply to SUBSCRIBE %.*s\n", - STR_FMT(&REQ_LINE(msg).uri)); + STR_FMT(ruri)); goto error; } @@ -1048,7 +1055,7 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, LM_ERR("Failed to parse Record-Route header %.*s in " "SUBSCRIBE %.*s from %.*s\n", STR_FMT(&msg->record_route->body), - STR_FMT(&REQ_LINE(msg).uri), + STR_FMT(ruri), STR_FMT(&contact_uri)); goto error; } @@ -1056,9 +1063,9 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, } req_sub->subscriber = contact_uri; - if (sca_uri_extract_aor(&REQ_LINE(msg).uri, &req_sub->target_aor) < 0) { + if (sca_uri_extract_aor(ruri, &req_sub->target_aor) < 0) { LM_ERR("Failed to extract AoR from RURI %.*s\n", - STR_FMT(&REQ_LINE(msg).uri)); + STR_FMT(ruri)); goto error; } req_sub->event = event_type;

1 0

[kamailio/kamailio] sca: sca_handle_subscribe() honor the "$ru" value (#778)
by Victor Seva 15 Sep '16

15 Sep '16

* try to get r-uri from $ru and fallback to msg value as previously Fix #777 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/778 -- Commit Summary -- * sca: sca_handle_subscribe() honor the "$ru" value -- File Changes -- M modules/sca/sca_subscribe.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/778.patch https://github.com/kamailio/kamailio/pull/778.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/778

2 4

[kamailio/kamailio] sca: sca_handle_subscribe() honor the "$ru" value (#777)
by Victor Seva 15 Sep '16

15 Sep '16

Sipwise hat ON: `sca_handle_subscribe()` does parse the message directly so if we change the value of `$ru` it doesn't use its value. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/777

1 1

← Newer
1
...
15
16
17
18
19
20
21
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2016