sr-dev December 2009

sr-dev@lists.kamailio.org

26 participants
157 discussions

git:kamailio_3.0: added groups to match kamailio packaging
by Daniel-Constantin Mierla 11 Dec '09

11 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: ae8f695bcb0a1dca8cd55fd6fd5214d40edb7154 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ae8f695… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 20:06:12 2009 +0100 added groups to match kamailio packaging --- Makefile | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index f5f05d4..9e7dc9f 100644 --- a/Makefile +++ b/Makefile @@ -194,6 +194,71 @@ module_group_stable=cpl-c dbtext jabber osp sms pdb # not have dependencies module_group_experimental=tls oracle iptrtpproxy +# Kamailio specific groups +# Standard modules in K Debian distro +module_group_kstandard=acc alias_db auth auth_db benchmark call_control \ + cfg_utils db_text dialog dispatcher diversion domain drouting \ + exec group htable imc kex maxfwd mi_datagram mi_fifo msilo \ + nat_traversal nathelper path pdt permissions pike pv qos \ + ratelimit regex registrar rr rtimer siptrace siputils sl sms \ + speeddial sqlops sst statistics textops tmx uac uac_redirect \ + uri_db userblacklist usrloc xlog \ + avpops cfg_db cfg_rpc ctl db_flatstore dialplan enum \ + iptrtpproxy lcr mediaproxy mi_rpc pdb sanity tm topoh + +# K mysql module +module_group_kmysql=db_mysql + +# K postgress module +module_group_kpostgres=db_postgres + +# K cpl module +module_group_kcpl=cpl-c + +# K radius modules +module_group_kradius=auth_radius misc_radius peering + +# K unixodbc module +module_group_kunixodbc=db_unixodbc + +# K xmlrpc modules +module_group_kxmlrpc=xmlrpc mi_xmlrpc + +# K perl module +module_group_kperl=perl perlvdb + +# K snmpstats module +module_group_ksnmpstats=snmpstats + +# K xmpp module +module_group_kxmpp=xmpp + +# K carrierroute module +module_group_kcarrierroute=carrierroute + +# K berkeley module +module_group_kberkeley=db_berkeley + +# K ldap modules +module_group_kldap=ldap h350 + +# K utils module +module_group_kutils=utils + +# K purple module +module_group_kpurple=purple + +# K memcached module +module_group_kmemcached=memcached + +# K tls module +module_group_ktls=tls + +# K presence modules +module_group_kpresence=presence presence_dialoginfo presence_mwi presence_xml \ + pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp \ + rls xcap_client + # if not set on the cmd. line, env or in the modules.lst (cfg_group_include) # exclude the below modules. ifneq ($(group_include)$(cfg_group_include),)

1 0

git:kamailio_3.0: db_text: install kamctl files
by Daniel-Constantin Mierla 11 Dec '09

11 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: b3d47d4912dd8b64c5bce56be574aafe2340605b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b3d47d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:06:15 2009 +0100 db_text: install kamctl files --- modules_k/db_text/Makefile | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules_k/db_text/Makefile b/modules_k/db_text/Makefile index 850e75c..dd35b11 100644 --- a/modules_k/db_text/Makefile +++ b/modules_k/db_text/Makefile @@ -19,3 +19,13 @@ SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 SER_LIBS+=$(SERLIBPATH)/kcore/kcore include ../../Makefile.modules + +ifeq ($(INSTALL_FLAVOUR),kamailio) +# extra install for kamailio + +install-dbtext-scripts: $(bin_prefix)/$(bin_dir) + DBTEXTON=yes make -C ../../utils/kamctl/ install-modules + +install-scripts: install-dbtext-scripts + +endif # INSTALL_FLAVOUR

1 0

git:kamailio_3.0: version set to 3.0.0-rc3
by Daniel-Constantin Mierla 11 Dec '09

11 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: b40bf31bcaa3c285687ce7d272f2e65810b4de9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b40bf31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 14:32:09 2009 +0100 version set to 3.0.0-rc3 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index dfd40bc..8d94e2c 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -145,7 +145,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc3 SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) )

1 0

git:kamailio_3.0: use pkg/$NAME/debian to generate deb
by Daniel-Constantin Mierla 11 Dec '09

11 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: 5ad4520bfdec47b6e3a85f9e120095b00eeb2aca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ad4520… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 20:08:01 2009 +0100 use pkg/$NAME/debian to generate deb - priority over pkg/debian - good for generating debs per distro name --- Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 9e7dc9f..16f3dbb 100644 --- a/Makefile +++ b/Makefile @@ -791,6 +791,10 @@ bin: deb: -@if [ -d debian ]; then \ dpkg-buildpackage -rfakeroot -tc; \ + elif [ -d pkg/$(MAIN_NAME)/debian ]; then \ + ln -s pkg/$(MAIN_NAME)/debian debian; \ + dpkg-buildpackage -rfakeroot -tc; \ + rm debian; \ else \ ln -s pkg/debian debian; \ dpkg-buildpackage -rfakeroot -tc; \

1 0

git:kamailio_3.0: db_mysql: install kamctl files
by Daniel-Constantin Mierla 11 Dec '09

11 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: f90750795260e753051e75f1918e0fd0ede1212f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f907507… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:03:21 2009 +0100 db_mysql: install kamctl files - done only for kamailio flavor --- modules/db_mysql/Makefile | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules/db_mysql/Makefile b/modules/db_mysql/Makefile index d47fd9a..c6458e0 100644 --- a/modules/db_mysql/Makefile +++ b/modules/db_mysql/Makefile @@ -42,4 +42,12 @@ install-mysql-script: $(bin_prefix)/$(bin_dir) install-scripts: install-mysql-script +else ifeq ($(INSTALL_FLAVOUR),kamailio) +# extra install for kamailio + +install-mysql-scripts: $(bin_prefix)/$(bin_dir) + MYSQLON=yes make -C ../../utils/kamctl/ install-modules + +install-scripts: install-mysql-scripts + endif # INSTALL_FLAVOUR

1 0

git:sr_3.0: core: use NAME to build User-Agent and Server headers
by Juha Heinanen 11 Dec '09

11 Dec '09

Module: sip-router Branch: sr_3.0 Commit: 84ac051301ecf7bc52af7192b93e633bcf1c016d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=84ac051… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Dec 11 10:29:06 2009 +0100 core: use NAME to build User-Agent and Server headers (cherry picked from commit e1c36fdfc9b8f30a4271ee6823a2288dcf9c3833) --- config.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config.h b/config.h index 09ec79a..a2de7bc 100644 --- a/config.h +++ b/config.h @@ -85,12 +85,12 @@ #define CONTENT_LENGTH "Content-Length: " #define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1) -#define USER_AGENT "User-Agent: SIP Router "\ - "(" VERSION " (" ARCH "/" OS_QUOTED "))" +#define USER_AGENT "User-Agent: " NAME \ + " (" VERSION " (" ARCH "/" OS_QUOTED "))" #define USER_AGENT_LEN (sizeof(USER_AGENT)-1) -#define SERVER_HDR "Server: SIP Router "\ - "(" VERSION " (" ARCH "/" OS_QUOTED "))" +#define SERVER_HDR "Server: " NAME \ + " (" VERSION " (" ARCH "/" OS_QUOTED "))" #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) #define MAX_WARNING_LEN 256

1 0

git:kamailio_3.0: tm: unlock replies in case of drop
by Daniel-Constantin Mierla 11 Dec '09

11 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: 5ff3c06aa9c216ef9b2168c0163f00017eb4718d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ff3c06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 10:33:33 2009 +0100 tm: unlock replies in case of drop - needed after yesterday fix from Andrei --- modules/tm/t_reply.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 5be259c..24fad6f 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2024,6 +2024,10 @@ int reply_received( struct sip_msg *p_msg ) replies_locked=1; run_top_route(onreply_rt.rlist[t->on_reply], p_msg, &ctx); if ((ctx.run_flags&DROP_R_F) && (msg_status<200)) { + if (unlikely(replies_locked)) { + replies_locked = 0; + UNLOCK_REPLIES( t ); + } goto done; } /* transfer current message context back to t */

3 4

git:sr_3.0: core: fix define of rval_get_int_handle_ret
by Andrei Pelinescu-Onciul 11 Dec '09

11 Dec '09

Module: sip-router Branch: sr_3.0 Commit: 866eba65f726cd39a937a0d8a67ae64eafee8b5b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=866eba6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Dec 11 10:29:50 2009 +0100 core: fix define of rval_get_int_handle_ret (cherry picked from commit a75b03f72e42740b410815330c895f16368895bd) --- rvalue.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/rvalue.c b/rvalue.c index ef50d3b..ef8dda0 100644 --- a/rvalue.c +++ b/rvalue.c @@ -1035,7 +1035,8 @@ error: if (unlikely((ret)<0)) \ RVE_LOG(L_WARN, rve, txt); \ }while(0) -#elif define RVAL_GET_INT_ERR_IGN \ +#elif defined RVAL_GET_INT_ERR_IGN +#define rval_get_int_handle_ret(ret, txt, rve) \ do { \ if (unlikely((ret)<0)) \ (ret)=0; \

1 0

git:sr_3.0: core: mod fixup spve_uint and spve_str fix
by Andrei Pelinescu-Onciul 11 Dec '09

11 Dec '09

Module: sip-router Branch: sr_3.0 Commit: 67df01ce1ac7a34060ec1de8490888c9eed1a0f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67df01c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Dec 11 11:33:57 2009 +0100 core: mod fixup spve_uint and spve_str fix fixup_spve_uint() and fixup_spve_str() wrongly converted the second parameter to a spve instead of an int or str. Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- mod_fix.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index 53b12ea..cca46cd 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -232,7 +232,8 @@ FIXUP_F2FP_T(igp_pvar_pvar, 1, 3, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS) } +/* format: name, minp, maxp, no_of_spve_params, type_for_rest_params */ FIXUP_F_SPVE_T(spve_spve, 1, 2, 2, 0) -FIXUP_F_SPVE_T(spve_uint, 1, 2, 2, FPARAM_INT) -FIXUP_F_SPVE_T(spve_str, 1, 2, 2, FPARAM_STR) +FIXUP_F_SPVE_T(spve_uint, 1, 2, 1, FPARAM_INT) +FIXUP_F_SPVE_T(spve_str, 1, 2, 1, FPARAM_STR) FIXUP_F_SPVE_T(spve_null, 1, 1, 1, 0)

1 0

git:kamailio_3.0: core: fix the fixup_spve_uint() and fixup_spve_str()
by Daniel-Constantin Mierla 11 Dec '09

11 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: f47abc04445c660e790a6c44f451a54601a4dbbf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f47abc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 11:27:57 2009 +0100 core: fix the fixup_spve_uint() and fixup_spve_str() - error introduced with the new design in SR of fixup functions set --- mod_fix.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index 53b12ea..6bb75d2 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -233,6 +233,6 @@ FIXUP_F2FP_T(igp_pvar_pvar, 1, 3, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS) FIXUP_F_SPVE_T(spve_spve, 1, 2, 2, 0) -FIXUP_F_SPVE_T(spve_uint, 1, 2, 2, FPARAM_INT) -FIXUP_F_SPVE_T(spve_str, 1, 2, 2, FPARAM_STR) +FIXUP_F_SPVE_T(spve_uint, 1, 2, 1, FPARAM_INT) +FIXUP_F_SPVE_T(spve_str, 1, 2, 1, FPARAM_STR) FIXUP_F_SPVE_T(spve_null, 1, 1, 1, 0)

1 0

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2009