sr-dev July 2010

sr-dev@lists.kamailio.org

29 participants
223 discussions

git:master: modules_k: ratelimit - removing MI interface from README doc file
by Ovidiu Sas 02 Jul '10

02 Jul '10

Module: sip-router Branch: master Commit: 60c69abf1faeede5ce224b861b8f0eca9a8a452a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60c69ab… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Jul 2 17:41:05 2010 -0400 modules_k: ratelimit - removing MI interface from README doc file --- modules_k/ratelimit/doc/ratelimit_admin.xml | 237 --------------------------- 1 files changed, 0 insertions(+), 237 deletions(-) diff --git a/modules_k/ratelimit/doc/ratelimit_admin.xml b/modules_k/ratelimit/doc/ratelimit_admin.xml index 7431b87..438179e 100644 --- a/modules_k/ratelimit/doc/ratelimit_admin.xml +++ b/modules_k/ratelimit/doc/ratelimit_admin.xml @@ -471,243 +471,6 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting" </section> <section> - <title>Exported MI Functions</title> - <section> - <title> - <function moreinfo="none">rl_stats</function> - </title> - <para> - Lists the parameters and variabiles in the ratelimit module. - </para> - <para> - Name: <emphasis>rl_stats</emphasis> - </para> - <para>Parameters: <emphasis>none</emphasis></para> - <para> - MI FIFO Command Format: - </para> - <programlisting format="linespecific"> - :rl_stats:_reply_fifo_file_ - _empty_line_ - </programlisting> - </section> - <section> - <title> - <function moreinfo="none">rl_set_pipe</function> - </title> - <para> - Sets the pipe parameters for the given pipe id. - </para> - <para> - Name: <emphasis>rl_set_pipe</emphasis> - </para> - <para>Parameters:</para> - <itemizedlist> - <listitem><para> - <emphasis>pipe_id</emphasis> - pipe id. - </para></listitem> - <listitem><para> - <emphasis>pipe_algorithm</emphasis> - the - algorithm assigned to the given pipe id. - </para></listitem> - <listitem><para> - <emphasis>pipe_limit</emphasis> - the limit - assigned to the given pipe id. - </para></listitem> - </itemizedlist> - <para> - MI FIFO Command Format: - </para> - <programlisting format="linespecific"> - :rl_set_pipe:_reply_fifo_file_ - 2 - RED - 10 - _empty_line_ - </programlisting> - </section> - <section> - <title> - <function moreinfo="none">rl_get_pipes</function> - </title> - <para> - Gets the list of in use pipes. - </para> - <para> - Name: <emphasis>rl_get_pipes</emphasis> - </para> - <para>Parameters: <emphasis>none</emphasis></para> - <para> - MI FIFO Command Format: - </para> - <programlisting format="linespecific"> - :rl_get_pipes:_reply_fifo_file_ - _empty_line_ - </programlisting> - </section> - <section> - <title> - <function moreinfo="none">rl_set_queue</function> - </title> - <para> - Sets the queue parameters for the given queue id. - </para> - <para> - Name: <emphasis>rl_set_queue</emphasis> - </para> - <para>Parameters:</para> - <itemizedlist> - <listitem><para> - <emphasis>queue_id</emphasis> - queue id. - </para></listitem> - <listitem><para> - <emphasis>queue_method</emphasis> - the method - assigned to the given queue id. - </para></listitem> - <listitem><para> - <emphasis>pipe_id</emphasis> - the pipe id - assigned to the given queue id. - </para></listitem> - </itemizedlist> - <para> - MI FIFO Command Format: - </para> - <programlisting format="linespecific"> - :rl_set_queue:_reply_fifo_file_ - 3 - INVITE - 2 - _empty_line_ - </programlisting> - </section> - <section> - <title> - <function moreinfo="none">rl_get_queues</function> - </title> - <para> - Gets the list of in use queues. - </para> - <para> - Name: <emphasis>rl_get_queues</emphasis> - </para> - <para>Parameters: <emphasis>none</emphasis></para> - <para> - MI FIFO Command Format: - </para> - <programlisting format="linespecific"> - :rl_get_queues:_reply_fifo_file_ - _empty_line_ - </programlisting> - </section> - <section> - <title> - <function moreinfo="none">rl_set_pid</function> - </title> - <para> - Sets the PID Controller parameters for the Feedback Algorithm. - </para> - <para> - Name: <emphasis>rl_set_pid</emphasis> - </para> - <para>Parameters:</para> - <itemizedlist> - <listitem><para> - <emphasis>ki</emphasis> - the integral parameter. - </para></listitem> - <listitem><para> - <emphasis>kp</emphasis> - the proportional parameter. - </para></listitem> - <listitem><para> - <emphasis>kd</emphasis> - the derivative parameter. - </para></listitem> - </itemizedlist> - <para> - MI FIFO Command Format: - </para> - <programlisting format="linespecific"> - :rl_set_pid:_reply_fifo_file_ - 0.5 - 0.5 - 0.5 - _empty_line_ - </programlisting> - </section> - <section> - <title> - <function moreinfo="none">rl_get_pid</function> - </title> - <para> - Gets the list of in use PID Controller parameters. - </para> - <para> - Name: <emphasis>rl_get_pid</emphasis> - </para> - <para>Parameters: <emphasis>none</emphasis></para> - <para> - MI FIFO Command Format: - </para> - <programlisting format="linespecific"> - :rl_get_pid:_reply_fifo_file_ - _empty_line_ - </programlisting> - </section> - <section> - <title> - <function moreinfo="none">rl_push_load</function> - </title> - <para> - Force the value of the load parameter. This methos is usefull - for testing the Feedback algorithm. - </para> - <para> - Name: <emphasis>rl_push_load</emphasis> - </para> - <para>Parameters:</para> - <itemizedlist> - <listitem><para> - <emphasis>load</emphasis> - the forced value of load - (it must be greater then 0.0 and smaller then 1.0). - </para></listitem> - </itemizedlist> - <para> - MI FIFO Command Format: - </para> - <programlisting format="linespecific"> - :rl_push_load:_reply_fifo_file_ - 0.85 - _empty_line_ - </programlisting> - </section> - <section> - <title> - <function moreinfo="none">rl_set_dbg</function> - </title> - <para> - This MI function will enable/disable a WARNING debug log exposing the - internal counters for each pipe (useful in monitoring the ratelimit internals). - </para> - <para> - Name: <emphasis>rl_set_dbg</emphasis> - </para> - <para>Parameters:</para> - <itemizedlist> - <listitem><para> - <emphasis>dbg</emphasis> - the debug value (0 means disable and - 1 means enable). - </para></listitem> - </itemizedlist> - <para> - MI FIFO Command Format: - </para> - <programlisting format="linespecific"> - :rl_set_dbg:_reply_fifo_file_ - 1 - _empty_line_ - </programlisting> - </section> - </section> - - <section> <title>Exported RPC Functions</title> <section> <title>

1 0

k/auth_radius module based on s/auth module
by Juha Heinanen 02 Jul '10

02 Jul '10

> My guess is that it would be easy. The differences are mainly in > exported callbacks and some missing or extra script functions. > k version has the *challenge() functions (which were removed from ser, > but could be re-added easily) and some pv stuff. andrei, i tried to add k compatible www_challenge/proxy_challenge functions to modules_s/auth and it is not easy (at least for me). i created function static inline int build_hf(struct sip_msg* msg, int stale, str* realm, str* nonce, str* algorithm, int hftype, str* hf) that just builds the hf str and then using it, it is easy to implement current build_challenge_hf function: int build_challenge_hf(struct sip_msg* msg, int stale, str* realm, str* nonce, str* algorithm, int hftype) { str hf; avp_value_t val; if (build_hf(msg, stale, realm, nonce, algorithm, hftype, &hf)) { val.s = hf; if (add_avp(challenge_avpid.flags | AVP_VAL_STR, challenge_avpid.name, val) < 0) { ERR("auth: Error while creating attribute\n"); pkg_free(hf.s); return -1; } pkg_free(hf.s); return 0; } else { return -1; } } but when i tried to implement k *_challenge functions using it, i was not able to figure out how to create nonce parameter. also, qop is module param in s auth. -- juha

1 0

git:master: modules_k/auth_radius: fixed header name in README
by Juha Heinanen 02 Jul '10

02 Jul '10

Module: sip-router Branch: master Commit: c3a511688537893b31907b6d6d0c12603404d146 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c3a5116… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Jul 2 19:42:18 2010 +0300 modules_k/auth_radius: fixed header name in README --- modules_k/auth_radius/README | 10 +++++----- modules_k/auth_radius/doc/auth_radius.xml | 2 +- modules_k/auth_radius/doc/auth_radius_admin.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules_k/auth_radius/README b/modules_k/auth_radius/README index 4bf7334..6431c80 100644 --- a/modules_k/auth_radius/README +++ b/modules_k/auth_radius/README @@ -26,7 +26,7 @@ Jan Janak Copyright © 2005 voice-system.ro - Copyright © 2008 Juha Heinanen + Copyright © 2008-2010 Juha Heinanen Revision History Revision $Revision$ $Date$ __________________________________________________________________ @@ -272,10 +272,10 @@ modparam("auth_radius", "use_ruri_flag", 22) used by some other functions). If the function was unable to verify the credentials for some reason, - it fails and assigns a WWW-Authorize header containing a new challenge - to digest_challenge AVP. The script should then respond with 407 that - includes this header, which will challenge the user again. For more - about the negative return codes, see the above function. + it fails and assigns a Proxy-Authorize header containing a new + challenge to digest_challenge AVP. The script should then respond with + 407 that includes this header, which will challenge the user again. For + more about the negative return codes, see the above function. This function will, in fact, perform sanity checks over the received credentials and then pass them along to the radius server which will diff --git a/modules_k/auth_radius/doc/auth_radius.xml b/modules_k/auth_radius/doc/auth_radius.xml index b218e91..13886d7 100644 --- a/modules_k/auth_radius/doc/auth_radius.xml +++ b/modules_k/auth_radius/doc/auth_radius.xml @@ -49,7 +49,7 @@ <holder>&voicesystem;</holder> </copyright> <copyright> - <year>2008</year> + <year>2008-2010</year> <holder>Juha Heinanen</holder> </copyright> <para></para> diff --git a/modules_k/auth_radius/doc/auth_radius_admin.xml b/modules_k/auth_radius/doc/auth_radius_admin.xml index 466f72c..0411555 100644 --- a/modules_k/auth_radius/doc/auth_radius_admin.xml +++ b/modules_k/auth_radius/doc/auth_radius_admin.xml @@ -294,7 +294,7 @@ modparam("auth_radius", "use_ruri_flag", 22) </para> <para>If the function was unable to verify the credentials for some reason, it fails and - assigns a WWW-Authorize header containing a new + assigns a Proxy-Authorize header containing a new challenge to digest_challenge AVP. The script should then respond with 407 that includes this header, which will challenge the user again.

1 0

git:master: tm: TMCB_RESPONSE_READY executes by its own
by Daniel-Constantin Mierla 02 Jul '10

02 Jul '10

Module: sip-router Branch: master Commit: f1c35c13252d3160334e9b3f56094404f06009ba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1c35c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 2 18:21:10 2010 +0200 tm: TMCB_RESPONSE_READY executes by its own - removed the define of it to TMCB_RESPONSE_OUT - now this callback is executed before writing reply to network --- modules/tm/t_hooks.h | 16 +++++++++------- modules/tm/t_lookup.c | 3 ++- modules/tm/t_reply.c | 19 +++++++++++++++---- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/modules/tm/t_hooks.h b/modules/tm/t_hooks.h index 32ebaa3..38ba5d4 100644 --- a/modules/tm/t_hooks.h +++ b/modules/tm/t_hooks.h @@ -74,15 +74,16 @@ struct cell; #define TMCB_DESTROY_N 15 /* called on transaction destroy */ #define TMCB_E2ECANCEL_IN_N 16 #define TMCB_E2EACK_RETR_IN_N 17 +#define TMCB_RESPONSE_READY_N 18 #ifdef WITH_AS_SUPPORT -#define TMCB_DONT_ACK_N 18 /* TM shoudn't ACK a local UAC */ +#define TMCB_DONT_ACK_N 19 /* TM shoudn't ACK a local UAC */ #endif #ifdef TMCB_ONSEND -#define TMCB_REQUEST_SENT_N 19 -#define TMCB_RESPONSE_SENT_N 20 -#define TMCB_MAX_N 20 +#define TMCB_REQUEST_SENT_N 20 +#define TMCB_RESPONSE_SENT_N 21 +#define TMCB_MAX_N 21 #else -#define TMCB_MAX_N 18 +#define TMCB_MAX_N 19 #endif @@ -104,6 +105,7 @@ struct cell; #define TMCB_DESTROY (1<<TMCB_DESTROY_N) #define TMCB_E2ECANCEL_IN (1<<TMCB_E2ECANCEL_IN_N) #define TMCB_E2EACK_RETR_IN (1<<TMCB_E2EACK_RETR_IN_N) +#define TMCB_RESPONSE_READY (1<<TMCB_RESPONSE_READY_N) #ifdef WITH_AS_SUPPORT #define TMCB_DONT_ACK (1<<TMCB_DONT_ACK_N) #endif @@ -113,8 +115,6 @@ struct cell; #endif #define TMCB_MAX ((1<<(TMCB_MAX_N+1))-1) -/* response ready - might need to be executed before sending reply out */ -#define TMCB_RESPONSE_READY TMCB_RESPONSE_OUT /* * Caution: most of the callbacks work with shmem-ized messages @@ -325,6 +325,8 @@ struct cell; * the cell* parameter (t) and the tmcb are set to 0. Only the param is * is filled inside TMCB. For dialogs callbacks t is also 0. * + * TMCB_RESPONSE_READY -- a reply is ready to be sent out. Callback is + * is executed just before writing the reply content to network. * * TMCB_DONT_ACK (requires AS support) -- for localy generated INVITEs, TM * automatically generates an ACK for the received 2xx replies. But, if this diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c index ff8b4c5..be65ade 100644 --- a/modules/tm/t_lookup.c +++ b/modules/tm/t_lookup.c @@ -1026,7 +1026,8 @@ int t_reply_matching( struct sip_msg *p_msg , int *p_branch ) && p_msg->REPLY_STATUS<300 && ((!is_local(p_cell) && has_tran_tmcbs(p_cell, - TMCB_RESPONSE_OUT|TMCB_E2EACK_IN|TMCB_E2EACK_RETR_IN) ) + TMCB_RESPONSE_OUT|TMCB_RESPONSE_READY + |TMCB_E2EACK_IN|TMCB_E2EACK_RETR_IN) ) || (is_local(p_cell)&&has_tran_tmcbs(p_cell, TMCB_LOCAL_COMPLETED)) )) ) { if (parse_headers(p_msg, HDR_TO_F, 0)==-1) { diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 4318886..3fc4123 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -596,10 +596,16 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, /* do UAC cleanup procedures in case we generated a final answer whereas there are pending UACs */ if (code>=200) { - if (unlikely(is_local(trans) && - has_tran_tmcbs(trans, TMCB_LOCAL_COMPLETED) )) - run_trans_callbacks(TMCB_LOCAL_COMPLETED, trans, + if (unlikely(is_local(trans))) { + if(unlikely(has_tran_tmcbs(trans, TMCB_LOCAL_COMPLETED))) + run_trans_callbacks(TMCB_LOCAL_COMPLETED, trans, 0, FAKED_REPLY, code); + } else { + if(unlikely(has_tran_tmcbs(trans, TMCB_RESPONSE_READY))) { + run_trans_callbacks(TMCB_RESPONSE_READY, trans, + trans->uas.request, FAKED_REPLY, code); + } + } cleanup_uac_timers( trans ); if (is_invite(trans)){ prepare_to_cancel(trans, &cancel_bitmap, 0); @@ -1724,7 +1730,8 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if ( unlikely(is_invite(t) && relayed_msg!=FAKED_REPLY && relayed_code>=200 && relayed_code < 300 && has_tran_tmcbs( t, - TMCB_RESPONSE_OUT|TMCB_E2EACK_IN|TMCB_E2EACK_RETR_IN))) { + TMCB_RESPONSE_OUT|TMCB_RESPONSE_READY + |TMCB_E2EACK_IN|TMCB_E2EACK_RETR_IN))) { totag_retr=update_totag_set(t, relayed_msg); } }; /* if relay ... */ @@ -1733,6 +1740,10 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, /* send it now (from the private buffer) */ if (relay >= 0) { + if (unlikely(!totag_retr && has_tran_tmcbs(t, TMCB_RESPONSE_READY))){ + run_trans_callbacks(TMCB_RESPONSE_READY, t, + t->uas.request, relayed_msg, relayed_code); + } /* Set retransmission timer before the reply is sent out to avoid * race conditions *

1 0

k/auth_radius module based on s/auth module
by Juha Heinanen 02 Jul '10

02 Jul '10

i have now converted k/auth_radius module to use the famed s/auth module. all functionality of existing auth_radius is preserved except for this: If an empty string "" is used (as realm parameter) then the server will generate it from the request. In case of REGISTER requests To header field domain will be used (because this header field represents a user being registered), for all other messages From header field domain will be used. so the user needs to always give the realm ($td/$fd/...). regarding s/auth module, there are differences in parameters as compared to k auth module and www_challenge()/proxy_challenge() have been replaced by digest_challenge avp. this will be shown in README example. is it ok if i commit the changes or does anyone else care if i'm the only radius user? -- juha

3 9

git:master: modules_k/auth_radius: module is now using api from modules_s/ auth
by Juha Heinanen 02 Jul '10

02 Jul '10

Module: sip-router Branch: master Commit: 6f5bc8bed44491c63e65f0f85c2595887fa2a073 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f5bc8b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Jul 2 16:53:33 2010 +0300 modules_k/auth_radius: module is now using api from modules_s/auth --- modules_k/auth_radius/README | 324 +++++++++++++---------- modules_k/auth_radius/authorize.c | 94 ++++++-- modules_k/auth_radius/authrad_mod.c | 6 +- modules_k/auth_radius/authrad_mod.h | 4 +- modules_k/auth_radius/doc/auth_radius_admin.xml | 123 ++++++--- modules_k/auth_radius/sterman.c | 2 +- modules_k/auth_radius/sterman.h | 3 +- 7 files changed, 346 insertions(+), 210 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=6f5…

1 0

topoh module questions
by jerome.marchet＠orange-ftgroup.com 02 Jul '10

02 Jul '10

4 6

git:master: modules_s/auth: cleaned up readme
by Juha Heinanen 02 Jul '10

02 Jul '10

Module: sip-router Branch: master Commit: badbfafb4d5b49b9bf75e26fc47be402fb5c8aa3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=badbfaf… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Jul 2 15:00:45 2010 +0300 modules_s/auth: cleaned up readme - Removed nonexistent stuff from README, but didn't add anything. Some module params are still undocumented. --- modules_s/auth/README | 156 ++------------------------------ modules_s/auth/doc/auth.xml | 13 +--- modules_s/auth/doc/functions.xml | 185 -------------------------------------- modules_s/auth/doc/params.xml | 38 -------- 4 files changed, 9 insertions(+), 383 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bad…

1 0

tcp quick connect is not done reliably
by Juha Heinanen 02 Jul '10

02 Jul '10

i have noticed that after i restart sip router, it does not immediately try to do tcp quick connect when it relays request over tcp. after restarting sr, i start twinkle and relaying over tcp fails: Jul 1 21:19:53 localhost /usr/sbin/sip-proxy[24197]: INFO: Routing initial SUBSCRIBE <sip:jh@vm.test.fi> to <sip:127.0.0.1:5082;transport=tcp> Jul 1 21:19:53 localhost /usr/sbin/sip-proxy[24197]: INFO: t_relay failed with result -1 Jul 1 21:19:53 localhost /usr/sbin/sip-proxy[24197]: INFO: Routing initial PUBLISH <sip:jh@test.fi> to <sip:127.0.0.1:5082;transport=tcp> Jul 1 21:19:53 localhost /usr/sbin/sip-proxy[24197]: INFO: t_relay failed with result -1 then i restarted twinkle and quick connect was correctly done: Jul 1 21:20:23 localhost /usr/sbin/sip-proxy[24199]: INFO: Routing initial SUBSCRIBE <sip:jh@vm.test.fi> to <sip:127.0.0.1:5082;transport=tcp> Jul 1 21:20:23 localhost /usr/sbin/sip-proxy[24199]: INFO: <core> [tcp_main.c:1926]: tcp_send: quick connect for 0xb4e70878 why is quick connect not done reliably? -- juha

3 6

where is s proxy_challenge function?
by Juha Heinanen 02 Jul '10

02 Jul '10

since people seemed to agree that s auth module is superior to k one, i decided to try porting k auth_radius module to use s auth api and was able to compile and build it against s auth api. when testing the result, i get errors about "unknown command, missing loadmodule" when script has proxy_challenge() call. i then went and checked s auth module and found this in README: 1.4.2. proxy_challenge(realm, qop) The function challenges a user agent. ... however, auth_mod.c does not include such function: /* * Exported functions */ static cmd_export_t cmds[] = { {"consume_credentials", consume_credentials, 0, 0, REQUEST_ROUTE}, {"bind_auth_s", (cmd_function)bind_auth_s, 0, 0, 0 }, {0, 0, 0, 0, 0} }; i don't find it even with grep on s modules. where is it? -- juha

5 23

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2010