sr-dev

sr-dev@lists.kamailio.org

12 participants
44198 discussions

git:master: doc: rpc struct_scan and struct_add example fixes

by Andrei Pelinescu-Onciul

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>

15 years, 8 months

git:master: doc: xmlrpc README added

by Andrei Pelinescu-Onciul

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…

15 years, 8 months

git:master: doc: rpc txt version added

by Andrei Pelinescu-Onciul

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…

15 years, 8 months

git:master: doc: xmlrpc functions and params added

by Andrei Pelinescu-Onciul

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>

15 years, 8 months

git:master: doc: rpc docs split into rpc api and xmlrpc modules docs

by Andrei Pelinescu-Onciul

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…

15 years, 8 months

msilo comparison

by jh＠tutpro.com

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

15 years, 8 months

git:master: * Fixed bug in computing expires value for subscription dialogs .

by Juha Heinanen

Module: sip-router Branch: master Commit: ae4856f3db1f4a82a23eaa9c9f305d8f6924bb48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ae4856f… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon May 11 14:15:12 2009 +0300 * Fixed bug in computing expires value for subscription dialogs. Credits to Anca Vamanu. --- modules_k/presence/notify.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index 87e728e..93dddf0 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -1096,14 +1096,14 @@ int get_subs_db(str* pres_uri, pres_ev_t* event, str* sender, row = &result->rows[i]; row_vals = ROW_VALUES(row); - // if(row_vals[expires_col].val.int_val< (int)time(NULL)) - // continue; - - if(row_vals[reason_col].val.string_val) - { - if(strlen(row_vals[reason_col].val.string_val) != 0) - continue; - } + // if(row_vals[expires_col].val.int_val< (int)time(NULL)) + // continue; + + if(row_vals[reason_col].val.string_val) { + if(strlen(row_vals[reason_col].val.string_val) != 0) + continue; + } + // s.reason.len= strlen(s.reason.s); memset(&s, 0, sizeof(subs_t)); @@ -1148,7 +1148,11 @@ int get_subs_db(str* pres_uri, pres_ev_t* event, str* sender, s.event= event; s.local_cseq = row_vals[cseq_col].val.int_val; - s.expires = row_vals[expires_col].val.int_val -(int)time(NULL); + if(row_vals[expires_col].val.int_val < (int)time(NULL)) + s.expires = 0; + else + s.expires = row_vals[expires_col].val.int_val - + (int)time(NULL); s.version = row_vals[version_col].val.int_val; s_new= mem_copy_subs(&s, PKG_MEM_TYPE);

15 years, 8 months

git:master: * Moved lcr module from modules_k to modules and removed it from modules_s .

by Juha Heinanen

Module: sip-router Branch: master Commit: a3f16850cd2a897710cb0a56174e9f64dcc77653 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3f1685… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat May 9 19:14:18 2009 +0300 * Moved lcr module from modules_k to modules and removed it from modules_s. --- {modules_k => modules}/lcr/Makefile | 0 {modules_k => modules}/lcr/README | 0 {modules_k => modules}/lcr/doc/Makefile | 0 {modules_k => modules}/lcr/doc/lcr.xml | 0 {modules_k => modules}/lcr/doc/lcr_admin.xml | 0 {modules_k => modules}/lcr/hash.c | 0 {modules_k => modules}/lcr/hash.h | 0 {modules_k => modules}/lcr/lcr_mod.c | 0 {modules_k => modules}/lcr/lcr_mod.h | 0 {modules_k => modules}/lcr/mi.c | 0 {modules_k => modules}/lcr/mi.h | 0 modules_s/lcr/Makefile | 17 - modules_s/lcr/README | 259 ------ modules_s/lcr/doc/Makefile | 4 - modules_s/lcr/doc/functions.xml | 17 - modules_s/lcr/doc/lcr.xml | 121 --- modules_s/lcr/doc/params.xml | 235 ------ modules_s/lcr/lcr_mod.c | 1113 -------------------------- modules_s/lcr/lcr_mod.h | 61 -- modules_s/lcr/lcr_rpc.c | 104 --- modules_s/lcr/lcr_rpc.h | 35 - modules_s/lcr/ser-lcr.cfg | 24 - 22 files changed, 0 insertions(+), 1990 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a3f…

15 years, 8 months

git:master: doc: rpc makefile migrated to the new doc make system

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 83d732f025fb4db086449e095b1c91e8fefaa754 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83d732f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun May 10 10:56:45 2009 +0200 doc: rpc makefile migrated to the new doc make system --- doc/rpc/Makefile | 27 +++------------------------ 1 files changed, 3 insertions(+), 24 deletions(-) diff --git a/doc/rpc/Makefile b/doc/rpc/Makefile index 5d2867c..8f32f6a 100644 --- a/doc/rpc/Makefile +++ b/doc/rpc/Makefile @@ -1,29 +1,8 @@ # # The list of documents to build (without extensions) # -DOCUMENTS = ser_rpc -# -# The root directory containing Makefile.doc -# -ROOT_DIR=../.. - -# -# Validate docbook documents before generating output -# (may be slow) -# -#VALIDATE=1 - -# -# You can override the stylesheet used to generate -# xhtml documents here -# -#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl - -# -# You can override the stylesheet used to generate -# plain text documents here -# -#TXT_XSL=$(XHTML_XSL) +docs = ser_rpc.xml +docbook_dir = ../../docbook -include $(ROOT_DIR)/Makefile.doc +include $(docbook_dir)/Makefile

15 years, 8 months

git:master: * Moved lcr module from modules_k to modules and removed it from modules_s .

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 4fdd0730d17b5770995817a50750897f1e0ab108 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fdd073… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat May 9 19:14:18 2009 +0300 * Moved lcr module from modules_k to modules and removed it from modules_s. --- {modules_k => modules}/lcr/Makefile | 0 {modules_k => modules}/lcr/README | 0 {modules_k => modules}/lcr/doc/Makefile | 0 {modules_k => modules}/lcr/doc/lcr.xml | 0 {modules_k => modules}/lcr/doc/lcr_admin.xml | 0 {modules_k => modules}/lcr/hash.c | 0 {modules_k => modules}/lcr/hash.h | 0 {modules_k => modules}/lcr/lcr_mod.c | 0 {modules_k => modules}/lcr/lcr_mod.h | 0 {modules_k => modules}/lcr/mi.c | 0 {modules_k => modules}/lcr/mi.h | 0 modules_s/lcr/Makefile | 17 - modules_s/lcr/README | 259 ------ modules_s/lcr/doc/Makefile | 4 - modules_s/lcr/doc/functions.xml | 17 - modules_s/lcr/doc/lcr.xml | 121 --- modules_s/lcr/doc/params.xml | 235 ------ modules_s/lcr/lcr_mod.c | 1113 -------------------------- modules_s/lcr/lcr_mod.h | 61 -- modules_s/lcr/lcr_rpc.c | 104 --- modules_s/lcr/lcr_rpc.h | 35 - modules_s/lcr/ser-lcr.cfg | 24 - 22 files changed, 0 insertions(+), 1990 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4fd…

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev