Henning Rogge [Wed, 9 Dec 2015 10:54:02 +0000 (11:54 +0100)]
Merge branch 'master' of git://olsr.org/olsrd
Henning Rogge [Wed, 9 Dec 2015 10:51:49 +0000 (11:51 +0100)]
Configuration file cleanup
Rename "full" config file (its not full anymore, its default only)
Add txtinfo to default configuration examples
Add some more explanation to README
Ferry Huberts [Wed, 9 Dec 2015 09:02:27 +0000 (10:02 +0100)]
all: fixes resulting from building with clang
Used clang 3.7.0-1 on Fedora 23
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 9 Dec 2015 09:32:03 +0000 (10:32 +0100)]
make: support building with clang (on Linux)
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 9 Dec 2015 10:03:39 +0000 (11:03 +0100)]
files: clarify why jsoninfo is in the example configuration files
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 8 Dec 2015 12:03:44 +0000 (13:03 +0100)]
jsoninfo: neighbors/2hop: show more information
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 16:03:57 +0000 (17:03 +0100)]
jsoninfo: only show gateways of the request IP version in /gateways
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 15:41:14 +0000 (16:41 +0100)]
txtinfo: minor scope change of 2 variable in /gat
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 15:40:49 +0000 (16:40 +0100)]
txtinfo: do not use tabs in the /gat table, use fixed widths
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 14:25:13 +0000 (15:25 +0100)]
txtinfo: also print gateways without a tc in /gat
Like in /sgw
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 14:23:51 +0000 (15:23 +0100)]
txtinfo: minor formatting in /gat
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 14:20:59 +0000 (15:20 +0100)]
txtinfo: simplify some code for /gat
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 15:33:57 +0000 (16:33 +0100)]
jsoninfo: move duplicated 'selectable' code into a function
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 13:29:25 +0000 (14:29 +0100)]
jsoninfo: refactor /gateways
It prints almost the same information as /sgw, so make them look alike
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 14:44:21 +0000 (15:44 +0100)]
jsoninfo: add 'selectable' field to /sgw
Like /gateways has (there it's called 'u')
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 13:20:56 +0000 (14:20 +0100)]
jsoninfo: minor field reordering for /sgw
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 15:23:06 +0000 (16:23 +0100)]
lq plugins: ensure string termination in lq_print_cost functions
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 10:34:10 +0000 (11:34 +0100)]
jsoninfo: minor improvement to /sgw printing
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 10:34:34 +0000 (11:34 +0100)]
jsoninfo: use the new ip address helper in /sgw printing
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 10:28:43 +0000 (11:28 +0100)]
jsoninfo: helpers: add abuf_json_ip_address
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 11:54:45 +0000 (12:54 +0100)]
txtinfo: minor improvements to /sgw printing
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 09:25:31 +0000 (10:25 +0100)]
info: remove unused nompr field from the configuration
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 10:18:11 +0000 (11:18 +0100)]
jsoninfo: update README
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 10:18:22 +0000 (11:18 +0100)]
txtinfo: update README
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 10:18:29 +0000 (11:18 +0100)]
info: update README
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 11:43:05 +0000 (12:43 +0100)]
info: simplify determine_action
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 11:32:20 +0000 (12:32 +0100)]
info: simplify use of the functions table further
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 10:51:26 +0000 (11:51 +0100)]
jsoninfo: simplify setup of the functions table
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 10:51:16 +0000 (11:51 +0100)]
txtinfo: simplify setup of the functions table
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 10:55:47 +0000 (11:55 +0100)]
info: simplify use of the functions table
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Thu, 3 Dec 2015 09:18:09 +0000 (10:18 +0100)]
info: minor reordering in send_info to reflect SIW_x order
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 17:48:41 +0000 (18:48 +0100)]
jsoninfo: define the uuidfile extern in the proper place
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 17:50:57 +0000 (18:50 +0100)]
txtinfo: define the vtime extern in the proper place
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 15:49:28 +0000 (16:49 +0100)]
jsoninfo: helpers: use sizeof() for uuid size
And make its size a bit less strange.
Plus an extra minor simplification.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 15:40:23 +0000 (16:40 +0100)]
jsoninfo: helpers: use a double as parameter for abuf_json_float
Higher precision
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 15:31:47 +0000 (16:31 +0100)]
jsoninfo: helpers: use sizeof() for buffers
Plus an extra 'ensure 0 termination'
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 15:31:12 +0000 (16:31 +0100)]
jsoninfo: helpers: get_string_from_file ensures '\0' in the first byte
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 15:19:26 +0000 (16:19 +0100)]
jsoninfo: helpers: use an actual bool as parameter for abuf_json_boolean
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 15:18:56 +0000 (16:18 +0100)]
jsoninfo: helpers: fix output format for int/long
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 16:59:06 +0000 (17:59 +0100)]
jsoninfo: helpers: output floats in full precision
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 15:14:21 +0000 (16:14 +0100)]
jsoninfo: helpers: use abuf_json_insert_comma
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 15:08:29 +0000 (16:08 +0100)]
jsoninfo: helpers: firm up asserts on currentjsondepth
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 15:06:11 +0000 (16:06 +0100)]
jsoninfo: helpers: minor simplification of abuf_json_new_indent
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 14:49:05 +0000 (15:49 +0100)]
jsoninfo: use the function to initialise the config
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 14:48:59 +0000 (15:48 +0100)]
txtinfo: use the function to initialise the config
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 14:48:43 +0000 (15:48 +0100)]
info: add a function to initialise the config
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 14:53:38 +0000 (15:53 +0100)]
jsoninfo: remove some unused includes
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 14:25:46 +0000 (15:25 +0100)]
txtinfo: remove some unused includes
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 14:11:40 +0000 (15:11 +0100)]
jsoninfo: rename header files recursive include guards
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 14:11:28 +0000 (15:11 +0100)]
txtinfo: rename header files recursive include guards
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 14:29:40 +0000 (15:29 +0100)]
info: check against the correct __linux__ define
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 13:51:01 +0000 (14:51 +0100)]
info: http headers: add some asserts
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 13:47:17 +0000 (14:47 +0100)]
info: plugin_ipc_init: merge 2 if statements
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 13:41:25 +0000 (14:41 +0100)]
info: plugin_ipc_init: fix a perror message
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 13:41:10 +0000 (14:41 +0100)]
info: plugin_ipc_init: close the ipc_socket on the error paths
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 13:34:57 +0000 (14:34 +0100)]
info: plugin_ipc_init: 'unelse' an else branch, the if already returns
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 13:15:08 +0000 (14:15 +0100)]
info: plugin_ipc_init: rename 2 variables
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 13:12:33 +0000 (14:12 +0100)]
info: ipc_action: minor fix
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 13:12:24 +0000 (14:12 +0100)]
info: ipc_action: use a safer 'oversize' comparison
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 13:06:37 +0000 (14:06 +0100)]
info: ipc_action: use a static sink buffer
That is also a bit larger
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 13:00:35 +0000 (14:00 +0100)]
info: ipc_action: make the IPv6 if statement like the IPv4 one
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 13:00:12 +0000 (14:00 +0100)]
info: ipc_action: merge 2 if statements
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 12:49:22 +0000 (13:49 +0100)]
info: ipc_action: minor simplification
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 12:47:35 +0000 (13:47 +0100)]
info: ipc_action: only use addr in debug builds
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 12:43:27 +0000 (13:43 +0100)]
info: ipc_action: move inet_ntop out of condition blocks
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 12:46:38 +0000 (13:46 +0100)]
info: ipc_action: rename 2 variables
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 12:09:58 +0000 (13:09 +0100)]
info: write_data: do not move buffers around
Just loop over all output buffers. Much simpler and much more
memory efficient.
Also place the socket first in the output buffer struct for better
cache efficiency.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 12:05:48 +0000 (13:05 +0100)]
info: write_data: use a safer 'close the socket' condition
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 12:03:11 +0000 (13:03 +0100)]
info: write_data: do not consider an invalid socket for send
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 12:02:06 +0000 (13:02 +0100)]
info: write_data: properly clean up an output buffer
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 11:59:58 +0000 (12:59 +0100)]
info: write_data: add a comment
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 11:59:46 +0000 (12:59 +0100)]
info: write_data: do not add invalid sockets to the FD set
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 11:58:41 +0000 (12:58 +0100)]
info: write_data: exit early if there is nothing to send
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 11:40:20 +0000 (12:40 +0100)]
info: there can only be a single command, optimise determine_action
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 11:31:47 +0000 (12:31 +0100)]
info: minor formatting fix
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 11:30:08 +0000 (12:30 +0100)]
info: rename a function prototype
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 11:28:50 +0000 (12:28 +0100)]
info: split out neighbors and 2hop printer functions
Making it all more generic
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 09:54:04 +0000 (10:54 +0100)]
txtinfo: rename 'printers' unit
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 09:52:28 +0000 (10:52 +0100)]
jsoninfo: rename 'printers' unit
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 21:32:37 +0000 (22:32 +0100)]
info: use a define for the info_plugin_config_t plugin parameters
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 21:21:20 +0000 (22:21 +0100)]
info: ensure all variables are correctly initialised and cleaned up
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 18:23:39 +0000 (19:23 +0100)]
info: remove some comments
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 18:23:27 +0000 (19:23 +0100)]
info: add some asserts
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 18:22:18 +0000 (19:22 +0100)]
info: rename a function
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 18:20:51 +0000 (19:20 +0100)]
info: rename PLUGIN_NAME to name
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 18:19:42 +0000 (19:19 +0100)]
info: rename info_plugin_config to config
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 18:13:12 +0000 (19:13 +0100)]
info: rename a function parameter
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 17:54:56 +0000 (18:54 +0100)]
txtinfo: rename info_plugin_config to config
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 17:54:46 +0000 (18:54 +0100)]
jsoninfo: rename info_plugin_config to config
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 17:42:44 +0000 (18:42 +0100)]
info: update copyrights
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 17:40:23 +0000 (18:40 +0100)]
info: rename a http header function
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 17:38:28 +0000 (18:38 +0100)]
info: rename header files recursive include guards
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 17:31:24 +0000 (18:31 +0100)]
info: do not export info_plugin_outbuffer_t, only used internally
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 17:29:05 +0000 (18:29 +0100)]
info: rename type outbuffer_t to info_plugin_outbuffer_t
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 11:02:43 +0000 (12:02 +0100)]
jsoninfo: rename variable printer_functions to functions
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 11:02:40 +0000 (12:02 +0100)]
txtinfo: rename variable printer_functions to functions
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 17:28:04 +0000 (18:28 +0100)]
info: rename variable printer_functions to functions
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Wed, 2 Dec 2015 11:00:30 +0000 (12:00 +0100)]
info: rename type printer_functions_t to info_plugin_functions_t
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 17:23:18 +0000 (18:23 +0100)]
info: rename some http header function parameters
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Ferry Huberts [Tue, 1 Dec 2015 17:33:02 +0000 (18:33 +0100)]
info: code formatting
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Repositories / olsrd.git / log