sr-dev April 2011

sr-dev@lists.kamailio.org

27 participants
271 discussions

git:3.1: pkg(k): version set to 3.1.3 for debian changelog specs

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 97bb1ae9722d30104672c74ab0a703b3351bc957 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97bb1ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 4 21:52:05 2011 +0200 pkg(k): version set to 3.1.3 for debian changelog specs --- pkg/kamailio/deb/debian/changelog | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 5d95b65..1c3efcb 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,15 @@ +kamailio (3.1.3) unstable; urgency=low + + * update to 3.1.3 from upstream + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Mon, 4 Apr 2011 20:29:40 +0100 + +kamailio (3.1.2) unstable; urgency=low + + * update to 3.1.2 from upstream + + -- Jon Bonilla <manwe(a)aholab.ehu.es> Tue, 8 Feb 2011 18:30:00 +0100 + kamailio (3.1.1) unstable; urgency=low * update to 3.1.1 from upstream

13 years

git:3.1: Makefile.radius: option to use freeradius-client library

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 6d2c5a8f0b7f1e9d5ae0ae61e735e84490da9ae1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d2c5a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 31 14:08:37 2011 +0200 Makefile.radius: option to use freeradius-client library - using FREERADIUS=1 turns on usage of freeradius-client library instead of radiusclient-ng - kamailio radius modules have support for freeradius-client, library which is included in opensuse instead of radiusclient-ng (cherry picked from commit 942dedaf0b54b8aa2767b5bbf2bc327aa4f4cc06) --- Makefile.radius | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Makefile.radius b/Makefile.radius index bedea2b..0abc2a7 100644 --- a/Makefile.radius +++ b/Makefile.radius @@ -6,9 +6,11 @@ # # (To be included from Makefiles of radius related modules) # -# The purpose of this makefile is to perform radiusclient library -# detection and setup library and include paths in DEFS and LIBS -# variables. In addition RADIUSCLIENT_NG_4 will be defined when +# The purpose of this makefile is to perform RADIUS client library +# selection (radiusclient-ng or freeradius-client) and setup +# library and include paths in DEFS and LIBS variables. +# +# In addition RADIUSCLIENT_NG_4 will be defined when # libradiusclient-ng version 4 is detected. That means the module # should include radiusclient.h, otherwise radiusclient-ng.h # should be included. Variable RADIUSCLIENT_LIB contains the @@ -21,6 +23,15 @@ # INCLUDES+=-I$(LOCALBASE)/include +ifeq ($(FREERADIUS),1) + +# - freeradius-client library +DEFS+= -DUSE_FREERADIUS +RADIUSCLIENT_LIB=freeradius-client + +else + +# - radiusclient-ng v5 or v4 library ifneq ($(radiusclient_ng), 4) # radiusclient-ng 5+ @@ -34,4 +45,6 @@ RADIUSCLIENT_LIB=radiusclient endif +endif + LIBS=-L$(LOCALBASE)/lib -l$(RADIUSCLIENT_LIB)

13 years

git:3.1: pkg(k): vesrsion set to 3.1.3 for centos rpm spec

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: b77ed42cd6ec12bebcc6af6d38645ccebf5cfa5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b77ed42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 4 21:51:32 2011 +0200 pkg(k): vesrsion set to 3.1.3 for centos rpm spec --- pkg/kamailio/rpm/kamailio.spec.CenOS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 7c61f7e..7043489 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 3.1.2 +%define ver 3.1.3 %define rel 0 %define _sharedir %{_prefix}/share

13 years

git:3.1: tls: update path for certificates with $cfg_target

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 973ce6a51888778e278be740b6ae8d9ea52516dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=973ce6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 30 21:29:00 2011 +0200 tls: update path for certificates with $cfg_target (cherry picked from commit 5d7aa2cb8c9b1f3b14b071f54dd36eacf42595ff) --- modules/tls/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tls/Makefile b/modules/tls/Makefile index 95cf759..6e00b70 100644 --- a/modules/tls/Makefile +++ b/modules/tls/Makefile @@ -32,7 +32,7 @@ install-tls-cert: $(cfg_prefix)/$(cfg_dir) install-cfg: install-tls-cert @$(call try_err, $(INSTALL_TOUCH) \ "$(cfg_prefix)/$(cfg_dir)tls.cfg.sample" ) - @sed -e "s#\./modules/tls/#$(cfg_prefix)/$(cfg_dir)#g" \ + @sed -e "s#\./modules/tls/#$(cfg_target)#g" \ -e "s#ser-selfsigned#$(MAIN_NAME)-selfsigned#g" \ < ./tls.cfg > "$(cfg_prefix)/$(cfg_dir)tls.cfg.sample" @if [ -z "${skip_cfg_install}" -a \

13 years

git:3.1: pv: cast the value of statistics for PV int value

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: a81157dd0a98d329cc6be4caadc4c46dae17b07a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a81157d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 30 21:24:54 2011 +0200 pv: cast the value of statistics for PV int value (cherry picked from commit d28a08034e2fb9b33d9c5c3655a0cb24e77d6d65) --- modules_k/pv/pv_stats.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_stats.c b/modules_k/pv/pv_stats.c index 85aaa7c..c8a1f29 100644 --- a/modules_k/pv/pv_stats.c +++ b/modules_k/pv/pv_stats.c @@ -49,6 +49,7 @@ int pv_get_stat(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) param->pvn.u.isname.name.s.len, param->pvn.u.isname.name.s.s); return pv_get_null(msg, param, res); } - return pv_get_uintval(msg, param, res, get_stat_val(stat)); + return pv_get_uintval(msg, param, res, + (unsigned int)get_stat_val(stat)); }

13 years

git:3.1: usrloc(k): update for get_stat_val() type

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: b39ca6acf53e140888f07ad1642cd5970fe476ba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b39ca6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 30 21:26:42 2011 +0200 usrloc(k): update for get_stat_val() type (cherry picked from commit dcc540027d3df990ba146dab6d5f86393b7da99a) --- modules_k/usrloc/dlist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/usrloc/dlist.c b/modules_k/usrloc/dlist.c index e2ea5dc..8ecf167 100644 --- a/modules_k/usrloc/dlist.c +++ b/modules_k/usrloc/dlist.c @@ -558,7 +558,7 @@ void print_all_udomains(FILE* _f) */ unsigned long get_number_of_users(void) { - int numberOfUsers = 0; + long numberOfUsers = 0; dlist_t* current_dlist;

13 years

git:3.1: snmpstats: update for get_stat_val(type)

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: e193da6e7ebf8dacbf9cbbef785856e69023acaf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e193da6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 30 21:25:51 2011 +0200 snmpstats: update for get_stat_val(type) (cherry picked from commit 03087fb98241680b2e2cc8c1d63dbe0d47d8d891) --- modules_k/snmpstats/utilities.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/snmpstats/utilities.c b/modules_k/snmpstats/utilities.c index 1880156..0b596a7 100644 --- a/modules_k/snmpstats/utilities.c +++ b/modules_k/snmpstats/utilities.c @@ -103,9 +103,9 @@ int stringHandlerSanityCheck( modparam_t type, void *val, char *parameterName) * return the value of the statistic denoted with statName, or zero if the * statistic was not found. */ -int get_statistic(char *statName) +int get_statistic(char *statName) { - int result = 0; + long result = 0; str theStr; @@ -120,7 +120,7 @@ int get_statistic(char *statName) result = get_stat_val(theVar); } - return result; + return (int)result; } /*! Returns a pointer to an SNMP DateAndTime OCTET STRING representation of the

13 years

git:3.1: dialog(k): update for get_stat_val() type

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: b9ad35d54a7835f117642307dd44c1bb90108203 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b9ad35d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 30 21:25:25 2011 +0200 dialog(k): update for get_stat_val() type (cherry picked from commit ed323cf7e12fe6e36f942b8a9716d4d4412f41b4) --- modules_k/dialog/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 3d536a1..e581ca3 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -362,7 +362,7 @@ static int pv_get_dlg_count(struct sip_msg *msg, pv_param_t *param, if(msg==NULL || res==NULL) return -1; - n = active_dlgs ? get_stat_val(active_dlgs) : 0; + n = active_dlgs ? (int)get_stat_val(active_dlgs) : 0; l = 0; ch = int2str( n, &l);

13 years

git:3.1: kcore: get_stat_val() returns long

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: e752430554d7e0b222561709de95f9c98ef0f7e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e752430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 30 21:23:10 2011 +0200 kcore: get_stat_val() returns long - the statistic value is long, the wrapper to get its value returns now long as well - reported by Paul Pankhurst, paul (at) crocodile-rcs.com (cherry picked from commit be40563d0735486939cb70636a4c86208828f7f5) --- lib/kcore/kstats_wrapper.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/kcore/kstats_wrapper.h b/lib/kcore/kstats_wrapper.h index 1c9559b..80cc9f8 100644 --- a/lib/kcore/kstats_wrapper.h +++ b/lib/kcore/kstats_wrapper.h @@ -76,11 +76,11 @@ inline static stat_var* get_stat(str *name) -inline static unsigned int get_stat_val(stat_var *v) +inline static unsigned long get_stat_val(stat_var *v) { counter_handle_t h; h.id = (unsigned short)(unsigned long)v; - return counter_get_val(h); + return (unsigned long)counter_get_val(h); }

13 years

git:3.1: Makefile: use lib64 for libs path on 64b arch

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: c7c5a3cb39adef86d1c19746a073b2b73b666348 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7c5a3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 30 17:34:14 2011 +0200 Makefile: use lib64 for libs path on 64b arch - it can be overwritten from command line with 'LIBDIR=xyz' (cherry picked from commit cf837383aa29090f484dde50759604169678f1a2) --- Makefile.defs | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 83e2c2d..e49c5bf 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -223,13 +223,23 @@ endif # extra CC command line options (e.g -march=athlon-mp) CC_EXTRA_OPTS ?= +LIBDIR ?= +ifeq ($(LIBDIR),) +ARCHBSZ= $(shell echo $(HOST_ARCH) | sed -e 's/.*64.*/64b/') +ifeq ($(ARCHBSZ),64b) + LIBDIR = lib64 +else + LIBDIR = lib +endif +endif + # dirs cfg_dir = etc/$(MAIN_NAME)/ bin_dir = sbin/ share_dir = share/$(MAIN_NAME)/ # lib/$(MAIN_NAME)/modules , lib/$(MAIN_NAME)/modules-s, lib/$(MAIN_NAME)/modules-k -modules_dir = lib/$(MAIN_NAME)/ -lib_dir = lib/$(MAIN_NAME)/ +modules_dir = $(LIBDIR)/$(MAIN_NAME)/ +lib_dir = $(LIBDIR)/$(MAIN_NAME)/ doc_dir = doc/$(MAIN_NAME)/ man_dir = man/ @@ -2045,7 +2055,7 @@ saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ # extra: prefix DESTDIR BASEDIR basedirt saved_chg_vars:=\ CC_EXTRA_OPTS CPU CFLAGS_RM CFLAGS MOD_CFLAGS LIB_CFLAGS UTILS_CFLAGS \ - BASEDIR basedir DESTDIR \ + BASEDIR basedir DESTDIR LIBDIR \ PREFIX prefix\ cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \ doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2011