sr-dev December 2014

sr-dev@lists.kamailio.org

33 participants
256 discussions

git:master: modules/ims_usrloc_pcscf: improved handling of wildcard userpart when matching contact
by Richard Good 03 Dec '14

03 Dec '14

Module: sip-router Branch: master Commit: 9e1a1afd460183b3e00778ac7730ddfe6cf00a4d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e1a1af… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Dec 3 16:25:39 2014 +0200 modules/ims_usrloc_pcscf: improved handling of wildcard userpart when matching contact When wildcard matching contact we now check that host part matches contact host part or alias param --- modules/ims_usrloc_pcscf/udomain.c | 26 +++++++++++++++++++------- modules/ims_usrloc_pcscf/usrloc.c | 2 +- modules/ims_usrloc_pcscf/usrloc.h | 2 ++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index fcbdb6c..6087ee1 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -254,7 +254,7 @@ void mem_timer_udomain(udomain_t* _d) while(ptr) { tmp = ptr; - ptr = ptr->next; + ptr = ptr->next; timer_pcontact(tmp); } @@ -451,7 +451,9 @@ int get_pcontact(udomain_t* _d, str* _contact, str* _received_host, int received ppublic_t* impu; struct sip_uri needle_uri, impu_uri; int port_match = 0; - + str alias_host = {0, 0}; + struct sip_uri contact_uri; + if (parse_uri(_contact->s, _contact->len, &needle_uri) != 0 ) { LM_ERR("failed to parse search URI [%.*s]\n", _contact->len, _contact->s); return 1; @@ -553,13 +555,23 @@ int get_pcontact(udomain_t* _d, str* _contact, str* _received_host, int received } /* user parts must match (if not wildcarded) with either primary contact OR with any userpart in the implicit set (associated URIs).. */ - if (((needle_uri.user.len == 1) - && (memcmp(needle_uri.user.s, "*", 1) == 0)) - || ((needle_uri.user.len == c->contact_user.len) - && (memcmp(needle_uri.user.s, c->contact_user.s, - needle_uri.user.len) == 0))) { + if((needle_uri.user.len == c->contact_user.len) && (memcmp(needle_uri.user.s, c->contact_user.s,needle_uri.user.len) == 0)) { + LM_DBG("Needle user part matches contact user part therefore this is a match\n"); + *_c = c; + return 0; + } else if ((needle_uri.user.len == 1) && (memcmp(needle_uri.user.s, "*", 1) == 0)) { /*wild card*/ + LM_DBG("This a wild card user part - we must check if hosts match or needle host matches alias\n"); + if(memcmp(needle_uri.host.s, c->contact_host.s, needle_uri.host.len) == 0) { + LM_DBG("Needle host matches contact host therefore this is a match\n"); *_c = c; return 0; + } else if ((parse_uri(c->aor.s, c->aor.len, &contact_uri) == 0) && ((get_alias_host_from_contact(&contact_uri.params, &alias_host)) == 0) && + (memcmp(needle_uri.host.s, alias_host.s, alias_host.len) == 0)) { + LM_DBG("Needle host matches contact alias therefore this is a match\n"); + *_c = c; + return 0; + + } } /* check impus user parts */ diff --git a/modules/ims_usrloc_pcscf/usrloc.c b/modules/ims_usrloc_pcscf/usrloc.c index 5172141..9de69b0 100644 --- a/modules/ims_usrloc_pcscf/usrloc.c +++ b/modules/ims_usrloc_pcscf/usrloc.c @@ -87,7 +87,7 @@ int bind_usrloc(usrloc_api_t* api) { #define ALIAS "alias=" #define ALIAS_LEN (sizeof(ALIAS) - 1) -inline int get_alias_host_from_contact(str *contact_uri_params, str *alias_host) { +int get_alias_host_from_contact(str *contact_uri_params, str *alias_host) { char *rest, *sep; unsigned int rest_len; diff --git a/modules/ims_usrloc_pcscf/usrloc.h b/modules/ims_usrloc_pcscf/usrloc.h index 92e287b..843827d 100644 --- a/modules/ims_usrloc_pcscf/usrloc.h +++ b/modules/ims_usrloc_pcscf/usrloc.h @@ -64,6 +64,8 @@ struct hslot; /*!< Hash table slot */ struct socket_info; +int get_alias_host_from_contact(str *contact_uri_params, str *alias_host); + struct udomain { str* name; /*!< Domain name (NULL terminated) */ int size; /*!< Hash table size */

1 0

[tracker] Task opened: add support to auth_db to validate source IP address (Attachment added)
by sip-router 03 Dec '14

03 Dec '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Emmanuel Schmidbauer (eschmidbauer) Attached to Project - sip-router Summary - add support to auth_db to validate source IP address Task Type - Improvement Category - Modules kamailio Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - 4.2 Due in Version - Undecided Due Date - Undecided Details - I've attached the git diff. This improvement is only executed if the module parameter "ip_address_column" is defined Example: modparam("auth_db", "ip_address_column", "ip_address") This way it will not affect those who do not wish to implement this feature and still upgrade. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=499 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

git:master: modules/ims_registrar_scscf: improved log line
by Richard Good 03 Dec '14

03 Dec '14

Module: sip-router Branch: master Commit: c512ed9f19b903cb028769bc6c802280d2b0ddfd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c512ed9… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Dec 3 15:43:51 2014 +0200 modules/ims_registrar_scscf: improved log line --- modules/ims_registrar_scscf/registrar_notify.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index dacde16..5f131d9 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -1125,11 +1125,12 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { goto error; } } else { - LM_ERR("Re-subscribe for same watcher_contact, presentity_uri, event but with different callid [%.*s], fromtag [%.*s] and totag [%.*s] for presentity [%.*s] - What happened?\n", + LM_ERR("Re-subscribe for same watcher_contact, presentity_uri, event but with different callid [%.*s], fromtag [%.*s] and totag [%.*s] for presentity [%.*s] and watcher contact [%.*s] - What happened?\n", subscriber_data.callid->len, subscriber_data.callid->s, subscriber_data.ftag->len, subscriber_data.ftag->s, subscriber_data.ttag->len, subscriber_data.ttag->s, - presentity_impurecord->public_identity.len, presentity_impurecord->public_identity.s); + presentity_impurecord->public_identity.len, presentity_impurecord->public_identity.s, + subscriber_data.watcher_contact->len, subscriber_data.watcher_contact->s); LM_DBG("Removing old subscriber and adding new one\n"); subscriber_data.presentity_uri = &presentity_impurecord->public_identity; ul.external_delete_subscriber(reg_subscriber, (udomain_t*) _t, 0 /*domain is already locked*/);

1 0

Dialplan docs
by Olle E. Johansson 03 Dec '14

03 Dec '14

dpid: 1 pr: 1 match_op: 1 match_exp: ^0([1-9][0-9]+)$ match_len: 0 subst_exp: ^0([1-9][0-9]+)$ repl_exp: 0049\1 attrs: de . This is the example we have in the dialplan documentation. I wonder why we have "(" and ")" in the match_exp. It makes sense in the subst_exp - but I still wonder about the match_exp. If there's no use of it I would like to simplify the example. /O

2 1

[tracker] Comment added: Kamailio Crash in WEBSOCKET module
by sip-router 03 Dec '14

03 Dec '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#495 - Kamailio Crash in WEBSOCKET module User who did this - Vitaliy Aleksandrov (Vitaliy) ---------- There was a race condition that is fixed in 4.1.3. So it is likely that upgrade will solve your problem. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=495#comment1716 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

git:master: modules/pua: do not override send_publish return value at error
by Juha Heinanen 03 Dec '14

03 Dec '14

Module: sip-router Branch: master Commit: 28ff58cfffc4d2b7bc0d2d3d2365891ecb25fcb6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28ff58c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Dec 3 09:13:49 2014 +0200 modules/pua: do not override send_publish return value at error (cherry picked from commit 0ac4c8e579214a75b102f2f1c6877dffb2db8597) --- modules/pua/send_publish.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/pua/send_publish.c b/modules/pua/send_publish.c index 3ddd5e7..c04163e 100644 --- a/modules/pua/send_publish.c +++ b/modules/pua/send_publish.c @@ -718,7 +718,6 @@ done: goto finish; error: - ret = -1; if(cb_param) shm_free(cb_param);

1 0

git:4.2: modules/pua: do not override send_publish return value at error
by Juha Heinanen 03 Dec '14

03 Dec '14

Module: sip-router Branch: 4.2 Commit: 0ac4c8e579214a75b102f2f1c6877dffb2db8597 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ac4c8e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Dec 3 09:13:49 2014 +0200 modules/pua: do not override send_publish return value at error --- modules/pua/send_publish.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/pua/send_publish.c b/modules/pua/send_publish.c index da74ab7..b0d540c 100644 --- a/modules/pua/send_publish.c +++ b/modules/pua/send_publish.c @@ -716,7 +716,6 @@ done: goto finish; error: - ret = -1; if(cb_param) shm_free(cb_param);

1 0

[tracker] Task closed: kamctl warning when greadlink does not exist
by sip-router 03 Dec '14

03 Dec '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#492 - kamctl warning when greadlink does not exist User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patches in master and 4.2 More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=492 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 Crash in WEBSOCKET module
by sip-router 03 Dec '14

03 Dec '14

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

pua/send_publish bug
by Juha Heinanen 03 Dec '14

03 Dec '14

while working on pua_rpc module, i think i found a bug in pua/send_publish function. it defines int ret = -1; if etag check fails or publish has no body, it does this: ret = 418; goto error; or ret = ERR_PUBLISH_NO_BODY; goto error; at error, however, the above assignments are reverted: error: ret = -1; my suggestion is to remove the above assignment. ok? -- juha

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2014