February 2011 - sr-dev - kamailio.org

Help with Git for commiting changes in a module
by Iñaki Baz Castillo 24 Feb '11

24 Feb '11

Hi, I've coded some modifications to regex module in my local branch ibc/regex. I've also commited the branch to the server with same name ibc/regex. Now my question is: how to commit such changes into remote master? Some options I've in mind: a) Commit from my local ibc/regex branch to remote branch, and later update my local master branch: ~# git branch ibc/regex ~# git push origin ibc/regex:master ~# git fetch origin ~# git pull --rebase origin master b) Merging my local ibc/regex module into my local master branch and commit to remote master: ~# git checkout master ~# git merge --log --no-ff ibc/regex ~# git push origin master:master Suggestions please? thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

3 5

Module documentation: $Revision$ $Date$ ?
by Iñaki Baz Castillo 24 Feb '11

24 Feb '11

Hi, in SVN we can use $Revision$ and $Date$ keywords and they are replaced in server side upon commit. I've realized that some modules under sip-router Git repository also contain such keywords but, are they valid in Git? Is there updated documentation about how to write module documentation? Thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

3 4

git:3.1: pipelimit: a bunch of spelling fixes
by Henning Westerholt 24 Feb '11

24 Feb '11

Module: sip-router Branch: 3.1 Commit: c0f7a010fd65910b28f5b9fe4ca2218e376d68d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0f7a01… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Feb 24 18:59:23 2011 +0100 pipelimit: a bunch of spelling fixes (cherry picked from commit 18fcaadf0741aaa98354319360b5e54420c273ec) --- modules/pipelimit/README | 8 ++++---- modules/pipelimit/doc/pipelimit_admin.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/pipelimit/README b/modules/pipelimit/README index 3514c7c..d248c48 100644 --- a/modules/pipelimit/README +++ b/modules/pipelimit/README @@ -154,7 +154,7 @@ modparam("pipelimit", "db_url", "dbdriver://username:password@dbhost/dbname") 3.2. plp_table_name (string) - Name of DB table where data definitio for pipes is stores. + Name of DB table where data definition for pipes is stores. Default value is “pl_pipes”. @@ -223,7 +223,7 @@ modparam("ratelimit", "timer_interval", 5) modparam("ratelimit", "reply_code", 505) ... - This value cant be modified at runtime using sercmd + This value can be modified at runtime using sercmd Example 1.8. Set reply_code parameter at runtime sercmd cfg.set_now_int ratelimit reply_code 505 @@ -239,7 +239,7 @@ sercmd cfg.set_now_int ratelimit reply_code 505 modparam("ratelimit", "reply_reason", "Limiting") ... - This value cant be modified at runtime using sercmd + This value can be modified at runtime using sercmd Example 1.10. Set reply_reason parameter at runtime sercmd cfg.set_now_string ratelimit reply_reason "Limiting" @@ -387,7 +387,7 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting" 5.6. pl_push_load - Force the value of the load parameter. This methos is usefull for + Force the value of the load parameter. This command is useful for testing the Feedback algorithm. Name: pl_push_load diff --git a/modules/pipelimit/doc/pipelimit_admin.xml b/modules/pipelimit/doc/pipelimit_admin.xml index 18ca757..b630d99 100644 --- a/modules/pipelimit/doc/pipelimit_admin.xml +++ b/modules/pipelimit/doc/pipelimit_admin.xml @@ -88,7 +88,7 @@ modparam("pipelimit", "db_url", "&exampledb;") <section> <title><varname>plp_table_name</varname> (string)</title> <para> - Name of DB table where data definitio for pipes is stores. + Name of DB table where data definition for pipes is stores. </para> <para> <emphasis> @@ -210,7 +210,7 @@ modparam("ratelimit", "reply_code", 505) </programlisting> </example> <para> - This value cant be modified at runtime using sercmd + This value can be modified at runtime using sercmd </para> <example> <title> Set <varname>reply_code</varname> parameter at runtime </title> @@ -240,7 +240,7 @@ modparam("ratelimit", "reply_reason", "Limiting") </programlisting> </example> <para> - This value cant be modified at runtime using sercmd + This value can be modified at runtime using sercmd </para> <example> <title> Set <varname>reply_reason</varname> parameter at runtime </title> @@ -471,7 +471,7 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting" <function moreinfo="none">pl_push_load</function> </title> <para> - Force the value of the load parameter. This methos is usefull + Force the value of the load parameter. This command is useful for testing the Feedback algorithm. </para> <para>

1 0

git:master: pipelimit: a bunch of spelling fixes
by Henning Westerholt 24 Feb '11

24 Feb '11

Module: sip-router Branch: master Commit: 18fcaadf0741aaa98354319360b5e54420c273ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=18fcaad… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Feb 24 18:59:23 2011 +0100 pipelimit: a bunch of spelling fixes --- modules/pipelimit/README | 8 ++++---- modules/pipelimit/doc/pipelimit_admin.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/pipelimit/README b/modules/pipelimit/README index 3514c7c..d248c48 100644 --- a/modules/pipelimit/README +++ b/modules/pipelimit/README @@ -154,7 +154,7 @@ modparam("pipelimit", "db_url", "dbdriver://username:password@dbhost/dbname") 3.2. plp_table_name (string) - Name of DB table where data definitio for pipes is stores. + Name of DB table where data definition for pipes is stores. Default value is “pl_pipes”. @@ -223,7 +223,7 @@ modparam("ratelimit", "timer_interval", 5) modparam("ratelimit", "reply_code", 505) ... - This value cant be modified at runtime using sercmd + This value can be modified at runtime using sercmd Example 1.8. Set reply_code parameter at runtime sercmd cfg.set_now_int ratelimit reply_code 505 @@ -239,7 +239,7 @@ sercmd cfg.set_now_int ratelimit reply_code 505 modparam("ratelimit", "reply_reason", "Limiting") ... - This value cant be modified at runtime using sercmd + This value can be modified at runtime using sercmd Example 1.10. Set reply_reason parameter at runtime sercmd cfg.set_now_string ratelimit reply_reason "Limiting" @@ -387,7 +387,7 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting" 5.6. pl_push_load - Force the value of the load parameter. This methos is usefull for + Force the value of the load parameter. This command is useful for testing the Feedback algorithm. Name: pl_push_load diff --git a/modules/pipelimit/doc/pipelimit_admin.xml b/modules/pipelimit/doc/pipelimit_admin.xml index 18ca757..b630d99 100644 --- a/modules/pipelimit/doc/pipelimit_admin.xml +++ b/modules/pipelimit/doc/pipelimit_admin.xml @@ -88,7 +88,7 @@ modparam("pipelimit", "db_url", "&exampledb;") <section> <title><varname>plp_table_name</varname> (string)</title> <para> - Name of DB table where data definitio for pipes is stores. + Name of DB table where data definition for pipes is stores. </para> <para> <emphasis> @@ -210,7 +210,7 @@ modparam("ratelimit", "reply_code", 505) </programlisting> </example> <para> - This value cant be modified at runtime using sercmd + This value can be modified at runtime using sercmd </para> <example> <title> Set <varname>reply_code</varname> parameter at runtime </title> @@ -240,7 +240,7 @@ modparam("ratelimit", "reply_reason", "Limiting") </programlisting> </example> <para> - This value cant be modified at runtime using sercmd + This value can be modified at runtime using sercmd </para> <example> <title> Set <varname>reply_reason</varname> parameter at runtime </title> @@ -471,7 +471,7 @@ sercmd cfg.set_now_string ratelimit reply_reason "Limiting" <function moreinfo="none">pl_push_load</function> </title> <para> - Force the value of the load parameter. This methos is usefull + Force the value of the load parameter. This command is useful for testing the Feedback algorithm. </para> <para>

1 0

Some question about auth_identity module
by Iñaki Baz Castillo 23 Feb '11

23 Feb '11

Hi, by reading auth_identity module documentation I get some doubts: - The doc examples use things like: if (@identity) { t_reply("403", "Invalid Identity header"); drop; } What is @identity ?? - When acting as verifier, the proxy must get the certificate via HTTP from the URL given in the Identity-Info header of the request. The module doesn't include TCP/HTTP timeouts so, what would happen if an attacker set a non-responding domain in such header? would the kamailio/ser process block when trying to retrieve the certificate until the kernel returns error for the TCP establishment? (it could take even minutes!!!). - The doc says: 1.6.2. auth_add_identity() [...] Note: this function needs the final outgoing message for authorization, so no module may modify any digest string related headers (From, To, Call-ID, CSeq, Date, Contact) and body after auth_add_identity()'s been called So we must be careful and don't use fix_contact(), force_rtpproxy() or whatever function modifying From/To/Contact/body. This means that this won't work in most of the cases (who doesn't deal with NATted clients?). The only solution seems to be calling msg_apply_changes(), but this doesn't seem to be very good. Am I wrong? So, is this module really usable in real environments? somebody using it? Thanks. -- Iñaki Baz Castillo <ibc(a)aliax.net>

3 5

"403 Forbidden - Invalid action parameter" in http://git.sip-router.org/cgi-bin/gitweb.cgi
by Iñaki Baz Castillo 23 Feb '11

23 Feb '11

Hi, I press a link to a commit made yesterday and get an error in the web: "403 Forbidden - Invalid action parameter" The link is this one: Module: sip-router Branch: master Commit: 7ea366cd3d7ba57926e08fec1c17a1d1eb45f06c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ea366c… What is the problem? -- Iñaki Baz Castillo <ibc(a)aliax.net>

1 1

About "GIT Quick Start Guide" in sip-router.org
by Iñaki Baz Castillo 23 Feb '11

23 Feb '11

Hi, http://sip-router.org/wiki/git/quick-start-guide page mixes some git config global options with repository specific options: git config --global merge.log true git config branch.master.rebase true --global means that such option is added to $HOME/.gitconfig. If not present, then option is added to .git/config into current repository. Perhaps this should be clarified and improved? Cheers. -- Iñaki Baz Castillo <ibc(a)aliax.net>

2 2

git:master: module regex: minor fix in documentation.
by I�aki Baz Castillo 23 Feb '11

23 Feb '11

Module: sip-router Branch: master Commit: e750f003f423e169a91d62f42d12da2c6675a700 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e750f00… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Wed Feb 23 01:32:12 2011 +0100 module regex: minor fix in documentation. --- modules_k/regex/doc/regex_admin.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/regex/doc/regex_admin.xml b/modules_k/regex/doc/regex_admin.xml index 979697f..5bcd77a 100644 --- a/modules_k/regex/doc/regex_admin.xml +++ b/modules_k/regex/doc/regex_admin.xml @@ -345,12 +345,12 @@ if (pcre_match_group("$rU", "2")) { <function>pcre_match_group</function> usage (using a pseudo-variable as group) </title> <programlisting format="linespecific"> - ... - $avp(i:10) = 5; # Maybe got from a DB query. - if (pcre_match_group("$ua", "$avp(i:10)")) { - xlog("L_INFO", "User-Agent matches group 5\n"); - } - ... +... +$avp(i:10) = 5; # Maybe got from a DB query. +if (pcre_match_group("$ua", "$avp(i:10)")) { + xlog("L_INFO", "User-Agent matches group 5\n"); +} +... </programlisting> </example>

1 0

git:master: module regex: pcre_match_group() allows pseudo-variable in group parameter
by I�aki Baz Castillo 23 Feb '11

23 Feb '11

Module: sip-router Branch: master Commit: 7ea366cd3d7ba57926e08fec1c17a1d1eb45f06c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ea366c… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Wed Feb 23 01:09:57 2011 +0100 module regex: pcre_match_group() allows pseudo-variable in group parameter - example: pcre_match_group("$rU", "$var(num)"), where $var(num) can be a pseudo-variable containing an integer pointing to any group in the regex text file. - module documentation updated and improved. --- modules_k/regex/README | 338 ++++++++++++++++++++--------------- modules_k/regex/doc/regex_admin.xml | 32 +++- modules_k/regex/regex_mod.c | 20 ++- 3 files changed, 232 insertions(+), 158 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7ea…

1 0

git:ibc/regex: module regex: minor fix in documentation.
by I�aki Baz Castillo 23 Feb '11

23 Feb '11

Module: sip-router Branch: ibc/regex Commit: e750f003f423e169a91d62f42d12da2c6675a700 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e750f00… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Wed Feb 23 01:32:12 2011 +0100 module regex: minor fix in documentation. --- modules_k/regex/doc/regex_admin.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/regex/doc/regex_admin.xml b/modules_k/regex/doc/regex_admin.xml index 979697f..5bcd77a 100644 --- a/modules_k/regex/doc/regex_admin.xml +++ b/modules_k/regex/doc/regex_admin.xml @@ -345,12 +345,12 @@ if (pcre_match_group("$rU", "2")) { <function>pcre_match_group</function> usage (using a pseudo-variable as group) </title> <programlisting format="linespecific"> - ... - $avp(i:10) = 5; # Maybe got from a DB query. - if (pcre_match_group("$ua", "$avp(i:10)")) { - xlog("L_INFO", "User-Agent matches group 5\n"); - } - ... +... +$avp(i:10) = 5; # Maybe got from a DB query. +if (pcre_match_group("$ua", "$avp(i:10)")) { + xlog("L_INFO", "User-Agent matches group 5\n"); +} +... </programlisting> </example>

1 0