sr-dev March 2012

sr-dev@lists.kamailio.org

26 participants
149 discussions

Kamailio dokuwiki
by Jan Klepal 24 Mar '12

24 Mar '12

Hello, can anybody block following adresses on http://www.kamailio.org/dokuwiki/ 50.22.104.219 109.230.216.0/24 91.224.161.250 It seems these hosts are bots which spam wiki. Cheers, Jan

3 3

git:3.2: rtpproxy: proper iovec size for rtpproxy commands
by Daniel-Constantin Mierla 23 Mar '12

23 Mar '12

Module: sip-router Branch: 3.2 Commit: 2357e54ecfba7a86b993e5a0e864fd232e1730ba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2357e54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 23 12:14:07 2012 +0100 rtpproxy: proper iovec size for rtpproxy commands - issue introduced with the last fix for timeout socket parameter - reported by Laurent Schweizer (cherry picked from commit 7c7e9f1051148887b7c5a578a9d09d66bf9586ce) --- modules/rtpproxy/rtpproxy.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 277f639..b6aa316 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -2222,9 +2222,9 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc } else { v[3].iov_len = 0; } - if (opts.s.s[0] == 'U' && to_tag.len > 0) { + if (to_tag.len > 0) { iovec_param_count = 18; - if (timeout_socket_str.len > 0) { + if (opts.s.s[0] == 'U' && timeout_socket_str.len > 0) { iovec_param_count = 20; STR2IOVEC(timeout_socket_str, v[19]); }

1 0

git:master: core: parser - helper functions to test msg context id
by Daniel-Constantin Mierla 23 Mar '12

23 Mar '12

Module: sip-router Branch: master Commit: cf9269d7315e2965dcb57afda7838c4a5d3ad807 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf9269d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 23 12:51:35 2012 +0100 core: parser - helper functions to test msg context id - use (msg id, pid) to identify the message context id - to be used for matching the message context when caching values are stored per it - reported by Klaus Darilion for $TV(...) --- parser/msg_parser.c | 26 ++++++++++++++++++++++++++ parser/msg_parser.h | 20 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 73a86cf..fdbbd09 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -871,3 +871,29 @@ hdr_field_t* next_sibling_hdr_by_name(hdr_field_t *hf) } return NULL; } + +/** + * set msg context id + * - return: -1 on error; 0 - on set + */ +int msg_ctx_id_set(sip_msg_t *msg, msg_ctx_id_t *mid) +{ + if(msg==NULL || mid==NULL) + return -1; + mid->msgid = msg->id; + mid->pid = msg->pid; + return 0; +} + +/** + * check msg context id + * - return: -1 on error; 0 - on no match; 1 - on match + */ +int msg_ctx_id_match(sip_msg_t *msg, msg_ctx_id_t *mid) +{ + if(msg==NULL || mid==NULL) + return -1; + if(msg->id != mid->msgid || msg->pid!=mid->pid) + return 0; + return 1; +} diff --git a/parser/msg_parser.h b/parser/msg_parser.h index ce71a44..cf78326 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -461,5 +461,25 @@ void reset_path_vector(struct sip_msg* msg); /** reset a previously forced send socket. */ #define reset_force_socket(msg) set_force_socket(msg, 0) +/** + * struct to identify a msg context + * - the pair of pid and message-id + */ +typedef struct msg_ctx_id { + int pid; + int msgid; +} msg_ctx_id_t; + +/** + * set msg context id + * - return: -1 on error; 0 - on set + */ +int msg_ctx_id_set(sip_msg_t *msg, msg_ctx_id_t *mid); + +/** + * check msg context id + * - return: -1 on error; 0 - on no match; 1 - on match + */ +int msg_ctx_id_match(sip_msg_t *msg, msg_ctx_id_t *mid); #endif

1 0

git:master: rtpproxy: proper iovec size for rtpproxy commands
by Daniel-Constantin Mierla 23 Mar '12

23 Mar '12

Module: sip-router Branch: master Commit: 7c7e9f1051148887b7c5a578a9d09d66bf9586ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c7e9f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 23 12:14:07 2012 +0100 rtpproxy: proper iovec size for rtpproxy commands - issue introduced with the last fix for timeout socket parameter - reported by Laurent Schweizer --- modules/rtpproxy/rtpproxy.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index ced9842..3294cbc 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -2220,9 +2220,9 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc } else { v[3].iov_len = 0; } - if (opts.s.s[0] == 'U' && to_tag.len > 0) { + if (to_tag.len > 0) { iovec_param_count = 18; - if (timeout_socket_str.len > 0) { + if (opts.s.s[0] == 'U' && timeout_socket_str.len > 0) { iovec_param_count = 20; STR2IOVEC(timeout_socket_str, v[19]); }

1 0

git:master: textops(k): two functions to search and subst inside header fields
by Daniel-Constantin Mierla 23 Mar '12

23 Mar '12

Module: sip-router Branch: master Commit: 5fc6a215d5d8b898d6ae72edb88e2731ed900ccd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5fc6a21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 23 11:01:21 2012 +0100 textops(k): two functions to search and subst inside header fields - search_hf(hf, re, flags) - search inside header fields body - subst_hf(hf, subst, flags) - perl-like substitution inside header field body --- modules_k/textops/README | 491 +++++++++++++++++-------------- modules_k/textops/doc/textops_admin.xml | 79 +++++ modules_k/textops/textops.c | 225 ++++++++++++++ 3 files changed, 573 insertions(+), 222 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5fc…

1 0

TLS certificates and database
by Torrey Searle 22 Mar '12

22 Mar '12

Hello, Does anybody know if it is technically feasible to make Kamailio's TLS module source TLS certificates from a database instead of a directory? Or would such functionality not be allowed by the OpenSSL library? Thanks! Torrey

2 1

DB replace
by Daniel-Constantin Mierla 21 Mar '12

21 Mar '12

Hello, looking at previous commits and the utility of a "replace" SQL command, I think it can be implemented in kamailio for those modules providing "affected_rows" but no native "replace". Pretty much like done for postgres case inside rls/pua, but done within a mutex lock, to avoid any kind of race. For proper concurrency, I think there should be an array of mutexes (gen_lock_set_t) , the exact mutex to be used will be selected based on a hash value over the unique key values of the record. That means the "replace" DB API method should be extended with two new parameters to specify the unique key values, a db_val_t array (kvals) and its number of elements (kn): typedef int (*db_replace_f) (const db1_con_t* handle, const db_key_t* keys, const db_val_t* vals, const int n, const db_val_t* kvals, const int kn); In the case the unique key values are at the beginning of the vals array, then vals can be reused for kvals and kn set accordingly. When the kvals array is null, no mutex will be used. Of course, if db library has native "replace" function, that will be used and the last two parameters will be ignored. In short, to implement replace() for postgres: - DB API replace method will be extended with two parameters - db_postgres will allocate at startup an array of mutex locks (AS) - its size (LS) to be set by module parameter - postgres replace() will compute the hash as: H = get_hash1_raw(kvals[0]) + ... + get_hash1_raw(kvals[kn-1]) -- if kval[N] is not string, but integer, its value can be used directly instead of getting to string and then hashing it - the mutex to be used will be M = AS[H % LS] - the rest of replace() as pseudocode: lock(M) do DB UPDATE if affected rows==0 do DB INSERT unlock(M) or, as the chance to have insert succeed in most of the cases can be relevant in some cases, the order can be: lock(M) do DB INSERT if insert error do DB UPDATE unlock(M) The way to be done can be a third new param to replace method -- this implementation does not require "affected rows", eventually to detect based on error code that it was a duplicate key failure. Then some other modules can use replace() mechanism easier (e.g, as discussed on IRC devel meeting, usrloc can solve inconsistency when db was not available for some time) -- such usage (insert or replace) can be a matter of module parameters, if wanted, from case to case. Any other opinions? I am not a postgres user, but I can try to make a patch if there are testers and nobody else wants to take over. Cheers, Daniel -- Daniel-Constantin Mierla Kamailio Advanced Training, April 23-26, 2012, Berlin, Germany http://www.asipto.com/index.php/kamailio-advanced-training/

3 5

git:master: modules_k/p_usrloc:Fixed sql table creation scheme
by Marius Zbihlei 21 Mar '12

21 Mar '12

Module: sip-router Branch: master Commit: d8fc55f0dec978a09bfd1aead4be55e2a1855d91 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8fc55f… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Mar 21 18:45:36 2012 +0200 modules_k/p_usrloc:Fixed sql table creation scheme TODO: create serdb schema definition Patch by Dragos Dinu (Dragos.Dinu AT 1and1.ro --- modules_k/p_usrloc/location.sql | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/modules_k/p_usrloc/location.sql b/modules_k/p_usrloc/location.sql index d8203a7..a80902a 100644 --- a/modules_k/p_usrloc/location.sql +++ b/modules_k/p_usrloc/location.sql @@ -1,20 +1,22 @@ -drop table location; +drop table if exists location; CREATE TABLE location ( -username VARCHAR(64) NOT NULL, -aor VARCHAR(255) NOT NULL, -contact VARCHAR(255) NOT NULL, -server_id INT NOT NULL DEFAULT '0', -received VARCHAR(255), -expires DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00', -q FLOAT NOT NULL DEFAULT '1.0', -callid VARCHAR(255), -cseq INT UNSIGNED, -flags INT UNSIGNED NOT NULL DEFAULT '0', -cflags INT UNSIGNED NOT NULL DEFAULT '0', -user_agent VARCHAR(64), -instance VARCHAR(255), -UNIQUE KEY location_key (username, contact), -KEY location_contact (contact), -KEY location_expires (expires) -); + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + username VARCHAR(64) DEFAULT '' NOT NULL, + domain VARCHAR(64) DEFAULT NULL, + contact VARCHAR(255) DEFAULT '' NOT NULL, + received VARCHAR(128) DEFAULT NULL, + path VARCHAR(128) DEFAULT NULL, + expires DATETIME DEFAULT '2020-05-28 21:32:15' NOT NULL, + q FLOAT(10,2) DEFAULT 1.0 NOT NULL, + callid VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL, + cseq INT(11) DEFAULT 1 NOT NULL, + last_modified DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL, + flags INT(11) DEFAULT 0 NOT NULL, + cflags INT(11) DEFAULT 0 NOT NULL, + user_agent VARCHAR(255) DEFAULT '' NOT NULL, + socket VARCHAR(64) DEFAULT NULL, + methods INT(11) DEFAULT NULL +) ENGINE=MyISAM; + +CREATE INDEX account_contact_idx ON location (username, domain, contact);

1 0

git:master: modules_k/p_usrloc : Fixed postgresql support
by Marius Zbihlei 21 Mar '12

21 Mar '12

Module: sip-router Branch: master Commit: 5269ac4fce1ce2a034ff711dfd8607e16cfeb591 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5269ac4… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Mar 21 18:41:34 2012 +0200 modules_k/p_usrloc : Fixed postgresql support Used replace DB API export instead of insert_update which was not available of postgresql. Patch by Dragos Dinu (dragos.dinu AT 1and1.ro) --- modules_k/p_usrloc/ucontact.c | 209 ++++++++++++++++++--------------- modules_k/p_usrloc/ul_db.c | 4 +- modules_k/p_usrloc/ul_db.h | 5 +- modules_k/p_usrloc/ul_db_api.c | 6 - modules_k/p_usrloc/ul_db_api.h | 2 +- modules_k/p_usrloc/ul_db_form_query.c | 6 +- modules_k/p_usrloc/ul_db_handle.c | 4 +- modules_k/p_usrloc/ul_db_handle.h | 2 +- modules_k/p_usrloc/ul_db_layer.c | 10 +- modules_k/p_usrloc/ul_db_layer.h | 4 +- modules_k/p_usrloc/ul_db_repl.c | 4 +- modules_k/p_usrloc/ul_db_repl.h | 2 +- 12 files changed, 135 insertions(+), 123 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=526…

1 0

git:master: registrar(k): optional uri parameter
by Daniel-Constantin Mierla 20 Mar '12

20 Mar '12

Module: sip-router Branch: master Commit: 3417a42c64535123d19896add6bc8324a29f24a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3417a42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 20 12:24:59 2012 +0100 registrar(k): optional uri parameter - removed aor_avp as it conflicted with unregister uri param - savel, lookup and register can take an extra optional parameter to specify the URI for which to do the operation. It provides the same functionality as it was with aor_avp --- modules_k/registrar/README | 197 ++++++++++++--------------- modules_k/registrar/api.c | 6 +- modules_k/registrar/common.c | 13 +-- modules_k/registrar/doc/registrar_admin.xml | 127 +++++++----------- modules_k/registrar/lookup.c | 26 ++-- modules_k/registrar/lookup.h | 4 +- modules_k/registrar/reg_mod.c | 120 ++++++++++++----- modules_k/registrar/reg_mod.h | 2 - modules_k/registrar/save.c | 17 +-- modules_k/registrar/save.h | 4 +- 10 files changed, 251 insertions(+), 265 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=341…

1 0

← Newer
1
2
3
4
5
6
7
8
...
15
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 2012