olsrd.git
3 years agolink_set: fix GCC 6 warnings
Ferry Huberts [Tue, 23 Feb 2016 21:55:18 +0000 (22:55 +0100)]
link_set: fix GCC 6 warnings

src/link_set.c: In function ‘update_link_entry’:
src/link_set.c:335:24: error: potential null pointer dereference [-Werror=null-dereference]
   for (mult = cfg_inter->cnf->lq_mult; mult != NULL; mult = mult->next) {
               ~~~~~~~~~^~~~~

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agounix: fix GCC 6 warnings
Ferry Huberts [Tue, 23 Feb 2016 18:36:46 +0000 (19:36 +0100)]
unix: fix GCC 6 warnings

src/unix/ifnet.c:270:109: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
         (&((struct sockaddr_in *)ARM_NOWARN_ALIGN(&ifp->int_addr))->sin_addr.s_addr, &((struct sockaddr_in *)ARM_NOWARN_ALIGN(&ifr.ifr_addr))->sin_addr.s_addr,
                                                                                                             ^
src/unix/ifnet.c:277:45: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
       ifp->int_addr = *(struct sockaddr_in *)ARM_NOWARN_ALIGN(&ifr.ifr_addr);
                                             ^
src/unix/ifnet.c:278:52: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
       memcpy(&ifp->ip_addr, &((struct sockaddr_in *)ARM_NOWARN_ALIGN(&ifr.ifr_addr))->sin_addr.s_addr, olsr_cnf->ipsize);
                                                    ^
src/unix/ifnet.c:296:112: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
         (&((struct sockaddr_in *)ARM_NOWARN_ALIGN(&ifp->int_netmask))->sin_addr.s_addr, &((struct sockaddr_in *)ARM_NOWARN_ALIGN(&ifr.ifr_netmask))->sin_addr.s_addr,
                                                                                                                ^
src/unix/ifnet.c:303:48: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
       ifp->int_netmask = *(struct sockaddr_in *)ARM_NOWARN_ALIGN(&ifr.ifr_netmask);
                                                ^
src/unix/ifnet.c:332:52: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
         ifp->int_broadaddr = *(struct sockaddr_in *)ARM_NOWARN_ALIGN(&ifr.ifr_broadaddr);
                                                    ^
src/unix/ifnet.c: In function ‘chk_if_up’:
src/unix/ifnet.c:604:44: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
       ifs.int_addr = *(struct sockaddr_in *)ARM_NOWARN_ALIGN(&ifr.ifr_addr);
                                            ^
src/unix/ifnet.c:612:45: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
     ifs.int_netmask = *(struct sockaddr_in *)ARM_NOWARN_ALIGN(&ifr.ifr_netmask);
                                             ^
src/unix/ifnet.c:625:49: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
       ifs.int_broadaddr = *(struct sockaddr_in *)ARM_NOWARN_ALIGN(&ifr.ifr_broadaddr);
                                                 ^

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agomake: sort warnings flags and make that section a bit easier to read
Ferry Huberts [Tue, 23 Feb 2016 22:54:54 +0000 (23:54 +0100)]
make: sort warnings flags and make that section a bit easier to read

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agomake: remove conditionals in WARNINGS section, no longer needed
Ferry Huberts [Tue, 23 Feb 2016 22:55:46 +0000 (23:55 +0100)]
make: remove conditionals in WARNINGS section, no longer needed

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agomake: need to load the OS specific makefile before evaluating WARNINGS
Ferry Huberts [Tue, 23 Feb 2016 22:42:36 +0000 (23:42 +0100)]
make: need to load the OS specific makefile before evaluating WARNINGS

Otherwise the compiler flag detection will not use the correct CC

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agomake: add more recognised formats to the gcc-warnings script
Ferry Huberts [Tue, 23 Feb 2016 22:42:04 +0000 (23:42 +0100)]
make: add more recognised formats to the gcc-warnings script

And fix a typo

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agochangelog: update for info/jsoninfo/txtinfo changes
Ferry Huberts [Sun, 21 Feb 2016 17:51:40 +0000 (18:51 +0100)]
changelog: update for info/jsoninfo/txtinfo changes

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: /config & /plugins are not implemented: return "not found" (404)
Ferry Huberts [Sun, 21 Feb 2016 17:26:39 +0000 (18:26 +0100)]
txtinfo: /config & /plugins are not implemented: return "not found" (404)

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: respond with "no content" (204) on empty output
Ferry Huberts [Sun, 21 Feb 2016 16:20:22 +0000 (17:20 +0100)]
info: respond with "no content" (204) on empty output

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: respond with "not found" (404) on invalid commands
Ferry Huberts [Sun, 21 Feb 2016 15:26:07 +0000 (16:26 +0100)]
info: respond with "not found" (404) on invalid commands

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: add function to the function table to output an error
Ferry Huberts [Sun, 21 Feb 2016 13:28:18 +0000 (14:28 +0100)]
info: add function to the function table to output an error

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: prepare for more HTTP status codes
Ferry Huberts [Sun, 21 Feb 2016 14:05:35 +0000 (15:05 +0100)]
info: prepare for more HTTP status codes

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: requesting / now is equivalent to /all
Ferry Huberts [Sun, 21 Feb 2016 14:11:23 +0000 (15:11 +0100)]
info: requesting / now is equivalent to /all

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: rename an HTTP status define
Ferry Huberts [Sun, 21 Feb 2016 14:09:23 +0000 (15:09 +0100)]
info: rename an HTTP status define

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: also handle empty requests
Ferry Huberts [Sun, 21 Feb 2016 14:37:51 +0000 (15:37 +0100)]
info: also handle empty requests

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: requests that are too large must set s to < 0
Ferry Huberts [Sun, 21 Feb 2016 14:41:03 +0000 (15:41 +0100)]
info: requests that are too large must set s to < 0

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agomake: preserve debugging info when NOSTRIP is set
Ferry Huberts [Wed, 24 Feb 2016 18:11:31 +0000 (19:11 +0100)]
make: preserve debugging info when NOSTRIP is set

Facilitates more accurate stack traces

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agomain: musl does not support execinfo.h (the backtrace functions)
Ferry Huberts [Wed, 24 Feb 2016 00:07:03 +0000 (01:07 +0100)]
main: musl does not support execinfo.h (the backtrace functions)

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agochangelog: update the warning about txtinfo/jsoninfo
Ferry Huberts [Sun, 21 Feb 2016 12:35:46 +0000 (13:35 +0100)]
changelog: update the warning about txtinfo/jsoninfo

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: simplify interfaces
Ferry Huberts [Sun, 21 Feb 2016 12:06:19 +0000 (13:06 +0100)]
txtinfo: simplify interfaces

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: add an empty line after the version, like all other tables
Ferry Huberts [Sun, 21 Feb 2016 12:03:51 +0000 (13:03 +0100)]
txtinfo: add an empty line after the version, like all other tables

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: simplify sgw
Ferry Huberts [Sun, 21 Feb 2016 12:02:13 +0000 (13:02 +0100)]
txtinfo: simplify sgw

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: simplify gateways
Ferry Huberts [Sun, 21 Feb 2016 11:49:46 +0000 (12:49 +0100)]
txtinfo: simplify gateways

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: clarify that using /gat and /sgw on non-Linux is an error
Ferry Huberts [Sat, 20 Feb 2016 19:17:13 +0000 (20:17 +0100)]
txtinfo: clarify that using /gat and /sgw on non-Linux is an error

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: simplify and fix printing MIDs
Ferry Huberts [Sun, 21 Feb 2016 11:41:03 +0000 (12:41 +0100)]
txtinfo: simplify and fix printing MIDs

This changes the format when vtime is set to true.
The code for vtime did not account for multiple aliases.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: simplify printing HNAs
Ferry Huberts [Sun, 21 Feb 2016 10:54:02 +0000 (11:54 +0100)]
txtinfo: simplify printing HNAs

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: simplify printing topology
Ferry Huberts [Sun, 21 Feb 2016 10:46:39 +0000 (11:46 +0100)]
txtinfo: simplify printing topology

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: avoid a potential null deref in routes
Ferry Huberts [Sat, 20 Feb 2016 10:58:31 +0000 (11:58 +0100)]
txtinfo: avoid a potential null deref in routes

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: simplify printing routes
Ferry Huberts [Sun, 21 Feb 2016 10:40:30 +0000 (11:40 +0100)]
txtinfo: simplify printing routes

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: avoid a potential null deref in links
Ferry Huberts [Sat, 20 Feb 2016 10:55:24 +0000 (11:55 +0100)]
txtinfo: avoid a potential null deref in links

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: simplify printing links
Ferry Huberts [Sun, 21 Feb 2016 10:38:10 +0000 (11:38 +0100)]
txtinfo: simplify printing links

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: avoid a potential null deref in 2-hop
Ferry Huberts [Sat, 20 Feb 2016 10:54:56 +0000 (11:54 +0100)]
txtinfo: avoid a potential null deref in 2-hop

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxinfo: fix 2-hop output
Ferry Huberts [Sun, 21 Feb 2016 10:21:17 +0000 (11:21 +0100)]
txinfo: fix 2-hop output

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: simplify isCommand function
Ferry Huberts [Sat, 20 Feb 2016 08:40:18 +0000 (09:40 +0100)]
txtinfo: simplify isCommand function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: minor fixes to the README
Ferry Huberts [Sat, 20 Feb 2016 08:31:27 +0000 (09:31 +0100)]
txtinfo: minor fixes to the README

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agojsoninfo: be a bit more explicit in determine_mime_type
Ferry Huberts [Sat, 20 Feb 2016 09:01:46 +0000 (10:01 +0100)]
jsoninfo: be a bit more explicit in determine_mime_type

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agojsoninfo: minor improvements
Ferry Huberts [Sat, 20 Feb 2016 09:01:14 +0000 (10:01 +0100)]
jsoninfo: minor improvements

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agojsoninfo / sgw: isGwSelectable function is common, use it as such
Ferry Huberts [Sat, 20 Feb 2016 08:51:54 +0000 (09:51 +0100)]
jsoninfo / sgw: isGwSelectable function is common, use it as such

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agojsoninfo: simplify isCommand function
Ferry Huberts [Sat, 20 Feb 2016 08:41:56 +0000 (09:41 +0100)]
jsoninfo: simplify isCommand function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: simplify send_info function
Ferry Huberts [Sat, 20 Feb 2016 21:36:13 +0000 (22:36 +0100)]
info: simplify send_info function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: introduce and use ARRAY_SIZE define
Ferry Huberts [Sat, 20 Feb 2016 21:35:56 +0000 (22:35 +0100)]
info: introduce and use ARRAY_SIZE define

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: do not send buffers of zero length, wget can't handle that
Ferry Huberts [Sat, 20 Feb 2016 20:47:13 +0000 (21:47 +0100)]
info: do not send buffers of zero length, wget can't handle that

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: fix send result error check in write_data
Ferry Huberts [Sat, 20 Feb 2016 20:48:54 +0000 (21:48 +0100)]
info: fix send result error check in write_data

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: minor update to the README
Ferry Huberts [Sat, 20 Feb 2016 08:31:14 +0000 (09:31 +0100)]
info: minor update to the README

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agojsoninfo: extract printing a gateway to a function
Ferry Huberts [Fri, 19 Feb 2016 16:36:03 +0000 (17:36 +0100)]
jsoninfo: extract printing a gateway to a function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agojsoninfo: review /links and show more information
Ferry Huberts [Fri, 19 Feb 2016 15:37:15 +0000 (16:37 +0100)]
jsoninfo: review /links and show more information

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agojsoninfo: also show local HNAs, like txtinfo does
Ferry Huberts [Fri, 19 Feb 2016 15:03:10 +0000 (16:03 +0100)]
jsoninfo: also show local HNAs, like txtinfo does

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agojsoninfo: also show the hops for /sgw, like for /gateways
Ferry Huberts [Fri, 19 Feb 2016 13:09:43 +0000 (14:09 +0100)]
jsoninfo: also show the hops for /sgw, like for /gateways

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agojsoninfo: protect against a possible null-deref in ipc_print_neighbors
Ferry Huberts [Fri, 19 Feb 2016 12:32:43 +0000 (13:32 +0100)]
jsoninfo: protect against a possible null-deref in ipc_print_neighbors

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agojsoninfo: protect abuf_json_ip_address against a NULL IP address
Ferry Huberts [Fri, 19 Feb 2016 12:25:23 +0000 (13:25 +0100)]
jsoninfo: protect abuf_json_ip_address against a NULL IP address

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agojsoninfo: add forgotten 2hop in function table
Ferry Huberts [Fri, 19 Feb 2016 13:55:34 +0000 (14:55 +0100)]
jsoninfo: add forgotten 2hop  in function table

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: add forgotten 2hop in function table
Ferry Huberts [Fri, 19 Feb 2016 13:55:24 +0000 (14:55 +0100)]
txtinfo: add forgotten 2hop  in function table

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: review /hna
Ferry Huberts [Fri, 19 Feb 2016 13:02:10 +0000 (14:02 +0100)]
txtinfo: review /hna

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: review /nei and /2ho
Ferry Huberts [Fri, 19 Feb 2016 13:01:58 +0000 (14:01 +0100)]
txtinfo: review /nei and /2ho

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agotxtinfo: review /lin
Ferry Huberts [Fri, 19 Feb 2016 12:48:48 +0000 (13:48 +0100)]
txtinfo: review /lin

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agopud: nmealib: be less strict about satellite elevation
Ferry Huberts [Fri, 19 Feb 2016 16:49:53 +0000 (17:49 +0100)]
pud: nmealib: be less strict about satellite elevation

Sometimes satellites are seen with elevation -91

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoifnet: ensure string termination
Ferry Huberts [Wed, 17 Feb 2016 17:58:44 +0000 (18:58 +0100)]
ifnet: ensure string termination

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoFix 2 Coverity warnings
Ferry Huberts [Wed, 17 Feb 2016 12:53:09 +0000 (13:53 +0100)]
Fix 2 Coverity warnings

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoall: use the getInterfaceLinkState function
Ferry Huberts [Wed, 10 Feb 2016 13:19:01 +0000 (14:19 +0100)]
all: use the getInterfaceLinkState function

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoifnet: add getInterfaceLinkState function
Ferry Huberts [Wed, 10 Feb 2016 13:17:59 +0000 (14:17 +0100)]
ifnet: add getInterfaceLinkState function

This Linux-only function queries a network interface to see if it has a
carrier (cable (dis)connected, medium up/down, etc).

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agolinux: netlink_process_link: simplify an if/else
Ferry Huberts [Wed, 10 Feb 2016 12:49:34 +0000 (13:49 +0100)]
linux: netlink_process_link: simplify an if/else

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agolinux: netlink_process_link: compute up status only once
Ferry Huberts [Wed, 10 Feb 2016 12:48:41 +0000 (13:48 +0100)]
linux: netlink_process_link: compute up status only once

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agolinux: netlink_process_link: simplify a comparison
Ferry Huberts [Wed, 10 Feb 2016 12:22:26 +0000 (13:22 +0100)]
linux: netlink_process_link: simplify a comparison

To make it easier to read

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agolinux: netlink_process_link: always determine the oif
Ferry Huberts [Wed, 10 Feb 2016 09:47:57 +0000 (10:47 +0100)]
linux: netlink_process_link: always determine the oif

This simplifies it a bit more.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agolinux: netlink_process_link: always determine the interface name
Ferry Huberts [Wed, 10 Feb 2016 09:45:58 +0000 (10:45 +0100)]
linux: netlink_process_link: always determine the interface name

This simplifies it a bit more.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agolinux: netlink_process_link: simplify NULL comparisons and add some braces
Ferry Huberts [Wed, 10 Feb 2016 09:38:46 +0000 (10:38 +0100)]
linux: netlink_process_link: simplify NULL comparisons and add some braces

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoifnet: remove unused function set_flag
Ferry Huberts [Wed, 10 Feb 2016 10:23:08 +0000 (11:23 +0100)]
ifnet: remove unused function set_flag

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoAdd a safety net in the segfault handler
Ferry Huberts [Sun, 7 Feb 2016 21:09:27 +0000 (22:09 +0100)]
Add a safety net in the segfault handler

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agomain: add & enable a new SEGV handler (Linux only)
Ferry Huberts [Sun, 7 Feb 2016 11:27:26 +0000 (12:27 +0100)]
main: add & enable a new SEGV handler (Linux only)

It outputs the stack trace to syslog and then tries to
clean up through olsr_shutdown.

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: fix processing of command per HTTP request
Ferry Huberts [Thu, 4 Feb 2016 10:00:20 +0000 (11:00 +0100)]
info: fix processing of command per HTTP request

Reported-by: Bastian Bittorf <bittorf@bluebottle.com>
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoinfo: do not try to interpret the request when it is too large
Ferry Huberts [Thu, 4 Feb 2016 09:48:33 +0000 (10:48 +0100)]
info: do not try to interpret the request when it is too large

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agocookie: split assert to see which part actually triggers the assert
Ferry Huberts [Sat, 30 Jan 2016 07:54:42 +0000 (08:54 +0100)]
cookie: split assert to see which part actually triggers the assert

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
3 years agoCHANGELOG: add a note about txtinfo and jsoninfo being merged
Ferry Huberts [Wed, 27 Jan 2016 14:33:10 +0000 (15:33 +0100)]
CHANGELOG: add a note about txtinfo and jsoninfo being merged

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
4 years agoinfo: strip EOLs from the command
Ferry Huberts [Tue, 5 Jan 2016 10:35:48 +0000 (11:35 +0100)]
info: strip EOLs from the command

After commits dc2719d and 20ed604 this is needed

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
4 years agotxtinfo: review of /hna
Ferry Huberts [Mon, 4 Jan 2016 10:32:27 +0000 (11:32 +0100)]
txtinfo: review of /hna

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
4 years agojsoninfo: review of /hna
Ferry Huberts [Mon, 4 Jan 2016 10:32:14 +0000 (11:32 +0100)]
jsoninfo: review of /hna

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
4 years agojsoninfo: use strcmp instead of strstr
Ferry Huberts [Mon, 4 Jan 2016 07:30:58 +0000 (08:30 +0100)]
jsoninfo: use strcmp instead of strstr

To avoid matching on substrings

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
4 years agotxtinfo: use strcmp instead of strstr
Ferry Huberts [Mon, 4 Jan 2016 07:30:52 +0000 (08:30 +0100)]
txtinfo: use strcmp instead of strstr

To avoid matching on substrings

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
4 years agoModify .gitignore file to keep full default example
Henning Rogge [Wed, 9 Dec 2015 10:54:52 +0000 (11:54 +0100)]
Modify .gitignore file to keep full default example

4 years agoMerge branch 'master' of git://olsr.org/olsrd
Henning Rogge [Wed, 9 Dec 2015 10:54:02 +0000 (11:54 +0100)]
Merge branch 'master' of git://olsr.org/olsrd

4 years agoConfiguration file cleanup
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

4 years agoall: fixes resulting from building with clang
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>
4 years agomake: support building with clang (on Linux)
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>
4 years agofiles: clarify why jsoninfo is in the example configuration files
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>
4 years agojsoninfo: neighbors/2hop: show more information
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>
4 years agojsoninfo: only show gateways of the request IP version in /gateways
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>
4 years agotxtinfo: minor scope change of 2 variable in /gat
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>
4 years agotxtinfo: do not use tabs in the /gat table, use fixed widths
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>
4 years agotxtinfo: also print gateways without a tc in /gat
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>
4 years agotxtinfo: minor formatting in /gat
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>
4 years agotxtinfo: simplify some code for /gat
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>
4 years agojsoninfo: move duplicated 'selectable' code into a function
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>
4 years agojsoninfo: refactor /gateways
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>
4 years agojsoninfo: add 'selectable' field to /sgw
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>
4 years agojsoninfo: minor field reordering for /sgw
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>
4 years agolq plugins: ensure string termination in lq_print_cost functions
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>
4 years agojsoninfo: minor improvement to /sgw printing
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>
4 years agojsoninfo: use the new ip address helper in /sgw printing
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>
4 years agojsoninfo: helpers: add abuf_json_ip_address
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>
4 years agotxtinfo: minor improvements to /sgw printing
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>