sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

git:3.1: modules_k/presence : Fixed a bug caused by an incorrect Macro

by Marius Zbihlei

Module: sip-router Branch: 3.1 Commit: 270a5cfcabaa1be16ccc5cf4c5a3da439fe7d644 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=270a5cf… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 27 12:21:11 2011 +0300 modules_k/presence : Fixed a bug caused by an incorrect Macro the macro expanded to incorrect results when called in statements like if(cond) COND_COPY(...); (cherry picked from commit 41b11916eec28133af499b7368940504c7c5834d) --- modules_k/presence/hash.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/presence/hash.h b/modules_k/presence/hash.h index 82eb23c..ba9a0ab 100644 --- a/modules_k/presence/hash.h +++ b/modules_k/presence/hash.h @@ -50,10 +50,12 @@ struct presentity; goto error #define CONT_COPY(buf, dest, source)\ + do{ \ dest.s= (char*)buf+ size;\ memcpy(dest.s, source.s, source.len);\ dest.len= source.len;\ - size+= source.len; + size+= source.len; \ + } while(0); #define PKG_MEM_TYPE 1<< 1 #define SHM_MEM_TYPE 1<< 2

13 years, 6 months

git:master: modules_k/presence : Fixed a bug caused by an incorrect Macro

by Marius Zbihlei

Module: sip-router Branch: master Commit: 41b11916eec28133af499b7368940504c7c5834d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41b1191… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 27 12:21:11 2011 +0300 modules_k/presence : Fixed a bug caused by an incorrect Macro the macro expanded to incorrect results when called in statements like if(cond) COND_COPY(...); --- modules_k/presence/hash.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/presence/hash.h b/modules_k/presence/hash.h index 82eb23c..ba9a0ab 100644 --- a/modules_k/presence/hash.h +++ b/modules_k/presence/hash.h @@ -50,10 +50,12 @@ struct presentity; goto error #define CONT_COPY(buf, dest, source)\ + do{ \ dest.s= (char*)buf+ size;\ memcpy(dest.s, source.s, source.len);\ dest.len= source.len;\ - size+= source.len; + size+= source.len; \ + } while(0); #define PKG_MEM_TYPE 1<< 1 #define SHM_MEM_TYPE 1<< 2

13 years, 6 months

git:3.1: utils/kamctl/presence-create. sql Increased size of contact and callid in presence tables

by Marius Zbihlei

Module: sip-router Branch: 3.1 Commit: ac679cf5093f99931da6aeea4b40c1215e295a4b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac679cf… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Apr 27 11:48:46 2011 +0300 utils/kamctl/presence-create.sql Increased size of contact and callid in presence tables Some CPE (e.g. FritzBox,Samsung) issue larger contacts that 64 chars, thus resulting in a truncation in the DB backend --- utils/kamctl/mysql/presence-create.sql | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 6af8d0a..b764976 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -24,10 +24,10 @@ CREATE TABLE active_watchers ( event_id VARCHAR(64), to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, - callid VARCHAR(64) NOT NULL, + callid VARCHAR(128) NOT NULL, local_cseq INT(11) NOT NULL, remote_cseq INT(11) NOT NULL, - contact VARCHAR(64) NOT NULL, + contact VARCHAR(128) NOT NULL, record_route TEXT, expires INT(11) NOT NULL, status INT(11) DEFAULT 2 NOT NULL, @@ -79,7 +79,7 @@ CREATE TABLE pua ( etag VARCHAR(64) NOT NULL, tuple_id VARCHAR(64), watcher_uri VARCHAR(128) NOT NULL, - call_id VARCHAR(64) NOT NULL, + call_id VARCHAR(128) NOT NULL, to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, cseq INT(11) NOT NULL,

13 years, 6 months

compiler warning with master

by Juha Heinanen

i compiled today sr from master and got warning: CC (cc) [M kex.so] core_stats.o core_stats.c: In function ‘mi_reset_and_add_stat’: core_stats.c:342: warning: implicit declaration of function ‘get_stat_val_long’ -- juha

13 years, 6 months

git:mariusbucur/dmq: implemented send/bcast functions

by Marius Ovidiu Bucur

Module: sip-router Branch: mariusbucur/dmq Commit: f403eea5871d682dedf28700a9544975c65fd838 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f403eea… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Tue Apr 26 19:21:26 2011 +0300 implemented send/bcast functions --- modules_k/dmq/dmq.c | 42 ++++++++++--- modules_k/dmq/dmq.h | 7 ++- modules_k/dmq/dmq_funcs.c | 100 ++++++++++++++++++++++++----- modules_k/dmq/dmq_funcs.h | 19 +++++- modules_k/dmq/dmqnode.c | 62 ++++++++++++++++++- modules_k/dmq/dmqnode.h | 22 ++++--- modules_k/dmq/message.c | 26 +++++--- modules_k/dmq/notification_peer.c | 127 ++++++++++++++++++++++++++----------- modules_k/dmq/notification_peer.h | 14 +++- modules_k/dmq/peer.c | 3 +- modules_k/dmq/peer.h | 6 +- modules_k/dmq/worker.c | 63 ++++++++++++++++++- 12 files changed, 401 insertions(+), 90 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f40…

13 years, 6 months

call for participation: kamailio project at LinuxTag 2011

by Henning Westerholt

Hello, in about five weeks the kamailio project will (again) be present on the LinuxTag fair, "the most important place for Linux and open source software in Europe" - http://www.linuxtag.org/2011/en.html . If you are in Berlin during this time, plan to visit the LinuxTag or just like to help your favourite SIP server project - please consider supporting us in running our fair booth! Even showing up for one or two hours helps a lot. We need also support to properly present our project, like flyers, a banner, maybe some live demonstrations.. So even if you can't participate in person, there are other ways to help us! Please contact me per mail if you could help at the booth or have some ideas about our project presentation. The actual state of preparations can be found in our wiki: http://sip-router.org/wiki/meetings/berlin_2011 Cheers, Henning

13 years, 6 months

Re: [sr-dev] is $td.did avp a normal avp?

by Jan Janak

(moving to sr-dev) This looks like a bug to me. All such AVPs should be preserved for reply and failure route blocks. Let me see if I can reproduce it, I'll get back to you later this week. -Jan On Fri, Apr 22, 2011 at 3:00 PM, Juha Heinanen <jh(a)tutpro.com> wrote: > domain module sets $td.did at lookup_domain call. $td.did seems to be a > normal avp, because i can print its value with xlog by referring to it > as $avp(td.did). however, its value is gone at failure route, which > makes me suspect that $td.did is not really a normal avp. > > in route block i have > > $avp(did) = $td.did; > xlog("L_INFO", "at t_relay: <td/td.did> = <$avp(did)/$avp(td.did)>\n"); > if (t_relay()) exit; > > branch route, onreply route, and failure route are set when the above > t_relay() takes place. > > at the end of branch route block, i have > > xlog("L_INFO", "at end of contact branches: <did/td.did> = <$avp(did)/$avp(td.did)>\n"); > > and at the beginning of onreply route block: > > xlog("L_INFO", "at beginning of onreply: <did/td.did> = <$avp(did)/$avp(td.did)>\n"); > > and at the beginning of failure route block: > > xlog("L_INFO", "at beginning of contact failure: <did/td.did = <$avp(did)/$avp(td.did)>\n"); > > when i make a call, i get to syslog: > > Apr 22 15:53:27 sip /usr/sbin/sip-proxy[13706]: INFO: at t_relay: <td/td.did> = <test.fi/test.fi> > Apr 22 15:53:27 sip /usr/sbin/sip-proxy[13706]: INFO: at end of contact branches: <did/td.did> = <test.fi/test.fi> > Apr 22 15:53:27 sip /usr/sbin/sip-proxy[13708]: INFO: at beginning of onreply: <did/td.did> = <test.fi/<null>> > Apr 22 15:53:27 sip /usr/sbin/sip-proxy[13705]: INFO: at beginning of contact failure: <did/td.did = <test.fi/<null>> > > why is it that $avp(did) value has been preserved from route/branch > route block to onreply/failure blocks, but value of $avp(td.did) is not? > > i'll cc to jan in case he is not on this list. > > -- juha > >

13 years, 6 months

Kamailio TLS Problem

by laura testi

Hi all, I'm trying to use the TLS module in order to allow the secure communication between Kamailio server v. 3.1.3 as registrar and presence server and my PC Client. I'm using SIP Communicator (Jitsi). When the PC client open the SSL connection to Kamailio server for Register/Subscriber/Publish messages, all seems OK. We see the PC client send "Client Hello" and the Kamailio answer "Server Hello" then they exchange the SIP messages (Register/Subscriber/Publish and thier answer). We observed a strange behavior, when Kamailio try to send the Notify to PC client, it open a new SSL connection as a client from kamailio to PC client and send the "Client Hello" to PC client, but PC client send back the Handshake Failure (40) Fatal error back to Kamailio. Here are the doubts: - why kamailio open a new ssl connection to PC in order to send the Notify even the ssl connection is already opened by PC? - is it the problem of the PC client which can not treat as a SSL server? Is it a PC client's problem or Kamailio's problem? The error in the kamailio site is: /usr/sbin/kamailio[4483]: ERROR: tls [tls_server.c:1174]: TLS connect:error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure /usr/sbin/kamailio[4483]: ERROR: <core> [tcp_read.c:882]: ERROR: tcp_read_req: error reading Could you please suggest another SIP client supporting the TLS protocol? thanks anf kind regards. laura

13 years, 6 months

git:master: rls(k): removed invalid lib path

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 68675b9585778e1b071982a2c52a85621c8313d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68675b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 25 13:05:03 2011 +0200 rls(k): removed invalid lib path --- modules_k/rls/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/Makefile b/modules_k/rls/Makefile index aa03602..1c71af7 100644 --- a/modules_k/rls/Makefile +++ b/modules_k/rls/Makefile @@ -12,7 +12,7 @@ LIBS= DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE

13 years, 7 months

git:master: kex: added mi cmd clear_statistics

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d4a66dae4e6e4f7a2129a1975b132eea90de71e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4a66da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 25 12:23:46 2011 +0200 kex: added mi cmd clear_statistics - return the values and rested the counters for statistics - patch by Paul Pankhurst --- modules_k/kex/core_stats.c | 122 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/core_stats.c b/modules_k/kex/core_stats.c index 9974056..4a5455d 100644 --- a/modules_k/kex/core_stats.c +++ b/modules_k/kex/core_stats.c @@ -95,10 +95,12 @@ stat_export_t shm_stats[] = { static struct mi_root *mi_get_stats(struct mi_root *cmd, void *param); static struct mi_root *mi_reset_stats(struct mi_root *cmd, void *param); +static struct mi_root *mi_clear_stats(struct mi_root *cmd, void *param); static mi_export_t mi_stat_cmds[] = { { "get_statistics", mi_get_stats, 0 , 0, 0 }, { "reset_statistics", mi_reset_stats, 0 , 0, 0 }, + { "clear_statistics", mi_clear_stats, 0 , 0, 0 }, { 0, 0, 0, 0, 0} }; @@ -329,6 +331,126 @@ static struct mi_root *mi_reset_stats(struct mi_root *cmd, void *param) return rpl_tree; } + +inline static int mi_reset_and_add_stat(struct mi_node *rpl, stat_var *stat) +{ + struct mi_node *node; + long old_val, new_val; + + if (stats_support()==0) return -1; + + old_val=get_stat_val_long(stat); + reset_stat(stat); + new_val=get_stat_val_long(stat); + + if (old_val==new_val) + { + node = addf_mi_node_child(rpl, 0, 0, 0, "%s:%s = %lu", + ZSW(get_stat_module(stat)), + ZSW(get_stat_name(stat)), + new_val); + } else { + node = addf_mi_node_child(rpl, 0, 0, 0, "%s:%s = %lu (%lu)", + ZSW(get_stat_module(stat)), + ZSW(get_stat_name(stat)), + new_val, old_val ); + } + + if (node==0) + return -1; + return 0; +} + + +/* callback for counter_iterate_grp_vars to reset counters */ +static void mi_add_grp_vars_cbk2(void* r, str* g, str* n, counter_handle_t h) +{ + struct mi_node *rpl; + struct mi_node *node; + counter_val_t old_val, new_val; + + rpl = r; + old_val = counter_get_val(h); + counter_reset(h); + new_val = counter_get_val(h); + + if (old_val==new_val) + { + node = addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu", + g->len, g->s, n->len, n->s, new_val); + } else { + node = addf_mi_node_child(rpl, 0, 0, 0, "%.*s:%.*s = %lu (%lu)", + g->len, g->s, n->len, n->s, new_val, old_val); + } +} + + +/* callback for counter_iterate_grp_names to reset counters */ +static void mi_add_all_grps_cbk2(void* p, str* g) +{ + counter_iterate_grp_vars(g->s, mi_add_grp_vars_cbk2, p); +} + + +static struct mi_root *mi_clear_stats(struct mi_root *cmd, void *param) +{ + struct mi_root *rpl_tree; + struct mi_node *rpl; + struct mi_node *arg; + stat_var *stat; + str val; + + if(stats_support()==0) + return init_mi_tree( 404, "Statistics Not Found", 20); + + if (cmd->node.kids==NULL) + return init_mi_tree( 400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN); + + rpl_tree = init_mi_tree( 200, MI_OK_S, MI_OK_LEN); + if (rpl_tree==0) + return 0; + rpl = &rpl_tree->node; + + for( arg=cmd->node.kids ; arg ; arg=arg->next) + { + if (arg->value.len==0) + continue; + + val = arg->value; + + if ( val.len==3 && memcmp(val.s,"all",3)==0) { + /* add all statistic variables */ + /* use direct counters access for that */ + counter_iterate_grp_names(mi_add_all_grps_cbk2, rpl); + } else if ( val.len>1 && val.s[val.len-1]==':') { + /* add module statistics */ + val.len--; + val.s[val.len]=0; /* zero term. */ + /* use direct counters access for that */ + counter_iterate_grp_vars(val.s, mi_add_grp_vars_cbk2, rpl); + val.s[val.len]=':' /* restore */; + } else { + /* reset & return only one statistic */ + stat = get_stat( &val ); + + if (stat==0) + continue; + if (mi_reset_and_add_stat(rpl,stat)!=0) + goto error; + } + } + + if (rpl->kids==0) { + free_mi_tree(rpl_tree); + return init_mi_tree( 404, "Statistics Not Found", 20); + } + + return rpl_tree; +error: + free_mi_tree(rpl_tree); + return 0; +} + /*** shm stats ***/ static struct mem_info _stats_shm_mi;

13 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2011