sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
298 discussions

git:master: modules/ims_charging: use new lib/ ims to get contact from req URI
by Richard Good 10 Mar '14

10 Mar '14

Module: sip-router Branch: master Commit: 876bdccb031e2378a798ddacc6b6ac2e6e35efc5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=876bdcc… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Mar 10 14:29:02 2014 +0200 modules/ims_charging: use new lib/ims to get contact from req URI --- modules/ims_charging/mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_charging/mod.c b/modules/ims_charging/mod.c index bbc2708..8de9df7 100644 --- a/modules/ims_charging/mod.c +++ b/modules/ims_charging/mod.c @@ -367,7 +367,7 @@ 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 = cscf_get_public_identity_from_requri(msg); + contact = cscf_get_contact_from_requri(msg); free_contact = 1; } else {

1 0

git:master: lib/ims: added new function to get contact from request uri
by Richard Good 10 Mar '14

10 Mar '14

Module: sip-router Branch: master Commit: 497ded52eaafd7a43520dee41910efa85ef042c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=497ded5… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Mar 10 14:28:32 2014 +0200 lib/ims: added new function to get contact from request uri --- lib/ims/ims_getters.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/ims/ims_getters.h | 11 +++++++++ 2 files changed, 67 insertions(+), 0 deletions(-) diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index eb266e8..a026e53 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -315,6 +315,62 @@ str cscf_get_public_identity_from_requri(struct sip_msg *msg) } /** + * Get the contact from the Request URI of the message + * NB: free returned result str when done from shm + * @param msg - the SIP message + * @returns the contact (don't forget to free from shm) + * + * NOTE: should only be called when REQ URI has been converted sip:user@IP_ADDRESS:PORT or tel:IP_ADDRESS:PORT + */ +str cscf_get_contact_from_requri(struct sip_msg *msg) +{ + str pu={0,0}; + + if (msg->first_line.type!=SIP_REQUEST) { + return pu; + } + if (parse_sip_msg_uri(msg)<0){ + return pu; + } + if(!msg->parsed_uri.port.len){ + return pu; + } + + if(msg->parsed_uri.type==TEL_URI_T){ + pu.len = 4 + msg->parsed_uri.user.len + msg->parsed_uri.port.len + 1 /*for colon before port*/; + pu.s = shm_malloc(pu.len+1); + if (!pu.s){ + LM_ERR("cscf_get_public_identity_from_requri: Error allocating %d bytes\n", pu.len + 1); + pu.len = 0; + goto done; + } + sprintf(pu.s,"tel:%.*s:%.*s", + msg->parsed_uri.user.len, + msg->parsed_uri.user.s, + msg->parsed_uri.port.len, + msg->parsed_uri.port.s); + }else{ + pu.len = 4 + msg->parsed_uri.user.len + 1/*for @*/ + msg->parsed_uri.host.len + msg->parsed_uri.port.len + 1 /*for colon before port*/; + pu.s = shm_malloc(pu.len+1); + if (!pu.s){ + LM_ERR("cscf_get_public_identity_from_requri: Error allocating %d bytes\n", pu.len + 1); + pu.len = 0; + goto done; + } + sprintf(pu.s,"sip:%.*s@%.*s:%.*s", + msg->parsed_uri.user.len, + msg->parsed_uri.user.s, + msg->parsed_uri.host.len, + msg->parsed_uri.host.s, + msg->parsed_uri.port.len, + msg->parsed_uri.port.s); + } + + done: + return pu; +} + +/** * Finds if the message contains the orig parameter in the first Route header * @param msg - the SIP message * @param str1 - not used diff --git a/lib/ims/ims_getters.h b/lib/ims/ims_getters.h index aeeb591..0111c0a 100644 --- a/lib/ims/ims_getters.h +++ b/lib/ims/ims_getters.h @@ -177,6 +177,17 @@ str cscf_get_realm_from_ruri(struct sip_msg *msg); * @returns the public identity */ str cscf_get_public_identity_from_requri(struct sip_msg *msg); + +/** + * Get the contact from the Request URI of the message + * NB: free returned result str when done from shm + * @param msg - the SIP message + * @returns the contact (don't forget to free from shm) + * + * NOTE: should only be called when REQ URI has been converted sip:user@IP_ADDRESS:PORT or tel:IP_ADDRESS:PORT + */ +str cscf_get_contact_from_requri(struct sip_msg *msg); + /** * Looks for the Call-ID header * @param msg - the sip message

1 0

git:master: modules/ims_charging: logging fix
by Richard Good 10 Mar '14

10 Mar '14

Module: sip-router Branch: master Commit: 84ea778d6340625fc4d3c2eafbc73ddad08548a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=84ea778… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Mar 10 14:27:59 2014 +0200 modules/ims_charging: logging fix --- modules/ims_charging/dialog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/ims_charging/dialog.c b/modules/ims_charging/dialog.c index d761af7..9c1980d 100644 --- a/modules/ims_charging/dialog.c +++ b/modules/ims_charging/dialog.c @@ -199,7 +199,7 @@ void remove_dlg_data_from_contact(struct dlg_cell *dlg, int type, struct dlg_cb_ return; } - LM_DBG("IMPU data is present, contact: <%.*s> identity <%.*s>:", impu_data->contact.len, impu_data->contact.s, impu_data->identity.len, impu_data->identity.s); + LM_DBG("IMPU data is present, contact: <%.*s> identity <%.*s>", impu_data->contact.len, impu_data->contact.s, impu_data->identity.len, impu_data->identity.s); LM_DBG("IMPU data domain <%.*s>", impu_data->d->name->len, impu_data->d->name->s); ul.lock_udomain(impu_data->d, &impu_data->identity); @@ -234,7 +234,7 @@ void add_dlg_data_to_contact(struct dlg_cell *dlg, int type, struct dlg_cb_param return; } - LM_DBG("IMPU data is present, contact: <%.*s> identity <%.*s>:", impu_data->contact.len, impu_data->contact.s, impu_data->identity.len, impu_data->identity.s); + LM_DBG("IMPU data is present, contact: <%.*s> identity <%.*s>", impu_data->contact.len, impu_data->contact.s, impu_data->identity.len, impu_data->identity.s); LM_DBG("IMPU data domain <%.*s>", impu_data->d->name->len, impu_data->d->name->s); ul.lock_udomain(impu_data->d, &impu_data->identity);

1 0

git:master: modules/textopx: Prevent msg_apply_changes() from adding the router header if path is set.
by Richard Good 10 Mar '14

10 Mar '14

Module: sip-router Branch: master Commit: 45e6878a398f7ba75ce253a7bfcbb66bc7a5c088 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45e6878… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Mar 10 14:26:29 2014 +0200 modules/textopx: Prevent msg_apply_changes() from adding the router header if path is set. This avoids adding router header twice when calling msg_apply_changes --- modules/textopsx/textopsx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/textopsx/textopsx.c b/modules/textopsx/textopsx.c index 2a7273d..80469c1 100644 --- a/modules/textopsx/textopsx.c +++ b/modules/textopsx/textopsx.c @@ -166,7 +166,7 @@ static int msg_apply_changes_f(sip_msg_t *msg, char *str1, char *str2) } else { obuf.s = build_req_buf_from_sip_req(msg, (unsigned int*)&obuf.len, &dst, - BUILD_NO_LOCAL_VIA|BUILD_NO_VIA1_UPDATE); + BUILD_NO_PATH|BUILD_NO_LOCAL_VIA|BUILD_NO_VIA1_UPDATE); } if(obuf.s == NULL) {

1 0

git:master: modules/ims_usrloc_pcscf: added storage for security data ( IPSEC/TLS)
by Jason Penton 10 Mar '14

10 Mar '14

Module: sip-router Branch: master Commit: 81d63a3f9726117288d6c5950c6d56e3a2749116 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81d63a3… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Mon Mar 10 12:39:28 2014 +0200 modules/ims_usrloc_pcscf: added storage for security data (IPSEC/TLS) -new module ims_security going to be added soon that requires this --- modules/ims_usrloc_pcscf/usrloc.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/ims_usrloc_pcscf/usrloc.h b/modules/ims_usrloc_pcscf/usrloc.h index 9816ec9..fc7b3cf 100644 --- a/modules/ims_usrloc_pcscf/usrloc.h +++ b/modules/ims_usrloc_pcscf/usrloc.h @@ -81,6 +81,12 @@ typedef struct { str wildcarded_psi; /** if exists is the wildcarded psi */ } ims_public_identity; +/** TLS SA Information */ +typedef struct tls { + unsigned short port_tls; /**< Port UE TLS */ + unsigned long session_hash; +} tls_t; + /** IPSec SA Information */ typedef struct ipsec { unsigned int spi_uc; /**< SPI Client to use */ @@ -103,6 +109,7 @@ typedef struct ipsec { typedef enum sec_type { SECURITY_NONE = 0, SECURITY_IPSEC = 1, + SECURITY_TLS = 2, } security_type; typedef struct security { @@ -111,6 +118,7 @@ typedef struct security { union { ipsec_t *ipsec; /**< IPSec SA information, if any */ + tls_t *tls; /**< TLS SA information, if any */ } data; float q; } security_t; @@ -188,6 +196,8 @@ typedef struct pcontact { time_t expires; /*!< expires time for contact */ str* service_routes; /*!< Array of service routes */ unsigned short num_service_routes; /*!< Number of service routes */ + security_t *security; /**< Security-Client Information */ + security_t *security_temp; /**< Security-Client Information (temp) */ ppublic_t* head; /*!< list of associated public identities */ ppublic_t* tail; struct socket_info *sock; /*!< received socket */

1 0

git:master: modules/ims_usrloc_pcscf: included hashing optimisation in search function for contacts
by Jason Penton 10 Mar '14

10 Mar '14

Module: sip-router Branch: master Commit: b02792a2bd3b8a07a5496fe00ec563b6d8142639 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b02792a… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Mon Mar 10 12:38:40 2014 +0200 modules/ims_usrloc_pcscf: included hashing optimisation in search function for contacts --- modules/ims_usrloc_pcscf/udomain.c | 73 ++++++++++++++++++++++++++++++------ modules/ims_usrloc_pcscf/ul_mod.c | 1 - 2 files changed, 61 insertions(+), 13 deletions(-) diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index a93b0e2..d3ba43b 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -61,6 +61,7 @@ #include "../../lib/ims/useful_defs.h" extern int db_mode; +extern unsigned int hashing_type; #ifdef STATISTICS static char *build_stat_name( str* domain, char *var_name) @@ -507,26 +508,45 @@ int get_pcontact(udomain_t* _d, str* _contact, struct pcontact** _c) { return 1; /* Nothing found */ } +/* can't assume we are locked here */ int get_pcontact_by_src(udomain_t* _d, str * _host, unsigned short _port, unsigned short _proto, struct pcontact** _c) { int i; struct pcontact* c; + unsigned int aorhash, sl; + char c_contact[256], *p; + str s_contact; + + if (hashing_type == 1) {//we hash on IP:PORT - so no need to search sequentially.. + /* get_aor_hash in this mode expects to see contact as host:port */ + memset(c_contact, 0, 256); + memcpy(c_contact, _host->s, _host->len); + p = c_contact + _host->len; + *p = ':'; + p++; + sprintf(p,"%d", _port); + s_contact.s = c_contact; + s_contact.len = strlen(c_contact); + + aorhash = get_aor_hash(_d, &s_contact); + sl = aorhash & (_d->size - 1); + c = _d->table[sl].first; + + for (i = 0; i < _d->table[sl].n; i++) { + lock_ulslot(_d, i); + LM_DBG("Searching for contact in P-CSCF usrloc [%.*s]\n", + s_contact.len, + s_contact.s); - for(i=0; i<_d->size; i++) - { - c = _d->table[i].first; - while(c) { - LM_DBG("Port %d (search %d), Proto %d (search %d), reg_state %s (search %s)\n", - c->received_port, _port, c->received_proto, _proto, - reg_state_to_string(c->reg_state), reg_state_to_string(PCONTACT_REGISTERED) - ); // First check, if Proto and Port matches: - if ((c->reg_state == PCONTACT_REGISTERED) && (c->received_port == _port) && (c->received_proto == _proto)) { + if ((c->reg_state == PCONTACT_REGISTERED) + && (c->received_port == _port) + && (c->received_proto == _proto)) { LM_DBG("Received host len %d (search %d)\n", c->received_host.len, _host->len); // Then check the length: if (c->received_host.len == _host->len) { LM_DBG("Received host %.*s (search %.*s)\n", - c->received_host.len, c->received_host.s, - _host->len, _host->s); + c->received_host.len, c->received_host.s, + _host->len, _host->s); // Finally really compare the "received_host" if (!memcmp(c->received_host.s, _host->s, _host->len)) { @@ -535,7 +555,36 @@ int get_pcontact_by_src(udomain_t* _d, str * _host, unsigned short _port, unsign } } } - c = c->next; + unlock_ulslot(_d, i); + } + } else { + /* search sequentially */ + for(i=0; i<_d->size; i++) + { + c = _d->table[i].first; + while(c) { + LM_DBG("Port %d (search %d), Proto %d (search %d), reg_state %s (search %s)\n", + c->received_port, _port, c->received_proto, _proto, + reg_state_to_string(c->reg_state), reg_state_to_string(PCONTACT_REGISTERED) + ); + // First check, if Proto and Port matches: + if ((c->reg_state == PCONTACT_REGISTERED) && (c->received_port == _port) && (c->received_proto == _proto)) { + LM_DBG("Received host len %d (search %d)\n", c->received_host.len, _host->len); + // Then check the length: + if (c->received_host.len == _host->len) { + LM_DBG("Received host %.*s (search %.*s)\n", + c->received_host.len, c->received_host.s, + _host->len, _host->s); + + // Finally really compare the "received_host" + if (!memcmp(c->received_host.s, _host->s, _host->len)) { + *_c = c; + return 0; + } + } + } + c = c->next; + } } } return 1; /* Nothing found */ diff --git a/modules/ims_usrloc_pcscf/ul_mod.c b/modules/ims_usrloc_pcscf/ul_mod.c index 5d6e11d..989e512 100644 --- a/modules/ims_usrloc_pcscf/ul_mod.c +++ b/modules/ims_usrloc_pcscf/ul_mod.c @@ -247,7 +247,6 @@ static int child_init(int _rank) _rank, ptr->name.len, ZSW(ptr->name.s)); return -1; } -// uldb_preload_attrs(ptr->d); } }

1 0

[tracker] Comment added: kamailio blocking in usrloc db_mode 2
by sip-router 10 Mar '14

10 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#408 - kamailio blocking in usrloc db_mode 2 User who did this - Daniel-Constantin Mierla (miconda) ---------- Have you benchmarked database server to see how many queries per second can handle? I would do: - increase the hash_size parameter (at least 12) - set timer_procs (at least 4) - set db_ops_ruid - be sure you have the unique constraint on it (just in case you didn't use the kamdbctl to create the location table) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=408#comment1341 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 opened: kamailio blocking in usrloc db_mode 2
by sip-router 10 Mar '14

10 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Krischan Udelhoven (Krischan) Attached to Project - sip-router Summary - kamailio blocking in usrloc db_mode 2 Task Type - Improvement Category - Core Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - 4.1 Due in Version - Undecided Due Date - Undecided Details - Hi, I am experimenting with the the db_mode parameter of the USRLOC module. In my scenario I am firing approximately 300 unique registers per second at a kamailio instance running on a dual core machine with a local mysql db. db_mode = 1 Some of the the registers are running in a timeout, so I think this mode is to slow to handle the load. db_mode = 2 There are a lot of timeouts when the module is syncing the location to the database. With ~ 80000 contacts the syncing takes about 30 seconds, meanwhile kamailio is not responsive. I've tried the timer_procs parameter but it doesn't help. Is there something I can to to make kamailio more responsive during the syncing process? db_mode = 4 Works fine, but requires some external tool to write the contacts in the database. Regards Krischan More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=408 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: Makefile.groups: greated group for uuid module
by Daniel-Constantin Mierla 09 Mar '14

09 Mar '14

Module: sip-router Branch: master Commit: c5eb9b7a742ea439edee77133b21095979cd3bc6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5eb9b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 10 00:25:22 2014 +0100 Makefile.groups: greated group for uuid module - depends on libuuid --- Makefile.groups | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Makefile.groups b/Makefile.groups index 9e2325f..16ebf4b 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -157,6 +157,9 @@ mod_list_iptrtpproxy=iptrtpproxy # - modules depending on gzip library mod_list_gzcompress=gzcompress +# - modules depending on uuid library +mod_list_uuid=uuid + # - all modules mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_db) $(mod_list_dbuid) \ @@ -179,7 +182,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_outbound) $(mod_list_osp) \ $(mod_list_java) $(mod_list_dnssec) \ $(mod_list_sctp) $(mod_list_autheph) \ - $(mod_list_gzcompress)) + $(mod_list_gzcompress) $(mod_list_uuid)) @@ -340,6 +343,9 @@ module_group_kautheph=$(mod_list_autheph) # pkg gzcompress module module_group_kgzcompress=$(mod_list_gzcompress) +# pkg uuid module +module_group_kuuid=$(mod_list_uuid) + # list of static modules # static_modules:=

1 0

git:master: uuid: new module to generate unique strings using libuuid
by Daniel-Constantin Mierla 09 Mar '14

09 Mar '14

Module: sip-router Branch: master Commit: 7726383031399fa9a4f8a67f1ff2cb15ea124b37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7726383… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 9 17:37:13 2014 +0100 uuid: new module to generate unique strings using libuuid - new class of variables exported - $uuid(type) - type can be: - g - generic/default uuid generation - r - random uuid generation - t - time based uuid generation - s - time safe uuid generation --- modules/uuid/Makefile | 23 +++++ modules/uuid/README | 81 ++++++++++++++++++ modules/uuid/doc/Makefile | 4 + modules/uuid/doc/uuid.xml | 37 ++++++++ modules/uuid/doc/uuid_admin.xml | 102 ++++++++++++++++++++++ modules/uuid/uuid_mod.c | 178 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 425 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=772…

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
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