sr-dev October 2009

sr-dev@lists.kamailio.org

30 participants
468 discussions

git:master: - Doxygen updates
by Olle E. Johansson 19 Oct '09

19 Oct '09

Module: sip-router Branch: master Commit: 39adc3617f23fdd19742f525cd29ea88122cf1b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39adc36… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Sun Oct 18 22:49:36 2009 +0200 - Doxygen updates - Replace Kamailio with "&kamailio;" in xml files - Update README's because of this --- modules/carrierroute/README | 10 +- modules/carrierroute/doc/carrierroute_admin.xml | 2 +- modules/dialplan/doc/dialplan_admin.xml | 2 +- modules/pdb/doc/pdb_admin.xml | 8 +- modules/peering/README | 202 +++++++++++++---------- modules/peering/doc/peering_admin.xml | 60 ++++---- 6 files changed, 153 insertions(+), 131 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=39a…

1 0

git:master: Typo fix in doxygen
by Olle E. Johansson 19 Oct '09

19 Oct '09

Module: sip-router Branch: master Commit: f4dc85266f12c7bfa27825ae2ddb1ec193645715 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4dc852… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Sun Oct 18 22:41:15 2009 +0200 Typo fix in doxygen --- modules/topoh/th_mask.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/topoh/th_mask.c b/modules/topoh/th_mask.c index a960cfb..6255868 100644 --- a/modules/topoh/th_mask.c +++ b/modules/topoh/th_mask.c @@ -20,8 +20,8 @@ /*! * \file * \brief SIP-router topoh :: - * \ingroup lcr - * Module: \ref lcr + * \ingroup topoh + * Module: \ref topoh */ #include <string.h>

1 0

git:master: Doxygen updates
by Olle E. Johansson 19 Oct '09

19 Oct '09

Module: sip-router Branch: master Commit: ca498ca100f8f9257e49d3961922692ad8d6e201 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca498ca… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Sun Oct 18 22:40:35 2009 +0200 Doxygen updates --- modules/enum/README | 307 ++++++++++++++++++++------------------ modules/enum/doc/enum_admin.xml | 16 +- modules/enum/enum.c | 25 +++ modules/enum/enum.h | 6 + modules/enum/enum_mod.c | 7 + modules/enum/enum_mod.h | 7 + 6 files changed, 215 insertions(+), 153 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ca4…

1 0

git:master: Doxygen updates
by Olle E. Johansson 19 Oct '09

19 Oct '09

Module: sip-router Branch: master Commit: 2d473a9db88327f69c316be42205be4fbed6ca98 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d473a9… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Sun Oct 18 22:28:11 2009 +0200 Doxygen updates --- modules/topoh/README | 16 ++++++++-------- modules/topoh/doc/topoh_admin.xml | 14 +++++++------- modules/topoh/th_mask.c | 6 ++++++ modules/topoh/th_mask.h | 7 +++++++ modules/topoh/th_msg.c | 7 +++++++ modules/topoh/th_msg.h | 7 +++++++ modules/topoh/topoh_mod.c | 15 +++++++++++++++ 7 files changed, 57 insertions(+), 15 deletions(-) diff --git a/modules/topoh/README b/modules/topoh/README index f6bb788..fd5fa13 100644 --- a/modules/topoh/README +++ b/modules/topoh/README @@ -70,10 +70,10 @@ Chapter 1. Admin Guide 1. Overview - This module hides the routing headers that show topology details. It it - is not affected by the server being transaction stateless or stateful. - The script interpretor gets the SIP messages decoded, so all - functionality existing so far is preserved. + This module hides the SIP routing headers that show topology details. + It it is not affected by the server being transaction stateless or + stateful. The script interpreter gets the SIP messages decoded, so all + existing functionality is preserved. The module is transparent for the configuration writer. It only needs to be loaded (tune the parameters if needed). The SIP server can be @@ -98,7 +98,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * None. In the future the module can be enhnaced to use a stronger + * None. In the future the module can be enhanced to use a stronger encryption algorithm. 3. Exported Parameters @@ -137,7 +137,7 @@ modparam("topoh", "mask_callid", 1) 3.3. uparam_name (str) - Name of URI param where to store encoded value. + Name of URI parameter where to store encoded value. Default value is "line". @@ -148,7 +148,7 @@ modparam("topoh", "uparam_name", "myparam") 3.4. uparam_prefix (str) - Prefix to be added in encoded URI params. + Prefix to be added in encoded URI parameters. Default value is "sr-". @@ -159,7 +159,7 @@ modparam("topoh", "uparam_prefix", "xyz") 3.5. vparam_name (str) - Name of Via: parameter where to store encoded value. + Name of Via: parameter used to store encoded value. Default value is "branch". diff --git a/modules/topoh/doc/topoh_admin.xml b/modules/topoh/doc/topoh_admin.xml index 4da3862..ddb2871 100644 --- a/modules/topoh/doc/topoh_admin.xml +++ b/modules/topoh/doc/topoh_admin.xml @@ -16,10 +16,10 @@ <section> <title>Overview</title> <para> - This module hides the routing headers that show topology details. + This module hides the SIP routing headers that show topology details. It it is not affected by the server being transaction stateless or - stateful. The script interpretor gets the SIP messages decoded, - so all functionality existing so far is preserved. + stateful. The script interpreter gets the SIP messages decoded, + so all existing functionality is preserved. </para> <para> The module is transparent for the configuration writer. It only needs to be @@ -57,7 +57,7 @@ <listitem> <para> <emphasis>None</emphasis>. In the future the module can be - enhnaced to use a stronger encryption algorithm. + enhanced to use a stronger encryption algorithm. </para> </listitem> </itemizedlist> @@ -111,7 +111,7 @@ modparam("topoh", "mask_callid", 1) <section> <title><varname>uparam_name</varname> (str)</title> <para> - Name of URI param where to store encoded value. + Name of URI parameter where to store encoded value. </para> <para> <emphasis> @@ -130,7 +130,7 @@ modparam("topoh", "uparam_name", "myparam") <section> <title><varname>uparam_prefix</varname> (str)</title> <para> - Prefix to be added in encoded URI params. + Prefix to be added in encoded URI parameters. </para> <para> <emphasis> @@ -149,7 +149,7 @@ modparam("topoh", "uparam_prefix", "xyz") <section> <title><varname>vparam_name</varname> (str)</title> <para> - Name of Via: parameter where to store encoded value. + Name of Via: parameter used to store encoded value. </para> <para> <emphasis> diff --git a/modules/topoh/th_mask.c b/modules/topoh/th_mask.c index ad536ce..a960cfb 100644 --- a/modules/topoh/th_mask.c +++ b/modules/topoh/th_mask.c @@ -17,6 +17,12 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/*! + * \file + * \brief SIP-router topoh :: + * \ingroup lcr + * Module: \ref lcr + */ #include <string.h> diff --git a/modules/topoh/th_mask.h b/modules/topoh/th_mask.h index 6284353..3061dc9 100644 --- a/modules/topoh/th_mask.h +++ b/modules/topoh/th_mask.h @@ -18,6 +18,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/*! + * \file + * \brief SIP-router topoh :: + * \ingroup topoh + * Module: \ref topoh + */ + #ifndef _TH_MASK_H_ #define _TH_MASK_H_ diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index eab6a42..9f078f6 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -18,6 +18,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/*! + * \file + * \brief SIP-router topoh :: + * \ingroup topoh + * Module: \ref topoh + */ + #include <string.h> #include "../../dprint.h" diff --git a/modules/topoh/th_msg.h b/modules/topoh/th_msg.h index 6e1fd99..092918b 100644 --- a/modules/topoh/th_msg.h +++ b/modules/topoh/th_msg.h @@ -18,6 +18,13 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/*! + * \file + * \brief SIP-router topoh :: + * \ingroup topoh + * Module: \ref topoh + */ + #ifndef _TH_MSG_H_ #define _TH_MSG_H_ diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index fdba6a1..c1a8b9c 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -18,6 +18,21 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/*! + * \file + * \brief SIP-router topoh :: Module interface + * \ingroup topoh + * Module: \ref topoh + */ + +/*! \defgroup topoh SIP-router :: Topology hiding + * + * This module hides the SIP routing headers that show topology details. + * It it is not affected by the server being transaction stateless or + * stateful. The script interpreter gets the SIP messages decoded, so all + * existing functionality is preserved. + */ + #include <stdio.h> #include <string.h> #include <stdlib.h>

1 0

git:master: - Documentation updates
by Olle E. Johansson 19 Oct '09

19 Oct '09

Module: sip-router Branch: master Commit: be51b750a57231e5488bc9ecafa0747c8b6058d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be51b75… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Sun Oct 18 22:19:34 2009 +0200 - Documentation updates - Doxygen for lcr --- README-MODULES | 2 +- doc/management_api.txt | 45 ++++ modules/avpops/README | 480 +++++++++++++++++++---------------- modules/avpops/doc/avpops_admin.xml | 22 +- modules/cfg_db/README | 117 +++++---- modules/cfg_db/doc/cfg_db.xml | 39 ++-- modules/cfg_rpc/README | 5 +- modules/cfg_rpc/doc/cfg_rpc.xml | 13 +- modules/lcr/README | 104 ++++---- modules/lcr/doc/lcr_admin.xml | 89 ++++--- modules/lcr/hash.c | 12 +- modules/lcr/hash.h | 6 + modules/lcr/lcr_mod.c | 16 ++ modules/lcr/lcr_mod.h | 7 + modules/lcr/lcr_rpc.c | 9 +- modules/lcr/lcr_rpc.h | 6 + modules/lcr/mi.c | 7 + modules/lcr/mi.h | 6 + 18 files changed, 586 insertions(+), 399 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=be5…

1 0

git:master: Fixed carrierroute module exports.
by Marius Zbihlei 19 Oct '09

19 Oct '09

Module: sip-router Branch: master Commit: ca28401667bcf8d65d942fdb29033eadb6bb82b2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca28401… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Oct 19 12:46:17 2009 +0300 Fixed carrierroute module exports. See http://lists.sip-router.org/pipermail/sr-dev/2009-October/004393.html thread for a complete description --- modules/carrierroute/carrierroute.c | 6 +++--- modules/carrierroute/cr_func.c | 23 +++++++++++++++++++++++ modules/carrierroute/cr_func.h | 9 +++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/modules/carrierroute/carrierroute.c b/modules/carrierroute/carrierroute.c index b2ff441..5738db2 100644 --- a/modules/carrierroute/carrierroute.c +++ b/modules/carrierroute/carrierroute.c @@ -87,11 +87,11 @@ static void mod_destroy(void); /************* Module Exports **********************************************/ static cmd_export_t cmds[]={ {"cr_user_carrier", (cmd_function)cr_load_user_carrier, 3, cr_load_user_carrier_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"cr_route", (cmd_function)cr_route, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"cr_route", (cmd_function)cr_route5, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"cr_route", (cmd_function)cr_route, 6, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"cr_prime_route", (cmd_function)cr_prime_route, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"cr_prime_route", (cmd_function)cr_prime_route5, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"cr_prime_route", (cmd_function)cr_prime_route, 6, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - {"cr_nofallback_route",(cmd_function)cr_nofallback_route, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"cr_nofallback_route",(cmd_function)cr_nofallback_route5, 5, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"cr_nofallback_route",(cmd_function)cr_nofallback_route, 6, cr_route_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"cr_next_domain", (cmd_function)cr_load_next_domain, 6, cr_load_next_domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {0, 0, 0, 0, 0, 0} diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index e4e6d71..1dd15c8 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -677,6 +677,14 @@ int cr_route(struct sip_msg * _msg, gparam_t *_carrier, _rewrite_user, _hsrc, alg_crc32, _descavp); } +int cr_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc) +{ + return cr_do_route(_msg, _carrier, _domain, _prefix_matching, + _rewrite_user, _hsrc, alg_crc32, NULL); +} + /** * rewrites the request URI of msg after determining the @@ -701,6 +709,13 @@ int cr_prime_route(struct sip_msg * _msg, gparam_t *_carrier, _rewrite_user, _hsrc, alg_prime, _descavp); } +int cr_prime_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc) +{ + return cr_do_route(_msg, _carrier, _domain, _prefix_matching, + _rewrite_user, _hsrc, alg_prime, NULL); +} /** * rewrites the request URI of msg after determining the * new destination URI with the crc32 hash algorithm. The difference @@ -726,6 +741,14 @@ int cr_nofallback_route(struct sip_msg * _msg, gparam_t *_carrier, _rewrite_user, _hsrc, alg_crc32_nofallback, _dstavp); } +int cr_nofallback_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc) +{ + return cr_do_route(_msg, _carrier, _domain, _prefix_matching, + _rewrite_user, _hsrc, alg_crc32_nofallback, NULL); +} + /** * Loads next domain from failure routing table and stores it in an AVP. diff --git a/modules/carrierroute/cr_func.h b/modules/carrierroute/cr_func.h index 941cf65..316abdb 100644 --- a/modules/carrierroute/cr_func.h +++ b/modules/carrierroute/cr_func.h @@ -69,6 +69,9 @@ int cr_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, gparam_t *_descavp); +int cr_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc); /** @@ -89,6 +92,9 @@ int cr_prime_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, gparam_t *_descavp); +int cr_prime_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc); /** * @@ -111,6 +117,9 @@ int cr_nofallback_route(struct sip_msg * _msg, gparam_t *_carrier, gparam_t *_domain, gparam_t *_prefix_matching, gparam_t *_rewrite_user, enum hash_source _hsrc, gparam_t *_dstavp); +int cr_nofallback_route5(struct sip_msg * _msg, gparam_t *_carrier, + gparam_t *_domain, gparam_t *_prefix_matching, + gparam_t *_rewrite_user, enum hash_source _hsrc); /**

1 0

git:master: Test 26.sh (uncomment)
by Marius Zbihlei 19 Oct '09

19 Oct '09

Module: sip-router Branch: master Commit: d1142a31abce28c9aba397ec0b412157bc939375 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1142a3… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Oct 19 12:40:29 2009 +0300 Test 26.sh (uncomment) --- test/unit/26.sh | 58 +++++++++++++++++++++++++++--------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/test/unit/26.sh b/test/unit/26.sh index 591f1e2..5f253ad 100755 --- a/test/unit/26.sh +++ b/test/unit/26.sh @@ -80,28 +80,28 @@ ret=$? sleep 1 -#if [ "$ret" -eq 0 ] ; then -# sipp -sn uas -bg -i localhost -m 12 -p 7000 &> /dev/null -# sipp -sn uas -bg -i localhost -m 12 -p 8000 &> /dev/null -# sipp -sn uac -s 49721123456787 127.0.0.1:5060 -i 127.0.0.1 -m 20 -p 5061 &> /dev/null -# ret=$? -# killall sipp &> /dev/null -#fi; - - -#if [ "$ret" -eq 0 ] ; then -# sipp -sn uas -bg -i localhost -m 10 -p 9000 &> /dev/null -# sipp -sn uac -s 49721123456786 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null -# ret=$? -#fi; -#sleep 1 - -#if [ "$ret" -eq 0 ] ; then -# sipp -sn uas -bg -i localhost -m 10 -p 10000 &> /dev/null -# sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null -# ret=$? -#fi; -#sleep 2 +if [ "$ret" -eq 0 ] ; then + sipp -sn uas -bg -i localhost -m 12 -p 7000 &> /dev/null + sipp -sn uas -bg -i localhost -m 12 -p 8000 &> /dev/null + sipp -sn uac -s 49721123456787 127.0.0.1:5060 -i 127.0.0.1 -m 20 -p 5061 &> /dev/null + ret=$? + killall sipp &> /dev/null +fi; + + +if [ "$ret" -eq 0 ] ; then + sipp -sn uas -bg -i localhost -m 10 -p 9000 &> /dev/null + sipp -sn uac -s 49721123456786 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null + ret=$? +fi; +sleep 1 + +if [ "$ret" -eq 0 ] ; then + sipp -sn uas -bg -i localhost -m 10 -p 10000 &> /dev/null + sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null + ret=$? +fi; +sleep 2 if [ "$ret" -eq 0 ] ; then killall sipp &> /dev/null @@ -115,13 +115,13 @@ flags, mask, next_domain) values ('4', '3', '1', '49', '127.0.0.1:10000', '4..', $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code, flags, mask, next_domain) values ('5', '3', '1', '49', '127.0.0.1:10000', '486', '0', '0', '2');" -#if [ ! "$ret" -eq 0 ] ; then -# $CTL fifo cr_reload_routes -# killall sipp &> /dev/null -# sipp -sf failure_route.xml -bg -i localhost -m 10 -p 10000 &> /dev/null -# sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null -# ret=$? -#fi; +if [ ! "$ret" -eq 0 ] ; then + $CTL fifo cr_reload_routes + killall sipp &> /dev/null + sipp -sf failure_route.xml -bg -i localhost -m 10 -p 10000 &> /dev/null + sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null + ret=$? +fi; $KILL

1 0

Why fetch docbook stylesheets remotely?
by Olle E. Johansson 19 Oct '09

19 Oct '09

Is there any particular reason for why we always fetch docbook style sheets over HTTP when running "make README" ? I can tell you that it doesn't work well with lousy connections. The result is an empty README file - just a few blank lines. Maybe we should consider storing the versions we use in the docbook directory. /O

4 16

git:master: If the user parameter is "<null>" (e. g a empty username in the request URI), do not copy this value to the rewritten uri.
by Marius Zbihlei 19 Oct '09

19 Oct '09

Module: sip-router Branch: master Commit: e06a69d625d4c1293fceef13f9eca22e14662f9f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e06a69d… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Oct 12 15:10:55 2009 +0300 If the user parameter is "<null>" (e.g a empty username in the request URI), do not copy this value to the rewritten uri. This is the case of a REGISTER request. Added statements that the parameters to the actually_rewrite func may not be null. --- modules/carrierroute/cr_func.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 5f4abb5..e4e6d71 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -267,11 +267,10 @@ static struct route_rule * get_rule_by_hash(const struct route_flags * rf, /** * does the work for rewrite_on_rule, writes the new URI into dest * - * @param rs the route rule used for rewriting - * @param dest the returned new destination URI - * @param msg the sip message - * @param user the localpart of the uri to be rewritten - * @param descavp the name of the AVP where the description is stored + * @param rs the route rule used for rewriting, not NULL + * @param dest the returned new destination URI, not NULL + * @param msg the sip message, not NULL + * @param user the localpart of the uri to be rewritten, not NULL * * @return 0 on success, -1 on failure * @@ -284,11 +283,23 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, int_str avp_val; int strip = 0; + str l_user = *user; + strip = (rs->strip > user->len ? user->len : rs->strip); strip = (strip < 0 ? 0 : strip); - len = rs->local_prefix.len + user->len + rs->local_suffix.len + - AT_SIGN.len + rs->host.len - strip; + if ( strcmp(user->s, "<null>") == 0 || user->len == 0) + { + l_user.s = NULL; + l_user.len = 0; + len = rs->host.len; + strip = 0; + } + else{ + len = rs->local_prefix.len + l_user.len + rs->local_suffix.len + + AT_SIGN.len + rs->host.len - strip; + } + if (msg->parsed_uri.type == SIPS_URI_T) { len += SIPS_URI.len; } else { @@ -309,11 +320,11 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, memcpy(p, SIP_URI.s, SIP_URI.len); p += SIP_URI.len; } - if (user->len) { + if (l_user.len) { memcpy(p, rs->local_prefix.s, rs->local_prefix.len); p += rs->local_prefix.len; - memcpy(p, user->s + strip, user->len - strip); - p += user->len - strip; + memcpy(p, l_user.s + strip, l_user.len - strip); + p += l_user.len - strip; memcpy(p, rs->local_suffix.s, rs->local_suffix.len); p += rs->local_suffix.len; memcpy(p, AT_SIGN.s, AT_SIGN.len);

2 2

git:master: Fixed userblacklist exported function
by Marius Zbihlei 19 Oct '09

19 Oct '09

Module: sip-router Branch: master Commit: ae18879b65d1a005639559ff689657b1cc2777d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ae18879… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Oct 19 11:27:25 2009 +0300 Fixed userblacklist exported function See http://lists.sip-router.org/pipermail/sr-dev/2009-October/004393.html thread for a complete description --- modules_k/userblacklist/userblacklist.c | 33 +++++++++++++++++++++++++++--- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/modules_k/userblacklist/userblacklist.c b/modules_k/userblacklist/userblacklist.c index 83a4f6e..57b2b84 100644 --- a/modules_k/userblacklist/userblacklist.c +++ b/modules_k/userblacklist/userblacklist.c @@ -82,6 +82,10 @@ static int check_user_blacklist_fixup(void** param, int param_no); /* ---- exported commands: */ static int check_user_blacklist(struct sip_msg *msg, char* str1, char* str2, char* str3, char* str4); static int check_user_whitelist(struct sip_msg *msg, char* str1, char* str2, char* str3, char* str4); +static int check_user_blacklist2(struct sip_msg *msg, char* str1, char* str2); +static int check_user_whitelist2(struct sip_msg *msg, char* str1, char* str2); +static int check_user_blacklist3(struct sip_msg *msg, char* str1, char* str2, char* str3); +static int check_user_whitelist3(struct sip_msg *msg, char* str1, char* str2, char* str3); static int check_blacklist(struct sip_msg *msg, struct check_blacklist_fs_t *arg1); /* ---- module init functions: */ @@ -95,10 +99,10 @@ struct mi_root * mi_reload_blacklist(struct mi_root* cmd, void* param); /* usag static cmd_export_t cmds[]={ - { "check_user_blacklist", (cmd_function)check_user_blacklist, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - { "check_user_whitelist", (cmd_function)check_user_whitelist, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - { "check_user_blacklist", (cmd_function)check_user_blacklist, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, - { "check_user_whitelist", (cmd_function)check_user_whitelist, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_user_blacklist", (cmd_function)check_user_blacklist2, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_user_whitelist", (cmd_function)check_user_whitelist2, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_user_blacklist", (cmd_function)check_user_blacklist3, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + { "check_user_whitelist", (cmd_function)check_user_whitelist3, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { "check_user_blacklist", (cmd_function)check_user_blacklist, 4, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { "check_user_whitelist", (cmd_function)check_user_whitelist, 4, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { "check_blacklist", (cmd_function)check_blacklist, 1, check_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, @@ -313,6 +317,27 @@ static int check_user_blacklist(struct sip_msg *msg, char* str1, char* str2, cha return check_user_list(msg, str1, str2, str3, str4, 0); } +static int check_user_whitelist2(struct sip_msg *msg, char* str1, char* str2) +{ + return check_user_list(msg, str1, str2, NULL, NULL, 1); +} + + +static int check_user_blacklist2(struct sip_msg *msg, char* str1, char* str2) +{ + return check_user_list(msg, str1, str2, NULL, NULL, 0); +} + +static int check_user_whitelist3(struct sip_msg *msg, char* str1, char* str2, char* str3) +{ + return check_user_list(msg, str1, str2, str3, NULL, 1); +} + + +static int check_user_blacklist3(struct sip_msg *msg, char* str1, char* str2, char* str3) +{ + return check_user_list(msg, str1, str2, str3, NULL, 0); +} /**

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2009