sr-dev

sr-dev@lists.kamailio.org

15 participants
44254 discussions

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, 3 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, 3 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, 3 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, 3 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, 3 months

git:kamailio_3.0: update fwd_rpls statistics

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 058f978739d0642d3332301eb8f0a0cd2bc64f37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=058f978… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 23 16:20:19 2009 +0200 update fwd_rpls statistics --- 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;

15 years, 3 months

git:kamailio_3.0: update bad_msg_hdr statistics

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 0c7926f1a854aed5af4541518bc0cacdf4fce7e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c7926f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 23 15:51:39 2009 +0200 update bad_msg_hdr statistics --- parser/msg_parser.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 0388bd4..d218b0b 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -54,6 +54,7 @@ #include "../data_lump_rpl.h" #include "../mem/mem.h" #include "../error.h" +#include "../events.h" #include "../globals.h" #include "parse_hname2.h" #include "parse_uri.h" @@ -276,6 +277,7 @@ char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr) return tmp; error: DBG("get_hdr_field: error exit\n"); + sr_event_exec(SREV_CORE_STATS, (void*)8); hdr->type=HDR_ERROR_T; hdr->len=tmp-hdr->name.s; return tmp;

15 years, 3 months

git:kamailio_3.0: update bad_URIs statistics

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: feef8d66b067e34459660be78b1f6b2625eaa533 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=feef8d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Oct 23 15:57:40 2009 +0200 update bad_URIs statistics --- parser/parse_uri.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/parser/parse_uri.c b/parser/parse_uri.c index 5b29710..a065efc 100644 --- a/parser/parse_uri.c +++ b/parser/parse_uri.c @@ -50,6 +50,7 @@ #include "../ut.h" /* q_memchr */ /* #endif */ #include "../error.h" +#include "../events.h" /* buf= pointer to begining of uri (sip:x@foo.bar:5060;a=b?h=i) * len= len of uri @@ -1223,6 +1224,7 @@ error_bug: error_exit: ser_error=E_BAD_URI; uri->type=ERROR_URI_T; + sr_event_exec(SREV_CORE_STATS, (void*)7); return E_BAD_URI; }

15 years, 3 months

git:master: Fixed test 36.sh

by Marius Zbihlei

Module: sip-router Branch: master Commit: 2c9196b6e53885d4cde7534b3230426d769e561b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c9196b… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Oct 23 17:31:18 2009 +0300 Fixed test 36.sh Grepped into location after specific string (___test___) Better formating --- test/unit/36.sh | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/test/unit/36.sh b/test/unit/36.sh index 808ccb6..da63623 100755 --- a/test/unit/36.sh +++ b/test/unit/36.sh @@ -31,10 +31,10 @@ CFG=11.cfg cp $CFG $CFG.bak -echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG +echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG # 1768 contacts should fit into 1 MB of PKG memory -../$BIN -V | grep "PKG_MALLOC" > /dev/null +$BIN -V | grep "PKG_MALLOC" > /dev/null if [ $? -eq 0 ]; then NR=176 else @@ -44,16 +44,25 @@ fi; COUNTER=0 while [ $COUNTER -lt $NR ]; do COUNTER=$(($COUNTER+1)) - $MYSQL "insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, u ser_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___');" + $MYSQL "insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); \ + insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); \ + insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); \ + insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); \ + insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); \ + insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); \ + insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); \ + insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); \ + insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___'); \ + insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___');" done -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? if [ $ret -eq 0 ]; then sleep 1 for ((i=1;i<=100;i+=1)); do - tmp=`../scripts/$CTL fifo ul_dump | grep "AOR" | wc -l` + tmp=$($CTL fifo ul_dump | grep "User-agent:: ___test___" | wc -l) NR_=$(($NR * 10)) if ! [ $tmp -eq $NR_ ]; then ret=1

15 years, 3 months

fix_nated_contact() then encode_contact() causes core dump

by Nick Lemberger

When one runs fix_nated_contact() from the nathelper module for it's intended purpose (it must complete successfully) and then run encode_contact() from the siputils module (it also must complete) Kamailio always core-dumps with: CRITICAL:core:del_lump: offset exceeds message size (202688 > 602) aborting... I'm guessing this has something to do with re-writing the contact header twice and not fixing the message size the second time but I can't say for sure. I have a core file, but it seems rather large (44M). It can be uploaded if need be. This is occurring with both the release 1.5.2tls & 1.6.0notls dev trunk. I posted this bug to the SourceForge Bug Tracker - if this is the wrong list for bug reports on 1.5/1.6 let me know. If this should be put into a different bug tracker, I can do that as well. Regards, Nicholas Lemberger Lakefield Communications

15 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev