sr-dev March 2011

sr-dev@lists.kamailio.org

25 participants
194 discussions

git:master: modules/lcr: improved documentation of defunct_gw() function.

by Juha Heinanen

Module: sip-router Branch: master Commit: df7f3bc62783672eff39748450e8845187efb74a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df7f3bc… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Mar 31 16:18:45 2011 +0300 modules/lcr: improved documentation of defunct_gw() function. --- modules/lcr/README | 9 +++++---- modules/lcr/doc/lcr_admin.xml | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 49b7c97..061bb60 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -841,10 +841,11 @@ if (!next_gw()) { 4.3. defunct_gw(period) - Defuncts gateway denoted by lcr_id_avp and defunct_gw_avp for a period - of seconds given as argument. Argument must be a positive integer - constant or a pseudo variable with positive integer value. Value of - defunct column in database is not updated. + Defuncts gateway denoted by lcr_id_avp and defunct_gw_avp (which were + set by previuos next_gw() call) for a period of seconds given as + argument. Argument must be a positive integer constant or a pseudo + variable with positive integer value. Value of defunct column in + database is not updated. Returns 1 on success and -1 in case of error (see syslog). diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 5840bbd..57f0ea8 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -1077,6 +1077,7 @@ if (!next_gw()) { </title> <para> Defuncts gateway denoted by lcr_id_avp and defunct_gw_avp + (which were set by previuos next_gw() call) for a period of seconds given as argument. Argument must be a positive integer constant or a pseudo variable with positive integer value. Value of defunct column in

13 years, 7 months

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

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 942dedaf0b54b8aa2767b5bbf2bc327aa4f4cc06 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=942deda… 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 --- 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, 7 months

RPM packages for Kamailio 3.1.2

by Daniel-Constantin Mierla

Hello, there is now a service on opensuse build server to create kamailio v3.1.2 (git branch 3.1.2) RPMs i586/x86_63 for Centos 5.5, RedHat 5, Fedora 14 and OpenSuse 11.4, you can check this project at: https://build.opensuse.org/package/show?package=kamailio&project=home%3Akam… Download links are: http://download.opensuse.org/repositories/home:/kamailio:/telephony/CentOS_… http://download.opensuse.org/repositories/home:/kamailio:/telephony/RedHat_… http://download.opensuse.org/repositories/home:/kamailio:/telephony/Fedora_… http://download.opensuse.org/repositories/home:/kamailio:/telephony/openSUS… The x86_64 build for opensuse is still not completed, some parameter to gcc compiler is not working, should be fixed soon. Note that not all modules are packaged since not all dependencies were met in these distros. The RPM spec was started from what is in source tree as kamailio.spec.CentOS, radically updated for cross compilation. Personally I am not using these distros, therefore it will be appreciated if people using any of them are willing to give an installation test and report if all goes ok. Moreover, I will be very thankful if anyone (can be many) wants to jump in and take over the maintenance of this kamailio build service. It would be good to enable the build for other versions of these distros, probably for many it will just work, if not it will require some adjustments on dependencies. Once these builds prove to be ok and useful, we can move them in the global telephony repository of the opensuse build service. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

13 years, 7 months

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

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5d7aa2cb8c9b1f3b14b071f54dd36eacf42595ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d7aa2c… 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 --- 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, 7 months

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

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 03087fb98241680b2e2cc8c1d63dbe0d47d8d891 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03087fb… 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) --- 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, 7 months

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

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: dcc540027d3df990ba146dab6d5f86393b7da99a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dcc5400… 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 --- 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 6399fad..cb6c899 100644 --- a/modules_k/usrloc/dlist.c +++ b/modules_k/usrloc/dlist.c @@ -585,7 +585,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, 7 months

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

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ed323cf7e12fe6e36f942b8a9716d4d4412f41b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed323cf… 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 --- 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, 7 months

git:master: kcore: get_stat_val() returns long

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: be40563d0735486939cb70636a4c86208828f7f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be40563… 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 --- 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, 7 months

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

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d28a08034e2fb9b33d9c5c3655a0cb24e77d6d65 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d28a080… 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 --- 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, 7 months

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

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cf837383aa29090f484dde50759604169678f1a2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf83738… 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' --- Makefile.defs | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index d1fce21..04559b0 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -225,13 +225,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/ @@ -2048,7 +2058,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, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2011