sr-dev April 2016

sr-dev@lists.kamailio.org

23 participants
430 discussions

git:4.3:768878b4: app_perl: Fix "use UNIVERSAL" is a fatal error since perl 5.22

by Victor Seva

Module: kamailio Branch: 4.3 Commit: 768878b431d486477f954cf9accfeabe3cb885cf URL: https://github.com/kamailio/kamailio/commit/768878b431d486477f954cf9accfeab… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-04-15T09:28:37+02:00 app_perl: Fix "use UNIVERSAL" is a fatal error since perl 5.22 * Author: JuliÃ¡n Moreno PatiÃ±o <julian(a)debian.org> * Fix #516 * from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=821039 (cherry picked from commit b77ed54d33f171d170ca89252f0a31a0d23996fa) --- Modified: modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm Modified: modules/app_perl/lib/perl/Kamailio/VDB.pm --- Diff: https://github.com/kamailio/kamailio/commit/768878b431d486477f954cf9accfeab… Patch: https://github.com/kamailio/kamailio/commit/768878b431d486477f954cf9accfeab… --- diff --git a/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm b/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm index f97a22d..3b6509a 100644 --- a/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm +++ b/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm @@ -52,7 +52,6 @@ package Kamailio::LDAPUtils::LDAPConnection; use Kamailio::LDAPUtils::LDAPConf; use Net::LDAP; use Authen::SASL; -use UNIVERSAL qw( isa ); my $ldap_singleton = undef; @@ -185,7 +184,7 @@ sub search { my $ldap = undef; - if( isa($conf ,"Kamailio::LDAPUtils::LDAPConnection") ) { + if( $conf->isa("Kamailio::LDAPUtils::LDAPConnection") ) { $ldap = $conf; } else { if( ! $ldap_singleton ) { diff --git a/modules/app_perl/lib/perl/Kamailio/VDB.pm b/modules/app_perl/lib/perl/Kamailio/VDB.pm index 8c6bdb3..0fff716 100644 --- a/modules/app_perl/lib/perl/Kamailio/VDB.pm +++ b/modules/app_perl/lib/perl/Kamailio/VDB.pm @@ -45,7 +45,6 @@ use Kamailio::VDB::Result; use Kamailio::VDB::Value; use Kamailio::VDB::VTab; -use UNIVERSAL qw ( can ); our @ISA = qw ( Kamailio::Utils::Debug ); @@ -87,12 +86,12 @@ sub use_table { Kamailio::log(L_DBG, "perlvdb:VDB: Setting VTab: v is $v (pkg is $pkg, func/method is $3)\n"); - if (can($pkg, $3)) { + if ($pkg->can($3)) { $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( func => $pkg . "::" . $3); - } elsif (can($v, "init")) { + } elsif ($v->can("init")) { $v->init(); $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( obj => $v ); - } elsif (can($v, "new")) { + } elsif ($v->can("new")) { my $obj = $v->new(); $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( obj => $obj ); } else {

8 years, 8 months

git:4.4:3356d6ac: app_perl: Fix "use UNIVERSAL" is a fatal error since perl 5.22

by Victor Seva

Module: kamailio Branch: 4.4 Commit: 3356d6aca4c85e7c086b1d46cf06e56635fd4739 URL: https://github.com/kamailio/kamailio/commit/3356d6aca4c85e7c086b1d46cf06e56… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-04-15T09:26:23+02:00 app_perl: Fix "use UNIVERSAL" is a fatal error since perl 5.22 * Author: JuliÃ¡n Moreno PatiÃ±o <julian(a)debian.org> * Fix #516 * from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=821039 (cherry picked from commit b77ed54d33f171d170ca89252f0a31a0d23996fa) --- Modified: modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm Modified: modules/app_perl/lib/perl/Kamailio/VDB.pm --- Diff: https://github.com/kamailio/kamailio/commit/3356d6aca4c85e7c086b1d46cf06e56… Patch: https://github.com/kamailio/kamailio/commit/3356d6aca4c85e7c086b1d46cf06e56… --- diff --git a/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm b/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm index f97a22d..3b6509a 100644 --- a/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm +++ b/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm @@ -52,7 +52,6 @@ package Kamailio::LDAPUtils::LDAPConnection; use Kamailio::LDAPUtils::LDAPConf; use Net::LDAP; use Authen::SASL; -use UNIVERSAL qw( isa ); my $ldap_singleton = undef; @@ -185,7 +184,7 @@ sub search { my $ldap = undef; - if( isa($conf ,"Kamailio::LDAPUtils::LDAPConnection") ) { + if( $conf->isa("Kamailio::LDAPUtils::LDAPConnection") ) { $ldap = $conf; } else { if( ! $ldap_singleton ) { diff --git a/modules/app_perl/lib/perl/Kamailio/VDB.pm b/modules/app_perl/lib/perl/Kamailio/VDB.pm index 8c6bdb3..0fff716 100644 --- a/modules/app_perl/lib/perl/Kamailio/VDB.pm +++ b/modules/app_perl/lib/perl/Kamailio/VDB.pm @@ -45,7 +45,6 @@ use Kamailio::VDB::Result; use Kamailio::VDB::Value; use Kamailio::VDB::VTab; -use UNIVERSAL qw ( can ); our @ISA = qw ( Kamailio::Utils::Debug ); @@ -87,12 +86,12 @@ sub use_table { Kamailio::log(L_DBG, "perlvdb:VDB: Setting VTab: v is $v (pkg is $pkg, func/method is $3)\n"); - if (can($pkg, $3)) { + if ($pkg->can($3)) { $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( func => $pkg . "::" . $3); - } elsif (can($v, "init")) { + } elsif ($v->can("init")) { $v->init(); $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( obj => $v ); - } elsif (can($v, "new")) { + } elsif ($v->can("new")) { my $obj = $v->new(); $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( obj => $obj ); } else {

8 years, 8 months

[kamailio/kamailio] app_perl: Fix "use UNIVERSAL" is a fatal error since perl 5.22 (#568)

by Victor Seva

* Author: Julián Moreno Patiño <julian(a)debian.org> * Fix #516 * from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=821039 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/568 -- Commit Summary -- * app_perl: Fix "use UNIVERSAL" is a fatal error since perl 5.22 -- File Changes -- M modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm (3) M modules/app_perl/lib/perl/Kamailio/VDB.pm (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/568.patch https://github.com/kamailio/kamailio/pull/568.diff --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/568

8 years, 8 months

git:master:b77ed54d: app_perl: Fix "use UNIVERSAL" is a fatal error since perl 5.22

by Victor Seva

Module: kamailio Branch: master Commit: b77ed54d33f171d170ca89252f0a31a0d23996fa URL: https://github.com/kamailio/kamailio/commit/b77ed54d33f171d170ca89252f0a31a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-04-15T09:09:08+02:00 app_perl: Fix "use UNIVERSAL" is a fatal error since perl 5.22 * Author: JuliÃ¡n Moreno PatiÃ±o <julian(a)debian.org> * Fix #516 * from: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=821039 --- Modified: modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm Modified: modules/app_perl/lib/perl/Kamailio/VDB.pm --- Diff: https://github.com/kamailio/kamailio/commit/b77ed54d33f171d170ca89252f0a31a… Patch: https://github.com/kamailio/kamailio/commit/b77ed54d33f171d170ca89252f0a31a… --- diff --git a/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm b/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm index f97a22d..3b6509a 100644 --- a/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm +++ b/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm @@ -52,7 +52,6 @@ package Kamailio::LDAPUtils::LDAPConnection; use Kamailio::LDAPUtils::LDAPConf; use Net::LDAP; use Authen::SASL; -use UNIVERSAL qw( isa ); my $ldap_singleton = undef; @@ -185,7 +184,7 @@ sub search { my $ldap = undef; - if( isa($conf ,"Kamailio::LDAPUtils::LDAPConnection") ) { + if( $conf->isa("Kamailio::LDAPUtils::LDAPConnection") ) { $ldap = $conf; } else { if( ! $ldap_singleton ) { diff --git a/modules/app_perl/lib/perl/Kamailio/VDB.pm b/modules/app_perl/lib/perl/Kamailio/VDB.pm index 8c6bdb3..0fff716 100644 --- a/modules/app_perl/lib/perl/Kamailio/VDB.pm +++ b/modules/app_perl/lib/perl/Kamailio/VDB.pm @@ -45,7 +45,6 @@ use Kamailio::VDB::Result; use Kamailio::VDB::Value; use Kamailio::VDB::VTab; -use UNIVERSAL qw ( can ); our @ISA = qw ( Kamailio::Utils::Debug ); @@ -87,12 +86,12 @@ sub use_table { Kamailio::log(L_DBG, "perlvdb:VDB: Setting VTab: v is $v (pkg is $pkg, func/method is $3)\n"); - if (can($pkg, $3)) { + if ($pkg->can($3)) { $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( func => $pkg . "::" . $3); - } elsif (can($v, "init")) { + } elsif ($v->can("init")) { $v->init(); $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( obj => $v ); - } elsif (can($v, "new")) { + } elsif ($v->can("new")) { my $obj = $v->new(); $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( obj => $obj ); } else {

8 years, 8 months

git:master:4acaf2f6: Merge pull request #568 from linuxmaniac/vseva/fix_516

by Victor Seva

Module: kamailio Branch: master Commit: 4acaf2f67907b852ac32154932083d05c3ddb112 URL: https://github.com/kamailio/kamailio/commit/4acaf2f67907b852ac32154932083d0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-04-15T09:25:28+02:00 Merge pull request #568 from linuxmaniac/vseva/fix_516 app_perl: Fix "use UNIVERSAL" is a fatal error since perl 5.22 --- Modified: modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm Modified: modules/app_perl/lib/perl/Kamailio/VDB.pm --- Diff: https://github.com/kamailio/kamailio/commit/4acaf2f67907b852ac32154932083d0… Patch: https://github.com/kamailio/kamailio/commit/4acaf2f67907b852ac32154932083d0… --- diff --git a/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm b/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm index f97a22d..3b6509a 100644 --- a/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm +++ b/modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm @@ -52,7 +52,6 @@ package Kamailio::LDAPUtils::LDAPConnection; use Kamailio::LDAPUtils::LDAPConf; use Net::LDAP; use Authen::SASL; -use UNIVERSAL qw( isa ); my $ldap_singleton = undef; @@ -185,7 +184,7 @@ sub search { my $ldap = undef; - if( isa($conf ,"Kamailio::LDAPUtils::LDAPConnection") ) { + if( $conf->isa("Kamailio::LDAPUtils::LDAPConnection") ) { $ldap = $conf; } else { if( ! $ldap_singleton ) { diff --git a/modules/app_perl/lib/perl/Kamailio/VDB.pm b/modules/app_perl/lib/perl/Kamailio/VDB.pm index 8c6bdb3..0fff716 100644 --- a/modules/app_perl/lib/perl/Kamailio/VDB.pm +++ b/modules/app_perl/lib/perl/Kamailio/VDB.pm @@ -45,7 +45,6 @@ use Kamailio::VDB::Result; use Kamailio::VDB::Value; use Kamailio::VDB::VTab; -use UNIVERSAL qw ( can ); our @ISA = qw ( Kamailio::Utils::Debug ); @@ -87,12 +86,12 @@ sub use_table { Kamailio::log(L_DBG, "perlvdb:VDB: Setting VTab: v is $v (pkg is $pkg, func/method is $3)\n"); - if (can($pkg, $3)) { + if ($pkg->can($3)) { $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( func => $pkg . "::" . $3); - } elsif (can($v, "init")) { + } elsif ($v->can("init")) { $v->init(); $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( obj => $v ); - } elsif (can($v, "new")) { + } elsif ($v->can("new")) { my $obj = $v->new(); $self->{vtabs}->{$v} = new Kamailio::VDB::VTab( obj => $obj ); } else {

8 years, 8 months

[kamailio] app_perl module - "use UNIVERSAL" is a fatal error starting with Pert 5.22 (#516)

by Peter Lemenkov

At least two places in OpenSIPS where "use UNIVERSAL" is used: At least two places in Kamailio where "use UNIVERSAL" is used: modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm 55:use UNIVERSAL qw( isa ); if( isa($conf ,"Kamailio::LDAPUtils::LDAPConnection") ) { modules/app_perl/lib/perl/Kamailio/VDB.pm 48:use UNIVERSAL qw ( can ); 90: if (can($pkg, $3)) { 92: } elsif (can($v, "init")) { 95: } elsif (can($v, "new")) { This should be fixed as according to this document it will throw a fatal error starting with Perl 5.22: http://search.cpan.org/~shay/perl-5.21.11/pod/perl5213delta.pod#use%C2%A0UN… --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/516

8 years, 8 months

git:master:51f01836: Makefile.defs: version set to 5.0.0-dev2

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 51f01836571dc56daf8c3560d692c9575456145a URL: https://github.com/kamailio/kamailio/commit/51f01836571dc56daf8c3560d692c95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-15T09:01:39+02:00 Makefile.defs: version set to 5.0.0-dev2 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/51f01836571dc56daf8c3560d692c95… Patch: https://github.com/kamailio/kamailio/commit/51f01836571dc56daf8c3560d692c95… --- diff --git a/Makefile.defs b/Makefile.defs index 7afc889..7d0da23 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -97,7 +97,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

8 years, 8 months

git:master:c1cb68f6: core: execute onsend_route callback via kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c1cb68f6f8d01ebaea52ae3fd9ceb8c38885ad84 URL: https://github.com/kamailio/kamailio/commit/c1cb68f6f8d01ebaea52ae3fd9ceb8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-15T09:00:53+02:00 core: execute onsend_route callback via kemi --- Modified: onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/c1cb68f6f8d01ebaea52ae3fd9ceb8c… Patch: https://github.com/kamailio/kamailio/commit/c1cb68f6f8d01ebaea52ae3fd9ceb8c… --- diff --git a/onsend.h b/onsend.h index 2ed68be..2f15663 100644 --- a/onsend.h +++ b/onsend.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /*! @@ -34,6 +34,7 @@ #include "route.h" #include "script_cb.h" #include "sr_compat.h" +#include "kemi.h" struct onsend_info{ union sockaddr_union* to; /* dest info */ @@ -58,10 +59,12 @@ static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, struct onsend_info onsnd_info = {0}; int ret; struct run_act_ctx ra_ctx; + struct run_act_ctx *bctx; int backup_route_type; snd_flags_t fwd_snd_flags_bak; snd_flags_t rpl_snd_flags_bak; - + sr_kemi_eng_t *keng = NULL; + ret=1; if (onsend_rt.rlist[DEFAULT_RT]){ onsnd_info.to=&dst->to; @@ -78,7 +81,17 @@ static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, rpl_snd_flags_bak=orig_msg->rpl_send_flags; orig_msg->fwd_send_flags=dst->send_flags; /* intial value */ init_run_actions_ctx(&ra_ctx); - ret=run_actions(&ra_ctx, onsend_rt.rlist[DEFAULT_RT], orig_msg); + + keng = sr_kemi_eng_get(); + if(unlikely(keng!=NULL)) { + bctx = sr_kemi_act_ctx_get(); + sr_kemi_act_ctx_set(&ra_ctx); + ret=keng->froute(orig_msg, ONSEND_ROUTE, NULL); + sr_kemi_act_ctx_set(bctx); + } else { + ret=run_actions(&ra_ctx, onsend_rt.rlist[DEFAULT_RT], orig_msg); + } + /* update dst send_flags */ dst->send_flags=orig_msg->fwd_send_flags; /* restore orig_msg flags */

8 years, 8 months

[kamailio/kamailio] kex: Call pkg_proc_update_stats only when needed (#567)

by Stefan Mititelu

This PR comes as a result to enabling MALLOC_STATS on 4.1 branch and noticing kamailio slowdown. On 4.1 the slowdown was happening because each time a memory function was called, iteration through all fragments happened upon `pkg_info`. On master this is not happening anymore, because `qm->ffrags` variable counts the fragments "on the fly", while memory functions are called. Still, is it necessarily to call pkg_proc_update_stats() callback every time?! Feel free to close this if not needed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/567 -- Commit Summary -- * kex: Call pkg_proc_update_stats only when needed -- File Changes -- M events.c (13) M events.h (1) M mem/f_malloc.c (9) M mem/q_malloc.c (18) M modules/kex/pkg_stats.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/567.patch https://github.com/kamailio/kamailio/pull/567.diff --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/567

8 years, 8 months

git:master:daf7aa39: core: set actions context for running kemi reply_route callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: daf7aa398e25caeccf0993014e137d7abd43bfeb URL: https://github.com/kamailio/kamailio/commit/daf7aa398e25caeccf0993014e137d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-14T21:23:52+02:00 core: set actions context for running kemi reply_route callback --- Modified: receive.c --- Diff: https://github.com/kamailio/kamailio/commit/daf7aa398e25caeccf0993014e137d7… Patch: https://github.com/kamailio/kamailio/commit/daf7aa398e25caeccf0993014e137d7… --- diff --git a/receive.c b/receive.c index 67c7df0..03f809d 100644 --- a/receive.c +++ b/receive.c @@ -117,6 +117,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) { struct sip_msg* msg; struct run_act_ctx ctx; + struct run_act_ctx *bctx; int ret; #ifdef STATS int skipped = 1; @@ -294,14 +295,16 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) } /* exec the onreply routing script */ - if (onreply_rt.rlist[DEFAULT_RT]){ + keng = sr_kemi_eng_get(); + if (onreply_rt.rlist[DEFAULT_RT]!=NULL || keng!=NULL){ set_route_type(CORE_ONREPLY_ROUTE); ret = 1; - if(unlikely(main_rt.rlist[DEFAULT_RT]==NULL)) { - keng = sr_kemi_eng_get(); - if(keng!=NULL) { - ret = keng->froute(msg, REQUEST_ROUTE, NULL); - } + if(unlikely(keng!=NULL)) { + bctx = sr_kemi_act_ctx_get(); + init_run_actions_ctx(&ctx); + sr_kemi_act_ctx_set(&ctx); + ret = keng->froute(msg, CORE_ONREPLY_ROUTE, NULL); + sr_kemi_act_ctx_set(bctx); } else { ret=run_top_route(onreply_rt.rlist[DEFAULT_RT], msg, &ctx); }

8 years, 8 months

← Newer
1
...
23
24
25
26
27
28
29
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2016