sr-dev August 2012

sr-dev@lists.kamailio.org

30 participants
169 discussions

git:3.3: lib/srdb1 : put pooling constans into separate header file to reduce
by Anca Vamanu 30 Aug '12

30 Aug '12

Module: sip-router Branch: 3.3 Commit: 8ad086aa81bc6ca4fb762264ffcc5e53be819ec2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ad086a… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Fri Jul 13 16:50:07 2012 +0300 lib/srdb1 : put pooling constans into separate header file to reduce include dependancy (cherry picked from commit f3ff581dbd0a53c4c5eafdf829bef0c25e8e8f28) --- lib/srdb1/db.h | 7 +------ lib/srdb1/db_id.h | 2 +- lib/srdb1/db_pooling.h | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index 2cbcdf7..0844c05 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -50,12 +50,7 @@ #include "db_cap.h" #include "db_con.h" #include "db_row.h" - - -typedef enum { - DB_POOLING_PERMITTED, - DB_POOLING_NONE -} db_pooling_t; +#include "db_pooling.h" /** * \brief Specify table name that will be used for subsequent operations. diff --git a/lib/srdb1/db_id.h b/lib/srdb1/db_id.h index 13ffc85..6d5a93f 100644 --- a/lib/srdb1/db_id.h +++ b/lib/srdb1/db_id.h @@ -31,7 +31,7 @@ #define _DB1_ID_H #include "../../str.h" -#include "db.h" +#include "db_pooling.h" /** Structure representing a database ID */ struct db_id { diff --git a/lib/srdb1/db_pooling.h b/lib/srdb1/db_pooling.h new file mode 100644 index 0000000..30daa49 --- /dev/null +++ b/lib/srdb1/db_pooling.h @@ -0,0 +1,41 @@ +/* + * $Id$ + * + * Copyright (C) 2001-2003 FhG Fokus + * Copyright (C) 2007-2008 1&1 Internet AG + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/** + * \file lib/srdb1/db_pooling.h + * \ingroup db1 + * \brief Defines Pooling states + * + */ + +#ifndef DB1_POOLING_H +#define DB1_POOLING_H + + +typedef enum { + DB_POOLING_PERMITTED, + DB_POOLING_NONE +} db_pooling_t; + + +#endif /* DB1_POOLING_H */

1 0

git:master: ndb_redis: argument checking in redisc_free_reply
by Vicente Hernando 30 Aug '12

30 Aug '12

Module: sip-router Branch: master Commit: 8d70484116e48b15681589f70c650a082614396c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d70484… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Thu Aug 30 05:20:25 2012 -0400 ndb_redis: argument checking in redisc_free_reply --- modules/ndb_redis/redis_client.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 5248135..0d8f703 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -482,6 +482,11 @@ int redisc_free_reply(str *name) redisc_reply_t *rpl, *next_rpl; unsigned int hid; + if(name==NULL || name->len==0) { + LM_ERR("invalid parameters"); + return -1; + } + hid = get_hash1_raw(name->s, name->len); rpl = _redisc_rpl_list;

1 0

git:master: modules/db_cassandra: Updated replace function to the new signature
by Anca Vamanu 30 Aug '12

30 Aug '12

Module: sip-router Branch: master Commit: 512013f324dd6faa37e26302a267afb07252812a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=512013f… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Aug 30 12:24:24 2012 +0300 modules/db_cassandra: Updated replace function to the new signature --- modules/db_cassandra/db_cassandra.c | 2 +- modules/db_cassandra/dbcassa_base.cpp | 8 +++++++- modules/db_cassandra/dbcassa_base.h | 6 ++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/db_cassandra/db_cassandra.c b/modules/db_cassandra/db_cassandra.c index 969123f..119ecca 100644 --- a/modules/db_cassandra/db_cassandra.c +++ b/modules/db_cassandra/db_cassandra.c @@ -136,7 +136,7 @@ int db_cassa_bind_api(db_func_t *dbb) dbb->query = db_cassa_query; dbb->free_result = db_cassa_free_result; dbb->insert = db_cassa_insert; - dbb->replace = db_cassa_insert; + dbb->replace = db_cassa_replace; dbb->insert_update = db_cassa_insert; dbb->delete = db_cassa_delete; dbb->update = db_cassa_update; diff --git a/modules/db_cassandra/dbcassa_base.cpp b/modules/db_cassandra/dbcassa_base.cpp index bd7f057..8a74a96 100644 --- a/modules/db_cassandra/dbcassa_base.cpp +++ b/modules/db_cassandra/dbcassa_base.cpp @@ -535,7 +535,7 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, while(1) { CON_CASSA(_h)->con->get_range_slices(key_slice_vect, cparent, sp, keyRange, oac::ConsistencyLevel::ONE); /* construct cassa_result */ - LM_DBG("Retuned %d key slices\n", key_slice_vect.size()); + LM_DBG("Retuned %d key slices\n", (int)key_slice_vect.size()); for(unsigned int i = 0; i< key_slice_vect.size(); i++) { if(key_slice_vect[i].columns.size()==0) { continue; @@ -881,6 +881,12 @@ int db_cassa_modify(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, return -1; } +int db_cassa_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, + int _n, const int _un, const int _m) +{ + LM_DBG("db_cassa_replace:\n"); + return db_cassa_modify(_h, _k, _v, _k, _v, _n, _n); +} int db_cassa_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, int _n) diff --git a/modules/db_cassandra/dbcassa_base.h b/modules/db_cassandra/dbcassa_base.h index 01b2a31..ea7f213 100644 --- a/modules/db_cassandra/dbcassa_base.h +++ b/modules/db_cassandra/dbcassa_base.h @@ -72,6 +72,12 @@ int db_cassa_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, /* + * Replace a row into table - same as insert for cassandra + */ +int db_cassa_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, + int _n, const int _un, const int _m); + +/* * Delete a row from table */ int db_cassa_delete(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,

1 0

Errors compiling for ARMhf
by Adam Baxter 30 Aug '12

30 Aug '12

Hi everyone, I recently built packages for ARMel, but I'm getting errors compiling for ARMhf. See http://paste.debian.net/186456/ I believe I need to compile with -DNO_SMP but I'm not sure where those flags are passed into the build process. Any assistance would be appreciated. --Adam

1 1

ARMel packages for Debian Squeeze
by Adam Baxter 30 Aug '12

30 Aug '12

Hi everyone, I've built ARMel packages of Kamailio (useful for Guruplug, Dreamplug, Sheevaplug etc). They are available at http://ge.tt/8efpriM as I have nowhere to host them. I'm happy for these to be re-hosted. The ARM-hf builds (Raspberry Pi) will be in progress soon. Thanks, Adam

2 2

git:3.3: modules_k/nathelper: fix a= lines inserted out of order
by Richard Fuchs 29 Aug '12

29 Aug '12

Module: sip-router Branch: 3.3 Commit: c79aef1753fb02a35f299fd0fb861d82c34226e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c79aef1… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Wed Aug 29 15:47:10 2012 -0400 modules_k/nathelper: fix a= lines inserted out of order RFC 4566 dictates a particular order of fields in the SDP body, in particular media-specific a= lines must be last fields within an m= block. Inserting them right after the m= lines violates this order if other fields (such as c=) are present, causing parse errors in some clients. So instead, insert them at the end of each m= block. --- modules_k/nathelper/nathelper.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index bec490c..a7f20a4 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -1370,7 +1370,7 @@ fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2) str body; str ip; int level, rest_len; - char *buf, *m_start, *m_end, *rest_s; + char *buf, *m_start, *m_end; struct lump* anchor; level = (int)(long)str1; @@ -1389,13 +1389,11 @@ fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2) if (level & ADD_ADIRECTION) { m_start = ser_memmem(body.s, "\r\nm=", body.len, 4); while (m_start != NULL) { - m_start = m_start + 2; + m_start += 4; rest_len = body.len - (m_start - body.s); - m_end = ser_memmem(m_start, "\r\n", rest_len, 2); - if (m_end == NULL) { - LM_ERR("m line is not crlf terminated\n"); - return -1; - } + m_start = m_end = ser_memmem(m_start, "\r\nm=", rest_len, 4); + if (!m_end) + m_end = body.s + body.len; /* just before the final \r\n */ anchor = anchor_lump(msg, m_end - msg->buf, 0, 0); if (anchor == NULL) { LM_ERR("anchor_lump failed\n"); @@ -1413,9 +1411,6 @@ fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2) pkg_free(buf); return -1; } - rest_s = m_end + 2; - rest_len = body.len - (rest_s - body.s); - m_start = ser_memmem(rest_s, "\r\nm=", rest_len, 4); } }

1 0

git:master: modules_k/nathelper: fix a= lines inserted out of order
by Richard Fuchs 29 Aug '12

29 Aug '12

Module: sip-router Branch: master Commit: 978ec2fb51751529953eadec653772edd5dc1ccd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=978ec2f… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Wed Aug 29 15:47:10 2012 -0400 modules_k/nathelper: fix a= lines inserted out of order RFC 4566 dictates a particular order of fields in the SDP body, in particular media-specific a= lines must be last fields within an m= block. Inserting them right after the m= lines violates this order if other fields (such as c=) are present, causing parse errors in some clients. So instead, insert them at the end of each m= block. --- modules_k/nathelper/nathelper.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index c27d073..7b13010 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -1393,7 +1393,7 @@ fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2) str body; str ip; int level, rest_len; - char *buf, *m_start, *m_end, *rest_s; + char *buf, *m_start, *m_end; struct lump* anchor; level = (int)(long)str1; @@ -1412,13 +1412,11 @@ fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2) if (level & ADD_ADIRECTION) { m_start = ser_memmem(body.s, "\r\nm=", body.len, 4); while (m_start != NULL) { - m_start = m_start + 2; + m_start += 4; rest_len = body.len - (m_start - body.s); - m_end = ser_memmem(m_start, "\r\n", rest_len, 2); - if (m_end == NULL) { - LM_ERR("m line is not crlf terminated\n"); - return -1; - } + m_start = m_end = ser_memmem(m_start, "\r\nm=", rest_len, 4); + if (!m_end) + m_end = body.s + body.len; /* just before the final \r\n */ anchor = anchor_lump(msg, m_end - msg->buf, 0, 0); if (anchor == NULL) { LM_ERR("anchor_lump failed\n"); @@ -1436,9 +1434,6 @@ fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2) pkg_free(buf); return -1; } - rest_s = m_end + 2; - rest_len = body.len - (rest_s - body.s); - m_start = ser_memmem(rest_s, "\r\nm=", rest_len, 4); } }

1 0

Outbound summary
by Peter Dunkley 29 Aug '12

29 Aug '12

Hello, I thought I would try and produce a short summary (basically just bullet points) of what is required for Outbound just to make sure I haven't missed anything. There are three use cases for Kamailio with Outbound/Path: * EDGE server between client and registrar * Registrar with EDGE server between it and client * Single server (EDGE server and registrar combined) using Outbound instead of aliasing for NAT traversal EDGE server ----------- * Path - Existing Path module does (most of) what is required when called for REGISTER requests - Received parameters are not needed on Path: headers because we will use Outbound flow tokens now * Outbound - Need to generate/add flow token and ;ob parameter to the Path/Record-Route headers when: # It's an initial request (out-of-dialog INVITE, REGISTER, SUBSCRIBE, or REFER), with # A single Via:, and # Top Route: points to us and has ;ob parameter or Contact: has ;ob parameter or it's a REGISTER with ;+sip.instance, or # force_outbound() API has been called - Need to maintain mapping of flow tokens to connections (flow token to/from source address and port) - Need an Outbound routing API (related to loose_route()) that sets $du correctly based on flow token in Route: header (R-URI no longer used) - If the flow token doesn't match a connection send 430 response (response sending in kamailio.cfg, but Outbound routing API needs to return an appropriate error to support this) Registrar --------- * Path - Path already supported in usrloc * Outbound - instance and reg IDs already stored in usrloc - multiple registrations with the same instance ID but different reg IDs must be supported (may be already) - Parallel and serial forking behaviour must be preserved, when forking branch to each unique instance ID not reg ID. - Need a new/improved lookup() API that returns the location for the best reg ID and populates an AVP with the other instance IDs in order they should be tried - On receipt of 430 response to a request the failed location should be removed from the usrloc table and the next location (from the AVP) tried. Similar to the way dispatcher works. Single server ------------- * Path - Use this to add single (local) Path header - just needed to get the Outbound flow token into the usrloc table - Received parameters are not needed on Path: headers because we will use Outbound flow tokens now * Outbound - Similar to the combined behaviour of EDGE server and Registrar, but because the mapping of flow token to connection is local there is no need for the 430 response stuff - can just loop through the list of matching connections locally until a good one is found. Note: Double-Path and advertised address... * Talking to one of my colleagues he thought that double-Path headers wouldn't be required. Double-RR is used to make sure the route-set is good in both directions when there are transport/network changes. Because Path is just used in the one direction this shouldn't be required. Does this make sense? * Because the Path header needs to show the address of the outbound interface it should use the advertised address for that interface, not the listening address of the interface. Is this correct? Proposed API ------------ Right thing to do might be a new outbound module which provides both the EDGE server and registrar functions. The module would bind (through C-API - which might need extended/tweaked for each of the modules) to path, rr, registrar, and location modules to make use of the functions already implemented there. Probably (when Outbound is used) path, rr, and registrar will not be called from kamailio.cfg directly - the outbound wrapper functions will be used instead: * outbound_route(): use instead of rr.loose_route() (may well call rr.loose_route() internally but will also use flow token to work out value for $du) * outbound_record_route(): use instead of rr.record_route() (may well call rr.record_route() internally - but will also add the flow token (if the requirements for Outbound are met in the request)) * outbound_add_path(): use instead of path.add_path() (may well call path.add_path() internally - but will also add the flow token and generate it (and add to token/connection mapping table) for new connections (if the requirements for Outbound are met in the request)) * outbound_lookup(): use instead of registrar.lookup() (may well call registrar.lookup() internally - but will select the contact(s) with the best reg IDs and fill in AVP) * outbound_next_contact(): new API which will remove the first contact from the AVP _and_ location table and select the best remaining reg ID * force_outbound(): new API which will make sure flow tokens are added by outbound_record_route() and outbound_add_path() even if the request doesn't indicate client support Token/connection map maintenance ---------------------------------- * Is there a need to add an event_route[] to catch connection closes (and a corresponding outbound module API to remove a token/connection mapping) as previously suggested by OEJ? * Is it OK for the outbound.outbound_route() function just to check that a connection found in the mapping table is valid when attempting to route a request (and removing the mapping and returning that there was no mapping when it isn't) - or would this lead to stuck entries in the mapping table? * Perhaps entries in the map should expire automatically anyway (so no catching of closes required) - they will be created when a client registers so there is an expiry time available? Thanks, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

5 15

git:master: ndb_redis: redisc_exec_argv function
by Vicente Hernando 29 Aug '12

29 Aug '12

Module: sip-router Branch: master Commit: b7a1ba89ce9d8a310b9b0151f6535d612dbc9057 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7a1ba8… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Wed Aug 29 12:45:40 2012 -0400 ndb_redis: redisc_exec_argv function --- modules/ndb_redis/redis_client.c | 55 ++++++++++++++++++++++++++++++++++++++ modules/ndb_redis/redis_client.h | 7 +++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 0bf2c37..5248135 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -379,6 +379,61 @@ error_exec: } /** + * Executes a redis command. + * Command is coded using a vector of strings, and a vector of lenghts. + * + * @param rsrv Pointer to a redis_server_t structure. + * @param argc number of elements in the command vector. + * @param argv vector of zero terminated strings forming the command. + * @param argvlen vector of command string lenghts or NULL. + * @return redisReply structure or NULL if there was an error. + */ +void * redisc_exec_argv(redisc_server_t *rsrv, int argc, const char **argv, const size_t *argvlen) +{ + redisReply *res=NULL; + + if(rsrv==NULL || rsrv->ctxRedis==NULL) + { + LM_ERR("no redis context found for server %.*s\n", + rsrv->sname->len, rsrv->sname->s); + return NULL; + } + if(argc<=0) + { + LM_ERR("invalid parameters\n"); + return NULL; + } + if(argv==NULL || *argv==NULL) + { + LM_ERR("invalid parameters\n"); + return NULL; + } + res = redisCommandArgv(rsrv->ctxRedis, argc, argv, argvlen); + if(res) + { + return res; + } + + /* null reply, reconnect and try again */ + if(rsrv->ctxRedis->err) + { + LM_ERR("Redis error: %s\n", rsrv->ctxRedis->errstr); + } + if(redisc_reconnect_server(rsrv)==0) + { + res = redisCommandArgv(rsrv->ctxRedis, argc, argv, argvlen); + } + else + { + LM_ERR("Unable to reconnect to server: %.*s\n", + rsrv->sname->len, rsrv->sname->s); + return NULL; + } + + return res; +} + +/** * */ redisc_reply_t *redisc_get_reply(str *name) diff --git a/modules/ndb_redis/redis_client.h b/modules/ndb_redis/redis_client.h index 8aebe77..805c6fd 100644 --- a/modules/ndb_redis/redis_client.h +++ b/modules/ndb_redis/redis_client.h @@ -58,6 +58,13 @@ typedef struct redisc_pv { gparam_t pos; /* Array element position. */ } redisc_pv_t; +/* Server related functions */ +redisc_server_t* redisc_get_server(str *name); +int redisc_reconnect_server(redisc_server_t *rsrv); + +/* Command related functions */ +int redisc_exec(str *srv, str *res, str *cmd, ...); +void* redisc_exec_argv(redisc_server_t *rsrv, int argc, const char **argv, const size_t *argvlen); redisc_reply_t *redisc_get_reply(str *name); int redisc_free_reply(str *name); #endif

1 0

git:3.3: kamctl/dbcassandra: Updated schema for cassandra location table
by Anca Vamanu 29 Aug '12

29 Aug '12

Module: sip-router Branch: 3.3 Commit: 12c25ac2a5dbc77b4f025f81a18eb4b07cfccee7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12c25ac… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed Aug 29 19:33:51 2012 +0300 kamctl/dbcassandra: Updated schema for cassandra location table (cherry picked from commit ae7047e05a7ff05a1707446286e2837fa49671dc) --- utils/kamctl/dbcassandra/openser/location | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/dbcassandra/openser/location b/utils/kamctl/dbcassandra/openser/location index 555aee3..acfcc97 100644 --- a/utils/kamctl/dbcassandra/openser/location +++ b/utils/kamctl/dbcassandra/openser/location @@ -1,3 +1,3 @@ -callid(string) cflags(int) contact(string) cseq(int) expires(timestamp) flags(int) last_modified(int) methods(int) path(string) q(double) received(string) socket(string) user_agent(string) username(string) +callid(string) cflags(int) contact(string) cseq(int) expires(timestamp) flags(int) last_modified(int) methods(int) path(string) q(double) received(string) socket(string) user_agent(string) username(string) ruid(string) instance(string) reg_id(int) username contact

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2012