sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
251 discussions

Single-quoted vs double-quoted params in Path/Route
by Andreas Granig 04 Jun '12

04 Jun '12

Hi guys, When I implemented the Path module 6 years ago, I chose to enclose the received-URI in double-quotes, like this: Path: <sip:1.2.3.4:5060;received="sip:1.2.3.5:1234;transport=tcp"> This Path value is stored in usrloc by registrar module, and is converted to a Route in a subsequent request. This worked fine so far, because there's the logic in parser/parse_param.c to handle double-quoted parameters. Now while doing some interop tests with another platform, it turned out that … [View More]

2 1

git:master: pkg/kamailio/fedora: Updated . spec file to fix issue where some directories were left on uninstall
by Peter Dunkley 04 Jun '12

04 Jun '12

Module: sip-router Branch: master Commit: 4d4b44d461aa568b60c7ae80c26ce8919aaadb44 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4d4b44d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Jun 4 15:30:21 2012 +0100 pkg/kamailio/fedora: Updated .spec file to fix issue where some directories were left on uninstall - Just needed a few %dir lines in the right place so that … [View More]RPM knows to delete all of the Kamilio directories on uninstall. --- pkg/kamailio/fedora/16/kamailio.spec | 52 ++++++++++++++++++++++++++-------- 1 files changed, 40 insertions(+), 12 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index e9aa833..ac3ca9f 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -119,8 +119,12 @@ CPL (Call Processing Language) interpreter for Kamailio. %package snmpstats Summary: SNMP management interface (scalar statistics) for Kamailio. Group: System Environment/Daemons +%if 0%{?fedora} +Requires: net-snmp-agent-libs, kamailio = %ver +%else Requires: net-snmp-libs, kamailio = %ver -BuildRequires: lm_sensors-devel, net-snmp-devel +%endif +BuildRequires: net-snmp-devel %description snmpstats SNMP management interface (scalar statistics) for Kamailio. @@ -438,6 +442,8 @@ fi %doc %{_docdir}/kamailio/INSTALL %doc %{_docdir}/kamailio/README %doc %{_docdir}/kamailio/README-MODULES + +%dir %{_docdir}/kamailio/modules %doc %{_docdir}/kamailio/modules/README.async %doc %{_docdir}/kamailio/modules/README.auth %doc %{_docdir}/kamailio/modules/README.avpops @@ -473,6 +479,8 @@ fi %doc %{_docdir}/kamailio/modules/README.topoh %doc %{_docdir}/kamailio/modules/README.xhttp %doc %{_docdir}/kamailio/modules/README.xhttp_rpc + +%dir %{_docdir}/kamailio/modules_k %doc %{_docdir}/kamailio/modules_k/README.acc %doc %{_docdir}/kamailio/modules_k/README.alias_db %doc %{_docdir}/kamailio/modules_k/README.auth_db @@ -653,9 +661,8 @@ fi %{_sbindir}/kamctl %{_sbindir}/kamdbctl %{_sbindir}/sercmd -%{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.py -%{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyc -%{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyo + +%dir %{_libdir}/kamailio/kamctl %{_libdir}/kamailio/kamctl/kamctl.base %{_libdir}/kamailio/kamctl/kamctl.ctlbase %{_libdir}/kamailio/kamctl/kamctl.dbtext @@ -667,9 +674,17 @@ fi %{_libdir}/kamailio/kamctl/kamdbctl.base %{_libdir}/kamailio/kamctl/kamdbctl.dbtext +%dir %{_libdir}/kamailio/kamctl/dbtextdb +%{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.py +%{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyc +%{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyo + %{_mandir}/man5/* %{_mandir}/man8/* +%dir %{_sharedir}/kamailio +%dir %{_sharedir}/kamailio/dbtext +%dir %{_sharedir}/kamailio/dbtext/kamailio %{_sharedir}/kamailio/dbtext/kamailio/* @@ -679,6 +694,7 @@ fi %{_libdir}/kamailio/modules/db_mysql.so %{_libdir}/kamailio/kamctl/kamctl.mysql %{_libdir}/kamailio/kamctl/kamdbctl.mysql +%dir %{_sharedir}/kamailio/mysql %{_sharedir}/kamailio/mysql/* @@ -688,6 +704,7 @@ fi %{_libdir}/kamailio/modules/db_postgres.so %{_libdir}/kamailio/kamctl/kamctl.pgsql %{_libdir}/kamailio/kamctl/kamdbctl.pgsql +%dir %{_sharedir}/kamailio/postgres %{_sharedir}/kamailio/postgres/* @@ -704,6 +721,7 @@ fi %{_libdir}/kamailio/modules/db_berkeley.so %{_libdir}/kamailio/kamctl/kamctl.db_berkeley %{_libdir}/kamailio/kamctl/kamdbctl.db_berkeley +%dir %{_sharedir}/kamailio/db_berkeley %{_sharedir}/kamailio/db_berkeley/* @@ -713,6 +731,7 @@ fi %{_libdir}/kamailio/modules_k/db_sqlite.so %{_libdir}/kamailio/kamctl/kamctl.sqlite %{_libdir}/kamailio/kamctl/kamdbctl.sqlite +%dir %{_sharedir}/kamailio/db_sqlite %{_sharedir}/kamailio/db_sqlite/* @@ -810,26 +829,32 @@ fi %doc %{_docdir}/kamailio/modules_k/README.perlvdb %{_libdir}/kamailio/modules_k/perl.so %{_libdir}/kamailio/modules_k/perlvdb.so +%dir %{_libdir}/kamailio/perl %{_libdir}/kamailio/perl/OpenSER.pm +%dir %{_libdir}/kamailio/perl/OpenSER %{_libdir}/kamailio/perl/OpenSER/Constants.pm +%{_libdir}/kamailio/perl/OpenSER/Message.pm +%{_libdir}/kamailio/perl/OpenSER/VDB.pm +%dir %{_libdir}/kamailio/perl/OpenSER/LDAPUtils %{_libdir}/kamailio/perl/OpenSER/LDAPUtils/LDAPConf.pm %{_libdir}/kamailio/perl/OpenSER/LDAPUtils/LDAPConnection.pm -%{_libdir}/kamailio/perl/OpenSER/Message.pm +%dir %{_libdir}/kamailio/perl/OpenSER/Utils %{_libdir}/kamailio/perl/OpenSER/Utils/Debug.pm %{_libdir}/kamailio/perl/OpenSER/Utils/PhoneNumbers.pm -%{_libdir}/kamailio/perl/OpenSER/VDB.pm -%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/AccountingSIPtrace.pm -%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/Alias.pm -%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/Auth.pm -%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/Describe.pm -%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/Speeddial.pm -%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/TableVersions.pm +%dir %{_libdir}/kamailio/perl/OpenSER/VDB %{_libdir}/kamailio/perl/OpenSER/VDB/Column.pm %{_libdir}/kamailio/perl/OpenSER/VDB/Pair.pm %{_libdir}/kamailio/perl/OpenSER/VDB/ReqCond.pm %{_libdir}/kamailio/perl/OpenSER/VDB/Result.pm %{_libdir}/kamailio/perl/OpenSER/VDB/VTab.pm %{_libdir}/kamailio/perl/OpenSER/VDB/Value.pm +%dir %{_libdir}/kamailio/perl/OpenSER/VDB/Adapter +%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/AccountingSIPtrace.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/Alias.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/Auth.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/Describe.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/Speeddial.pm +%{_libdir}/kamailio/perl/OpenSER/VDB/Adapter/TableVersions.pm %files lua @@ -916,6 +941,9 @@ fi %changelog +* Mon Jun 4 2012 Peter Dunkley <peter(a)dunkley.me.uk> + - Added a number of %dir lines to make sure the RPMs are properly cleaned up + on uninstall * Sat Jun 2 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Added %postun section to reload systemd on Fedora after uninstall - Added build requirement for redhat-rpm-config so debuginfo RPMs get built [View Less]

1 0

git:master: pkg/kamailio/(centos|fedora): Tidied up a couple of issues in the BoxGrinder appliances
by Peter Dunkley 04 Jun '12

04 Jun '12

Module: sip-router Branch: master Commit: 874db2c236c07e634c93484ffb35b23db8b28118 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=874db2c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Jun 4 15:31:36 2012 +0100 pkg/kamailio/(centos|fedora): Tidied up a couple of issues in the BoxGrinder appliances --- pkg/kamailio/centos/6/kamailio-build.appl | 1 - pkg/… [View More]

1 0

[tracker] Task closed: dialog doesn't clear calls that were re-INVITEd shortly after ACK
by sip-router 04 Jun '12

04 Jun '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#206 - dialog doesn't clear calls that were re-INVITEd shortly after ACK User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Re-open if still occurs with new dlg. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=206 You are receiving this message because you have requested it from … [View More]

1 0

git:master: utils/kamctl: kamctl.sqlite not installed, kamctl. pgsql is installed (as kamctl.sqlite) instead
by Peter Dunkley 04 Jun '12

04 Jun '12

Module: sip-router Branch: master Commit: b2a5914e600f7494e9c8a14137a0e4561724166e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2a5914… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Jun 4 12:58:56 2012 +0100 utils/kamctl: kamctl.sqlite not installed, kamctl.pgsql is installed (as kamctl.sqlite) instead --- utils/kamctl/Makefile | 2 +- 1 files changed, 1 … [View More]

1 0

git:master: dispatcher(k): improved debug message
by Daniel-Constantin Mierla 04 Jun '12

04 Jun '12

Module: sip-router Branch: master Commit: 83a558fbad700198a8667ef01f756269d7e2c310 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83a558f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 4 12:28:09 2012 +0200 dispatcher(k): improved debug message - when hashing due to alg 7, print the string to be hased as well as the hash code for it --- modules_k/dispatcher/… [View More]

1 0

git:master: app_lua: explicit link against libm only of no pkg-config or lua-config is found
by Daniel-Constantin Mierla 04 Jun '12

04 Jun '12

Module: sip-router Branch: master Commit: 231e7fcfdded9fedfc30331642fb9ba9a3a99556 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=231e7fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 4 11:54:09 2012 +0200 app_lua: explicit link against libm only of no pkg-config or lua-config is found - otherwise it appears two times in the libs linking string --- modules/app_lua/… [View More]

1 0

git:master: registrar(k): moved realm prefix as first field in cfg registrar struct
by Daniel-Constantin Mierla 04 Jun '12

04 Jun '12

Module: sip-router Branch: master Commit: 4875c53d467c973c07213a13975add4b7ca4f560 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4875c53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jun 4 11:40:11 2012 +0200 registrar(k): moved realm prefix as first field in cfg registrar struct - added debug message to print the realm prefix --- modules_k/registrar/common.c | 8 ++… [View More]++++-- modules_k/registrar/config.c | 8 ++++---- modules_k/registrar/config.h | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/modules_k/registrar/common.c b/modules_k/registrar/common.c index c8a1948..c682f15 100644 --- a/modules_k/registrar/common.c +++ b/modules_k/registrar/common.c @@ -95,8 +95,12 @@ int extract_aor(str* _uri, str* _a, sip_uri_t *_pu) /* strip prefix (if defined) */ realm_prefix.s = cfg_get(registrar, registrar_cfg, realm_pref).s; realm_prefix.len = cfg_get(registrar, registrar_cfg, realm_pref).len; - if (realm_prefix.len>0 && realm_prefix.len<puri->host.len && - (memcmp(realm_prefix.s, puri->host.s, realm_prefix.len)==0) ) { + LM_DBG("realm prefix is [%.*s]\n", realm_prefix.len, + (realm_prefix.len>0)?realm_prefix.s:""); + if (realm_prefix.len>0 + && realm_prefix.len<puri->host.len + && (memcmp(realm_prefix.s, puri->host.s, realm_prefix.len)==0)) + { memcpy(aor_buf + _a->len, puri->host.s + realm_prefix.len, puri->host.len - realm_prefix.len); _a->len += puri->host.len - realm_prefix.len; diff --git a/modules_k/registrar/config.c b/modules_k/registrar/config.c index 038a68c..f183511 100644 --- a/modules_k/registrar/config.c +++ b/modules_k/registrar/config.c @@ -31,6 +31,7 @@ #include "config.h" struct cfg_group_registrar default_registrar_cfg = { + STR_NULL, /* realm_pref */ 3600, /* default_expires */ 0, /* default_expires_range */ 60, /* min_expires */ @@ -39,13 +40,14 @@ struct cfg_group_registrar default_registrar_cfg = { 0, /* retry_after */ 0, /* case_sensitive */ Q_UNSPECIFIED, /* default_q */ - 1, /* append_branches */ - STR_NULL /* realm_pref */ + 1 /* append_branches */ }; void *registrar_cfg = &default_registrar_cfg; cfg_def_t registrar_cfg_def[] = { + {"realm_pref", CFG_VAR_STR, 0, 0, 0, 0, + "Realm prefix to be removed. Default is \"\""}, {"default_expires", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 0, 0, default_expires_stats_update, "Contains number of second to expire if no expire hf or contact expire present" }, {"default_expires_range", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 100, 0, default_expires_range_update, @@ -64,7 +66,5 @@ cfg_def_t registrar_cfg_def[] = { "The parameter represents default q value for new contacts."}, /* Q_UNSPECIFIED is -1 */ {"append_branches", CFG_VAR_INT , 0, 0, 0, 0, "If set to 1(default), lookup will put all contacts found in msg structure"}, - {"realm_pref", CFG_VAR_STR, 0, 0, 0, 0, - "Realm prefix to be removed. Default is \"\""}, {0, 0, 0, 0, 0, 0} }; diff --git a/modules_k/registrar/config.h b/modules_k/registrar/config.h index f2708d6..496a14b 100644 --- a/modules_k/registrar/config.h +++ b/modules_k/registrar/config.h @@ -27,6 +27,7 @@ #include "../../str.h" struct cfg_group_registrar { + str realm_pref; unsigned int default_expires; unsigned int default_expires_range; unsigned int min_expires; @@ -36,7 +37,6 @@ struct cfg_group_registrar { unsigned int case_sensitive; qvalue_t default_q; unsigned int append_branches; - str realm_pref; }; extern struct cfg_group_registrar default_registrar_cfg; [View Less]

1 0

Yum repos for Fedora
by Peter Dunkley 04 Jun '12

04 Jun '12

Hi, As a home project I have been working on creating an up-to-date .spec file to build Kamailio 3.3 RPMs for Fedora 16 (and Fedora 17 soon). My plan is to build Kamailio 3.3 RPMs for Fedora 17 on x86_64 and Raspberry Pi (armv5) when Kamailio 3.3.0 and Fedora 17 are both released. Does anyone have, or have the capability to host, a yum repo for these? If so I would be happy to make the RPMs available once I've built them. Regards, Peter

3 7

git:master: pkg/deb Remove mono build from Squeeze
by Jon Bonilla 04 Jun '12

04 Jun '12

Module: sip-router Branch: master Commit: 83e922b0f253418c089a4a89f63230c370c0331b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83e922b… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Mon Jun 4 10:19:00 2012 +0200 pkg/deb Remove mono build from Squeeze The module depends on Mono2.0 which is not available in Squeeze. --- pkg/kamailio/deb/squeeze/control | 24 ++++++++++++------------ pkg/… [View More]kamailio/deb/squeeze/rules | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control index b2bff92..72b20df 100644 --- a/pkg/kamailio/deb/squeeze/control +++ b/pkg/kamailio/deb/squeeze/control @@ -2,7 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libgeoip-dev (>= 1.4.5), libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libsqlite3-dev, libjson0-dev, libevent-dev, libncurses5-dev, libmono-dev +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libgeoip-dev (>= 1.4.5), libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libsqlite3-dev, libjson0-dev, libevent-dev, libncurses5-dev Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ @@ -10,7 +10,7 @@ Package: kamailio Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, adduser Conflicts: kamailio-regex-modules, kamailio-dbg -Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-tls-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-lua-modules, kamailio-python-modules, kamailio-mono-modules +Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-tls-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xml-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules, kamailio-lua-modules, kamailio-python-modules Description: very fast and configurable SIP proxy Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -246,16 +246,16 @@ Description: contains the app_lua module This package provides the app_lua module, an extension allowing to execute embedded Lua applications within configuration file. -Package: kamailio-mono-modules -Architecture: any -Depends: ${shlibs:Depends}, kamailio (= ${Source-Version}) -Description: contains the app_mono module - Kamailio is a very fast and flexible SIP (RFC3261) - proxy server. Written entirely in C, Kamailio can handle thousands calls - per second even on low-budget hardware. - . - This package provides the app_mono module, an extension allowing to - execute embedded Mono applications within configuration file. +#Package: kamailio-mono-modules +#Architecture: any +#Depends: ${shlibs:Depends}, kamailio (= ${Source-Version}) +#Description: contains the app_mono module +# Kamailio is a very fast and flexible SIP (RFC3261) +# proxy server. Written entirely in C, Kamailio can handle thousands calls +# per second even on low-budget hardware. +# . +# This package provides the app_mono module, an extension allowing to +# execute embedded Mono applications within configuration file. Package: kamailio-python-modules diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index a76dc31..bf53a51 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -43,7 +43,7 @@ MODULES_SP= PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils geoip memcached tls \ snmpstats carrierroute xmpp cpl lua python \ - sqlite json mono + sqlite json # name of libdir in the path for libraries (e.g., lib for 32b, lib64 for 64b) LIBDIR ?= lib [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2012