sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
375 discussions

git:master: db_mongodb: new module offering DB APIv1 connector for MongoDB NoSQL server
by Daniel-Constantin Mierla 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: 53771bd598012b1029b06797c3d49026a8514cdd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53771bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 10 11:39:13 2014 +0200 db_mongodb: new module offering DB APIv1 connector for MongoDB NoSQL server - initial version, tested for INSERT (e.g., can be used with acc module) - UPDATE and … [View More]

1 0

git:master: ims_registrar_pcscf: Fix previous commit (copy&paste error)
by Carsten Bock 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: d202dac87dab4bb92de9aa26ac9614225938524f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d202dac… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Sep 10 11:13:44 2014 +0200 ims_registrar_pcscf: Fix previous commit (copy&paste error) --- modules/ims_registrar_pcscf/service_routes.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff -… [View More]

1 0

New developer: Federico Cabiddu
by Daniel-Constantin Mierla 10 Sep '14

10 Sep '14

Hello, I would like to announce that Federico Cabiddu has now write access to Kamailio git repository. He is going to push a new module named tsilo, which facilitates adding new branches to active transactions -- the typical case implemented so far is to track invites per callee and add a new branch if the callee registers while invite transaction is active, quite useful for services with mobile clients that are getting push notifications to wake up. Federico is one of the guys using … [View More]

1 0

new module tsilo
by Federico Cabiddu 10 Sep '14

10 Sep '14

Hi all Kamailio developers, I would like to propose a new module that I've written recently, the tsilo module where tsilo stands for "transaction silo" (thanks Daniel for suggesting the name). The module provides the ability to add branches to a transaction that has already been relayed and still hasn't got a final response. It achieves it by storing in an internal table a list of transactions per r-uri. The scenarios for which this functionality has been originally though are those in which a … [View More]

2 3

git:master: ims_registrar_pcscf: Optimization: fallback2ip can be set to "2 ", in order to check for the source IP first, before checking the contact-host of the request.
by Carsten Bock 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: eec712826c17ba8270e35033d608781ce74940d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eec7128… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Sep 10 10:39:34 2014 +0200 ims_registrar_pcscf: Optimization: fallback2ip can be set to "2", in order to check for the source IP first, before checking the contact-host of the request. --- modules/… [View More]ims_registrar_pcscf/service_routes.c | 129 ++++++++++++++++---------- 1 files changed, 78 insertions(+), 51 deletions(-) diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 17328de..d348bba 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -107,6 +107,52 @@ static inline int find_next_route(struct sip_msg* _m, struct hdr_field** _hdr) return 0; } +int checkcontact(struct sip_msg* _m, pcontact_t * c) { + int security_server_port = -1; + str received_host = {0, 0}; + char srcip[50]; + + if (c->security) { + switch (c->security->type) { + case SECURITY_IPSEC: + security_server_port = c->security->data.ipsec->port_uc; + break; + case SECURITY_TLS: + case SECURITY_NONE: + break; + } + } else if (c->security_temp) { + switch (c->security->type) { + case SECURITY_IPSEC: + security_server_port = c->security->data.ipsec->port_uc; + break; + case SECURITY_TLS: + case SECURITY_NONE: + break; + } + } + + if ((c->reg_state == PCONTACT_REGISTERED) + && (ignore_contact_rxport_check || (c->received_port == _m->rcv.src_port) || (security_server_port == _m->rcv.src_port)) + && (ignore_contact_rxport_check||(c->received_proto == _m->rcv.proto))) { + + received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); + received_host.s = srcip; + LM_DBG("Received host len %d (search %d)\n", c->received_host.len, received_host.len); + // Then check the length: + if (c->received_host.len == received_host.len) { + LM_DBG("Received host %.*s (search %.*s)\n", + c->received_host.len, c->received_host.s, + received_host.len, received_host.s); + + // Finally really compare the "received_host" + if (!memcmp(c->received_host.s, received_host.s, received_host.len)) + return 0; + } + } + return 1; +} + /** * get PContact-Structure for message * (search only once per Request) @@ -114,73 +160,49 @@ static inline int find_next_route(struct sip_msg* _m, struct hdr_field** _hdr) pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d) { ppublic_t * p; contact_body_t *b = 0; - str received_host = {0, 0}; contact_t *ct; - char srcip[50]; - int security_server_port = -1; if (_m->id != current_msg_id) { current_msg_id = _m->id; c = NULL; - b = cscf_parse_contacts(_m); + if (is_registered_fallback2ip == 2) { + received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); + received_host.s = srcip; + if (ul.get_pcontact_by_src(_d, &received_host, _m->rcv.src_port, _m->rcv.proto, &c) == 1) + LM_DBG("No entry in usrloc for %.*s:%i (Proto %i) found!\n", received_host.len, received_host.s, _m->rcv.src_port, _m->rcv.proto); + if (checkcontact(_m, c) != 0) { + c = NULL; + } + } + + if (c == NULL) { + b = cscf_parse_contacts(_m); - if (b && b->contacts) { - for (ct = b->contacts; ct; ct = ct->next) { - if (ul.get_pcontact(_d, &ct->uri, &c) == 0) { - if (c->security) { - switch (c->security->type) { - case SECURITY_IPSEC: - security_server_port = c->security->data.ipsec->port_uc; - break; - case SECURITY_TLS: - case SECURITY_NONE: - break; - } - } else if (c->security_temp) { - switch (c->security->type) { - case SECURITY_IPSEC: - security_server_port = c->security->data.ipsec->port_uc; + if (b && b->contacts) { + for (ct = b->contacts; ct; ct = ct->next) { + if (ul.get_pcontact(_d, &ct->uri, &c) == 0) { + if (checkcontact(_m, c) == 0) { break; - case SECURITY_TLS: - case SECURITY_NONE: - break; - } - } - - if ((c->reg_state == PCONTACT_REGISTERED) - && (ignore_contact_rxport_check || (c->received_port == _m->rcv.src_port) || (security_server_port == _m->rcv.src_port)) - && (ignore_contact_rxport_check||(c->received_proto == _m->rcv.proto))) { - - received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); - received_host.s = srcip; - LM_DBG("Received host len %d (search %d)\n", c->received_host.len, received_host.len); - // Then check the length: - if (c->received_host.len == received_host.len) { - LM_DBG("Received host %.*s (search %.*s)\n", - c->received_host.len, c->received_host.s, - received_host.len, received_host.s); - - // Finally really compare the "received_host" - if (!memcmp(c->received_host.s, received_host.s, received_host.len)) - break; + } else { c = NULL; } - } else { - c = NULL; } } + } else { + LM_WARN("No contact-header found?!?\n"); } - } else { - LM_WARN("No contact-header found\n"); } - if ((c == NULL) && (is_registered_fallback2ip > 0)) { - LM_WARN("Contact not found based on Contact-header, trying IP/Port/Proto\n"); + if ((c == NULL) && (is_registered_fallback2ip == 1)) { + LM_INFO("Contact not found based on Contact-header, trying IP/Port/Proto\n"); received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); received_host.s = srcip; if (ul.get_pcontact_by_src(_d, &received_host, _m->rcv.src_port, _m->rcv.proto, &c) == 1) LM_DBG("No entry in usrloc for %.*s:%i (Proto %i) found!\n", received_host.len, received_host.s, _m->rcv.src_port, _m->rcv.proto); + if (checkcontact(_m, c) != 0) { + c = NULL; + } } } asserted_identity = NULL; @@ -327,10 +349,12 @@ error: return -1; } -static str route_start={"Route: <",8}; +static str route_start={": <",8}; static str route_sep={">, <",4}; static str route_end={">\r\n",3}; +extern str route_header; + /** * Force Service routes (upon request) */ @@ -348,7 +372,7 @@ int force_service_routes(struct sip_msg* _m, udomain_t* _d) { /* we need to be sure we have seen all HFs */ parse_headers(_m, HDR_EOH_F, 0); - /* Savbe current buffer */ + /* Save current buffer */ buf = _m->buf; // Delete old Route headers: @@ -381,7 +405,9 @@ int force_service_routes(struct sip_msg* _m, udomain_t* _d) { goto error; } /* Calculate the length: */ - new_route_header.len = route_start.len + route_end.len + (c->num_service_routes-1) * route_sep.len; + new_route_header.len = route_header.len + route_start.len + + route_end.len + (c->num_service_routes-1) * route_sep.len; + for(i=0; i< c->num_service_routes; i++) new_route_header.len+=c->service_routes[i].len; /* Allocate the memory for this new header: */ @@ -393,6 +419,7 @@ int force_service_routes(struct sip_msg* _m, udomain_t* _d) { /* Construct new header */ new_route_header.len = 0; + STR_APPEND(new_route_header, route_header); STR_APPEND(new_route_header, route_start); for(i=0; i < c->num_service_routes; i++) { if (i) STR_APPEND(new_route_header, route_sep); [View Less]

1 0

git:master: ims_usrloc_pcscf: New hashing_type: "2" Hash over received IP, fallback to Host from contact (especially for NAT)
by Carsten Bock 10 Sep '14

10 Sep '14

Module: sip-router Branch: master Commit: 6f79459b8aea611acce81468198e0b7e775a51d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f79459… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Sep 10 10:41:42 2014 +0200 ims_usrloc_pcscf: New hashing_type: "2" Hash over received IP, fallback to Host from contact (especially for NAT) --- .../doc/ims_usrloc_pcscf_admin.xml | 7 +++++… [View More]-- modules/ims_usrloc_pcscf/pcontact.c | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml b/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml index e2707ee..c904b53 100644 --- a/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml +++ b/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml @@ -188,9 +188,12 @@ modparam("ims_usrloc_pcscf", "db_mode", 1) <para>0 - This uses the original hash over AOR method. By default we are backwards compatible...</para> </listitem> - <listitem> - <para>1 - Use the newer hash over IP:PORT.</para> + <para>1 - Use the newer hash over the Host from Contact-Header.</para> + </listitem> + <listitem> + <para>2 - Use the newer hash over the source-IP from where the + request was received (useful for NAT-Scenarios)</para> </listitem> </itemizedlist> diff --git a/modules/ims_usrloc_pcscf/pcontact.c b/modules/ims_usrloc_pcscf/pcontact.c index 0a23c3d..907ac5f 100644 --- a/modules/ims_usrloc_pcscf/pcontact.c +++ b/modules/ims_usrloc_pcscf/pcontact.c @@ -155,11 +155,6 @@ int new_pcontact(struct udomain* _d, str* _contact, struct pcontact_info* _ci, s (*_c)->contact_user.s = sip_uri.user.s; (*_c)->contact_user.len = sip_uri.user.len; - if (hashing_type==0) { - (*_c)->aorhash = core_hash(_contact, 0, 0); - } else { - (*_c)->aorhash = core_hash(&(*_c)->contact_host, 0, 0); - } (*_c)->expires = _ci->expires; (*_c)->reg_state = _ci->reg_state; @@ -179,6 +174,18 @@ int new_pcontact(struct udomain* _d, str* _contact, struct pcontact_info* _ci, s (*_c)->received_proto = _ci->received_proto; } + if (hashing_type==0) { + (*_c)->aorhash = core_hash(_contact, 0, 0); + } else if (hashing_type==1) { + (*_c)->aorhash = core_hash(&(*_c)->contact_host, 0, 0); + } else { + if ((*_c)->received_host.len > 0) { + (*_c)->aorhash = core_hash(&(*_c)->received_host, 0, 0); + } else { + (*_c)->aorhash = core_hash(&(*_c)->contact_host, 0, 0); + } + } + //setup public ids for (i=0; i<_ci->num_public_ids; i++) { if (i>0) is_default = 0; //only the first one is default - P-Associated-uri (first one is default) [View Less]

1 0

new module db_kazoo
by Luis Azedo 10 Sep '14

10 Sep '14

Hello Awesome Kamailio Community, We are writing on behalf of 2600hz, where we have been using Kamailio for some time now and are very pleased with our results! So, seems time to commit something back, dontchya think? We would like to present to you a new module, to hopefully be included in master. We call it db_kazoo (although a new name is fine too). db_kazoo is a general purpose AMQP connector (connects to our rabbitmq-server). It exposes publish/consume capabilities into Kamailio. Why … [View More]is this amazing, you ask? Well even if you didn’t ask, we will explain… >From a high-level, the purpose of the module might be for things like: - Integrate to an AMQP application to make real-time routing decisions (instead of using, say, a SQL database) - Provide a real-time integration into your program, instead of your database, so you can overlay additional logic in your preferred language while also utilizing a message bus - Utilize messaging to have a distributed messaging layer, such that machines processing requests/responses/events can go up/down or share the workload and your Kamailio node will still be happy With this module, someone can: 1 - publish json payloads to rabbitmq 2 - publish json payloads to rabbitmq and wait for correlated response message 3 - subscribe to an exchange with a routing key The module works with a main forked process that does the communication with rabbitmq for issuing publishes, waiting for replies and consuming messages. When it consumes a message it defers the process to a worker process so that it doesn't block this main process. The worker process issues an event-route where we can act on the received payload. The name of the event-route is composed by values extracted from the payload. Consumed messages have the option of being acknowledge in two ways: 1 - immediately when received 2 - after processing by the worker One unique feature of our implementation revolves around failover of the message bus itself. In our design, the module supports multiple RabbitMQ servers and will fallback from one to the next in a list of RabbitMQ servers if the connection fails to the current connected server. When using acknowledge in db_kazoo with clustering in RabbitMQ, we have simulated and experienced full reconnects while in the middle of processing pending messages. In this way, when we get disconnected from one server we proved that, even at high speeds, we are able to connect to the next in the list and continue interacting with our application. We have run a variety of sipp load tests on this module and believe it is ready for prime time. We monitored memory, response accuracy and overall stability and it seemed OK. But we would, of course, love for others to help us find what we have missed, or contribute more features, or overall just use the work we slaved over for so many hours. Or just make comments and suggestions! If nothing else, we hope we’ve provided something useful to the Kamailio community, as you all have provided useful items to us. Thanks to everyone for all the work on Kamailio and related products. Look forward to hearing from you all. This is our first formal / large contribution to Kamailio so if we’ve done something wrong process, code or otherwise please let us know! [View Less]

3 5

Freezing development for v4.2 at the end of today
by Daniel-Constantin Mierla 10 Sep '14

10 Sep '14

Hello, the development of new features for next major release, v4.2.0, is going to be frozen by end of today. As we have developers all over the world, we are going to allow everyone to benefit of the full day, so technically is like end of Wednesday, September 10, in Hawaii ( :-) a good fit, because it is the home region for the name of the project. If there is a patch with new features that you want to push, but needs review, we are going to take care of them in the next days, but … [View More]

1 0

New developer: Luis Azedo
by Daniel-Constantin Mierla 10 Sep '14

10 Sep '14

Hello, I would like to announce that a new developer has now write access to Kamailo git repository: Luis Azedo. His commit username is: lazedo He is going to push soon the 'kazoo' module that was discussed these days on the mailing list - a module connector for the Kazoo - the open source, distributed VoIP platform using Kamailio for core SIP routing. He also provided many patches to other components so far. Luis works for 2600hz, an USA company, and will be accompanied by Darren … [View More]

1 0

question on transformation
by Luis Azedo 10 Sep '14

10 Sep '14

Hi, we have a transformation in our module and on the eval function we are setting the pv_value_t flags to PV_VAL_STR | PV_VAL_PKG. shouldn't the pv_value_t.rs.s be freed ? we want to avoid using static buffers because they may be overlapped by other processes. Best

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
38
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 2014