sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

SF.net SVN: openser:[5949] branches/1.5/modules/lcr

by Juha Heinanen

Revision: 5949 http://openser.svn.sourceforge.net/openser/?rev=5949&view=rev Author: juhe Date: 2009-10-23 17:16:30 +0000 (Fri, 23 Oct 2009) Log Message: ----------- * Added note about maximum number of gateways. Modified Paths: -------------- branches/1.5/modules/lcr/README branches/1.5/modules/lcr/doc/lcr_admin.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 2 months

git:master: db scheme(k): update schemes after version increment in trusted table from Juha

by Henning Westerholt

Module: sip-router Branch: master Commit: c3305feeccd1a3f063f4c210ec0c6118d9d218ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c3305fe… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Oct 23 18:23:38 2009 +0200 db scheme(k): update schemes after version increment in trusted table from Juha --- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/permissions-create.sql | 4 ++-- utils/kamctl/oracle/permissions-create.sql | 4 ++-- utils/kamctl/postgres/permissions-create.sql | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index d977706..e03028f 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -79,7 +79,7 @@ speed_dial|2 subscriber| subscriber|6 trusted| -trusted|4 +trusted|5 uri| uri|1 userblacklist| diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 2822a7a..5b9b49d 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -34,7 +34,7 @@ silo:5 sip_trace:2 speed_dial:2 subscriber:6 -trusted:4 +trusted:5 uri:1 userblacklist:1 usr_preferences:2 diff --git a/utils/kamctl/mysql/permissions-create.sql b/utils/kamctl/mysql/permissions-create.sql index ecc92e8..f3be981 100644 --- a/utils/kamctl/mysql/permissions-create.sql +++ b/utils/kamctl/mysql/permissions-create.sql @@ -1,10 +1,10 @@ -INSERT INTO version (table_name, table_version) values ('trusted','4'); +INSERT INTO version (table_name, table_version) values ('trusted','5'); CREATE TABLE trusted ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, src_ip VARCHAR(50) NOT NULL, proto VARCHAR(4) NOT NULL, from_pattern VARCHAR(64) DEFAULT NULL, - tag VARCHAR(32) + tag VARCHAR(64) ) ENGINE=MyISAM; CREATE INDEX peer_idx ON trusted (src_ip); diff --git a/utils/kamctl/oracle/permissions-create.sql b/utils/kamctl/oracle/permissions-create.sql index 4153147..c6045d0 100644 --- a/utils/kamctl/oracle/permissions-create.sql +++ b/utils/kamctl/oracle/permissions-create.sql @@ -1,10 +1,10 @@ -INSERT INTO version (table_name, table_version) values ('trusted','4'); +INSERT INTO version (table_name, table_version) values ('trusted','5'); CREATE TABLE trusted ( id NUMBER(10) PRIMARY KEY, src_ip VARCHAR2(50), proto VARCHAR2(4), from_pattern VARCHAR2(64) DEFAULT NULL, - tag VARCHAR2(32) + tag VARCHAR2(64) ); CREATE OR REPLACE TRIGGER trusted_tr diff --git a/utils/kamctl/postgres/permissions-create.sql b/utils/kamctl/postgres/permissions-create.sql index 886ec12..5514ef5 100644 --- a/utils/kamctl/postgres/permissions-create.sql +++ b/utils/kamctl/postgres/permissions-create.sql @@ -1,10 +1,10 @@ -INSERT INTO version (table_name, table_version) values ('trusted','4'); +INSERT INTO version (table_name, table_version) values ('trusted','5'); CREATE TABLE trusted ( id SERIAL PRIMARY KEY NOT NULL, src_ip VARCHAR(50) NOT NULL, proto VARCHAR(4) NOT NULL, from_pattern VARCHAR(64) DEFAULT NULL, - tag VARCHAR(32) + tag VARCHAR(64) ); CREATE INDEX trusted_peer_idx ON trusted (src_ip);

15 years, 2 months

Modules_s :: Missing docs

by Olle E. Johansson

Modules missing README/xml docs in modules_s acc_db acc_radius dialog diversion eval fifo oracle prefix_route print_lib unixsock This propably is something that needs to be fixed before any release. For some modules, I belive you could steal from modules_k, that have similarity and all have docs. Cheers, /O

15 years, 2 months

git:master: core: Correct an error in doxygen comments.

by Jan Janak

Module: sip-router Branch: master Commit: 061274a5b241430c575d93f74c9daa7286c93c3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=061274a… Author: Jan Janak <jan(a)ryngle.com> Committer: Jan Janak <jan(a)ryngle.com> Date: Fri Oct 23 17:31:50 2009 +0200 core: Correct an error in doxygen comments. One of previous commits added an extra comment-closing sequence which caused a compilation error. This patch fixes that. --- timer_funcs.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/timer_funcs.h b/timer_funcs.h index f5c23fa..8e17b8a 100644 --- a/timer_funcs.h +++ b/timer_funcs.h @@ -57,13 +57,12 @@ struct timer_head{ * (1<<H0_BITS)*sizeof(struct timer_head) bytes of memory, so arrange it * accordingly * -x* Uses ~280K on a 64 bits system and ~140K on a 32 bit system; for TICKS_HZ=10 + * Uses ~280K on a 64 bits system and ~140K on a 32 bit system; for TICKS_HZ=10 * holds ~ 30 min in the first hash/wheel and ~233h in the first two. * More perfomant arrangement: 16, 8, 8 (but eats 1 MB on a 64 bit system, and * 512K on a 32 bit one). For TICKS_HZ=10 it holds almost 2h in the * first hash/wheel and ~460h in the first two. */ - */ /*@{ */ #define H0_BITS 14

15 years, 2 months

git:master: Fixed test 40.sh

by Marius Zbihlei

Module: sip-router Branch: master Commit: db29fbe3b6d3ff5f656ef8ebe3a65272b4c89ae3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db29fbe… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Oct 23 17:57:32 2009 +0300 Fixed test 40.sh --- test/unit/40.cfg | 7 ++++--- test/unit/40.sh | 18 +++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/test/unit/40.cfg b/test/unit/40.cfg index dc6379a..f9f5c6c 100644 --- a/test/unit/40.cfg +++ b/test/unit/40.cfg @@ -1,8 +1,9 @@ -mpath="../modules" +mpath="../../modules_k" + +loadmodule "../../modules/tm/tm.so" loadmodule "sl/sl.so" -loadmodule "tm/tm.so" -loadmodule "db_mysql/db_mysql.so" +loadmodule "../../modules/db_mysql/db_mysql.so" loadmodule "usrloc/usrloc.so" loadmodule "registrar/registrar.so" loadmodule "pike/pike.so" diff --git a/test/unit/40.sh b/test/unit/40.sh index 2ae9ab1..6e2b298 100755 --- a/test/unit/40.sh +++ b/test/unit/40.sh @@ -35,24 +35,24 @@ if ! (check_sipp && check_kamailio && check_module "db_mysql" && check_mysql); t fi ; # add an registrar entry to the db; -$MYSQL "INSERT INTO location (username,contact,socket,user_agent,cseq,q) VALUES (\"foo\",\"sip:foo@localhost:$UAS\",\"udp:127.0.0.1:$UAS\",\"ser_test\",1,-1);" +$MYSQL "INSERT INTO location (username,contact,socket,user_agent,cseq,q) VALUES (\"foo\",\"sip:foo@127.0.0.1:$UAS\",\"udp:127.0.0.1:$UAS\",\"ser_test\",1,-1);" # start -../$BIN -w . -f $CFG &> /dev/null +$BIN -w . -f $CFG &> /dev/null ret=$? # this should work if [ "$ret" -eq 0 ]; then - sipp -sn uas -bg -i localhost -m 10 -p $UAS &> /dev/null - sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 10 -p $UAC &> /dev/null + sipp -sn uas -bg -i 127.0.0.1 -m 10 -p $UAS &> /dev/null + sipp -sn uac -s foo 127.0.0.1:$SRV -i 127.0.0.1 -m 10 -p $UAC &> /dev/null ret=$? fi; # this should be trigger the blocking if [ "$ret" -eq 0 ]; then killall -9 sipp > /dev/null 2>&1 - sipp -sn uas -bg -i localhost -m 11 -p $UAS &> /dev/null - sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 11 -p $UAC &> /dev/null + sipp -sn uas -bg -i 127.0.0.1 -m 11 -p $UAS &> /dev/null + sipp -sn uac -s foo 127.0.0.1:$SRV -i 127.0.0.1 -m 11 -p $UAC &> /dev/null ret=$? fi; @@ -60,8 +60,8 @@ fi; if [ "$ret" -eq 1 ]; then sleep 7 killall -9 sipp > /dev/null 2>&1 - sipp -sn uas -bg -i localhost -m 15 -p $UAS &> /dev/null - sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 15 -p $UAC &> /dev/null + sipp -sn uas -bg -i 127.0.0.1 -m 15 -p $UAS &> /dev/null + sipp -sn uac -s foo 127.0.0.1:$SRV -i 127.0.0.1 -m 15 -p $UAC &> /dev/null ret=$? fi; @@ -69,5 +69,5 @@ sleep 1 $KILL killall -9 sipp > /dev/null 2>&1 -$MYSQL "DELETE FROM location WHERE ((contact = \"sip:foo@localhost:$UAS\") and (user_agent = \"ser_test\"));" +$MYSQL "DELETE FROM location WHERE ((contact = \"sip:foo@127.0.0.1:$UAS\") and (user_agent = \"ser_test\"));" exit $ret \ No newline at end of file

15 years, 2 months

History of Kamailio Core in Git?

by Jan Janak

Hello, When we imported the code from both repositories into the common git repository, we imported the full history of SER core and modules, as well as the full history of all Kamailio modules and scripts/tools. What we did not import is the full history of Kamailio core. We went through Kamailio modules and selected directories one by one, but we left the core file behind, which means that changes in Kamailio to most core files are no accessible in the git repository history. We put quite a bit of effort into importing everything properly, including full history. And I wonder if we should perhaps also import the history of Kamailio core, perhaps on a separate branch? The history of Kamailio core would not be directly visible if one types git log on the master branch, but it will be stored in the repository in case someone needs to investigate it in the future. Without that one would need to get back to the SVN repository and look there. We also have the automatic git import of Kamailio SVN, but I assume that we will stop that if there will be no more commits in the SVN repository in the future. -- Jan

15 years, 2 months

git:kamailio_3.0: update err_rpls statistics

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: b542c1c71ed132e58d0d07d5ba66a241384ae6a2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b542c1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 23 16:04:21 2009 +0200 update err_rpls statistics --- receive.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/receive.c b/receive.c index 579a6c2..4d10d1a 100644 --- a/receive.c +++ b/receive.c @@ -207,6 +207,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) if ((msg->via1==0) || (msg->via1->error!=PARSE_OK)){ /* no via, send back error ? */ LOG(L_ERR, "ERROR: receive_msg: no via found in reply\n"); + sr_event_exec(SREV_CORE_STATS, (void*)6); goto error02; }

15 years, 2 months

git:kamailio_3.0: update drp_reqs statistics

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: f4b64fc173c4ecc470346f05514af43adbda294a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4b64fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 23 16:48:16 2009 +0200 update drp_reqs statistics --- forward.c | 2 ++ receive.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index eae80ed..3a4fbf4 100644 --- a/forward.c +++ b/forward.c @@ -584,6 +584,8 @@ end: /* 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); + else + sr_event_exec(SREV_CORE_STATS, (void*)3); return ret; } diff --git a/receive.c b/receive.c index 92f6bb0..b6e6f6e 100644 --- a/receive.c +++ b/receive.c @@ -182,7 +182,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, REQUEST_CB_TYPE)==0 ) + { + sr_event_exec(SREV_CORE_STATS, (void*)3); goto end; /* drop the request */ + } set_route_type(REQUEST_ROUTE); /* exec the routing script */

15 years, 2 months

git:kamailio_3.0: update drp_rpls statistics

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 770ced39b0b749355559e2a35bedf1b9c3674adc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=770ced3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 23 16:39:59 2009 +0200 update drp_rpls statistics --- forward.c | 6 +++++- receive.c | 9 +++++++-- 2 files changed, 12 insertions(+), 3 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 495f383..92f6bb0 100644 --- a/receive.c +++ b/receive.c @@ -225,7 +225,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]){ @@ -235,8 +238,10 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) LOG(L_WARN, "WARNING: receive_msg: " "error while trying onreply script\n"); goto error_rpl; - }else if (ret==0) goto skip_send_reply; /* drop the message, - no error */ + }else if (ret==0){ + sr_event_exec(SREV_CORE_STATS, (void*)4); + goto skip_send_reply; /* drop the message, no error */ + } } /* send the msg */ forward_reply(msg);

15 years, 2 months

git:kamailio_3.0: update err_reqs statistics

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: e524a9512dbd24b56713dcf8f0fce1d44b46ae0b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e524a95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 23 16:08:40 2009 +0200 update err_reqs statistics --- receive.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/receive.c b/receive.c index 4d10d1a..495f383 100644 --- a/receive.c +++ b/receive.c @@ -148,6 +148,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) if ((msg->via1==0) || (msg->via1->error!=PARSE_OK)){ /* no via, send back error ? */ LOG(L_ERR, "ERROR: receive_msg: no via found in request\n"); + sr_event_exec(SREV_CORE_STATS, (void*)5); goto error02; } /* check if necessary to add receive?->moved to forward_req */

15 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev