examples: add shunit2 tests for json_script

Signed-off-by: Yousong Zhou <[email protected]>

json_script: add "isdir" support

Signed-off-by: Yousong Zhou <[email protected]>

blobmsg_json: support json_type_null in blobmsg_add_json_element()

We already serialize BLOBMSG_TYPE_UNSPEC as "null" so represent JSON null
values as blob attribute type unspec with payload size zero.

Signed-off-by: Jo-Philipp Wich <[email protected]>

usock: implement usock_inet_timeout() with RFC6555 support

Signed-off-by: Felix Fietkau <[email protected]>

ustream-fd: handle ENOTCONN for read/write on not-yet-connected sockets

Signed-off-by: Felix Fietkau <[email protected]>

lua: add gc/delete support for processes

Signed-off-by: Felix Fietkau <[email protected]>

lua: create a common function for userdata with gc

Signed-off-by: Felix Fietkau <[email protected]>

usock: add usock_inet, which returns the remote address

Signed-off-by: Felix Fietkau <[email protected]>

libubox: lua: use pkg-config built in module to search for alternatives

Different distributions have different names for the lua 5.1 package.
Use cmake's built in pkg-config support to search for the first one,
rather than running it explicitly and searching for a single version.

Signed-off-by: Karl Palsson <[email protected]>

json_script: allow non-string types in command arguments

Signed-off-by: Felix Fietkau <[email protected]>

json_script: add support for aborting script processing

Signed-off-by: Felix Fietkau <[email protected]>

ulog: avoid accidental /dev/kmsg creation

Race is possible in ulog_kmsg(): if no /dev/kmsg exists
(e.g. while /dev gets re-mounted) regular file created instead.
>From this point system goes without kernel logger:
special character file can't be created anymore, all clients keep
overwriting single message in regular file.

To avoid this we open file in "r+" mode which doesn't create
file if it's not found.

Signed-off-by: Sergiy Kibrik <[email protected]>
Cc: John Crispin <[email protected]>

b64_encode(): fixed input[] not initialized warn under gcc 4.4.5

Signed-off-by: Dmitri Bachtin <[email protected]>

Build static version of libblobmsg_json

Signed-off-by: Dmitri Bachtin <[email protected]>

ustream-fd: handle uloop errors

The default uloop error handling is to delete the fd. Continue to do
that, but also set the write_error flag and notify the user.

Signed-off-by: Philip Craig <[email protected]>

md5: include utils.h instead of endian.h to fix portability issues

Signed-off-by: Felix Fietkau <[email protected]>

md5: include endian.h for musl, otherwise hashes are invalid for BE

Signed-off-by: Steven Barth <[email protected]>

ulog: always use stderr for ulog_stdio().

stdout is for normal program output.

Signed-off-by: Yousong Zhou <[email protected]>

libubox: cmake: Add BUILD_EXAMPLES option

Add ability to skip building the examples. The default value is ON to follow
the original cmake behavior.

Signed-off-by: Nikolay Dimitrov <[email protected]>

ustream-fd: stop trying to read when s->read_blocked is set.

User's s->notify_read is called in ustream_fill_read().  If
s->read_blocked is set there, then stop reading more.

Signed-off-by: Yousong Zhou <[email protected]>

ustream-fd: readability change.

Signed-off-by: Yousong Zhou <[email protected]>

ustream: tweak ustream_prepare_buf() a bit.

No functional change.

 - Reuse existing NULL check on buf.
 - Add some comments for ease of reading the code.

Signed-off-by: Yousong Zhou <[email protected]>

ubox: CMake: fix json-c detection

Use PKG_SEARCH_MODULE() to detect json-c library,
otherwise the search fails, if both json-c and json
are not present in pkg-config database.

Signed-off-by: Yegor Yefremov <[email protected]>

add a base64 implementation (based on FreeBSD code)

Signed-off-by: Felix Fietkau <[email protected]>

allow process callback to call uloop_end()

Signed-off-by: John Crispin <[email protected]>

ulog: implement ulog_close()

Signed-off-by: Jo-Philipp Wich <[email protected]>

ulog: introduce new simple logging api

The ulog api is intended to be used by procd, fstools, ubox etc. to provide
a generic logging api for early boot messages and automatic switching between
syslog / kmsg / stdout depending on the way the process is executed.

Signed-off-by: Jo-Philipp Wich <[email protected]>

uloop: ignore SIGPIPE by default

Most app don't want to crash because of unhandled SIGPIPE. It could
happen is such trivial situations like writing to socket.

Signed-off-by: Rafał Miłecki <[email protected]>

utils: use clock_get_time() for clock_gettime() on Apple.

It turns out that mach_absolute_time() is not monotonic at all.  While
at it, convert the CLOCK_REALTIME implementation to using
clock_get_time() as well.

Signed-off-by: Yousong Zhou <[email protected]>

uloop: optimize uloop_timeout_set() implementaiton a bit.

Signed-off-by: Yousong Zhou <[email protected]>

ustream-fd: fix logic invert of write polling.

ustream_write_pending() returns true if write buffer was flushed there.

Signed-off-by: Yousong Zhou <[email protected]>

ustream: add function ustream_read().

It can be used to fill caller-specified buffer with data already in
ustream read buffer.  Useful in the following use pattern.

int available = ustream_pending_data(s, false);
if (available >= sizeof(struct msghdr)) {
struct msghdr h;
ustream_read(s, &h, sizeof(h));
}

Signed-off-by: Yousong Zhou <[email protected]>

usock: set socket flags right after creating it

Otherwise some flags like USOCK_NONBLOCK wouldn't work as expected
(O_NONBLOCK affects connect behavior).

Signed-off-by: RafaÅ‚ MiÅ‚ecki <[email protected]>

usock: add helper waiting for socket to be ready

Signed-off-by: RafaÅ‚ MiÅ‚ecki <[email protected]>

examples: add example code for json_script.

Signed-off-by: Yousong Zhou <[email protected]>

json_script: fix logic invert of handle_expr_not().

Signed-off-by: Yousong Zhou <[email protected]>

json_script: remove unneed argument check before calling __json_script_file_free().

NULL check is present at the begining of function body.

Signed-off-by: Yousong Zhou <[email protected]>

json_script: fix eval_string().

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

Signed-off-by: Yousong Zhou <[email protected]>

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 <[email protected]>

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 <[email protected]>

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 <[email protected]>

lua: do not hardcode /opt/local/include for Apple.

Signed-off-by: Yousong Zhou <[email protected]>

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 <[email protected]>
Signed-off-by: Yousong Zhou <[email protected]>

Revert "jshn: only keep UP_* variables around while they are needed"

Signed-off-by: Felix Fietkau <[email protected]>

jshn: shorten JSON_VAR to J_V

Signed-off-by: Felix Fietkau <[email protected]>

jshn: shorten variable names to speed up processing

Signed-off-by: Felix Fietkau <[email protected]>

jshn: remove TYPE_JSON_VAR

Signed-off-by: Felix Fietkau <[email protected]>

jshn: do not export JSON_SEQ

Signed-off-by: Felix Fietkau <[email protected]>

jshn: only keep UP_* variables around while they are needed

Signed-off-by: Felix Fietkau <[email protected]>

jshn: improve performance by using let instead of $(( ))

Signed-off-by: Felix Fietkau <[email protected]>

blobmsg_json: avoid redefinition of json_object

Signed-off-by: Felix Fietkau <[email protected]>

uloop: Do not override signal handlers not installed by us

Signed-off-by: Michel Stam <[email protected]>

uloop: Remove uloop_cancelled variable, it is not used anywhere

Signed-off-by: Michel Stam <[email protected]>

md5: add a new implementation under permissive license

Signed-off-by: Felix Fietkau <[email protected]>

blobmsg_json: include json.h inside blobmsg_json.c instead of the public header file

Signed-off-by: Felix Fietkau <[email protected]>

avoid using the deprecated is_error() function from json-c

Signed-off-by: Felix Fietkau <[email protected]>

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 <[email protected]>

jshn: pretty print indented output with jshn -i -w

Signed-off-by: John Crispin <[email protected]>

blobmsg: accept NULL attr in blobmsg_get_string()

Signed-off-by: Felix Fietkau <[email protected]>

lua/uloop: 'end' is the keyword of Lua, use 'cancel' replace it.

Signed-off-by: Xiongfei Guo <[email protected]>

blob: improve out-of-memory handling

Signed-off-by: Chen Bin <[email protected]>
Signed-off-by: Felix Fietkau <[email protected]>

blobmsg: add a helper function to reset the name of a blobmsg attribute

Signed-off-by: Felix Fietkau <[email protected]>

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 <[email protected]>

blobmsg: add blobmsg_check_array, which returns the size of the array

Signed-off-by: Felix Fietkau <[email protected]>

blobmsg-example: use blobmsg_get_string()

Signed-off-by: Felix Fietkau <[email protected]>

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 <[email protected]>

blobmsg_example: fix output

Signed-off-by: Felix Fietkau <[email protected]>

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 <[email protected]>

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 <[email protected]>

examples: fix linking with json-c

Signed-off-by: Luka Perkov <[email protected]>

examples: remove set but unused variable

Fixes build failure.

Signed-off-by: Luka Perkov <[email protected]>

usock: fix indentation

Signed-off-by: Luka Perkov <[email protected]>

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 <[email protected]>

Fix bug of unref resources in Lua binding; fd method delete -> cancel.

Signed-off-by: Xiongfei(Alex) Guo <[email protected]>

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 <[email protected]>

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 <[email protected]>

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 <[email protected]>

build a static version of libubox

Signed-off-by: John Crispin <[email protected]>

vlist: add static initializer macros

Signed-off-by: Felix Fietkau <[email protected]>

blobmsg_json: use cross-platform macro for fprintf on 64-bit values

Signed-off-by: Felix Fietkau <[email protected]>

json_script: fix a segfault in the file free handler

Signed-off-by: Felix Fietkau <[email protected]>

blob/blobmsg: Perform explicit casts from void* to avoid compilation errors when using libubox from C++.

Signed-off by: Jacob Siverskog <[email protected]>

uloop: fix multiple calls to uloop_run()

Signed-off-by: Luka Perkov <[email protected]>

utils: add a bitfield size macro

Signed-off-by: Felix Fietkau <[email protected]>

kvlist: constify arguments

Signed-off-by: Felix Fietkau <[email protected]>

json_script: add json_script_run_file()

Signed-off-by: Felix Fietkau <[email protected]>

json_script: implement json_script_eval_string

Signed-off-by: Felix Fietkau <[email protected]>

blobmsg: make length variables unsigned

Signed-off-by: Felix Fietkau <[email protected]>

blob: make length variables unsigned

Signed-off-by: Felix Fietkau <[email protected]>

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 <[email protected]>

uloop: clear uloop_fd::error on add

Signed-off-by: Felix Fietkau <[email protected]>

blobmsg_json: let blobmsg_format_json_with_cb with list == true also format arrays

Signed-off-by: Felix Fietkau <[email protected]>

blob: fix handling of custom validator callback

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

Signed-off-by: Felix Fietkau <[email protected]>

kvlist: avoid unused-but-set warnings in code not using the name in kvlist_for_each()

Signed-off-by: Felix Fietkau <[email protected]>

md5: remove unnecessary variable change

Signed-off-by: Felix Fietkau <[email protected]>

blobmsg_json: fix a memleak on error

Signed-off-by: Felix Fietkau <[email protected]>

ustream: remove unnecessary initialization

Signed-off-by: Felix Fietkau <[email protected]>

blobmsg: remove unnecessary initialization

Signed-off-by: Felix Fietkau <[email protected]>

kvlist: add a simply key/value store implementation

Signed-off-by: Felix Fietkau <[email protected]>

avl: add AVL_TREE macro to define an initialized struct avl_tree

Signed-off-by: Felix Fietkau <[email protected]>