sr-dev October 2010

sr-dev@lists.kamailio.org

33 participants
336 discussions

git:master: * kamailio packaging changes for 3.1 branch

by Jon Bonilla

Module: sip-router Branch: master Commit: 80544c29d1b8bf4fc1bfa9a82a8451d8bc37c6eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80544c2… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Thu Oct 7 00:26:23 2010 +0200 * kamailio packaging changes for 3.1 branch * changelog version update with proper date * debian-etch support dropped * kamailio-xmlrpc transitional package created (to proper handling of upgrades) * new module package creation and dependency tracking (cherry picked from commit 9781988041b0da8cd2ee25147c2a2ace8a42fb1b) --- pkg/kamailio/debian-etch/changelog | 52 ----- pkg/kamailio/debian-etch/compat | 1 - pkg/kamailio/debian-etch/control | 199 ------------------ pkg/kamailio/debian-etch/copyright | 27 --- pkg/kamailio/debian-etch/kamailio.README.Debian | 38 ---- pkg/kamailio/debian-etch/kamailio.default | 24 -- pkg/kamailio/debian-etch/kamailio.dirs | 2 - pkg/kamailio/debian-etch/kamailio.examples | 2 - pkg/kamailio/debian-etch/kamailio.init | 170 --------------- pkg/kamailio/debian-etch/kamailio.postinst | 48 ----- pkg/kamailio/debian-etch/patches/00list | 3 - .../patches/10_no_lib64_on_64_bits.dpatch | 27 --- .../debian-etch/patches/11_always_smp.dpatch | 24 -- pkg/kamailio/debian-etch/rules | 220 -------------------- pkg/kamailio/debian-squeeze/changelog | 6 + pkg/kamailio/debian-squeeze/control | 68 ++++++- pkg/kamailio/debian-squeeze/rules | 10 +- pkg/kamailio/debian/changelog | 2 +- pkg/kamailio/debian/control | 33 ++-- pkg/kamailio/debian/rules | 7 +- 20 files changed, 96 insertions(+), 867 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=805…

14 years, 1 month

git:kamailio_3.0: pkg debian

by Jon Bonilla

Module: sip-router Branch: kamailio_3.0 Commit: b532368d655fb7b08c44120c85eb09ff545bab44 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b532368… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Sun Oct 10 01:32:45 2010 +0200 pkg debian * Use libreadline-dev generic instead of libreadline5-dev as dependency --- pkg/kamailio/debian-squeeze/control | 2 +- pkg/kamailio/debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kamailio/debian-squeeze/control b/pkg/kamailio/debian-squeeze/control index 5178bec..3878ce5 100644 --- a/pkg/kamailio/debian-squeeze/control +++ b/pkg/kamailio/debian-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, libmemcache-dev, libreadline5-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 Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/debian/control b/pkg/kamailio/debian/control index d4f1d6c..d3d5c1b 100644 --- a/pkg/kamailio/debian/control +++ b/pkg/kamailio/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, libreadline5-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 Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/

14 years, 1 month

git:master: permissions(k): better hint for db load problem

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 60ddc83911e78bf240820b41ac62a993bbeffef8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60ddc83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Oct 9 11:21:26 2010 +0200 permissions(k): better hint for db load problem - tell that the record is invalid - some identations to reveal the inner blocks --- modules_k/permissions/address.c | 106 +++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 53 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 469e21a..ccdbf1a 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -92,20 +92,20 @@ int reload_address_table(void) /* Choose new hash table and free its old contents */ if (*addr_hash_table == addr_hash_table_1) { - empty_addr_hash_table(addr_hash_table_2); - new_hash_table = addr_hash_table_2; + empty_addr_hash_table(addr_hash_table_2); + new_hash_table = addr_hash_table_2; } else { - empty_addr_hash_table(addr_hash_table_1); - new_hash_table = addr_hash_table_1; + empty_addr_hash_table(addr_hash_table_1); + new_hash_table = addr_hash_table_1; } /* Choose new subnet table */ if (*subnet_table == subnet_table_1) { - empty_subnet_table(subnet_table_2); - new_subnet_table = subnet_table_2; + empty_subnet_table(subnet_table_2); + new_subnet_table = subnet_table_2; } else { - empty_subnet_table(subnet_table_1); - new_subnet_table = subnet_table_1; + empty_subnet_table(subnet_table_1); + new_subnet_table = subnet_table_1; } row = RES_ROWS(res); @@ -114,54 +114,54 @@ int reload_address_table(void) for (i = 0; i < RES_ROW_N(res); i++) { val = ROW_VALUES(row + i); - if ((ROW_N(row + i) == 5) && - (VAL_TYPE(val) == DB1_INT) && !VAL_NULL(val) && - (VAL_INT(val) > 0) && - (VAL_TYPE(val + 1) == DB1_STRING) && !VAL_NULL(val + 1) && - inet_aton((char *)VAL_STRING(val + 1), &ip_addr) != 0 && - (VAL_TYPE(val + 2) == DB1_INT) && !VAL_NULL(val + 2) && - ((unsigned int)VAL_INT(val + 2) > 0) && - ((unsigned int)VAL_INT(val + 2) <= 32) && - (VAL_TYPE(val + 3) == DB1_INT) && !VAL_NULL(val + 3)) { - tagv = VAL_NULL(val + 4)?NULL:(char *)VAL_STRING(val + 4); - if ((unsigned int)VAL_INT(val + 2) == 32) { - if (addr_hash_table_insert(new_hash_table, - (unsigned int)VAL_INT(val), - (unsigned int)ip_addr.s_addr, - (unsigned int)VAL_INT(val + 3), - tagv) - == -1) { - LM_ERR("hash table problem\n"); - perm_dbf.free_result(db_handle, res); - return -1; - } - LM_DBG("Tuple <%u, %s, %u> inserted into address hash " - "table\n", (unsigned int)VAL_INT(val), - (char *)VAL_STRING(val + 1), - (unsigned int)VAL_INT(val + 2)); - } else { - if (subnet_table_insert(new_subnet_table, - (unsigned int)VAL_INT(val), - (unsigned int)ip_addr.s_addr, - (unsigned int)VAL_INT(val + 2), - (unsigned int)VAL_INT(val + 3), - tagv) - == -1) { - LM_ERR("subnet table problem\n"); + if ((ROW_N(row + i) == 5) && + (VAL_TYPE(val) == DB1_INT) && !VAL_NULL(val) && + (VAL_INT(val) > 0) && + (VAL_TYPE(val + 1) == DB1_STRING) && !VAL_NULL(val + 1) && + inet_aton((char *)VAL_STRING(val + 1), &ip_addr) != 0 && + (VAL_TYPE(val + 2) == DB1_INT) && !VAL_NULL(val + 2) && + ((unsigned int)VAL_INT(val + 2) > 0) && + ((unsigned int)VAL_INT(val + 2) <= 32) && + (VAL_TYPE(val + 3) == DB1_INT) && !VAL_NULL(val + 3)) { + tagv = VAL_NULL(val + 4)?NULL:(char *)VAL_STRING(val + 4); + if ((unsigned int)VAL_INT(val + 2) == 32) { + if (addr_hash_table_insert(new_hash_table, + (unsigned int)VAL_INT(val), + (unsigned int)ip_addr.s_addr, + (unsigned int)VAL_INT(val + 3), + tagv) + == -1) { + LM_ERR("hash table problem\n"); + perm_dbf.free_result(db_handle, res); + return -1; + } + LM_DBG("Tuple <%u, %s, %u> inserted into address hash " + "table\n", (unsigned int)VAL_INT(val), + (char *)VAL_STRING(val + 1), + (unsigned int)VAL_INT(val + 2)); + } else { + if (subnet_table_insert(new_subnet_table, + (unsigned int)VAL_INT(val), + (unsigned int)ip_addr.s_addr, + (unsigned int)VAL_INT(val + 2), + (unsigned int)VAL_INT(val + 3), + tagv) + == -1) { + LM_ERR("subnet table problem\n"); + perm_dbf.free_result(db_handle, res); + return -1; + } + LM_DBG("Tuple <%u, %s, %u, %u> inserted into subnet " + "table\n", (unsigned int)VAL_INT(val), + (char *)VAL_STRING(val + 1), + (unsigned int)VAL_INT(val + 2), + (unsigned int)VAL_INT(val + 3)); + } + } else { + LM_ERR("database problem - invalid record\n"); perm_dbf.free_result(db_handle, res); return -1; } - LM_DBG("Tuple <%u, %s, %u, %u> inserted into subnet " - "table\n", (unsigned int)VAL_INT(val), - (char *)VAL_STRING(val + 1), - (unsigned int)VAL_INT(val + 2), - (unsigned int)VAL_INT(val + 3)); - } - } else { - LM_ERR("database problem\n"); - perm_dbf.free_result(db_handle, res); - return -1; - } } perm_dbf.free_result(db_handle, res);

14 years, 1 month

git:master: Added editor attribution to myself as non-trivial content was added by

by Alex Balashov

Module: sip-router Branch: master Commit: ad9e86d7b8292e034968104370053ef6ffbf03c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad9e86d… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Alex Balashov <abalashov(a)evaristesys.com> Date: Sat Oct 9 05:08:29 2010 -0400 Added editor attribution to myself as non-trivial content was added by me to GeoIP docs. --- modules/geoip/README | 7 +++++++ modules/geoip/doc/geoip.xml | 6 ++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/modules/geoip/README b/modules/geoip/README index 11c8c73..016d0d8 100644 --- a/modules/geoip/README +++ b/modules/geoip/README @@ -10,6 +10,13 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> +Edited by + +Alex Balashov + + Evariste Systems LLC + <abalashov(a)evaristesys.com> + Copyright © 2010 Daniel-Constantin Mierla (asipto.com) __________________________________________________________________ diff --git a/modules/geoip/doc/geoip.xml b/modules/geoip/doc/geoip.xml index d4f2bff..9c491b1 100644 --- a/modules/geoip/doc/geoip.xml +++ b/modules/geoip/doc/geoip.xml @@ -23,6 +23,12 @@ <surname>Mierla</surname> <email>miconda(a)gmail.com</email> </editor> + <editor> + <firstname>Alex</firstname> + <surname>Balashov</surname> + <email>abalashov(a)evaristesys.com</email> + <affiliation><orgname>Evariste Systems LLC</orgname></affiliation> + </editor> </authorgroup> <copyright> <year>2010</year>

14 years, 1 month

git:kamailio_3.0: permissions(k): fixed misleading out of shm

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 80928443fcd9548bd2e4599e76f1c96498aed4a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8092844… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Oct 9 10:56:38 2010 +0200 permissions(k): fixed misleading out of shm - out of shm memory was printed even when db load failed - some identations to reveal the inner blocks --- modules_k/permissions/address.c | 161 ++++++++++++++++++++------------------- 1 files changed, 81 insertions(+), 80 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 126c8d8..93e5f5c 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -90,20 +90,20 @@ int reload_address_table(void) /* Choose new hash table and free its old contents */ if (*addr_hash_table == addr_hash_table_1) { - empty_addr_hash_table(addr_hash_table_2); - new_hash_table = addr_hash_table_2; + empty_addr_hash_table(addr_hash_table_2); + new_hash_table = addr_hash_table_2; } else { - empty_addr_hash_table(addr_hash_table_1); - new_hash_table = addr_hash_table_1; + empty_addr_hash_table(addr_hash_table_1); + new_hash_table = addr_hash_table_1; } /* Choose new subnet table */ if (*subnet_table == subnet_table_1) { - empty_subnet_table(subnet_table_2); - new_subnet_table = subnet_table_2; + empty_subnet_table(subnet_table_2); + new_subnet_table = subnet_table_2; } else { - empty_subnet_table(subnet_table_1); - new_subnet_table = subnet_table_1; + empty_subnet_table(subnet_table_1); + new_subnet_table = subnet_table_1; } row = RES_ROWS(res); @@ -111,52 +111,52 @@ int reload_address_table(void) LM_DBG("Number of rows in address table: %d\n", RES_ROW_N(res)); for (i = 0; i < RES_ROW_N(res); i++) { - val = ROW_VALUES(row + i); - if ((ROW_N(row + i) == 4) && - (VAL_TYPE(val) == DB1_INT) && !VAL_NULL(val) && - (VAL_INT(val) > 0) && - (VAL_TYPE(val + 1) == DB1_STRING) && !VAL_NULL(val + 1) && - inet_aton((char *)VAL_STRING(val + 1), &ip_addr) != 0 && - (VAL_TYPE(val + 2) == DB1_INT) && !VAL_NULL(val + 2) && - ((unsigned int)VAL_INT(val + 2) > 0) && - ((unsigned int)VAL_INT(val + 2) <= 32) && - (VAL_TYPE(val + 3) == DB1_INT) && !VAL_NULL(val + 3)) { - if ((unsigned int)VAL_INT(val + 2) == 32) { - if (addr_hash_table_insert(new_hash_table, + val = ROW_VALUES(row + i); + if ((ROW_N(row + i) == 4) && + (VAL_TYPE(val) == DB1_INT) && !VAL_NULL(val) && + (VAL_INT(val) > 0) && + (VAL_TYPE(val + 1) == DB1_STRING) && !VAL_NULL(val + 1) && + inet_aton((char *)VAL_STRING(val + 1), &ip_addr) != 0 && + (VAL_TYPE(val + 2) == DB1_INT) && !VAL_NULL(val + 2) && + ((unsigned int)VAL_INT(val + 2) > 0) && + ((unsigned int)VAL_INT(val + 2) <= 32) && + (VAL_TYPE(val + 3) == DB1_INT) && !VAL_NULL(val + 3)) { + if ((unsigned int)VAL_INT(val + 2) == 32) { + if (addr_hash_table_insert(new_hash_table, (unsigned int)VAL_INT(val), (unsigned int)ip_addr.s_addr, (unsigned int)VAL_INT(val + 3)) - == -1) { - LM_ERR("hash table problem\n"); - perm_dbf.free_result(db_handle, res); - return -1; - } - LM_DBG("Tuple <%u, %s, %u> inserted into address hash " - "table\n", (unsigned int)VAL_INT(val), - (char *)VAL_STRING(val + 1), - (unsigned int)VAL_INT(val + 2)); - } else { - if (subnet_table_insert(new_subnet_table, - (unsigned int)VAL_INT(val), - (unsigned int)ip_addr.s_addr, - (unsigned int)VAL_INT(val + 2), - (unsigned int)VAL_INT(val + 3)) - == -1) { - LM_ERR("subnet table problem\n"); - perm_dbf.free_result(db_handle, res); - return -1; + == -1) { + LM_ERR("hash table problem\n"); + perm_dbf.free_result(db_handle, res); + return -1; + } + LM_DBG("Tuple <%u, %s, %u> inserted into address hash " + "table\n", (unsigned int)VAL_INT(val), + (char *)VAL_STRING(val + 1), + (unsigned int)VAL_INT(val + 2)); + } else { + if (subnet_table_insert(new_subnet_table, + (unsigned int)VAL_INT(val), + (unsigned int)ip_addr.s_addr, + (unsigned int)VAL_INT(val + 2), + (unsigned int)VAL_INT(val + 3)) + == -1) { + LM_ERR("subnet table problem\n"); + perm_dbf.free_result(db_handle, res); + return -1; + } + LM_DBG("Tuple <%u, %s, %u, %u> inserted into subnet " + "table\n", (unsigned int)VAL_INT(val), + (char *)VAL_STRING(val + 1), + (unsigned int)VAL_INT(val + 2), + (unsigned int)VAL_INT(val + 3)); + } + } else { + LM_ERR("database problem\n"); + perm_dbf.free_result(db_handle, res); + return -1; } - LM_DBG("Tuple <%u, %s, %u, %u> inserted into subnet " - "table\n", (unsigned int)VAL_INT(val), - (char *)VAL_STRING(val + 1), - (unsigned int)VAL_INT(val + 2), - (unsigned int)VAL_INT(val + 3)); - } - } else { - LM_ERR("database problem\n"); - perm_dbf.free_result(db_handle, res); - return -1; - } } perm_dbf.free_result(db_handle, res); @@ -176,19 +176,19 @@ int reload_address_table(void) int init_addresses(void) { if (!db_url.s) { - LM_INFO("db_url parameter of permissions module not set, " - "disabling allow_address\n"); - return 0; + LM_INFO("db_url parameter of permissions module not set, " + "disabling allow_address\n"); + return 0; } else { - if (db_bind_mod(&db_url, &perm_dbf) < 0) { - LM_ERR("load a database support module\n"); - return -1; - } + if (db_bind_mod(&db_url, &perm_dbf) < 0) { + LM_ERR("load a database support module\n"); + return -1; + } - if (!DB_CAPABILITY(perm_dbf, DB_CAP_QUERY)) { - LM_ERR("database module does not implement 'query' function\n"); - return -1; - } + if (!DB_CAPABILITY(perm_dbf, DB_CAP_QUERY)) { + LM_ERR("database module does not implement 'query' function\n"); + return -1; + } } addr_hash_table_1 = addr_hash_table_2 = 0; @@ -212,9 +212,11 @@ int init_addresses(void) addr_hash_table_2 = new_addr_hash_table(); if (!addr_hash_table_2) goto error; - addr_hash_table = (struct addr_list ***)shm_malloc - (sizeof(struct addr_list **)); - if (!addr_hash_table) goto error; + addr_hash_table = (struct addr_list ***)shm_malloc(sizeof(struct addr_list **)); + if (!addr_hash_table) { + LM_ERR("no more shared memory\n"); + goto error; + } *addr_hash_table = addr_hash_table_1; @@ -230,8 +232,8 @@ int init_addresses(void) *subnet_table = subnet_table_1; if (reload_address_table() == -1) { - LM_CRIT("reload of address table failed\n"); - goto error; + LM_CRIT("reload of address table failed\n"); + goto error; } perm_dbf.close(db_handle); @@ -240,30 +242,29 @@ int init_addresses(void) return 0; error: - LM_ERR("no more shm memory\n"); if (addr_hash_table_1) { - free_addr_hash_table(addr_hash_table_1); - addr_hash_table_1 = 0; + free_addr_hash_table(addr_hash_table_1); + addr_hash_table_1 = 0; } if (addr_hash_table_2) { - free_addr_hash_table(addr_hash_table_2); - addr_hash_table_2 = 0; + free_addr_hash_table(addr_hash_table_2); + addr_hash_table_2 = 0; } if (addr_hash_table) { - shm_free(addr_hash_table); - addr_hash_table = 0; + shm_free(addr_hash_table); + addr_hash_table = 0; } if (subnet_table_1) { - free_subnet_table(subnet_table_1); - subnet_table_1 = 0; + free_subnet_table(subnet_table_1); + subnet_table_1 = 0; } if (subnet_table_2) { - free_subnet_table(subnet_table_2); - subnet_table_2 = 0; + free_subnet_table(subnet_table_2); + subnet_table_2 = 0; } - if (subnet_table) { - shm_free(subnet_table); - subnet_table = 0; + if (subnet_table) { + shm_free(subnet_table); + subnet_table = 0; } perm_dbf.close(db_handle); db_handle = 0;

14 years, 1 month

[tracker] Task changed: nathelper.c: rtpproxy_offer / rtpproxy_answer (str2 parameter ignored)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#69 - nathelper.c: rtpproxy_offer / rtpproxy_answer (str2 parameter ignored) User who did this: Ovidiu Sas (osas) Assigned To: Daniel-Constantin Mierla -> Ovidiu Sas More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=69 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 1 month

[tracker] Task closed: SDP parsing when dealing with multi-part bodies

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#73 - SDP parsing when dealing with multi-part bodies User who did this - Ovidiu Sas (osas) Reason for closing: Fixed Additional comments about closing: Fixed in 3.1 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=73 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 1 month

[tracker] Comment added: SDP parsing when dealing with multi-part bodies

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#73 - SDP parsing when dealing with multi-part bodies User who did this - Ovidiu Sas (osas) ---------- Fix available in 3.1 (see the new rtpproxy module). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=73#comment130 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 1 month

git: updating local git repo while pending changes

by Ovidiu Sas

Hello all, Sometimes, while doing coding on my local git repo, I would like to synchronize my local repo with the remote one but without commiting my changes. Is there a way to do this in a simple and elegant matter? Regards, Ovidiu Sas

14 years, 1 month

git:3.1: modules/auth: fixed sending of [www|proxy]_challenge reply

by Juha Heinanen

Module: sip-router Branch: 3.1 Commit: c7974ebd1d2f9a55d3b742964ab6940236204e33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7974eb… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Oct 7 17:59:27 2010 +0300 modules/auth: fixed sending of [www|proxy]_challenge reply - By default, [www|proxy]_challenge functions now send reply statefully if transaction exists and statelessly otherwise. - Added force_stateless_reply module param that can be used to change the default behavior. - Credits to Andrei Pelinescu-Onciul. --- modules/auth/README | 29 ++++++++++++++++++++++------- modules/auth/auth_mod.c | 12 ++++++++++-- modules/auth/doc/functions.xml | 6 ++++-- modules/auth/doc/params.xml | 19 +++++++++++++++++++ 4 files changed, 55 insertions(+), 11 deletions(-) diff --git a/modules/auth/README b/modules/auth/README index 92e4641..0f0214b 100644 --- a/modules/auth/README +++ b/modules/auth/README @@ -36,6 +36,7 @@ Daniel-Constantin Mierla 1.3.10. secret (string) 1.3.11. nonce_expire (integer) 1.3.12. nonce_auth_max_drift (integer) + 1.3.13. force_stateless_reply (boolean) 1.4. Functions @@ -450,6 +451,18 @@ modparam("auth", "nonce_expire", 600) # Set nonce_expire to 600s modparam("auth", "nonce_auth_max_drift", 1) # set max drift to 1 s ... +1.3.13. force_stateless_reply (boolean) + + If set to 1, www_challenge() and proxy_challenge() functions send reply + statelessly no matter if transaction exists or not. If set to 0 + (default), reply is sent statefully if transaction exists and + stelelessly otherwise. + + Example 13. force_stateless_reply example +... +modparam("auth", "force_stateless_reply", 1) +... + 1.4. Functions 1.4.1. consume_credentials() @@ -462,7 +475,7 @@ modparam("auth", "nonce_auth_max_drift", 1) # set max drift to 1 s little bit shorter. The function must be called after www_authorize, proxy_authorize, www_authenticate or proxy_authenticate. - Example 13. consume_credentials example + Example 14. consume_credentials example ... if (www_authenticate("realm", "subscriber)) { consume_credentials(); @@ -476,7 +489,8 @@ if (www_authenticate("realm", "subscriber)) { field into a response generated from the request the server is processing and send the reply. Upon reception of such a reply the user agent should compute credentials and retry the request. For more - information regarding digest authentication see RFC2617. + information regarding digest authentication see RFC2617. See module + parameter force_stateless_reply regarding sending of the reply. Meaning of the parameters is as follows: * realm - Realm is a opaque string that the user agent should present @@ -496,7 +510,7 @@ if (www_authenticate("realm", "subscriber)) { This function can be used from REQUEST_ROUTE. - Example 14. www_challenge usage + Example 15. www_challenge usage ... if (!www_authenticate("$td", "subscriber")) { www_challenge("$td", "1"); @@ -510,14 +524,15 @@ if (!www_authenticate("$td", "subscriber")) { the header field into a response generated from the request the server is processing and send the reply. Upon reception of such a reply the user agent should compute credentials and retry the request. For more - information regarding digest authentication see RFC2617. + information regarding digest authentication see RFC2617. See module + parameter force_stateless_reply regarding sending of the reply. Meaning of the parameters the same as for function www_challenge(realm, flags) This function can be used from REQUEST_ROUTE. - Example 15. proxy_challenge usage + Example 16. proxy_challenge usage ... if (!proxy_authenticate("$fd", "subscriber)) { proxy_challenge("$fd", "1"); @@ -562,7 +577,7 @@ if (!proxy_authenticate("$fd", "subscriber)) { This function can be used from REQUEST_ROUTE. - Example 16. pv_www_authenticate usage + Example 17. pv_www_authenticate usage ... if (!pv_www_authenticate("$td", "123abc", "0")) { www_challenge("$td", "1"); @@ -584,7 +599,7 @@ if (!pv_www_authenticate("$td", "123abc", "0")) { This function can be used from REQUEST_ROUTE. - Example 17. pv_proxy_authenticate usage + Example 18. pv_proxy_authenticate usage ... $avp(password)="xyz"; if (!pv_proxy_authenticate("$fd", "$avp(password)", "0")) { diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c index f75530b..b30f6b8 100644 --- a/modules/auth/auth_mod.c +++ b/modules/auth/auth_mod.c @@ -97,6 +97,7 @@ char* sec_param = 0; /* If the parameter was not used, the secret phrase int nonce_expire = 300; /* Nonce lifetime */ /*int auth_extra_checks = 0; -- in nonce.c */ int protect_contacts = 0; /* Do not include contacts in nonce by default */ +int force_stateless_reply = 0; /* Always send reply statelessly */ str secret1; str secret2; @@ -171,7 +172,7 @@ static param_export_t params[] = { {"one_time_nonce" , PARAM_INT, &otn_enabled }, {"otn_in_flight_no", PARAM_INT, &otn_in_flight_no }, {"otn_in_flight_order", PARAM_INT, &otn_in_flight_k }, - {"nid_pool_no", PARAM_INT, &nid_pool_no }, + {"force_stateless_reply", PARAM_INT, &force_stateless_reply }, {0, 0, 0} }; @@ -558,6 +559,8 @@ static int fixup_pv_auth(void **param, int param_no) static int auth_send_reply(struct sip_msg *msg, int code, char *reason, char *hdr, int hdr_len) { + str reason_str; + /* Add new headers if there are any */ if ((hdr!=NULL) && (hdr_len>0)) { if (add_lump_rpl(msg, hdr, hdr_len, LUMP_RPL_HDR)==0) { @@ -566,7 +569,12 @@ static int auth_send_reply(struct sip_msg *msg, int code, char *reason, } } - return slb.zreply(msg, code, reason); + reason_str.s = reason; + reason_str.len = strlen(reason); + + return force_stateless_reply ? + slb.sreply(msg, code, &reason_str) : + slb.freply(msg, code, &reason_str); } /** diff --git a/modules/auth/doc/functions.xml b/modules/auth/doc/functions.xml index 90f4c93..b9816bc 100644 --- a/modules/auth/doc/functions.xml +++ b/modules/auth/doc/functions.xml @@ -42,7 +42,8 @@ if (www_authenticate("realm", "subscriber)) { server is processing and send the reply. Upon reception of such a reply the user agent should compute credentials and retry the request. For more information regarding digest authentication - see RFC2617. + see RFC2617. See module parameter force_stateless_reply + regarding sending of the reply. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -109,7 +110,8 @@ if (!www_authenticate("$td", "subscriber")) { put the header field into a response generated from the request the server is processing and send the reply. Upon reception of such a reply the user agent should compute credentials and retry the request. - For more information regarding digest authentication see RFC2617. + For more information regarding digest authentication see RFC2617. See module parameter force_stateless_reply + regarding sending of the reply. </para> <para>Meaning of the parameters the same as for function www_challenge(realm, flags)</para> diff --git a/modules/auth/doc/params.xml b/modules/auth/doc/params.xml index ad84251..67c83bb 100644 --- a/modules/auth/doc/params.xml +++ b/modules/auth/doc/params.xml @@ -572,4 +572,23 @@ modparam("auth", "nonce_auth_max_drift", 1) # set max drift to 1 s </programlisting> </example> </section> + + <section id="force_stateless_reply"> + <title><varname>force_stateless_reply</varname> (boolean)</title> + <para> + If set to 1, <function>www_challenge()</function> and + <function>proxy_challenge()</function> + functions send reply statelessly no matter if transaction + exists or not. If set to 0 (default), reply is sent statefully + if transaction exists and stelelessly otherwise. + </para> + <example> + <title>force_stateless_reply example</title> + <programlisting> +... +modparam("auth", "force_stateless_reply", 1) +... + </programlisting> + </example> + </section> </section>

14 years, 1 month

← Newer
1
...
16
17
18
19
20
21
22
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2010