sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
250 discussions

git:3.2: pkg/deb Remove purple from Ubuntu 12.04 build

by Jon Bonilla

Module: sip-router Branch: 3.2 Commit: 9b865030e61596b6f6b4dda2aaee0a1199f9fcec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b86503… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Sun Jun 3 20:03:13 2012 +0200 pkg/deb Remove purple from Ubuntu 12.04 build --- pkg/kamailio/deb/precise/control | 24 ++++++++++++------------ pkg/kamailio/deb/precise/rules | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index 8c5d6f7..fc24adc 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/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, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libsqlite3-dev, libjson0-dev, libevent-dev, libncurses5-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, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libsqlite3-dev, libjson0-dev, libevent-dev, libncurses5-dev Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ @@ -204,17 +204,17 @@ Description: Provides a set utility functions for Kamailio Provides a set of utility functions for Kamailio, which are not related to the server configuration. -Package: kamailio-purple-modules -Architecture: any -Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) -Replaces: kamailio-purple-module -Description: Provides the purple module, a multi-protocol IM gateway - 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 purple module, a multi-protocol instant - messaging gateway module. +#Package: kamailio-purple-modules +#Architecture: any +#Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +#Replaces: kamailio-purple-module +#Description: Provides the purple module, a multi-protocol IM gateway +# 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 purple module, a multi-protocol instant +# messaging gateway module. Package: kamailio-memcached-modules Architecture: any diff --git a/pkg/kamailio/deb/precise/rules b/pkg/kamailio/deb/precise/rules index cdc477a..75bd315 100755 --- a/pkg/kamailio/deb/precise/rules +++ b/pkg/kamailio/deb/precise/rules @@ -20,7 +20,7 @@ export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) nostrip" # modules not in the "main" kamailio package -EXCLUDED_MODULES= mi_xmlrpc +EXCLUDED_MODULES= mi_xmlrpc purple # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, @@ -41,7 +41,7 @@ MODULES_SP= # Note: the order is important (should be in dependency order, the one # on which other depend first) PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ - ldap xml perl utils purple memcached tls \ + ldap xml perl utils memcached tls \ snmpstats carrierroute xmpp cpl lua python geoip\ redis sqlite json

11 years, 11 months

git:master: pkg/kamialio/(centos|fedora): Tidied up some stuff in the Boxgrinder appliances

by Peter Dunkley

Module: sip-router Branch: master Commit: 85e7a593684c175d5c557f2340b175cf26679d2e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85e7a59… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 2 21:40:13 2012 +0100 pkg/kamialio/(centos|fedora): Tidied up some stuff in the Boxgrinder appliances --- pkg/kamailio/centos/6/kamailio-build.appl | 2 +- pkg/kamailio/fedora/16/kamailio-build.appl | 2 +- pkg/kamailio/fedora/16/kamailio.appl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio-build.appl b/pkg/kamailio/centos/6/kamailio-build.appl index 08a12b7..60d3cb2 100644 --- a/pkg/kamailio/centos/6/kamailio-build.appl +++ b/pkg/kamailio/centos/6/kamailio-build.appl @@ -11,7 +11,6 @@ hardware: size: 4 packages: - @core - - redhat-rpm-config # kamailio-debuginfo - bison # kamailio - db4-devel # kamailio-bdb - expat-devel # kamailio-xmpp @@ -33,6 +32,7 @@ packages: - pcre-devel # kamailio-regex, kamailio-dialplan, kamailio-lcr - postgresql-devel # kamailio-postgresql - python-devel # kamailio-python + - redhat-rpm-config # kamailio-debuginfo - rpm-build - sqlite-devel # kamailio-sqlite - unixODBC-devel # kamailio-unixODBC diff --git a/pkg/kamailio/fedora/16/kamailio-build.appl b/pkg/kamailio/fedora/16/kamailio-build.appl index 5f4b27a..99574c7 100644 --- a/pkg/kamailio/fedora/16/kamailio-build.appl +++ b/pkg/kamailio/fedora/16/kamailio-build.appl @@ -11,7 +11,6 @@ hardware: size: 4 packages: - @core - - redhat-rpm-config # kamailio-debuginfo - bison # kamailio - db4-devel # kamailio-bdb - expat-devel # kamailio-xmpp @@ -39,6 +38,7 @@ packages: - postgresql-devel # kamailio-postgresql - python-devel # kamailio-python - radiusclient-ng-devel # kamailio-radius + - redhat-rpm-config # kamailio-debuginfo - rpm-build - sqlite-devel # kamailio-sqlite - unixODBC-devel # kamailio-unixODBC diff --git a/pkg/kamailio/fedora/16/kamailio.appl b/pkg/kamailio/fedora/16/kamailio.appl index be24a7f..f65ecd2 100644 --- a/pkg/kamailio/fedora/16/kamailio.appl +++ b/pkg/kamailio/fedora/16/kamailio.appl @@ -25,7 +25,7 @@ packages: - mod_perl # kamailio-perl - mono-core # kamailio-mono - mysql-libs # kamailio-mysql - - net-snmp-agent-libs # kamailio-snmpstats + - net-snmp-libs # kamailio-snmpstats - openldap # kamailio-ldap - openssl # kamailio-tls - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr

11 years, 11 months

git:3.2: pkg/deb Add ubuntu 12.04 debian folder

by Jon Bonilla

Module: sip-router Branch: 3.2 Commit: ef680fefff53e692aafbbfb4adfd366b3b0d2f5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef680fe… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Sat Jun 2 22:20:34 2012 +0200 pkg/deb Add ubuntu 12.04 debian folder --- pkg/kamailio/deb/precise/changelog | 88 +++++++ pkg/kamailio/deb/precise/compat | 1 + pkg/kamailio/deb/precise/control | 309 +++++++++++++++++++++++ pkg/kamailio/deb/precise/copyright | 27 ++ pkg/kamailio/deb/precise/kamailio.README.Debian | 38 +++ pkg/kamailio/deb/precise/kamailio.default | 33 +++ pkg/kamailio/deb/precise/kamailio.dirs | 2 + pkg/kamailio/deb/precise/kamailio.examples | 2 + pkg/kamailio/deb/precise/kamailio.init | 240 ++++++++++++++++++ pkg/kamailio/deb/precise/kamailio.postinst | 48 ++++ pkg/kamailio/deb/precise/rules | 224 ++++++++++++++++ 11 files changed, 1012 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ef6…

11 years, 11 months

git:master: pkg/kamailio/fedora/16: Updated Boxgrinder build appliance to install redhat-rpm-config

by Peter Dunkley

Module: sip-router Branch: master Commit: 8545966dc22eeadd3ffa8aed2fc476af1572c3d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8545966… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 2 20:23:51 2012 +0100 pkg/kamailio/fedora/16: Updated Boxgrinder build appliance to install redhat-rpm-config - This is needed to get debuginfo RPMs to build automatically --- pkg/kamailio/fedora/16/kamailio-build.appl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio-build.appl b/pkg/kamailio/fedora/16/kamailio-build.appl index dba1c21..5f4b27a 100644 --- a/pkg/kamailio/fedora/16/kamailio-build.appl +++ b/pkg/kamailio/fedora/16/kamailio-build.appl @@ -11,6 +11,7 @@ hardware: size: 4 packages: - @core + - redhat-rpm-config # kamailio-debuginfo - bison # kamailio - db4-devel # kamailio-bdb - expat-devel # kamailio-xmpp

11 years, 11 months

git:master: pkg/kamailio/fedora/16: Updated . spec to require redhat-rpm-config for building

by Peter Dunkley

Module: sip-router Branch: master Commit: 8389f7a3d1cc6eb312ec92662a4db6758bc5c03b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8389f7a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 2 20:25:38 2012 +0100 pkg/kamailio/fedora/16: Updated .spec to require redhat-rpm-config for building - This is needed to get debuginfo RPMs to build automatically --- pkg/kamailio/fedora/16/kamailio.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index 6abcfd2..e9aa833 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -31,7 +31,7 @@ Conflicts: kamailio-radius < %ver, kamailio-carrierroute < %ver Conflicts: kamailio-redis < %ver, kamailio-json < %ver Conflicts: kamailio-mono < %ver, kamailio-GeoIP < %ver %endif -BuildRequires: bison flex gcc make +BuildRequires: bison flex gcc make redhat-rpm-config %description Kamailio (former OpenSER) is an Open Source SIP Server released under GPL, able @@ -654,6 +654,8 @@ fi %{_sbindir}/kamdbctl %{_sbindir}/sercmd %{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.py +%{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyc +%{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyo %{_libdir}/kamailio/kamctl/kamctl.base %{_libdir}/kamailio/kamctl/kamctl.ctlbase %{_libdir}/kamailio/kamctl/kamctl.dbtext @@ -916,6 +918,7 @@ fi %changelog * 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 * Fri Jun 1 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Tweak to the pkg/kamailio/fedora directory structure - Tested with Fedora 17

11 years, 11 months

git:master: pkg/kamailio/centos/6: Updated Boxgrinder build appliance to install redhat-rpm-config

by Peter Dunkley

Module: sip-router Branch: master Commit: 38140a453004979059bf58039fb410f0c2c58cad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=38140a4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 2 20:22:50 2012 +0100 pkg/kamailio/centos/6: Updated Boxgrinder build appliance to install redhat-rpm-config - This is needed to get debuginfo RPMs to build automatically --- pkg/kamailio/centos/6/kamailio-build.appl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio-build.appl b/pkg/kamailio/centos/6/kamailio-build.appl index 7f8b81a..08a12b7 100644 --- a/pkg/kamailio/centos/6/kamailio-build.appl +++ b/pkg/kamailio/centos/6/kamailio-build.appl @@ -11,6 +11,7 @@ hardware: size: 4 packages: - @core + - redhat-rpm-config # kamailio-debuginfo - bison # kamailio - db4-devel # kamailio-bdb - expat-devel # kamailio-xmpp

11 years, 11 months

git:master: pkg/kamailio/fedora: Improvements to service script and .spec

by Peter Dunkley

Module: sip-router Branch: master Commit: 54404016cb6863339021eb6790d79911823db624 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5440401… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 2 00:48:29 2012 +0100 pkg/kamailio/fedora: Improvements to service script and .spec - systemd service script now deletes PID file and restarts Kamailio automatically if it fails due to an unhandled signal. - Updated .spec to call "systemctl --system daemon-reload" after uninstall --- pkg/kamailio/fedora/16/kamailio.service | 2 ++ pkg/kamailio/fedora/16/kamailio.spec | 9 +++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.service b/pkg/kamailio/fedora/16/kamailio.service index 3aa65c7..a8d59b0 100644 --- a/pkg/kamailio/fedora/16/kamailio.service +++ b/pkg/kamailio/fedora/16/kamailio.service @@ -7,6 +7,8 @@ Type=forking EnvironmentFile=/etc/sysconfig/kamailio PIDFile=/var/run/kamailio.pid ExecStart=/usr/sbin/kamailio -P /var/run/kamailio.pid $OPTIONS +ExecStopPost=/usr/bin/rm -f /var/run/kamailio.pid +Restart=on-abort [Install] WantedBy=multi-user.target diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index 78ba9d9..6abcfd2 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -423,6 +423,13 @@ fi +%postun +%if 0%{?fedora} +/bin/systemctl --system daemon-reload +%endif + + + %files %defattr(-,root,root) %dir %{_docdir}/kamailio @@ -907,6 +914,8 @@ fi %changelog +* Sat Jun 2 2012 Peter Dunkley <peter(a)dunkley.me.uk> + - Added %postun section to reload systemd on Fedora after uninstall * Fri Jun 1 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Tweak to the pkg/kamailio/fedora directory structure - Tested with Fedora 17

11 years, 11 months

git:master: pkg/kamailio/fedora: Changed directory structure a little and tweaked .spec for Fedora 17

by Peter Dunkley

Module: sip-router Branch: master Commit: 40201ac316b1ca3b1bcc52c07537194938b9cacc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=40201ac… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 1 23:09:41 2012 +0100 pkg/kamailio/fedora: Changed directory structure a little and tweaked .spec for Fedora 17 --- pkg/kamailio/centos/6/kamailio.spec | 2 +- .../fedora/{fc16 => 16}/kamailio-build.appl | 0 pkg/kamailio/fedora/{fc16 => 16}/kamailio.appl | 0 pkg/kamailio/fedora/{fc16 => 16}/kamailio.service | 0 pkg/kamailio/fedora/{fc16 => 16}/kamailio.spec | 7 +++++-- .../fedora/{fc16 => 16}/kamailio.sysconfig | 0 pkg/kamailio/fedora/17/kamailio.service | 1 + pkg/kamailio/fedora/17/kamailio.spec | 1 + pkg/kamailio/fedora/17/kamailio.sysconfig | 1 + 9 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 3e20839..1e42ad2 120000 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1 +1 @@ -../../fedora/fc16/kamailio.spec \ No newline at end of file +../../fedora/16/kamailio.spec \ No newline at end of file diff --git a/pkg/kamailio/fedora/fc16/kamailio-build.appl b/pkg/kamailio/fedora/16/kamailio-build.appl similarity index 100% rename from pkg/kamailio/fedora/fc16/kamailio-build.appl rename to pkg/kamailio/fedora/16/kamailio-build.appl diff --git a/pkg/kamailio/fedora/fc16/kamailio.appl b/pkg/kamailio/fedora/16/kamailio.appl similarity index 100% rename from pkg/kamailio/fedora/fc16/kamailio.appl rename to pkg/kamailio/fedora/16/kamailio.appl diff --git a/pkg/kamailio/fedora/fc16/kamailio.service b/pkg/kamailio/fedora/16/kamailio.service similarity index 100% rename from pkg/kamailio/fedora/fc16/kamailio.service rename to pkg/kamailio/fedora/16/kamailio.service diff --git a/pkg/kamailio/fedora/fc16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec similarity index 99% rename from pkg/kamailio/fedora/fc16/kamailio.spec rename to pkg/kamailio/fedora/16/kamailio.spec index 0069151..78ba9d9 100644 --- a/pkg/kamailio/fedora/fc16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -364,11 +364,11 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ xmlops" mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -install -m644 pkg/kamailio/fedora/fc%{?fedora}/kamailio.service \ +install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.service \ $RPM_BUILD_ROOT/%{_unitdir}/kamailio.service mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig -install -m644 pkg/kamailio/fedora/fc%{?fedora}/kamailio.sysconfig \ +install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.sysconfig \ $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/kamailio %else make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ @@ -907,6 +907,9 @@ fi %changelog +* Fri Jun 1 2012 Peter Dunkley <peter(a)dunkley.me.uk> + - Tweak to the pkg/kamailio/fedora directory structure + - Tested with Fedora 17 * Thu May 31 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Updated rel to pre3 - Combined Fedora/CentOS .spec in preparation for Fedora 17 diff --git a/pkg/kamailio/fedora/fc16/kamailio.sysconfig b/pkg/kamailio/fedora/16/kamailio.sysconfig similarity index 100% rename from pkg/kamailio/fedora/fc16/kamailio.sysconfig rename to pkg/kamailio/fedora/16/kamailio.sysconfig diff --git a/pkg/kamailio/fedora/17/kamailio.service b/pkg/kamailio/fedora/17/kamailio.service new file mode 120000 index 0000000..bc15c15 --- /dev/null +++ b/pkg/kamailio/fedora/17/kamailio.service @@ -0,0 +1 @@ +../16/kamailio.service \ No newline at end of file diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec new file mode 120000 index 0000000..01b1f60 --- /dev/null +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -0,0 +1 @@ +../16/kamailio.spec \ No newline at end of file diff --git a/pkg/kamailio/fedora/17/kamailio.sysconfig b/pkg/kamailio/fedora/17/kamailio.sysconfig new file mode 120000 index 0000000..94886a8 --- /dev/null +++ b/pkg/kamailio/fedora/17/kamailio.sysconfig @@ -0,0 +1 @@ +../16/kamailio.sysconfig \ No newline at end of file

11 years, 11 months

git:master: modules_k/permissions: allow_trusted() doesn' t work for HTTP requests

by Peter Dunkley

Module: sip-router Branch: master Commit: 462a7b4c00e5ea544472e3f1f89a844c0158adb5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=462a7b4… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 1 11:37:21 2012 +0100 modules_k/permissions: allow_trusted() doesn't work for HTTP requests - This is because HTTP requests don't have From: headers. - Fixed by only checking From-URIs for SIP requests. --- modules_k/permissions/hash.c | 19 +++++++++++-------- modules_k/permissions/trusted.c | 18 ++++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/modules_k/permissions/hash.c b/modules_k/permissions/hash.c index 467259b..72ebc41 100644 --- a/modules_k/permissions/hash.c +++ b/modules_k/permissions/hash.c @@ -218,21 +218,24 @@ int match_hash_table(struct trusted_list** table, struct sip_msg* msg, src_ip.s = src_ip_c_str; src_ip.len = strlen(src_ip.s); - if (parse_from_header(msg) < 0) return -1; - uri = get_from(msg)->uri; - if (uri.len > MAX_URI_SIZE) { - LM_ERR("from URI too large\n"); - return -1; + if (IS_SIP(msg)) + { + if (parse_from_header(msg) < 0) return -1; + uri = get_from(msg)->uri; + if (uri.len > MAX_URI_SIZE) { + LM_ERR("from URI too large\n"); + return -1; + } + memcpy(uri_string, uri.s, uri.len); + uri_string[uri.len] = (char)0; } - memcpy(uri_string, uri.s, uri.len); - uri_string[uri.len] = (char)0; for (np = table[perm_hash(src_ip)]; np != NULL; np = np->next) { if ((np->src_ip.len == src_ip.len) && (strncmp(np->src_ip.s, src_ip.s, src_ip.len) == 0) && ((np->proto == PROTO_NONE) || (proto == PROTO_NONE) || (np->proto == proto))) { - if (np->pattern) { + if (np->pattern && IS_SIP(msg)) { if (regcomp(&preg, np->pattern, REG_NOSUB)) { LM_ERR("invalid regular expression\n"); continue; diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index 4e7953c..96c03e7 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -344,14 +344,16 @@ static int match_res(struct sip_msg* msg, int proto, db1_res_t* _r) int_str tag_avp, avp_val; int count = 0; - if (parse_from_header(msg) < 0) return -1; - uri = get_from(msg)->uri; - if (uri.len > MAX_URI_SIZE) { - LM_ERR("message has From URI too large\n"); - return -1; + if (IS_SIP(msg)) { + if (parse_from_header(msg) < 0) return -1; + uri = get_from(msg)->uri; + if (uri.len > MAX_URI_SIZE) { + LM_ERR("message has From URI too large\n"); + return -1; + } + memcpy(uri_string, uri.s, uri.len); + uri_string[uri.len] = (char)0; } - memcpy(uri_string, uri.s, uri.len); - uri_string[uri.len] = (char)0; get_tag_avp(&tag_avp, &tag_avp_type); row = RES_ROWS(_r); @@ -366,7 +368,7 @@ static int match_res(struct sip_msg* msg, int proto, db1_res_t* _r) (VAL_NULL(val + 2) || ((VAL_TYPE(val + 2) == DB1_STRING) && !VAL_NULL(val + 2)))) { - if (!VAL_NULL(val + 1)) { + if (!VAL_NULL(val + 1) && IS_SIP(msg)) { if (regcomp(&preg, (char *)VAL_STRING(val + 1), REG_NOSUB)) { LM_ERR("invalid regular expression\n"); continue;

11 years, 11 months

git:master: modules_k/presence: Fixed presence hard-state implementation

by Peter Dunkley

Module: sip-router Branch: master Commit: 258bc7e2f9d147679c0434782f376afe2c3f02a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=258bc7e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 1 11:50:17 2012 +0100 modules_k/presence: Fixed presence hard-state implementation - Removed modparams added when I did this originally - Hard-state is still "publish"ed to the presentity table (with expiry of -1) - Removed exported function for updating hard-state presentity and added a new type to pres_refresh_watchers instead (also updated refreshWatchers MI command) - Hard-state presentity now fetched using the event->get_pidf_doc() function instead of directly from the database - Also fixed two bugs (from my notifier work) found during testing: - query_db_notify() sends NOTIFY requests immediately (instead of through notifier tasks) - segmentation fault in update_pw_dialogs_dbonlymode() when there are no matching dialogs --- modules_k/presence/README | 386 ++++++++++++----------------- modules_k/presence/doc/presence_admin.xml | 157 +++--------- modules_k/presence/event_list.c | 3 +- modules_k/presence/event_list.h | 2 + modules_k/presence/notify.c | 57 +++-- modules_k/presence/presence.c | 241 ++++++++---------- modules_k/presence/presence.h | 5 - modules_k/presence/presentity.c | 2 +- modules_k/presence/publish.c | 153 ++---------- modules_k/presence/publish.h | 3 +- 10 files changed, 371 insertions(+), 638 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=258…

11 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2012