project/libubox.git
9 years agojson_script: fix eval_string().
Yousong Zhou [Wed, 12 Nov 2014 13:59:22 +0000 (21:59 +0800)]
json_script: fix eval_string().

- Fix handling of "%%".
 - Fix length requirement when calling blobmsg_realloc_string_buffer().

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
9 years agojshn: add error handling and fix memory leak in jshn_format().
Yousong Zhou [Wed, 12 Nov 2014 13:59:20 +0000 (21:59 +0800)]
jshn: add error handling and fix memory leak in jshn_format().

Though currently jshn is more a one-shot data transformation tool and
won't leak much memory in its lifetime, people may use it as example
code, so do it right.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
9 years agoblobmsg: remove unneeded assignment in blobmsg_alloc_string_buffer().
Yousong Zhou [Wed, 12 Nov 2014 13:59:19 +0000 (21:59 +0800)]
blobmsg: remove unneeded assignment in blobmsg_alloc_string_buffer().

data_dest should already be assigned by blobmsg_new() if the return
value is not NULL.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
9 years agoexamples: fix build.
Yousong Zhou [Wed, 12 Nov 2014 13:59:16 +0000 (21:59 +0800)]
examples: fix build.

- runqueue-example.c: fix include path for in-tree build.
 - blobmsg-example.c: add inttypes.h for using PRIu64.
 - add examples/ subdirectory to main CMakeLists.txt

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
9 years agolua: do not hardcode /opt/local/include for Apple.
Yousong Zhou [Wed, 12 Nov 2014 13:59:15 +0000 (21:59 +0800)]
lua: do not hardcode /opt/local/include for Apple.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
9 years agolibubox: drop legacy json-c support
Yousong Zhou [Wed, 12 Nov 2014 13:59:14 +0000 (21:59 +0800)]
libubox: drop legacy json-c support

The cmake logic is wrong (E.G. PKG_CHECK_FOR_MODULES fails unless all
modules are found), and the legacy libjson.so name is also used by the other
libjson (http://sourceforge.net/projects/libjson/) which provides an
incompatible API, so just drop it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
9 years agoRevert "jshn: only keep UP_* variables around while they are needed"
Felix Fietkau [Sun, 23 Nov 2014 22:53:37 +0000 (23:53 +0100)]
Revert "jshn: only keep UP_* variables around while they are needed"

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
9 years agojshn: shorten JSON_VAR to J_V
Felix Fietkau [Sun, 23 Nov 2014 19:21:14 +0000 (20:21 +0100)]
jshn: shorten JSON_VAR to J_V

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
9 years agojshn: shorten variable names to speed up processing
Felix Fietkau [Sun, 23 Nov 2014 19:02:33 +0000 (20:02 +0100)]
jshn: shorten variable names to speed up processing

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
9 years agojshn: remove TYPE_JSON_VAR
Felix Fietkau [Sun, 23 Nov 2014 18:45:07 +0000 (19:45 +0100)]
jshn: remove TYPE_JSON_VAR

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
9 years agojshn: do not export JSON_SEQ
Felix Fietkau [Sun, 23 Nov 2014 18:44:10 +0000 (19:44 +0100)]
jshn: do not export JSON_SEQ

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
9 years agojshn: only keep UP_* variables around while they are needed
Felix Fietkau [Sun, 23 Nov 2014 18:43:56 +0000 (19:43 +0100)]
jshn: only keep UP_* variables around while they are needed

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
9 years agojshn: improve performance by using let instead of $(( ))
Felix Fietkau [Sun, 23 Nov 2014 18:25:39 +0000 (19:25 +0100)]
jshn: improve performance by using let instead of $(( ))

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblobmsg_json: avoid redefinition of json_object
Felix Fietkau [Fri, 24 Oct 2014 11:40:10 +0000 (13:40 +0200)]
blobmsg_json: avoid redefinition of json_object

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agouloop: Do not override signal handlers not installed by us
Michel Stam [Mon, 13 Oct 2014 14:14:28 +0000 (16:14 +0200)]
uloop: Do not override signal handlers not installed by us

Signed-off-by: Michel Stam <m.stam@fugro.nl>
10 years agouloop: Remove uloop_cancelled variable, it is not used anywhere
Michel Stam [Mon, 13 Oct 2014 14:14:27 +0000 (16:14 +0200)]
uloop: Remove uloop_cancelled variable, it is not used anywhere

Signed-off-by: Michel Stam <m.stam@fugro.nl>
10 years agomd5: add a new implementation under permissive license
Felix Fietkau [Wed, 1 Oct 2014 14:38:17 +0000 (16:38 +0200)]
md5: add a new implementation under permissive license

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblobmsg_json: include json.h inside blobmsg_json.c instead of the public header file
Felix Fietkau [Tue, 23 Sep 2014 10:03:32 +0000 (12:03 +0200)]
blobmsg_json: include json.h inside blobmsg_json.c instead of the public header file

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoavoid using the deprecated is_error() function from json-c
Felix Fietkau [Tue, 23 Sep 2014 10:02:31 +0000 (12:02 +0200)]
avoid using the deprecated is_error() function from json-c

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agousock: add usock_port() for convenient use of numeric ports
Jo-Philipp Wich [Mon, 22 Sep 2014 16:15:58 +0000 (18:15 +0200)]
usock: add usock_port() for convenient use of numeric ports

Add a new helper function usock_port() which converts the given numeric port number
into a string using a private static buffer. This way a calling application can
conveniently use numeric port arguments without having to convert them before:

  int fd = usock(USOCK_UDP, "example.org", usock_port(80));

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
10 years agojshn: pretty print indented output with jshn -i -w
John Crispin [Mon, 4 Aug 2014 17:26:18 +0000 (19:26 +0200)]
jshn: pretty print indented output with jshn -i -w

Signed-off-by: John Crispin <blogic@openwrt.org>
10 years agoblobmsg: accept NULL attr in blobmsg_get_string()
Felix Fietkau [Sun, 3 Aug 2014 13:00:54 +0000 (15:00 +0200)]
blobmsg: accept NULL attr in blobmsg_get_string()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agolua/uloop: 'end' is the keyword of Lua, use 'cancel' replace it.
xfguo@credosemi.com [Sun, 27 Jul 2014 09:21:35 +0000 (17:21 +0800)]
lua/uloop: 'end' is the keyword of Lua, use 'cancel' replace it.

Signed-off-by: Xiongfei Guo <xfguo@credosemi.com>
10 years agoblob: improve out-of-memory handling
ewolfok [Tue, 8 Jul 2014 13:43:58 +0000 (21:43 +0800)]
blob: improve out-of-memory handling

Signed-off-by: Chen Bin <ewolfok@126.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblobmsg: add a helper function to reset the name of a blobmsg attribute
Felix Fietkau [Sun, 20 Jul 2014 23:24:01 +0000 (01:24 +0200)]
blobmsg: add a helper function to reset the name of a blobmsg attribute

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agojshn: do not collapse whitespace in json_load()
Jo-Philipp Wich [Tue, 15 Jul 2014 13:57:47 +0000 (15:57 +0200)]
jshn: do not collapse whitespace in json_load()

When running the test case below the $key variable holds "foo bar" instead
of the expected "foo  bar".

-- 8< --
. /usr/share/libubox/jshn.sh
json_init
json_load '{ "key": "foo  bar" }'
json_get_var key key
-- >8 --

Quote the output of the "jshn -r" backtick expression to prevent the shell
from erroneously collapsing whitespace.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
10 years agoblobmsg: add blobmsg_check_array, which returns the size of the array
Felix Fietkau [Tue, 15 Jul 2014 08:51:09 +0000 (10:51 +0200)]
blobmsg: add blobmsg_check_array, which returns the size of the array

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblobmsg-example: use blobmsg_get_string()
Felix Fietkau [Thu, 3 Jul 2014 11:50:49 +0000 (13:50 +0200)]
blobmsg-example: use blobmsg_get_string()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoexamples: fix build error
Luka Perkov [Thu, 3 Jul 2014 11:46:24 +0000 (13:46 +0200)]
examples: fix build error

Patch fixes the following error:

error: format ‘%s’ expects argument of type ‘char *’, but argument 3 has type ‘void *’ [-Werror=format=]
   indent_printf(indent, "%s\n", blobmsg_data(data));

Signed-off-by: Luka Perkov <luka@openwrt.org>
10 years agoblobmsg_example: fix output
Felix Fietkau [Thu, 3 Jul 2014 10:56:40 +0000 (12:56 +0200)]
blobmsg_example: fix output

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoexamples: use PRIu64 instead %lld when printing uint64_t values
Luka Perkov [Thu, 3 Jul 2014 10:28:24 +0000 (12:28 +0200)]
examples: use PRIu64 instead %lld when printing uint64_t values

Patch fixes build failure:

error: format ‘%lld’ expects argument of type ‘long long int’, but argument 3 has type ‘uint64_t’ [-Werror=format=]
   indent_printf(indent, "%lld\n", *(uint64_t *)data);

Signed-off-by: Luka Perkov <luka@openwrt.org>
10 years agoexamples: add missing include
Luka Perkov [Thu, 3 Jul 2014 10:28:23 +0000 (12:28 +0200)]
examples: add missing include

Patch fixes following build error:

error: implicit declaration of function ‘close’ [-Werror=implicit-function-declaration]
  close(cl->s.fd.fd);

Signed-off-by: Luka Perkov <luka@openwrt.org>
10 years agoexamples: fix linking with json-c
Luka Perkov [Thu, 3 Jul 2014 10:28:22 +0000 (12:28 +0200)]
examples: fix linking with json-c

Signed-off-by: Luka Perkov <luka@openwrt.org>
10 years agoexamples: remove set but unused variable
Luka Perkov [Thu, 3 Jul 2014 10:28:21 +0000 (12:28 +0200)]
examples: remove set but unused variable

Fixes build failure.

Signed-off-by: Luka Perkov <luka@openwrt.org>
10 years agousock: fix indentation
Luka Perkov [Thu, 3 Jul 2014 10:28:20 +0000 (12:28 +0200)]
usock: fix indentation

Signed-off-by: Luka Perkov <luka@openwrt.org>
10 years agoFix bug of GC in fd and timeout objects for lua binding.
Xiongfei Guo [Fri, 20 Jun 2014 10:31:21 +0000 (10:31 +0000)]
Fix bug of GC in fd and timeout objects for lua binding.

fd and timeout lua object has a __gc method in its metatable. After the object
is freed and the another new object use the same reference in __uloop_cb and
__uloop_fds, the new object will be freed by the old __gc of the old object
when garbag collecting.

Signed-off-by: Xiongfei(Alex) Guo <xfguo@credosemi.com>
10 years agoFix bug of unref resources in Lua binding; fd method delete -> cancel.
Xiongfei Guo [Fri, 20 Jun 2014 10:31:20 +0000 (10:31 +0000)]
Fix bug of unref resources in Lua binding; fd method delete -> cancel.

Signed-off-by: Xiongfei(Alex) Guo <xfguo@credosemi.com>
10 years agoSupport delete a fd event.
Xiongfei Guo [Fri, 20 Jun 2014 10:31:19 +0000 (10:31 +0000)]
Support delete a fd event.

When you call the fd_add, it will return an object with `delete` method.
So you can delete that event if you want.

Signed-off-by: Xiongfei(Alex) Guo <xfguo@credosemi.com>
10 years agoAdded fd_add method for uloop lua binding.
Xiongfei Guo [Fri, 20 Jun 2014 10:31:18 +0000 (10:31 +0000)]
Added fd_add method for uloop lua binding.

Use uloop.fd_add like this:

    local socket = require "socket"

    udp = socket.udp()

    uloop.fd_add(
        udp, -- socket
        function( -- callback function
            ufd,    -- socket object when register the fd
            events  -- uloop events. eg. uloop.ULOOP_READ .
        )
            local words, msg_or_ip, port_or_nil = ufd:receivefrom()
            print('Recv UDP packet from '..msg_or_ip..':'..port_or_nil..' : '..words)
        end,
        uloop.ULOOP_READ -- event you want to listen
    )

The `examples/uloop-example.lua` show an example of this work.

Signed-off-by: Xiongfei(Alex) Guo <xfguo@credosemi.com>
10 years agoFix stack overflow bug of uloop lua binding.
Xiongfei Guo [Fri, 20 Jun 2014 10:31:17 +0000 (10:31 +0000)]
Fix stack overflow bug of uloop lua binding.

The static variable `state` in `lua/uloop.c` should be clean after every callback.

Signed-off-by: Xiongfei(Alex) Guo <xfguo@credosemi.com>
10 years agobuild a static version of libubox
John Crispin [Wed, 11 Jun 2014 00:39:12 +0000 (01:39 +0100)]
build a static version of libubox

Signed-off-by: John Crispin <blogic@openwrt.org>
10 years agovlist: add static initializer macros
Felix Fietkau [Thu, 5 Jun 2014 13:28:45 +0000 (15:28 +0200)]
vlist: add static initializer macros

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblobmsg_json: use cross-platform macro for fprintf on 64-bit values
Felix Fietkau [Sat, 31 May 2014 12:48:03 +0000 (14:48 +0200)]
blobmsg_json: use cross-platform macro for fprintf on 64-bit values

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agojson_script: fix a segfault in the file free handler
Felix Fietkau [Mon, 26 May 2014 13:53:29 +0000 (15:53 +0200)]
json_script: fix a segfault in the file free handler

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblob/blobmsg: Perform explicit casts from void* to avoid compilation errors when...
Jacob Siverskog [Fri, 9 May 2014 12:31:37 +0000 (14:31 +0200)]
blob/blobmsg: Perform explicit casts from void* to avoid compilation errors when using libubox from C++.

Signed-off by: Jacob Siverskog <jacob@teenageengineering.com>

10 years agouloop: fix multiple calls to uloop_run()
Luka Perkov [Mon, 5 May 2014 00:41:34 +0000 (02:41 +0200)]
uloop: fix multiple calls to uloop_run()

Signed-off-by: Luka Perkov <luka@openwrt.org>
10 years agoutils: add a bitfield size macro
Felix Fietkau [Wed, 30 Apr 2014 11:27:03 +0000 (13:27 +0200)]
utils: add a bitfield size macro

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agokvlist: constify arguments
Felix Fietkau [Mon, 28 Apr 2014 15:56:08 +0000 (17:56 +0200)]
kvlist: constify arguments

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agojson_script: add json_script_run_file()
Felix Fietkau [Mon, 28 Apr 2014 15:54:25 +0000 (17:54 +0200)]
json_script: add json_script_run_file()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agojson_script: implement json_script_eval_string
Felix Fietkau [Mon, 28 Apr 2014 14:57:28 +0000 (16:57 +0200)]
json_script: implement json_script_eval_string

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblobmsg: make length variables unsigned
Felix Fietkau [Sun, 27 Apr 2014 14:32:09 +0000 (16:32 +0200)]
blobmsg: make length variables unsigned

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblob: make length variables unsigned
Felix Fietkau [Sun, 27 Apr 2014 14:29:31 +0000 (16:29 +0200)]
blob: make length variables unsigned

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agosh/jshn.sh - json_cleanup() dont pollute env with local vars
Bastian Bittorf [Sun, 20 Apr 2014 20:55:48 +0000 (22:55 +0200)]
sh/jshn.sh - json_cleanup() dont pollute env with local vars

this script is mostly sourced, so we should try to keep the pollution
of the users environment as low as possible. make the var 'tmp' local

Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>
10 years agouloop: clear uloop_fd::error on add
Felix Fietkau [Sat, 26 Apr 2014 14:55:17 +0000 (16:55 +0200)]
uloop: clear uloop_fd::error on add

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblobmsg_json: let blobmsg_format_json_with_cb with list == true also format arrays
Felix Fietkau [Sat, 26 Apr 2014 08:58:54 +0000 (10:58 +0200)]
blobmsg_json: let blobmsg_format_json_with_cb with list == true also format arrays

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblob: fix handling of custom validator callback
Felix Fietkau [Mon, 21 Apr 2014 10:02:30 +0000 (12:02 +0200)]
blob: fix handling of custom validator callback

https://dev.openwrt.org/ticket/15638

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agokvlist: avoid unused-but-set warnings in code not using the name in kvlist_for_each()
Felix Fietkau [Tue, 15 Apr 2014 14:58:55 +0000 (16:58 +0200)]
kvlist: avoid unused-but-set warnings in code not using the name in kvlist_for_each()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agomd5: remove unnecessary variable change
Felix Fietkau [Sat, 12 Apr 2014 18:25:32 +0000 (20:25 +0200)]
md5: remove unnecessary variable change

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblobmsg_json: fix a memleak on error
Felix Fietkau [Sat, 12 Apr 2014 18:23:23 +0000 (20:23 +0200)]
blobmsg_json: fix a memleak on error

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoustream: remove unnecessary initialization
Felix Fietkau [Sat, 12 Apr 2014 18:21:13 +0000 (20:21 +0200)]
ustream: remove unnecessary initialization

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblobmsg: remove unnecessary initialization
Felix Fietkau [Sat, 12 Apr 2014 18:20:36 +0000 (20:20 +0200)]
blobmsg: remove unnecessary initialization

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agokvlist: add a simply key/value store implementation
Felix Fietkau [Fri, 11 Apr 2014 23:42:44 +0000 (01:42 +0200)]
kvlist: add a simply key/value store implementation

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoavl: add AVL_TREE macro to define an initialized struct avl_tree
Felix Fietkau [Thu, 27 Mar 2014 16:39:53 +0000 (17:39 +0100)]
avl: add AVL_TREE macro to define an initialized struct avl_tree

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agolist_compat.h: remove
Felix Fietkau [Thu, 20 Mar 2014 22:06:42 +0000 (23:06 +0100)]
list_compat.h: remove

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agolist_compat.h: remove list_remove()
Felix Fietkau [Thu, 20 Mar 2014 22:00:53 +0000 (23:00 +0100)]
list_compat.h: remove list_remove()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agolist_compat.h: remove list_add_before()
Felix Fietkau [Thu, 20 Mar 2014 22:00:24 +0000 (23:00 +0100)]
list_compat.h: remove list_add_before()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agolist_compat.h: remove list_add_after()
Felix Fietkau [Thu, 20 Mar 2014 21:59:26 +0000 (22:59 +0100)]
list_compat.h: remove list_add_after()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agolist_compat.h: remove list_add_head()
Felix Fietkau [Thu, 20 Mar 2014 21:58:21 +0000 (22:58 +0100)]
list_compat.h: remove list_add_head()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agolist_compat.h: remove list_init_head()
Felix Fietkau [Thu, 20 Mar 2014 21:56:31 +0000 (22:56 +0100)]
list_compat.h: remove list_init_head()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agolist_compat.h: remove list_entity compat define
Felix Fietkau [Thu, 20 Mar 2014 21:55:45 +0000 (22:55 +0100)]
list_compat.h: remove list_entity compat define

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoavl.c: remove compat macros and switch to the argument order from list.h
Felix Fietkau [Thu, 20 Mar 2014 21:54:59 +0000 (22:54 +0100)]
avl.c: remove compat macros and switch to the argument order from list.h

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoutils: add __constructor and __hidden defines
Felix Fietkau [Tue, 18 Mar 2014 13:02:40 +0000 (14:02 +0100)]
utils: add __constructor and __hidden defines

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblobmsg_json: unconditionally use blobmsg data/len accessor functions
Felix Fietkau [Wed, 12 Mar 2014 19:13:05 +0000 (20:13 +0100)]
blobmsg_json: unconditionally use blobmsg data/len accessor functions

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblobmsg: allow data/length iterator/accessor functions to work on non-blobmsg elements
Felix Fietkau [Wed, 12 Mar 2014 19:08:27 +0000 (20:08 +0100)]
blobmsg: allow data/length iterator/accessor functions to work on non-blobmsg elements

This primarily helps with simplifying the ubus APIs.
blobmsg header presence is indicated by the BLOB_ATTR_EXTENDED bit in
the id_len field.

This changes the format ABI, but not the API.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agouloop: Add flag to allow callback to be called on error conditions.
Karl Vogel [Tue, 11 Feb 2014 08:37:08 +0000 (09:37 +0100)]
uloop: Add flag to allow callback to be called on error conditions.

In some conditions, an application is interested in errors happening
on a file descriptor and might be able to resolve the issue in the
callback function.

This patch adds a flag to notify the uloop framework that errors
should be passed to the callback function, instead of silently
removing the fd from the polling set.

Signed-off-by: Karl Vogel <karl.vogel@gmail.com>
10 years agojshn: drop json_select warnings when called from json_get_values()
Felix Fietkau [Sun, 2 Feb 2014 14:22:23 +0000 (15:22 +0100)]
jshn: drop json_select warnings when called from json_get_values()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agolibubox: runqueue: Cancel task timeout when completeing task
Helmut Schaa [Wed, 15 Jan 2014 15:09:19 +0000 (15:09 +0000)]
libubox: runqueue: Cancel task timeout when completeing task

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
10 years agojshn: add ability to pass default values to json_get_var and json_get_vars
Jo-Philipp Wich [Tue, 10 Dec 2013 17:30:15 +0000 (17:30 +0000)]
jshn: add ability to pass default values to json_get_var and json_get_vars

10 years agojshn: in json_get_values(), handle json_select errors
Felix Fietkau [Mon, 2 Dec 2013 09:56:54 +0000 (10:56 +0100)]
jshn: in json_get_values(), handle json_select errors

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agojshn: optimize the shell code some more
Felix Fietkau [Thu, 28 Nov 2013 16:51:26 +0000 (17:51 +0100)]
jshn: optimize the shell code some more

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
10 years agoblobmsg_json: do not emit any whitespace when formatting without indentation
Jo-Philipp Wich [Wed, 27 Nov 2013 18:40:15 +0000 (18:40 +0000)]
blobmsg_json: do not emit any whitespace when formatting without indentation

10 years agofix memset call in md5.c
John Crispin [Tue, 19 Nov 2013 21:50:53 +0000 (22:50 +0100)]
fix memset call in md5.c

Signed-off-by: John Crispin <blogic@openwrt.org>
10 years agoadd md5.c to libubox
John Crispin [Tue, 19 Nov 2013 19:31:45 +0000 (20:31 +0100)]
add md5.c to libubox

Signed-off-by: John Crispin <blogic@openwrt.org>
10 years agorunqueue: add a function that allows adding jobs to the front of the runqueue
John Crispin [Mon, 18 Nov 2013 10:15:19 +0000 (11:15 +0100)]
runqueue: add a function that allows adding jobs to the front of the runqueue

Signed-off-by: John Crispin <blogic@openwrt.org>
11 years agojshn: refactor _jshn_append to require fewer evals
Felix Fietkau [Wed, 30 Oct 2013 10:50:39 +0000 (11:50 +0100)]
jshn: refactor _jshn_append to require fewer evals

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agojshn: improve performance by getting rid of unnecessary variables in parser related...
Felix Fietkau [Wed, 30 Oct 2013 10:36:46 +0000 (11:36 +0100)]
jshn: improve performance by getting rid of unnecessary variables in parser related code

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agojshn: do not export SEQ_*
Felix Fietkau [Wed, 30 Oct 2013 09:55:01 +0000 (10:55 +0100)]
jshn: do not export SEQ_*

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agojshn: get rid of the table stack, use the UP_* variable instead to speed up processing
Felix Fietkau [Wed, 30 Oct 2013 09:34:40 +0000 (10:34 +0100)]
jshn: get rid of the table stack, use the UP_* variable instead to speed up processing

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agojshn: reduce the number of appends to the cleanup list to speed up processing of...
Felix Fietkau [Wed, 30 Oct 2013 09:19:52 +0000 (10:19 +0100)]
jshn: reduce the number of appends to the cleanup list to speed up processing of large json files

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agojshn: allow json_get_keys/values to refer to the currently selected array/table if...
Felix Fietkau [Tue, 29 Oct 2013 14:11:42 +0000 (15:11 +0100)]
jshn: allow json_get_keys/values to refer to the currently selected array/table if no argument is given

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agojshn: add json_get_values (useful for arrays)
Felix Fietkau [Tue, 29 Oct 2013 13:59:47 +0000 (14:59 +0100)]
jshn: add json_get_values (useful for arrays)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agoutils.h: fix name collisions in __u_bswap16 with using "val" both inside the macro...
Felix Fietkau [Thu, 24 Oct 2013 09:33:22 +0000 (11:33 +0200)]
utils.h: fix name collisions in __u_bswap16 with using "val" both inside the macro and as argument

Reported-by: Markus Stenberg <markus.stenberg@iki.fi>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agoRestore signal handler after uloop_run()
Kristian Evensen [Tue, 22 Oct 2013 08:24:15 +0000 (10:24 +0200)]
Restore signal handler after uloop_run()

uloop_run calls uloop_setup_signals() to set up signal handling before the while
loop, but does not remove the signal handling after the loop has ended. This can
cause problems for for example applications using the ubus file descriptor in
their own event loops, and perhaps with their own signal handling.

This patch stores the signal handle that was in place when the initial
uloop_run() call was made, and restores the handle when this call returns.
For recursive calls, the signal handler is not updated.

One use-case I experienced was an application that subscribed to several ubus
objects and used the ubus file descriptor in its own event loop. Even though
ubus_register_subscriber() (which calls uloop_run()) had returned, the signal
handler was not removed. This caused SIGINT not to be caught by the application.

Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agoblobmsg: add blobmsg_len() for consistency (similar to blob_len)
Felix Fietkau [Sun, 20 Oct 2013 11:19:51 +0000 (13:19 +0200)]
blobmsg: add blobmsg_len() for consistency (similar to blob_len)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agojshn: add json_get_keys()
Felix Fietkau [Sat, 19 Oct 2013 22:00:42 +0000 (00:00 +0200)]
jshn: add json_get_keys()

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agoustream: properly clear fields to fix ustream reuse
Felix Fietkau [Sat, 19 Oct 2013 16:20:03 +0000 (18:20 +0200)]
ustream: properly clear fields to fix ustream reuse

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agoblob: add a magic offset to nesting cookies to ensure that NULL is never returned...
Felix Fietkau [Tue, 15 Oct 2013 23:22:02 +0000 (01:22 +0200)]
blob: add a magic offset to nesting cookies to ensure that NULL is never returned as a normal value

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agovlist: constify key argument to vlist_add
Felix Fietkau [Sat, 5 Oct 2013 19:40:04 +0000 (21:40 +0200)]
vlist: constify key argument to vlist_add

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agoblobmsg_json: allow signed output of integers
Felix Fietkau [Fri, 4 Oct 2013 14:55:14 +0000 (16:55 +0200)]
blobmsg_json: allow signed output of integers

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 years agoblob: add blob_put_raw() for copying one or more blob attributes into the buffer...
Felix Fietkau [Wed, 25 Sep 2013 06:44:39 +0000 (08:44 +0200)]
blob: add blob_put_raw() for copying one or more blob attributes into the buffer directly

Signed-off-by: Felix Fietkau <nbd@openwrt.org>