sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: modules/lcr: forgot to increase lcr_gw table version

by Juha Heinanen

Module: sip-router Branch: master Commit: 94b1e890f5bca252130369fadec6a7b86aa3e173 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94b1e89… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Oct 12 11:41:32 2010 +0300 modules/lcr: forgot to increase lcr_gw table version --- modules/lcr/lcr_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index c864e7f..333b5de 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -92,7 +92,7 @@ MODULE_VERSION */ #define LCR_RULE_TABLE_VERSION 1 #define LCR_RULE_TARGET_TABLE_VERSION 1 -#define LCR_GW_TABLE_VERSION 1 +#define LCR_GW_TABLE_VERSION 2 /* database defaults */

14 years, 4 months

Development builds for debian and ubuntu available

by Jon Bonilla

Starting today, Kamailio's debian repository offers nightly development versions of "master" and "3.1" branches for Ubuntu and Debian distributions. Brief summary of the repository status at the moment: * Flavours: Kamailio * Branches: 3.0, 3.1, master * Distributions: Etch (3.0 stable only), Lenny, Squeeze, Lucid * Archs: amd64, i386 * Sources (deb-src) provided for stable releases * Nightly builds of supported branches All the instructions and status updates can be found here: http://www.kamailio.org/dokuwiki/doku.php/packages:debs We hope you will find these dev builds usefull for testing or playing. Sipdoc Team

14 years, 4 months

Automatic restart on upgrades

by Jon Bonilla

Hi all I'm taking a look to the postinst script under pkg/kamailio/deb/debian folder and I see that it creates the required user, but it does not restart kamailio services. I was considering triggering: - A restart on upgrades if we are upgrading inside the same mayor release (ej 3.1.1 to 3.1.2) - No restart and display a warning message if upgrading between major releses (ej 3.1.1 to 3.2.0). This message should point or show some kind of UPGRADE.txt file where differences, database schema changes... etc are explained. Maybe just show a link to the wiki would be enough. Opinions?

14 years, 4 months

git:master: modules/lcr: changes and new features

by Juha Heinanen

Module: sip-router Branch: master Commit: 8c0501bfaa27acab9721953e8c1551687c96edf2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c0501b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Oct 11 21:16:28 2010 +0300 modules/lcr: changes and new features - New module parameter tag_avp. - Renamed lcr_gw table's tag field to prefix field. - Renamed dont_strip_or_tag_flag module parameter to dont_strip_or_prefix_flag. - Added optional tag_avp module parameter and made lcr_flags module parameter optional. - Added tag field to lcr_gw table whose value is assigned to possible tag_avp by next_gw() and from_gw() functions. - Increased lc_gw tables version number to 2. - load_gws() can take uri_user param, value of which is used instead of Request URI user part by load_gws() function. - Parameters of load_gw() function must be given without quotes. --- lib/srdb1/schema/lcr_gw.xml | 15 ++- modules/lcr/README | 228 +++++++++++++++++++--------------- modules/lcr/doc/lcr_admin.xml | 76 ++++++++---- modules/lcr/lcr_mod.c | 268 +++++++++++++++++++++++++---------------- modules/lcr/lcr_mod.h | 10 +- modules/lcr/lcr_rpc.c | 7 +- 6 files changed, 367 insertions(+), 237 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8c0…

14 years, 4 months

git:kamailio_3.0: pkg debian

by Jon Bonilla

Module: sip-router Branch: kamailio_3.0 Commit: 145ea7cf9f28520ada30ede689e1e5ab6d0d19ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=145ea7c… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Mon Oct 11 19:06:58 2010 +0200 pkg debian move debian folders to pkg/kamailio/deb lenny and lucid are no longer symlinks --- Makefile | 4 ++-- pkg/kamailio/{debian-etch => deb/debian}/changelog | 0 pkg/kamailio/{debian-etch => deb/debian}/compat | 0 pkg/kamailio/{ => deb}/debian/control | 0 pkg/kamailio/{debian-etch => deb/debian}/copyright | 0 .../debian}/kamailio.README.Debian | 0 .../{debian-etch => deb/debian}/kamailio.default | 0 .../{debian-etch => deb/debian}/kamailio.dirs | 0 .../{debian-etch => deb/debian}/kamailio.examples | 0 .../{debian-etch => deb/debian}/kamailio.init | 0 .../{debian-etch => deb/debian}/kamailio.postinst | 0 pkg/kamailio/{ => deb}/debian/rules | 0 .../{debian-squeeze => deb/etch}/changelog | 0 pkg/kamailio/{debian-squeeze => deb/etch}/compat | 0 pkg/kamailio/{debian-etch => deb/etch}/control | 0 .../{debian-squeeze => deb/etch}/copyright | 0 .../etch}/kamailio.README.Debian | 0 .../{debian-squeeze => deb/etch}/kamailio.default | 0 .../{debian-squeeze => deb/etch}/kamailio.dirs | 0 .../{debian-squeeze => deb/etch}/kamailio.examples | 0 .../{debian-squeeze => deb/etch}/kamailio.init | 0 .../{debian-squeeze => deb/etch}/kamailio.postinst | 0 pkg/kamailio/{debian-etch => deb/etch}/rules | 0 pkg/kamailio/{debian => deb/lenny}/changelog | 0 pkg/kamailio/{debian => deb/lenny}/compat | 0 pkg/kamailio/{debian => deb/lenny}/control | 0 pkg/kamailio/{debian => deb/lenny}/copyright | 0 .../{debian => deb/lenny}/kamailio.README.Debian | 0 .../{debian => deb/lenny}/kamailio.default | 0 pkg/kamailio/{debian => deb/lenny}/kamailio.dirs | 0 .../{debian => deb/lenny}/kamailio.examples | 0 pkg/kamailio/{debian => deb/lenny}/kamailio.init | 0 .../{debian => deb/lenny}/kamailio.postinst | 0 pkg/kamailio/{debian => deb/lenny}/rules | 0 pkg/kamailio/{debian-etch => deb/lucid}/changelog | 0 pkg/kamailio/{debian-etch => deb/lucid}/compat | 0 pkg/kamailio/{debian => deb/lucid}/control | 0 pkg/kamailio/{debian-etch => deb/lucid}/copyright | 0 .../lucid}/kamailio.README.Debian | 0 .../{debian-etch => deb/lucid}/kamailio.default | 0 .../{debian-etch => deb/lucid}/kamailio.dirs | 0 .../{debian-etch => deb/lucid}/kamailio.examples | 0 .../{debian-etch => deb/lucid}/kamailio.init | 0 .../{debian-etch => deb/lucid}/kamailio.postinst | 0 pkg/kamailio/{debian => deb/lucid}/rules | 0 .../{debian-etch => deb/squeeze}/changelog | 0 pkg/kamailio/{debian-etch => deb/squeeze}/compat | 0 .../{debian-squeeze => deb/squeeze}/control | 0 .../{debian-etch => deb/squeeze}/copyright | 0 .../squeeze}/kamailio.README.Debian | 0 .../{debian-etch => deb/squeeze}/kamailio.default | 0 .../{debian-etch => deb/squeeze}/kamailio.dirs | 0 .../{debian-etch => deb/squeeze}/kamailio.examples | 0 .../{debian-etch => deb/squeeze}/kamailio.init | 0 .../{debian-etch => deb/squeeze}/kamailio.postinst | 0 pkg/kamailio/{debian-squeeze => deb/squeeze}/rules | 0 pkg/kamailio/debian-lenny | 1 - pkg/kamailio/ubuntu-lucid | 1 - 58 files changed, 2 insertions(+), 4 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=145…

14 years, 4 months

git:master: pkg debian

by Jon Bonilla

Module: sip-router Branch: master Commit: 77260d4bc86fb63dd9b855460f6fdff5311a8854 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=77260d4… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Mon Oct 11 18:54:09 2010 +0200 pkg debian change path of different debian folders under pkg/kamailio to a generic pkg/kamailio/deb lenny and lucid are no longer symlinks (cherry picked from commit 55178d48a2fdfb3f468a4a9afa00a11ca47beba7) --- Makefile | 4 +- .../{debian-squeeze => deb/debian}/changelog | 0 pkg/kamailio/{debian-squeeze => deb/debian}/compat | 0 pkg/kamailio/{ => deb}/debian/control | 0 .../{debian-squeeze => deb/debian}/copyright | 0 .../debian}/kamailio.README.Debian | 0 .../debian}/kamailio.default | 0 .../{debian-squeeze => deb/debian}/kamailio.dirs | 0 .../debian}/kamailio.examples | 0 .../{debian-squeeze => deb/debian}/kamailio.init | 0 .../debian}/kamailio.postinst | 0 pkg/kamailio/{ => deb}/debian/rules | 0 pkg/kamailio/{debian => deb/lenny}/changelog | 0 pkg/kamailio/{debian => deb/lenny}/compat | 0 pkg/kamailio/{debian => deb/lenny}/control | 0 pkg/kamailio/{debian => deb/lenny}/copyright | 0 .../{debian => deb/lenny}/kamailio.README.Debian | 0 .../{debian => deb/lenny}/kamailio.default | 0 pkg/kamailio/{debian => deb/lenny}/kamailio.dirs | 0 .../{debian => deb/lenny}/kamailio.examples | 0 pkg/kamailio/{debian => deb/lenny}/kamailio.init | 0 .../{debian => deb/lenny}/kamailio.postinst | 0 pkg/kamailio/{debian => deb/lenny}/rules | 0 .../{debian-squeeze => deb/lucid}/changelog | 0 pkg/kamailio/{debian-squeeze => deb/lucid}/compat | 0 pkg/kamailio/{debian => deb/lucid}/control | 22 ++++++++++---------- .../{debian-squeeze => deb/lucid}/copyright | 0 .../lucid}/kamailio.README.Debian | 0 .../{debian-squeeze => deb/lucid}/kamailio.default | 0 .../{debian-squeeze => deb/lucid}/kamailio.dirs | 0 .../lucid}/kamailio.examples | 0 .../{debian-squeeze => deb/lucid}/kamailio.init | 0 .../lucid}/kamailio.postinst | 0 pkg/kamailio/{debian => deb/lucid}/rules | 4 +- .../{debian-squeeze => deb/squeeze}/changelog | 0 .../{debian-squeeze => deb/squeeze}/compat | 0 .../{debian-squeeze => deb/squeeze}/control | 0 .../{debian-squeeze => deb/squeeze}/copyright | 0 .../squeeze}/kamailio.README.Debian | 0 .../squeeze}/kamailio.default | 0 .../{debian-squeeze => deb/squeeze}/kamailio.dirs | 0 .../squeeze}/kamailio.examples | 0 .../{debian-squeeze => deb/squeeze}/kamailio.init | 0 .../squeeze}/kamailio.postinst | 0 pkg/kamailio/{debian-squeeze => deb/squeeze}/rules | 0 pkg/kamailio/debian-lenny | 1 - pkg/kamailio/ubuntu-lucid | 1 - 47 files changed, 15 insertions(+), 17 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=772…

14 years, 4 months

git:master: pkg debian generic

by Jon Bonilla

Module: sip-router Branch: master Commit: caeb4ab03cefdd95efd127dd340a3bb3f55822c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=caeb4ab… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Mon Oct 11 18:56:52 2010 +0200 pkg debian generic geoip modules added to the debian generic folder (cherry picked from commit 21a3752bf31a8e6cc488d26e43a48dae11b90575) --- pkg/kamailio/deb/debian/control | 22 +++++++++++----------- pkg/kamailio/deb/debian/rules | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 73a1e26..1f44925 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/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 +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 Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ @@ -257,16 +257,16 @@ Description: contains the app_python module This package provides the app_python module, an extension allowing to execute embedded Python applications within configuration file. -#Package: kamailio-geoip-modules -#Architecture: any -#Depends: ${shlibs:Depends}, kamailio (= ${Source-Version}) -#Description: contains the geoip 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 geoip module, an extension allowing to -# use GeoIP API within configuration file. +Package: kamailio-geoip-modules +Architecture: any +Depends: ${shlibs:Depends}, kamailio (= ${Source-Version}) +Description: contains the geoip 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 geoip module, an extension allowing to + use GeoIP API within configuration file. Package: kamailio-nth Architecture: any diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index 4ed1149..5ec2077 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -20,7 +20,7 @@ export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) nostrip" # modules not in the "main" kamailio package -EXCLUDED_MODULES= geoip +EXCLUDED_MODULES= # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, @@ -42,7 +42,7 @@ MODULES_SP= # on which other depend first) PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ - snmpstats carrierroute xmpp cpl lua python + snmpstats carrierroute xmpp cpl lua python geoip # directories with possible duplicate libraries (that should be deleted # from current module* packages)

14 years, 4 months

git:3.1: pkg debian generic

by Jon Bonilla

Module: sip-router Branch: 3.1 Commit: 21a3752bf31a8e6cc488d26e43a48dae11b90575 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21a3752… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Mon Oct 11 18:56:52 2010 +0200 pkg debian generic geoip modules added to the debian generic folder --- pkg/kamailio/deb/debian/control | 22 +++++++++++----------- pkg/kamailio/deb/debian/rules | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 73a1e26..1f44925 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/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 +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 Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ @@ -257,16 +257,16 @@ Description: contains the app_python module This package provides the app_python module, an extension allowing to execute embedded Python applications within configuration file. -#Package: kamailio-geoip-modules -#Architecture: any -#Depends: ${shlibs:Depends}, kamailio (= ${Source-Version}) -#Description: contains the geoip 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 geoip module, an extension allowing to -# use GeoIP API within configuration file. +Package: kamailio-geoip-modules +Architecture: any +Depends: ${shlibs:Depends}, kamailio (= ${Source-Version}) +Description: contains the geoip 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 geoip module, an extension allowing to + use GeoIP API within configuration file. Package: kamailio-nth Architecture: any diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index 4ed1149..5ec2077 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -20,7 +20,7 @@ export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) nostrip" # modules not in the "main" kamailio package -EXCLUDED_MODULES= geoip +EXCLUDED_MODULES= # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, @@ -42,7 +42,7 @@ MODULES_SP= # on which other depend first) PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ ldap xml perl utils purple memcached tls \ - snmpstats carrierroute xmpp cpl lua python + snmpstats carrierroute xmpp cpl lua python geoip # directories with possible duplicate libraries (that should be deleted # from current module* packages)

14 years, 4 months

git:3.1: pkg debian

by Jon Bonilla

Module: sip-router Branch: 3.1 Commit: 55178d48a2fdfb3f468a4a9afa00a11ca47beba7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55178d4… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Mon Oct 11 18:54:09 2010 +0200 pkg debian change path of different debian folders under pkg/kamailio to a generic pkg/kamailio/deb lenny and lucid are no longer symlinks --- Makefile | 4 +- .../{debian-squeeze => deb/debian}/changelog | 0 pkg/kamailio/{debian-squeeze => deb/debian}/compat | 0 pkg/kamailio/{ => deb}/debian/control | 0 .../{debian-squeeze => deb/debian}/copyright | 0 .../debian}/kamailio.README.Debian | 0 .../debian}/kamailio.default | 0 .../{debian-squeeze => deb/debian}/kamailio.dirs | 0 .../debian}/kamailio.examples | 0 .../{debian-squeeze => deb/debian}/kamailio.init | 0 .../debian}/kamailio.postinst | 0 pkg/kamailio/{ => deb}/debian/rules | 0 pkg/kamailio/{debian => deb/lenny}/changelog | 0 pkg/kamailio/{debian => deb/lenny}/compat | 0 pkg/kamailio/{debian => deb/lenny}/control | 0 pkg/kamailio/{debian => deb/lenny}/copyright | 0 .../{debian => deb/lenny}/kamailio.README.Debian | 0 .../{debian => deb/lenny}/kamailio.default | 0 pkg/kamailio/{debian => deb/lenny}/kamailio.dirs | 0 .../{debian => deb/lenny}/kamailio.examples | 0 pkg/kamailio/{debian => deb/lenny}/kamailio.init | 0 .../{debian => deb/lenny}/kamailio.postinst | 0 pkg/kamailio/{debian => deb/lenny}/rules | 0 .../{debian-squeeze => deb/lucid}/changelog | 0 pkg/kamailio/{debian-squeeze => deb/lucid}/compat | 0 pkg/kamailio/{debian => deb/lucid}/control | 22 ++++++++++---------- .../{debian-squeeze => deb/lucid}/copyright | 0 .../lucid}/kamailio.README.Debian | 0 .../{debian-squeeze => deb/lucid}/kamailio.default | 0 .../{debian-squeeze => deb/lucid}/kamailio.dirs | 0 .../lucid}/kamailio.examples | 0 .../{debian-squeeze => deb/lucid}/kamailio.init | 0 .../lucid}/kamailio.postinst | 0 pkg/kamailio/{debian => deb/lucid}/rules | 4 +- .../{debian-squeeze => deb/squeeze}/changelog | 0 .../{debian-squeeze => deb/squeeze}/compat | 0 .../{debian-squeeze => deb/squeeze}/control | 0 .../{debian-squeeze => deb/squeeze}/copyright | 0 .../squeeze}/kamailio.README.Debian | 0 .../squeeze}/kamailio.default | 0 .../{debian-squeeze => deb/squeeze}/kamailio.dirs | 0 .../squeeze}/kamailio.examples | 0 .../{debian-squeeze => deb/squeeze}/kamailio.init | 0 .../squeeze}/kamailio.postinst | 0 pkg/kamailio/{debian-squeeze => deb/squeeze}/rules | 0 pkg/kamailio/debian-lenny | 1 - pkg/kamailio/ubuntu-lucid | 1 - 47 files changed, 15 insertions(+), 17 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=551…

14 years, 4 months

git:master: modules_k/rtpproxy: fix rtpproxy_offer/ answer when called with a second parameter

by Ovidiu Sas

Module: sip-router Branch: master Commit: 0af3944586c881f5d3ea0be19242cdf84906269e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0af3944… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 8 12:02:30 2010 -0400 modules_k/rtpproxy: fix rtpproxy_offer/answer when called with a second parameter - closes FS#69 - nathelper.c: rtpproxy_offer / rtpproxy_answer (str2 parameter ignored) - reported by Marc Villacorta --- modules_k/rtpproxy/rtpproxy.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index e9a0832..920bdd6 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -284,7 +284,7 @@ static int alter_rtcp(struct sip_msg *msg, str *body, str *oldport, str *newport static char *gencookie(); static int rtpp_test(struct rtpp_node*, int, int); static int unforce_rtp_proxy_f(struct sip_msg *, char *, char *); -static int force_rtp_proxy(struct sip_msg *, char *, char *, int); +static int force_rtp_proxy(struct sip_msg *, char *, char *, int, int); static int start_recording_f(struct sip_msg *, char *, char *); static int rtpproxy_answer1_f(struct sip_msg *, char *, char *); static int rtpproxy_answer2_f(struct sip_msg *, char *, char *); @@ -1672,13 +1672,13 @@ rtpproxy_offer1_f(struct sip_msg *msg, char *str1, char *str2) cp = ip_addr2a(&msg->rcv.dst_ip); strcpy(newip, cp); - return rtpproxy_offer2_f(msg, str1, newip); + return force_rtp_proxy(msg, str1, newip, 1, 0); } static int rtpproxy_offer2_f(struct sip_msg *msg, char *param1, char *param2) { - return force_rtp_proxy(msg, param1, param2, 1); + return force_rtp_proxy(msg, param1, param2, 1, 1); } static int @@ -1687,9 +1687,13 @@ rtpproxy_answer1_f(struct sip_msg *msg, char *str1, char *str2) char *cp; char newip[IP_ADDR_MAX_STR_SIZE]; + if (msg->first_line.type == SIP_REQUEST) + if (msg->first_line.u.request.method_value != METHOD_ACK) + return -1; + cp = ip_addr2a(&msg->rcv.dst_ip); strcpy(newip, cp); - return rtpproxy_answer2_f(msg, str1, newip); + return force_rtp_proxy(msg, str1, newip, 0, 0); } static int @@ -1700,7 +1704,7 @@ rtpproxy_answer2_f(struct sip_msg *msg, char *param1, char *param2) if (msg->first_line.u.request.method_value != METHOD_ACK) return -1; - return force_rtp_proxy(msg, param1, param2, 0); + return force_rtp_proxy(msg, param1, param2, 0, 1); } @@ -1751,7 +1755,7 @@ free_opts(struct options *op1, struct options *op2, struct options *op3) } while (0); static int -force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) +force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forcedIP) { str body, body1, oldport, oldip, newport, newip; str callid, from_tag, to_tag, tmp, payload_types; @@ -2165,8 +2169,16 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) newip.len = 7; } } else { - newip.s = (argc < 2) ? str2 : argv[1]; - newip.len = strlen(newip.s); + if (forcedIP) { + newip.s = str2; + newip.len = strlen(newip.s); +#ifdef EXTRA_DEBUG + LM_DBG("forcing IP='%.*s'\n", newip.len, newip.s); +#endif + } else { + newip.s = (argc < 2) ? str2 : argv[1]; + newip.len = strlen(newip.s); + } } /* marker to double check : newport goes: str -> int -> str ?!?! */ newport.s = int2str(port, &newport.len); /* beware static buffer */

14 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev