sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

sip_uri structure
by Miklos Tirpak 13 May '09

13 May '09

Hello, I am wondering whether I can add a new parameter (or possibly parameters) to the sip_uri structure because of performance reasons. There are some parameter values that need to be accessed frequently, and having a short-cut to them would be very good, otherwise the linked list for the parameters is always constructed and freed. The current request is for the "rn" parameter from RFC 4694 which may be checked as frequently as ruri.user in certain deployments. If the memory usage is a concern then I can also introduce a #define statement, something like URI_PARAM_SHORTCUTS. Thanks, Miklos

1 0

git:master: typo correction
by Miklos Tirpak 13 May '09

13 May '09

Module: sip-router Branch: master Commit: 205c28ae0de03703fedf235d27f5244a45e3b1d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=205c28a… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed May 13 08:51:27 2009 +0200 typo correction --- modules_s/cfg_rpc/README | 2 +- modules_s/cfg_rpc/doc/rpc.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_s/cfg_rpc/README b/modules_s/cfg_rpc/README index 7e457da..c3cdc80 100644 --- a/modules_s/cfg_rpc/README +++ b/modules_s/cfg_rpc/README @@ -33,7 +33,7 @@ Miklos Tirpak accepts three parameters: group name, variable name, string value. * cfg_rpc.commit - Commit the previously prepared configuration changes. The function does not have any parameters. - * cfg_rpc.rollback - Drop the prepared configuration changed. The + * cfg_rpc.rollback - Drop the prepared configuration changes. The function does not have any parameters. * cfg_rpc.get - Get the value of a configuration variable. The function accepts two parameters: group name, variable name. diff --git a/modules_s/cfg_rpc/doc/rpc.xml b/modules_s/cfg_rpc/doc/rpc.xml index eb1e8a0..9307c0a 100644 --- a/modules_s/cfg_rpc/doc/rpc.xml +++ b/modules_s/cfg_rpc/doc/rpc.xml @@ -52,7 +52,7 @@ <listitem> <para> <emphasis>cfg_rpc.rollback</emphasis> - Drop the prepared - configuration changed. The function does not have any + configuration changes. The function does not have any parameters. </para> </listitem>

1 0

K modules fully ported to SR
by Iñaki Baz Castillo 11 May '09

11 May '09

Hi, which would be the best example of an already ported Kamailio module? I mean a Kamailio module that has been *fully* ported (this involves using the "new"/definitive MI system and so on). I know that there are some K module ported but they still use the K MI functions. Thanks a lot. -- Iñaki Baz Castillo <ibc(a)aliax.net>

2 2

git:master: * Moved modules_k/utils to modules ( it does not exist in s and contains
by Juha Heinanen 11 May '09

11 May '09

Module: sip-router Branch: master Commit: b24ce7c29876f747c35b185233de70115c0a03cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b24ce7c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon May 11 18:17:17 2009 +0300 * Moved modules_k/utils to modules (it does not exist in s and contains functions that don't exist in s). --- {modules_k => modules}/utils/Makefile | 0 {modules_k => modules}/utils/README | 0 {modules_k => modules}/utils/conf.c | 0 {modules_k => modules}/utils/conf.h | 0 {modules_k => modules}/utils/doc/Makefile | 0 {modules_k => modules}/utils/doc/utils.xml | 0 {modules_k => modules}/utils/doc/utils_admin.xml | 0 {modules_k => modules}/utils/functions.c | 0 {modules_k => modules}/utils/functions.h | 0 {modules_k => modules}/utils/utils.c | 0 {modules_k => modules}/utils/utils.h | 0 11 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules_k/utils/Makefile b/modules/utils/Makefile similarity index 100% rename from modules_k/utils/Makefile rename to modules/utils/Makefile diff --git a/modules_k/utils/README b/modules/utils/README similarity index 100% rename from modules_k/utils/README rename to modules/utils/README diff --git a/modules_k/utils/conf.c b/modules/utils/conf.c similarity index 100% rename from modules_k/utils/conf.c rename to modules/utils/conf.c diff --git a/modules_k/utils/conf.h b/modules/utils/conf.h similarity index 100% rename from modules_k/utils/conf.h rename to modules/utils/conf.h diff --git a/modules_k/utils/doc/Makefile b/modules/utils/doc/Makefile similarity index 100% rename from modules_k/utils/doc/Makefile rename to modules/utils/doc/Makefile diff --git a/modules_k/utils/doc/utils.xml b/modules/utils/doc/utils.xml similarity index 100% rename from modules_k/utils/doc/utils.xml rename to modules/utils/doc/utils.xml diff --git a/modules_k/utils/doc/utils_admin.xml b/modules/utils/doc/utils_admin.xml similarity index 100% rename from modules_k/utils/doc/utils_admin.xml rename to modules/utils/doc/utils_admin.xml diff --git a/modules_k/utils/functions.c b/modules/utils/functions.c similarity index 100% rename from modules_k/utils/functions.c rename to modules/utils/functions.c diff --git a/modules_k/utils/functions.h b/modules/utils/functions.h similarity index 100% rename from modules_k/utils/functions.h rename to modules/utils/functions.h diff --git a/modules_k/utils/utils.c b/modules/utils/utils.c similarity index 100% rename from modules_k/utils/utils.c rename to modules/utils/utils.c diff --git a/modules_k/utils/utils.h b/modules/utils/utils.h similarity index 100% rename from modules_k/utils/utils.h rename to modules/utils/utils.h

1 0

git:master: doc: rpc struct_scan and struct_add example fixes
by Andrei Pelinescu-Onciul 11 May '09

11 May '09

Module: sip-router Branch: master Commit: 48a578874677e62af9fa0039decc738f14ac9ae7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48a5788… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 11 17:12:16 2009 +0200 doc: rpc struct_scan and struct_add example fixes --- doc/rpc/ser_rpc.txt | 20 +++++++++++++------- doc/rpc/ser_rpc.xml | 17 +++++++++++++---- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/doc/rpc/ser_rpc.txt b/doc/rpc/ser_rpc.txt index e9a00cf..35873a3 100644 --- a/doc/rpc/ser_rpc.txt +++ b/doc/rpc/ser_rpc.txt @@ -303,7 +303,9 @@ static void rpc_delete_contact(rpc_t* rpc) return; } - if (rpc->struct_scan(handle, "Sdf", &contact, &expires, &q) < 0) { + if (rpc->struct_scan(handle, "Sdf", "Contact", &contact, + "Expires", &expires, + "Q", &q ) < 0) { /* Reply is set automatically by struct_scan upon failure, * no need to do anything here */ @@ -460,8 +462,9 @@ static void rpc_func(rpc_t* rpc) /* Create empty structure and obtain its handle */ if (rpc->add("{", &handle) < 0) return; /* Fill-in the structure */ - if (rpc->struct_add(handle, "sd", "attr1", str_val, "attr2", int_val) < 0) r -eturn; + if (rpc->struct_add(handle, "sd", "attr1", str_val, + "attr2", int_val ) < 0) + return; } The function returns -1 on an error (and sets the status code and @@ -483,8 +486,10 @@ static void rpc_register(rpc_t* rpc) /* Extract the domain, address of record from the request */ if (rpc->scan("sS{", &domain, &aor, &handle) < 0) return; /* Extract the structure describing the contact to be processed */ - if (rpc->struct_scan(handle, "Sdf", &contact.c, &contact.expires, &contact.q -) < 0) return; + if (rpc->struct_scan(handle, "Sdf", "Contact", &contact.c, + "Expires", &contact.expires, + "Q", &contact.q ) < 0) + return; /* Process the contact, new_contact will contain updated value after pro cessing */ @@ -497,8 +502,9 @@ cessing */ /* Return the domain and the address of record */ rpc->add("sS{", &domain, &aor, &handle) < 0) return; /* And also add the new values for contact, q, and expires parameters */ - rpc->struct_add(handle, "Sdf", &new_contact.c, &new_contact.expires, &new_co -ntact.q); + rpc->struct_add(handle, "Sdf", "Contact", &new_contact.c, + "Expires", &new_contact.expires, + "Q", &new_contact.q ); } 1.3. Client Examples diff --git a/doc/rpc/ser_rpc.xml b/doc/rpc/ser_rpc.xml index 2853c95..0a4a41f 100644 --- a/doc/rpc/ser_rpc.xml +++ b/doc/rpc/ser_rpc.xml @@ -405,7 +405,9 @@ static void rpc_delete_contact(rpc_t* rpc) return; } - if (rpc->struct_scan(handle, "Sdf", &contact, &expires, &q) < 0) { + if (rpc->struct_scan(handle, "Sdf", "Contact", &contact, + "Expires", &expires, + "Q", &q ) < 0) { /* Reply is set automatically by struct_scan upon failure, * no need to do anything here */ @@ -628,7 +630,9 @@ static void rpc_func(rpc_t* rpc) /* Create empty structure and obtain its handle */ if (rpc->add("{", &handle) < 0) return; /* Fill-in the structure */ - if (rpc->struct_add(handle, "sd", "attr1", str_val, "attr2", int_val) < 0) return; + if (rpc->struct_add(handle, "sd", "attr1", str_val, + "attr2", int_val ) < 0) + return; } ]]> </programlisting> @@ -658,7 +662,10 @@ static void rpc_register(rpc_t* rpc) /* Extract the domain, address of record from the request */ if (rpc->scan("sS{", &domain, &aor, &handle) < 0) return; /* Extract the structure describing the contact to be processed */ - if (rpc->struct_scan(handle, "Sdf", &contact.c, &contact.expires, &contact.q) < 0) return; + if (rpc->struct_scan(handle, "Sdf", "Contact", &contact.c, + "Expires", &contact.expires, + "Q", &contact.q ) < 0) + return; /* Process the contact, new_contact will contain updated value after processing */ if (process_contact(domain, &aor, &new_contact, &contact) < 0) { @@ -670,7 +677,9 @@ static void rpc_register(rpc_t* rpc) /* Return the domain and the address of record */ rpc->add("sS{", &domain, &aor, &handle) < 0) return; /* And also add the new values for contact, q, and expires parameters */ - rpc->struct_add(handle, "Sdf", &new_contact.c, &new_contact.expires, &new_contact.q); + rpc->struct_add(handle, "Sdf", "Contact", &new_contact.c, + "Expires", &new_contact.expires, + "Q", &new_contact.q ); } ]]> </programlisting>

1 0

git:master: doc: xmlrpc functions and params added
by Andrei Pelinescu-Onciul 11 May '09

11 May '09

Module: sip-router Branch: master Commit: a23b076fff03adc14dfb366b2827d304c43fb623 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a23b076… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 11 16:50:15 2009 +0200 doc: xmlrpc functions and params added --- modules_s/xmlrpc/doc/functions.xml | 84 ++++++++++++++++++++++++++++++++++++ modules_s/xmlrpc/doc/params.xml | 67 ++++++++++++++++++++++++++++ modules_s/xmlrpc/doc/xmlrpc.xml | 3 + 3 files changed, 154 insertions(+), 0 deletions(-) diff --git a/modules_s/xmlrpc/doc/functions.xml b/modules_s/xmlrpc/doc/functions.xml new file mode 100644 index 0000000..bc3820f --- /dev/null +++ b/modules_s/xmlrpc/doc/functions.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<section id="xmlrpc.functions" xmlns:xi="http://www.w3.org/2001/XInclude"> + <sectioninfo> + <revhistory> + <revision> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> + </revision> + </revhistory> + </sectioninfo> + + <title>Functions</title> + + <section id="xmlrpc.dispatch_rpc"> + <title> + <function>dispatch_rpc()</function> + </title> + <para> + This function processes an XMLRPC request, found in the body of + the request. + </para> + <para> + It should be used only in a route specified using the + <varname>"route"</varname> module parameter or if the request method + is GET or POST (using it for other request methods will not have + adverse side-effects, but it will probably not work). + </para> + <para> + dispatch_rpc() extracts the XML-RPC document from the body of the + request to determine the name of the RPC method to be called and then + it searches through the list of all the RPC functions to find a + function with matching name. If such a function is found then + dispatch_rpc() will pass control to the function to handle the + request. + </para> + <example> + <title><function>dispatch_rpc</function> usage</title> + <programlisting> +#... +modparam("xmlrpc", "route", "XMLRPC"); +#... +route[XMLRPC]{ + dispatch_rpc(); +} + </programlisting> + </example> + </section> + + <section id="xmlrpc.xmlrpc_reply"> + <title> + <function>xmlrpc_reply(code, reason)</function> + </title> + <para> + This function can be called from the config script to directly + generate an XML-RPC reply. + </para> + <example> + <title><function>xmlrpc_reply</function> usage</title> + <programlisting> +#... +modparam("xmlrpc", "route", "XMLRPC"); +#... +route[XMLRPC]{ + # allow XMLRPC requests only on TLS and only if the client + # certificate is valid + if (proto!=TLS){ + xmlrpc_reply("400", "xmlrpc allowed only over TLS"); + return; + } + if (@tls.peer.verified!=""){ + xmlrpc_reply("400", "Unauthorized"); + return; + } + dispatch_rpc(); +} + </programlisting> + </example> + </section> + + +</section> diff --git a/modules_s/xmlrpc/doc/params.xml b/modules_s/xmlrpc/doc/params.xml new file mode 100644 index 0000000..324495d --- /dev/null +++ b/modules_s/xmlrpc/doc/params.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<section id="xmlrpc.parameters" xmlns:xi="http://www.w3.org/2001/XInclude"> + <sectioninfo> + <revhistory> + <revision> + <revnumber>$Revision$</revnumber> + <date>$Date$</date> + </revision> + </revhistory> + </sectioninfo> + + <title>Parameters</title> + + <section id="route"> + <title><varname>route</varname> (string)</title> + <para> + Name of the route called for XMLRPC messages. + </para> + <para> + This route will be called only for HTTP messages whose method is + either GET or POST. The message visible inside the route + will be a HTTP request converted to SIP (the uri will be fixed and + a fake via will be added). + </para> + <para> + The route should perform additional security checks to + ensure the client is authorized to execute management/RPC functions + and then it should call the <function>dispatch_rpc()</function>. + </para> + <para> + Default: the main route is used. + </para> + <example> + <title>Set <varname>route</varname> parameter</title> + <programlisting> +modparam("xmlrpc", "route", "route_for_xmlrpcs") + </programlisting> + </example> + </section> + +  + +</section> diff --git a/modules_s/xmlrpc/doc/xmlrpc.xml b/modules_s/xmlrpc/doc/xmlrpc.xml index 7a1b908..4438185 100644 --- a/modules_s/xmlrpc/doc/xmlrpc.xml +++ b/modules_s/xmlrpc/doc/xmlrpc.xml @@ -686,4 +686,7 @@ Content-Length: 276 </para> </section> + <xi:include href="params.xml"/> + <xi:include href="functions.xml"/> + </section>

1 0

git:master: doc: rpc txt version added
by Andrei Pelinescu-Onciul 11 May '09

11 May '09

Module: sip-router Branch: master Commit: 68d84c0c2584404dca59882f047d70be1b131901 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68d84c0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 11 16:51:42 2009 +0200 doc: rpc txt version added ser_rpc.txt generated from ser_rpc.xml added. --- doc/rpc/ser_rpc.txt | 523 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 523 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=68d…

1 0

git:master: doc: xmlrpc README added
by Andrei Pelinescu-Onciul 11 May '09

11 May '09

Module: sip-router Branch: master Commit: 2f5b7adc2a83c5903e95e64019cbacf82555a9de URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f5b7ad… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 11 16:51:05 2009 +0200 doc: xmlrpc README added --- modules_s/xmlrpc/README | 521 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 521 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2f5…

1 0

git:master: doc: rpc docs split into rpc api and xmlrpc modules docs
by Andrei Pelinescu-Onciul 11 May '09

11 May '09

Module: sip-router Branch: master Commit: e9ad62bff43409a249649892e182e8b34c5f2700 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e9ad62b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon May 11 15:59:54 2009 +0200 doc: rpc docs split into rpc api and xmlrpc modules docs - doc/rpc/ser_rpc.xml split into ser_rpc.xml (that contains now only generic RPC documentation) and modules_s/xmlrpc/doc/xmlrpc.xml (that contains xmlrpc specific stuff). - slight updates and fixes --- doc/rpc/ser_rpc.xml | 724 +++------------------ modules_s/xmlrpc/doc/Makefile | 4 + {doc/rpc => modules_s/xmlrpc/doc}/rpc_example.dia | Bin 2197 -> 2197 bytes {doc/rpc => modules_s/xmlrpc/doc}/rpc_example.png | Bin 22105 -> 22105 bytes modules_s/xmlrpc/doc/xmlrpc.xml | 689 ++++++++++++++++++++ 5 files changed, 778 insertions(+), 639 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e9a…

1 0

msilo comparison
by jh＠tutpro.com 11 May '09

11 May '09

i recently added a new feature to k msilo module and now took a look how does s msilo compare to k's. it turns out that k msilo module has lots of stuff that is missing from s version. there seems to be one difference though. in s module there is this: registrar (string) The SIP address used to inform users that destination of their message is not online and the message will be delivered next time when that user goes online. If the parameter is not set, the module will not send any notification. All requests intended for this SIP address will not be stored for lately delivery. Default value is "NULL". Example 5. Set the registrar parameter ... modparam("msilo", "registrar", "sip:registrar@iptel.org") and the corresponding thing in k is this: 1.3.3. from_address (string) The SIP address used to inform users that destination of their message is not online and the message will be delivered next time when that user goes online. If the parameter is not set, the module will not send any notification. It can contain pseudo-variables. Default value is "NULL". Example 1.3. Set the "from_address" parameter ... modparam("msilo", "from_address", "sip:registrar@example.org") modparam("msilo", "from_address", "sip:$rU@example.org") in my opnion the difference is so small that we could adopt k version of msilo as is. comments? -- juha

2 3

← Newer
1
...
14
15
16
17
18
19
20
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009