sr-dev February 2010

sr-dev@lists.kamailio.org

31 participants
250 discussions

git:tmp/k3.0_sr_backports: update drp_rpls statistics
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: c7ccd4a4cd8aa1e4e7bcb0d9419edcc15ae94034 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7ccd4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 23 16:39:59 2009 +0200 update drp_rpls statistics (cherry picked from commit 770ced3) --- forward.c | 6 +++++- receive.c | 4 ++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/forward.c b/forward.c index a7328e3..eae80ed 100644 --- a/forward.c +++ b/forward.c @@ -736,7 +736,11 @@ int forward_reply(struct sip_msg* msg) } #endif - if (msg_send(&dst, new_buf, new_len)<0) goto error; + if (msg_send(&dst, new_buf, new_len)<0) + { + sr_event_exec(SREV_CORE_STATS, (void*)4); + goto error; + } #ifdef STATS STATS_TX_RESPONSE( (msg->first_line.u.reply.statuscode/100) ); #endif diff --git a/receive.c b/receive.c index 5047d3a..4b0c755 100644 --- a/receive.c +++ b/receive.c @@ -226,7 +226,10 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) on via1 being parsed in a pre-script callback --andrei */ if (exec_pre_script_cb(msg, ONREPLY_CB_TYPE)==0 ) + { + sr_event_exec(SREV_CORE_STATS, (void*)4); goto end; /* drop the request */ + } /* exec the onreply routing script */ if (onreply_rt.rlist[DEFAULT_RT]){ @@ -240,6 +243,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) }else #endif /* NO_ONREPLY_ROUTE_ERROR */ if (unlikely(ret==0 || (ctx.run_flags&DROP_R_F))){ + sr_event_exec(SREV_CORE_STATS, (void*)4); goto skip_send_reply; /* drop the message, no error */ } }

1 0

git:tmp/k3.0_sr_backports: kex: support to update core stats via core events
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 492346e52903c48050a2ffadf2071cbca7e3bf34 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=492346e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Oct 13 21:28:42 2009 +0200 kex: support to update core stats via core events (cherry picked from commit ea5ee19268c6a7e6f69df674b16fb19d2a2d6409) --- modules_k/kex/core_stats.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/core_stats.c b/modules_k/kex/core_stats.c index 121bb15..466dd11 100644 --- a/modules_k/kex/core_stats.c +++ b/modules_k/kex/core_stats.c @@ -36,6 +36,7 @@ #include "../../lib/kcore/statistics.h" #include "../../lib/kmi/mi.h" +#include "../../events.h" #include "../../dprint.h" #include "../../timer.h" #include "../../parser/msg_parser.h" @@ -127,6 +128,49 @@ static int km_cb_rpl_stats(struct sip_msg *msg, return 1; } + +static int sts_update_core_stats(void *data) +{ + int type; + + type = (int)data; + switch(type) { + case 1: + /* fwd_requests */ + update_stat(fwd_reqs, 1); + break; + case 2: + /* fwd_replies */ + update_stat(fwd_rpls, 1); + break; + case 3: + /* drop_requests */ + update_stat(drp_reqs, 1); + break; + case 4: + /* drop_replies */ + update_stat(drp_rpls, 1); + break; + case 5: + /* err_requests */ + update_stat(err_reqs, 1); + break; + case 6: + /* err_replies */ + update_stat(err_rpls, 1); + break; + case 7: + /* bad_URIs_rcvd */ + update_stat(bad_URIs, 1); + break; + case 8: + /* bad_msg_hdr */ + update_stat(bad_msg_hdr, 1); + break; + } + return 0; +} + int register_core_stats(void) { /* register core statistics */ @@ -147,6 +191,7 @@ int register_core_stats(void) LM_ERR("failed to register PRE request callback\n"); return -1; } + sr_event_register_cb(SREV_CORE_STATS, sts_update_core_stats); return 0; }

1 0

git:tmp/k3.0_sr_backports: update fwd_rpls statistics
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 2fd39cac8b5768863a439e946a84db300519a478 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2fd39ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 23 16:20:19 2009 +0200 update fwd_rpls statistics (cherry picked from commit 058f978739d0642d3332301eb8f0a0cd2bc64f37) --- forward.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index a9cfc7f..a7328e3 100644 --- a/forward.c +++ b/forward.c @@ -745,6 +745,7 @@ int forward_reply(struct sip_msg* msg) msg->via2->host.len, msg->via2->host.s, (unsigned short) msg->via2->port); + sr_event_exec(SREV_CORE_STATS, (void*)2); pkg_free(new_buf); skip: return 0;

1 0

git:tmp/k3.0_sr_backports: core: update fwd_reqs stat
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 878d2c6bf05eb2d81f00df2618b3b4f216e16bb0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=878d2c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Oct 13 21:40:04 2009 +0200 core: update fwd_reqs stat (cherry picked from commit 6a84eeebc2575d90d5795abb95af33ab37407aef) --- forward.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index d7fb827..a9cfc7f 100644 --- a/forward.c +++ b/forward.c @@ -72,6 +72,7 @@ #include "config.h" #include "parser/msg_parser.h" #include "route.h" +#include "events.h" #include "dprint.h" #include "globals.h" #include "cfg_core.h" @@ -581,6 +582,8 @@ end: #endif if (buf) pkg_free(buf); /* received_buf & line_buf will be freed in receive_msg by free_lump_list*/ + if(ret==0) + sr_event_exec(SREV_CORE_STATS, (void*)1); return ret; }

1 0

git:tmp/k3.0_sr_backports: core: added new event SREV_CORE_STATS
by Andrei Pelinescu-Onciul 01 Feb '10

01 Feb '10

Module: sip-router Branch: tmp/k3.0_sr_backports Commit: 13959998a2701a279db6396cd9aa6e7913cc0ec7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1395999… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Oct 13 20:47:35 2009 +0200 core: added new event SREV_CORE_STATS - to be used by Kamailio core statistics not included in stock SR core (cherry picked from commit 47c89177ce276cdf8f6a2d06fdd3359ba283fe4c) --- events.c | 12 ++++++++++++ events.h | 2 ++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/events.c b/events.c index 0d07395..be98221 100644 --- a/events.c +++ b/events.c @@ -48,6 +48,11 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.net_data_out = f; else return -1; break; + case SREV_CORE_STATS: + if(_sr_events_list.core_stats==0) + _sr_events_list.core_stats = f; + else return -1; + break; default: return -1; } @@ -91,6 +96,13 @@ int sr_event_exec(int type, void *data) return ret; } else return 1; break; + case SREV_CORE_STATS: + if(unlikely(_sr_events_list.core_stats!=0)) + { + ret = _sr_events_list.core_stats(data); + return ret; + } else return 1; + break; default: return -1; } diff --git a/events.h b/events.h index 9fda619..9af0d71 100644 --- a/events.h +++ b/events.h @@ -25,12 +25,14 @@ #define SREV_NET_DATA_IN 1 #define SREV_NET_DATA_OUT 2 +#define SREV_CORE_STATS 3 typedef int (*sr_event_cb_f)(void *data); typedef struct sr_event_cb { sr_event_cb_f net_data_in; sr_event_cb_f net_data_out; + sr_event_cb_f core_stats; } sr_event_cb_t; void sr_event_cb_init(void);

1 0

SF.net SVN: openser:[5971] branches/1.5/forward.c
by Marius Zbihlei 01 Feb '10

01 Feb '10

Revision: 5971 http://openser.svn.sourceforge.net/openser/?rev=5971&view=rev Author: mariuszbihlei Date: 2010-02-01 14:39:47 +0000 (Mon, 01 Feb 2010) Log Message: ----------- The mhomed implementation works by calling a socket()/connect()/getsockname()/close() to find out the interface in a multihomed system. Because mhomed works only for UDP sockets, a major performance improvement is shown if we use the same socket for multiple connects(possible for UDP sockets), thus completly removing the socket() call and the close() call.(well, except for the first time) The CPU load(user+system) shown in a mhomed environment on a stateless router, with a call rate of 6000 calls/s is 46.1% load in the case of this patched version, versus 63.54% load in the case of the original version. Modified Paths: -------------- branches/1.5/forward.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

new module: mtree
by Daniel-Constantin Mierla 01 Feb '10

01 Feb '10

Hello, the master branch got a new module named mtree. It is able to load database records in the form of (key,value) and index them in shared memory trees based on key. One db table is loaded in one mtree, you can define as many trees as you need. The typical use case is to load arbitrary data related to DIDs or prefixes, offering very fast lookup even with large number of records. The value can be string or digested in a runtime structure, so far being able to digest dstid:weight values, useful for prefix matching on weight rather than longest match. The trees are read only, with option to reload via mi command (rpc to be added soon). Online readme at: http://sip-router.org/docbook/sip-router/branch/master/modules/mtree/mtree.… Cheers, Daniel -- Daniel-Constantin Mierla eLearning class for Kamailio 3.0.0 Starting Feb 8, 2010 * http://www.asipto.com/

1 0

git:kamailio_3.0: core: use dlflags to load modules
by Daniel-Constantin Mierla 01 Feb '10

01 Feb '10

Module: sip-router Branch: kamailio_3.0 Commit: 055915a558a485cda17c9bb1c8e43aca12d116b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=055915a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 30 17:02:37 2010 +0100 core: use dlflags to load modules - dlflags var used for dlopen function --- sr_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sr_module.c b/sr_module.c index b8db2c7..d5dc322 100644 --- a/sr_module.c +++ b/sr_module.c @@ -384,7 +384,7 @@ int load_module(char* mod_path) retries=2; dlflags=RTLD_NOW; reload: - handle=dlopen(path, RTLD_NOW); /* resolve all symbols now */ + handle=dlopen(path, dlflags); /* resolve all symbols now */ if (handle==0){ LOG(L_ERR, "ERROR: load_module: could not open module <%s>: %s\n", path, dlerror());

1 0

git:kamailio_3.0: uac(k): use header types for detection
by Daniel-Constantin Mierla 01 Feb '10

01 Feb '10

Module: sip-router Branch: kamailio_3.0 Commit: 369d7598244c60c2c8e4d601e166a03cb211128c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=369d759… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 24 21:21:59 2010 +0100 uac(k): use header types for detection --- modules_k/uac/auth.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/uac/auth.c b/modules_k/uac/auth.c index 78f51d5..0fb3e25 100644 --- a/modules_k/uac/auth.c +++ b/modules_k/uac/auth.c @@ -232,9 +232,9 @@ static inline struct hdr_field *get_autenticate_hdr(struct sip_msg *rpl, } for( hdr=rpl->headers ; hdr ; hdr=hdr->next ) { - if((rpl_code==WWW_AUTH_CODE && hdr->type==HDR_WWW_AUTHENTICATE_T) - || (rpl_code==PROXY_AUTH_CODE - && hdr->type==HDR_PROXY_AUTHENTICATE_T)) + if ( rpl_code==WWW_AUTH_CODE && hdr->type==HDR_WWW_AUTHENTICATE_T ) + return hdr; + if ( rpl_code==PROXY_AUTH_CODE && hdr->type==HDR_PROXY_AUTHENTICATE_T ) return hdr; }

1 0

git:kamailio_3.0: uac(k): proper test for send failure
by Daniel-Constantin Mierla 01 Feb '10

01 Feb '10

Module: sip-router Branch: kamailio_3.0 Commit: 9600b1be5136f72d567a6b579abeb96cb5928fc7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9600b1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 24 21:20:02 2010 +0100 uac(k): proper test for send failure (cherry picked from commit 1479cd808ea8e5025bfa8400a257e3f89db4ab68) --- modules_k/uac/uac_send.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/uac/uac_send.c b/modules_k/uac/uac_send.c index 9a1f2b9..b77317d 100644 --- a/modules_k/uac/uac_send.c +++ b/modules_k/uac/uac_send.c @@ -398,7 +398,7 @@ int uac_req_send(struct sip_msg *msg, char *s1, char *s2) (_uac_req.s_ouri.len<=0)?NULL:&_uac_req.s_ouri /* outbound uri */ ); - if(ret!=0) + if(ret<0) return -1; return 1; }

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 February 2010