sr-dev

sr-dev@lists.kamailio.org

15 participants
44239 discussions

git:kamailio_3.0: added groups to match kamailio packaging

by Daniel-Constantin Mierla

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),)

15 years, 1 month

git:kamailio_3.0: kamctl: mysql specific files installed by db_mysql module

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: c79057fb794171b5acb46c2811b97dc22158dbf2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c79057f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 22:13:45 2009 +0100 kamctl: mysql specific files installed by db_mysql module --- utils/kamctl/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index e9cef17..6f5b2a8 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -87,7 +87,7 @@ install-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 chmod 644 $(man_prefix)/$(man_dir)/man8/kamdbctl.8 -MYSQLON?=yes +# MYSQLON?=yes install-modules: $(bin_prefix)/$(bin_dir) # install MySQL stuff

15 years, 1 month

git:kamailio_3.0: tls: name the certificates based on $MAIN_NAME

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 6ecc6c13f63dab04083f61aa1b7ee767f9441ee0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6ecc6c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:07:27 2009 +0100 tls: name the certificates based on $MAIN_NAME --- modules/tls/Makefile | 2 +- modules/tls/sip-router_cert.sh | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/tls/Makefile b/modules/tls/Makefile index f3970a4..0c3aa30 100644 --- a/modules/tls/Makefile +++ b/modules/tls/Makefile @@ -23,6 +23,6 @@ include ../../Makefile.modules install-tls-cert: $(cfg_prefix)/$(cfg_dir) - ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) + MAIN_NAME=$(MAIN_NAME) ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) install-cfg: install-tls-cert diff --git a/modules/tls/sip-router_cert.sh b/modules/tls/sip-router_cert.sh index df08caa..9e1cd7f 100755 --- a/modules/tls/sip-router_cert.sh +++ b/modules/tls/sip-router_cert.sh @@ -3,18 +3,20 @@ # $Id$ # # This script generates a self-signed TLS/SSL certificate that can be -# immediately used with the TLS module of SER. The file was inspired +# immediately used with the TLS module of SIP Router. The file was inspired # by a script from Debian's uw-imapd package. # ############################################################################# # Configuration variables ############################################################################# -DEFAULT_DIR="/usr/local/etc/ser" +NAME=$MAIN_NAME +if [ -z "$NAME" ] ; then NAME="sip-router"; fi; +DEFAULT_DIR="/usr/local/etc/$NAME" DEFAULT_DAYS=365 -DEFAULT_INFO="Self-signed certificate for SER" -DEFAULT_CERT_FILENAME="ser-selfsigned.pem" -DEFAULT_KEY_FILENAME="ser-selfsigned.key" +DEFAULT_INFO="Self-signed certificate for $NAME" +DEFAULT_CERT_FILENAME="$NAME-selfsigned.pem" +DEFAULT_KEY_FILENAME="$NAME-selfsigned.key" DEFAULT_OPENSSL='openssl' @@ -50,19 +52,19 @@ longopts() { usage() { cat <<EOF NAME - $COMMAND - Generate a self-signed TLS/SSL certificate for use with SER. + $COMMAND - Generate a self-signed TLS/SSL certificate for use with $NAME. SYNOPSIS $COMMAND [options] DESCRIPTION This is a simple shell script that generates a self signed TLS/SSL - certificate (and private key) for use with the tls module of SER. The + certificate (and private key) for use with the tls module of $NAME. The self-signed certificate is suitable for testing and/or private setups. You are encouraged to create a proper authorized one if needed. Both certificate and key files are by default stored in the directory - containing the configuration file of SER (unless you change it using + containing the configuration file of $NAME (unless you change it using the options below). OPTIONS @@ -100,7 +102,7 @@ AUTHOR Written by Jan Janak <jan(a)iptel.org> REPORTING BUGS - Report bugs to <ser-bugs(a)iptel.org> + Report bugs to <sr-dev(a)sip-router.org> EOF } #usage @@ -175,7 +177,7 @@ if [ $? != 0 ] ; then exit 1 fi -echo "Creating a new SER self-signed certificate for '$FQDN'" \ +echo "Creating a new $NAME self-signed certificate for '$FQDN'" \ "valid for $DAYS days." openssl req -new -x509 -days "$DAYS" -nodes -out "$DIR/$CERT_FILENAME" \ -keyout "$DIR/$KEY_FILENAME" > /dev/null 2>&1 <<+

15 years, 1 month

git:kamailio_3.0: db_oracle: install kamctl files

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 669e52df21b5fe54d1968db94628859c5291681a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=669e52d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:06:35 2009 +0100 db_oracle: install kamctl files --- modules_k/db_oracle/Makefile | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules_k/db_oracle/Makefile b/modules_k/db_oracle/Makefile index 55e7b0d..bcceb9e 100644 --- a/modules_k/db_oracle/Makefile +++ b/modules_k/db_oracle/Makefile @@ -66,3 +66,13 @@ DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules + +ifeq ($(INSTALL_FLAVOUR),kamailio) +# extra install for kamailio + +install-oracle-scripts: $(bin_prefix)/$(bin_dir) + ORACLEON=yes make -C ../../utils/kamctl/ install-modules + +install-scripts: install-oracle-scripts + +endif # INSTALL_FLAVOUR

15 years, 1 month

git:kamailio_3.0: kamctl: install of berkeley and oracle tools

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 5b46bc809a5bc970f7ad7334be33bf0db723807b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5b46bc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:08:44 2009 +0100 kamctl: install of berkeley and oracle tools --- utils/kamctl/Makefile | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 6f5b2a8..61bcee0 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -181,7 +181,8 @@ install-modules: $(bin_prefix)/$(bin_dir) $(data_prefix)/$(data_dir)/oracle/admin/`basename "$$FILE"` ; \ fi ;\ done ; \ - $(INSTALL_BIN) utils/db_oracle/kamailio_orasel $(bin-prefix)/$(bin-dir) ; \ + make -C ../db_oracle/ ; \ + $(INSTALL_BIN) ../db_oracle/kamailio_orasel $(bin_prefix)/$(bin_dir) ; \ fi # install Berkeley database stuff if [ "$(BERKELEYDBON)" = "yes" ]; then \ @@ -205,7 +206,8 @@ install-modules: $(bin_prefix)/$(bin_dir) $(data_prefix)/$(data_dir)/db_berkeley/kamailio/`basename "$$FILE"` ; \ fi ;\ done ; \ - $(INSTALL_BIN) utils/db_berkeley/kambdb_recover $(bin-prefix)/$(bin-dir) ; \ + make -C ../db_berkeley/ ; \ + $(INSTALL_BIN) ../db_berkeley/kambdb_recover $(bin_prefix)/$(bin_dir) ; \ fi # install dbtext stuff if [ "$(DBTEXTON)" = "yes" ]; then \

15 years, 1 month

git:kamailio_3.0: db_postgres: install kamctl files

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 7922ddd9442e27028afae8e9d342bb31e383f624 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7922ddd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:04:49 2009 +0100 db_postgres: install kamctl files --- modules/db_postgres/Makefile | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/Makefile b/modules/db_postgres/Makefile index 9c578b9..03e8c27 100644 --- a/modules/db_postgres/Makefile +++ b/modules/db_postgres/Makefile @@ -35,3 +35,13 @@ SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules + +ifeq ($(INSTALL_FLAVOUR),kamailio) +# extra install for kamailio + +install-pgsql-scripts: $(bin_prefix)/$(bin_dir) + PGSQLON=yes make -C ../../utils/kamctl/ install-modules + +install-scripts: install-pgsql-scripts + +endif # INSTALL_FLAVOUR

15 years, 1 month

git:kamailio_3.0: db_berkely: install kamctl files

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 1daa56fbec81034affeaadcfa97a1373413c68ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1daa56f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:05:27 2009 +0100 db_berkely: install kamctl files --- modules/db_berkeley/Makefile | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/db_berkeley/Makefile b/modules/db_berkeley/Makefile index 617c3c3..55b304f 100644 --- a/modules/db_berkeley/Makefile +++ b/modules/db_berkeley/Makefile @@ -20,3 +20,13 @@ SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/kmi/kmi include ../../Makefile.modules + +ifeq ($(INSTALL_FLAVOUR),kamailio) +# extra install for kamailio + +install-berkeley-scripts: $(bin_prefix)/$(bin_dir) + BERKELEYDBON=yes make -C ../../utils/kamctl/ install-modules + +install-scripts: install-berkeley-scripts + +endif # INSTALL_FLAVOUR

15 years, 1 month

git:kamailio_3.0: debian(k): packaging for 3.0

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 72692ea1af122b12e1071e364063fcc1a182cbd0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72692ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 11 23:09:29 2009 +0100 debian(k): packaging for 3.0 - updated deb packaging specs for 3.0 - use SR makefile groups to build the packages - all module packages are named kamailio-*-modules - kamailio-dbg not packaged for now --- pkg/kamailio/debian/changelog | 14 + pkg/kamailio/debian/control | 81 ++-- pkg/kamailio/debian/patches/00list | 3 - .../debian/patches/10_no_lib64_on_64_bits.dpatch | 27 -- pkg/kamailio/debian/patches/11_always_smp.dpatch | 24 - pkg/kamailio/debian/rules | 467 +++++++------------- 6 files changed, 202 insertions(+), 414 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=726…

15 years, 1 month

git:sr_3.0: core: use NAME to build User-Agent and Server headers

by Juha Heinanen

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

15 years, 1 month

git:kamailio_3.0: tm: unlock replies in case of drop

by Daniel-Constantin Mierla

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 */

15 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev