Module: sip-router Branch: mgw/json Commit: 2d129b5538b64acea788b502dcf97c5ffffdf949 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d129b55...
Author: Matthew Williams mgwilliams@gmail.com Committer: Matthew Williams mgwilliams@gmail.com Date: Wed Jan 23 10:49:52 2013 -0800
correct url to libjson in json and jsonrpc-c module docs
---
modules/json/README | 2 +- modules/json/doc/json_admin.xml | 4 +--- modules/jsonrpc-c/README | 21 +++++++++++---------- modules/jsonrpc-c/doc/jsonrpc-c_admin.xml | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/modules/json/README b/modules/json/README index 4d4c0eb..381bedf 100644 --- a/modules/json/README +++ b/modules/json/README @@ -71,7 +71,7 @@ Chapter 1. Admin Guide
The following libraries or applications must be installed before running Kamailio with this module loaded: - * libjson (http://metaparadigm.com/json-c/) + * libjson (https://github.com/json-c/json-c/wiki)
3. Parameters
diff --git a/modules/json/doc/json_admin.xml b/modules/json/doc/json_admin.xml index 9c8e3a3..f8f899f 100644 --- a/modules/json/doc/json_admin.xml +++ b/modules/json/doc/json_admin.xml @@ -10,9 +10,7 @@ <!-- Module User's Guide -->
<chapter> - <title>&adminguide;</title> - <section> <title>Overview</title> <para> @@ -43,7 +41,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libjson (http://metaparadigm.com/json-c/)</emphasis> + <emphasis>libjson (https://github.com/json-c/json-c/wiki)</emphasis> </para> </listitem> </itemizedlist> diff --git a/modules/jsonrpc-c/README b/modules/jsonrpc-c/README index 7df3ed3..bfa8ea3 100644 --- a/modules/jsonrpc-c/README +++ b/modules/jsonrpc-c/README @@ -10,7 +10,7 @@ Jordan Levy
- Copyright � 2011 Flowroute LLC (flowroute.com) + Copyright © 2011 Flowroute LLC (flowroute.com) __________________________________________________________________
Table of Contents @@ -23,11 +23,11 @@ Jordan Levy 2.1. Kamailio Modules 2.2. External Libraries or Applications
- 3. Exported Parameters + 3. Parameters
3.1. servers (string)
- 4. Exported Functions + 4. Functions
4.1. jsonrpc_notification(method, parameters) 4.2. jsonrpc_request(method, parameters, return_route, @@ -49,11 +49,11 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules 2.2. External Libraries or Applications
- 3. Exported Parameters + 3. Parameters
3.1. servers (string)
- 4. Exported Functions + 4. Functions
4.1. jsonrpc_notification(method, parameters) 4.2. jsonrpc_request(method, parameters, return_route, @@ -86,9 +86,10 @@ Chapter 1. Admin Guide
The following libraries or applications must be installed before running Kamailio with this module loaded: - * libjson - http://metaparadigm.com/json-c/ + * libjson (https://github.com/json-c/json-c/wiki) + * libevent - http://libevent.org/
-3. Exported Parameters +3. Parameters
3.1. servers (string)
@@ -105,13 +106,13 @@ modparam("jsonrpc", "servers", "localhost:9999,2 10.10.0.1:9999,2 backup.server: 9999,1") ...
-4. Exported Functions +4. Functions
4.1. jsonrpc_notification(method, parameters) 4.2. jsonrpc_request(method, parameters, return_route, error_route, result_var)
-4.1. jsonrpc_notification(method, parameters) +4.1. jsonrpc_notification(method, parameters)
Invokes the remote 'method' with the given 'parameters' as a notification. Unlike jsonrpc_request (below), notifications do not @@ -126,7 +127,7 @@ modparam("jsonrpc", "servers", "localhost:9999,2 10.10.0.1:9999,2 backup.server: jsonrpc_notification("update_user", "{'id': 1234, 'name': 'Petros'}") ...
-4.2. jsonrpc_request(method, parameters, return_route, error_route, +4.2. jsonrpc_request(method, parameters, return_route, error_route, result_var)
Invokes the remote 'method' with the given 'parameters'. When the diff --git a/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml b/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml index 2b89549..ef5dcae 100644 --- a/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml +++ b/modules/jsonrpc-c/doc/jsonrpc-c_admin.xml @@ -53,7 +53,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libjson</emphasis> - http://metaparadigm.com/json-c/ + <emphasis>libjson (https://github.com/json-c/json-c/wiki)</emphasis> </para> </listitem> <listitem>
Matthew!
I am sure you know you cmmitted to a branch and not to main code base.
A side question: Are these libraries available as RPMs for linux or ports for FreeBSD?
/O
23 jan 2013 kl. 19:50 skrev Matthew Williams matthew@flowroute.com:
Yes, I committed to a side branch so you can review the changes ;-). If that's not what I should do, I can push to master.
libjson appears to be available as an RPM (It's just libjson). On Ubuntu (and presumably Debian) it's libjson0 and libjson0-dev packages. I don't know about BSD ports.
On Wed, Jan 23, 2013 at 1:55 PM, Olle E. Johansson oej@edvina.net wrote:
23 jan 2013 kl. 20:07 skrev Matthew Williams matthew@flowroute.com:
Yes, I committed to a side branch so you can review the changes ;-). If that's not what I should do, I can push to master.
It's just a small change that you can push. Go ahead.
libjson appears to be available as an RPM (It's just libjson).
Ok so libjson and libjson-c are the same?
On Ubuntu (and presumably Debian) it's libjson0 and libjson0-dev packages. I don't know about BSD ports.
Thanks for the feedback. I know there are people out there working with the spec files and such, so they like to know. :-)
/O
I should mention that the improvements we are making involve a switch to libjansson, so that nested elements can be easily accessed (e.g., elem1[0][1].elem2). Unfortunately, at this time, there are not packages for the version of libjansson we are using. Will that cause problem with it being accepted into master?
On Wed, Jan 23, 2013 at 2:24 PM, Olle E. Johansson oej@edvina.net wrote:
-
Matthew Williams -
Olle E. Johansson