commits December 2017

commits@lists.open-mesh.org

1 participants
242 discussions

[batman-adv] master: batman-adv: Start new development cycle (b5364afe)
by postmaster＠open-mesh.org 05 Dec '17

05 Dec '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit b5364afecf9724d32d1b5187e9d5a5ea83fbd603 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Dec 5 16:55:40 2017 +0100 batman-adv: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- b5364afecf9724d32d1b5187e9d5a5ea83fbd603 net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index edb2f239..bb8003cf 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -24,7 +24,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2017.4" +#define BATADV_SOURCE_VERSION "2018.0" #endif /* B.A.T.M.A.N. parameters */

1 0

[batctl] master: batctl: Start new development cycle (007ece3)
by postmaster＠open-mesh.org 05 Dec '17

05 Dec '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 007ece3fabad40fbdfa174a10e5e5ac5f9c6bc46 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Dec 5 16:59:47 2017 +0100 batctl: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 007ece3fabad40fbdfa174a10e5e5ac5f9c6bc46 main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index 3a5bdd6..9b33ec3 100644 --- a/main.h +++ b/main.h @@ -25,7 +25,7 @@ #include <stdint.h> #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2017.4" +#define SOURCE_VERSION "2018.0" #endif #define SOCKET_PATH_FMT "%s/batman_adv/%s/socket"

1 0

[batman-adv] master: batman-adv: Update CHANGELOG for upcoming release (e09ce414)
by postmaster＠open-mesh.org 05 Dec '17

05 Dec '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit e09ce414fe6d2aa5dae684b2c6ea11bd0a408ba8 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Dec 5 16:55:01 2017 +0100 batman-adv: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- e09ce414fe6d2aa5dae684b2c6ea11bd0a408ba8 CHANGELOG.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 16eb6e6d..ce596b69 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,19 @@ .. SPDX-License-Identifier: GPL-2.0 +2017.4 (2017-12-05) +=================== + +* support latest kernels (3.2 - 4.15) +* coding style cleanups and refactoring +* documentation cleanup +* bugs squashed: + + - avoid spurious warnings from bat_v neigh_cmp implementation + - fix check of gateway availability in B.A.T.M.A.N. V + - fix locking for bidirectional TQ check counters + - remove leak of stack bits in fragmentation header priority + + 2017.3 (2017-09-28) ===================

1 0

[alfred] master: alfred: Update CHANGELOG for upcoming release (0da2771)
by postmaster＠open-mesh.org 05 Dec '17

05 Dec '17

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 0da277127202c7f4ea43383e66a808beedd8f0e8 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Dec 5 16:57:12 2017 +0100 alfred: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 0da277127202c7f4ea43383e66a808beedd8f0e8 CHANGELOG.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c559f54..8dd31f5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,17 @@ .. SPDX-License-Identifier: GPL-2.0 +2017.4 (2017-12-05) +=================== + +* synchronization of batman-adv netlink header +* coding style cleanups and refactoring +* documentation cleanup +* bugs squashed: + + - only query debugfs when netlink failed + - handle allocation errors in hashtable iterator + + 2017.3 (2017-09-28) ===================

1 0

[batctl] master: batctl: Update CHANGELOG for upcoming release (087e4fe)
by postmaster＠open-mesh.org 05 Dec '17

05 Dec '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 087e4fe2fc9cae6f289e120c9da5e9e4703cd90b Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Dec 5 16:59:22 2017 +0100 batctl: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 087e4fe2fc9cae6f289e120c9da5e9e4703cd90b CHANGELOG.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9083816..359b3a4 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,17 @@ .. SPDX-License-Identifier: GPL-2.0 +2017.4 (2017-12-05) +=================== + +* synchronization of batman-adv netlink header +* coding style cleanups and refactoring +* documentation cleanup +* bugs squashed: + + - improve error handling for libnl related errors + - add checks for various allocation errors + + 2017.3 (2017-09-28) ===================

1 0

[linux-merge]linux integration; branch, ecsv/flowdissector, created. v4.15-rc1-26-gd3be424009ba
by postmaster＠open-mesh.org 05 Dec '17

05 Dec '17

The branch, ecsv/flowdissector has been created at d3be424009ba2884287fc95d888dc4f6fdf23483 (commit) - Shortlog ------------------------------------------------------------ commit d3be424009ba2884287fc95d888dc4f6fdf23483 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Mon Nov 27 13:33:41 2017 +0100 flow_dissector: Parse batman-adv unicast headers The batman-adv unicast packets contain a full layer 2 frame in encapsulated form. The flow dissector must therefore be able to parse the batman-adv unicast header to reach the layer 2+3 information. +--------------------+ | ip(v6)hdr | +--------------------+ | inner ethhdr | +--------------------+ | batadv unicast hdr | +--------------------+ | outer ethhdr | +--------------------+ The obtained information from the upper layer can then be used by RPS to schedule the processing on separate cores. This allows better distribution of multiple flows from the same neighbor to different cores. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> commit 6e57df8d6a43789132049190e6c1a363929bbef1 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 14:39:48 2017 +0100 batman-adv: Convert packet.h to uapi header The header file is used by different userspace programs to inject packets or to decode sniffed packets. It should therefore be available to them as userspace header. Also other components in the kernel (like the flow dissector) require access to the packet definitions to be able to decode ETH_P_BATMAN ethernet packets. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> commit 7d6278a48e0449bec7b1fcf9a9c70ceea4de86ef Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 14:17:28 2017 +0100 batman-adv: Remove usage of BIT(x) in packet.h The BIT(x) macro is no longer available for uapi headers because it is defined outside of it (linux/bitops.h). The use of it must therefore be avoided and replaced by an appropriate other representation. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> commit 345e2255baa6fdcab6686f5dd39c4c2ed932d0f6 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 11:39:29 2017 +0100 batman-adv: Let packet.h include its headers directly The headers used by packet.h should also be included by it directly. main.h is currently dealing with it in batman-adv, but this will no longer work when this header is moved to include/uapi/linux/. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> commit eb3ff71c60e26c64c5cf5ca844fae1dbf1655136 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 14:31:51 2017 +0100 batman-adv: Rename batman-adv.h to batadv_genl.h This file contains the relevant information to let userspace communicate with batman-adv over generic netlink. The relevant genl enums for the attributes and commands have the prefix batadv_genl. Renaming this file to this name therefore represents the content better and avoids confusion with the file which will contain the packet format definitions. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> commit 60b1a1ef22c957efb2bbb8df05d1cb051152eb7a Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 14:22:16 2017 +0100 batman-adv: Change nl references to genl The batman-adv netlink functionality is actually not pure netlink but is using NETLINK_GENERIC and related API. The code should therefore also use this "genl" instead of "nl" to make this more clear. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master: batctl: Handle allocation error in vlan_get_link_parse (2ea390c)
by postmaster＠open-mesh.org 04 Dec '17

04 Dec '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 2ea390ce9bdda39d3c15bd9470009f56f42d5ed9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 2 08:45:59 2017 +0100 batctl: Handle allocation error in vlan_get_link_parse The malloc could fail and return NULL. In this case, the processing of the current interface index has to be stopped to avoid writing to NULL (which would cause a segfault). Fixes: d29288fe0583 ("batctl: implement vlan-to-link helper functions") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 2ea390ce9bdda39d3c15bd9470009f56f42d5ed9 functions.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/functions.c b/functions.c index 8bcf52d..5e4eda0 100644 --- a/functions.c +++ b/functions.c @@ -812,6 +812,9 @@ static int vlan_get_link_parse(struct nl_msg *msg, void *arg) idx = *(int *)nla_data(tb[IFLA_LINK]); free(nl_arg->iface); nl_arg->iface = malloc(IFNAMSIZ + 1); + if (!nl_arg->iface) + goto err; + if (!if_indextoname(idx, nl_arg->iface)) goto err;

1 0

[batman-adv] master: batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq (9a3b1954)
by postmaster＠open-mesh.org 04 Dec '17

04 Dec '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 9a3b195410e5d2f285cdf0073fef721ff8d9474d Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 3 11:26:45 2017 +0100 batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq The originator node object orig_neigh_node is used to when accessing the bcast_own(_sum) and real_packet_count information. The access to them has to be protected with the spinlock in orig_neigh_node. But the function uses the lock in orig_node instead. This is incorrect because they could be two different originator node objects. Fixes: f14416760b62 ("batman-adv: protect bit operations to count OGMs with spinlock") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 9a3b195410e5d2f285cdf0073fef721ff8d9474d net/batman-adv/bat_iv_ogm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 1b659ab6..bbe8414b 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1214,7 +1214,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, orig_node->last_seen = jiffies; /* find packet count of corresponding one hop neighbor */ - spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); + spin_lock_bh(&orig_neigh_node->bat_iv.ogm_cnt_lock); if_num = if_incoming->if_num; orig_eq_count = orig_neigh_node->bat_iv.bcast_own_sum[if_num]; neigh_ifinfo = batadv_neigh_ifinfo_new(neigh_node, if_outgoing); @@ -1224,7 +1224,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, } else { neigh_rq_count = 0; } - spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); + spin_unlock_bh(&orig_neigh_node->bat_iv.ogm_cnt_lock); /* pay attention to not get a value bigger than 100 % */ if (orig_eq_count > neigh_rq_count)

1 0

[linux-merge]linux integration; annotated tag, v4.15-rc2, created. v4.15-rc2
by postmaster＠open-mesh.org 03 Dec '17

03 Dec '17

The annotated tag, v4.15-rc2 has been created at 9f92a4865a74b206034b1358b226a1237ad7e6c9 (tag) tagging ae64f9bd1d3621b5e60d7363bc20afb46aede215 (commit) replaces v4.15-rc1 tagged by Linus Torvalds on Sun Dec 3 11:02:00 2017 -0500 - Shortlog ------------------------------------------------------------ Linux 4.15-rc2 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJaJB/4AAoJEHm+PkMAQRiGszoIAIZniwYijqbvutnB8GR5FtJD 3lbIIw9UWD654NSnWTQ5kswahm82daNPyRNh7REULwRxYjGnxOP/zwg55l04Jwfh fzcilE/QCdwEGcFxG5d/dqQQ13WiqzRkR8BH+jL1HtK199FMxAS2X0iZyaFprvsM S5mYUAPN5rYr1SqZmJv2SI4rXL+oGJXPTgk8r72qLHyoQcdnyirmMLb9CawO6YGA JsgwGUbC5fCli8W0yPmOEKEp67E85zQ27B9SeHq8dNLr+ITbbnWy+NSWqGa13fc4 xuq7SGV9jiq3iumcFQ0PCEzJeCOSEpFVXhJ/eYG09beZ5EugMxqTbnT9hxrrcKc= =JFxM -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[alfred] master: alfred: Convert README to reStructuredText (6be59ad)
by postmaster＠open-mesh.org 01 Dec '17

01 Dec '17

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 6be59adc442f5385690013442a73ef6c50c0296a Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 20 15:04:32 2017 +0100 alfred: Convert README to reStructuredText The current format of the file is not well defined. The reStructuredText format (as used by other batman-adv related files) has the benefit that it is similar easy to read and write. And it allows other tools to parse the content of the file and convert it in a sensible way to a different file format. Multiple git repository web-based management software also can directly render these files as properly formatted HTML output. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 6be59adc442f5385690013442a73ef6c50c0296a README => README.rst | 311 +++++++++++++++++++++++++++------------------------ 1 file changed, 164 insertions(+), 147 deletions(-) diff --git a/README b/README.rst similarity index 55% rename from README rename to README.rst index 28f3dc9..d7446a3 100644 --- a/README +++ b/README.rst @@ -1,12 +1,17 @@ +.. SPDX-License-Identifier: GPL-2.0 + +============================================================== A.L.F.R.E.D - Almighty Lightweight Fact Remote Exchange Daemon --------------------------------------------------------------- +============================================================== + + "alfred is a user space daemon to efficiently[tm] flood the network with + useless data - like vis, weather data, network notes, etc" + + - Marek Lindner, 2012 -"alfred is a user space daemon to efficiently[tm] flood the network with - useless data - like vis, weather data, network notes, etc" - - Marek Lindner, 2012 Introduction ------------- +============ alfred is a user space daemon for distributing arbitrary local information over the mesh/network in a decentralized fashion. This data can be anything which @@ -24,47 +29,51 @@ information available from all alfred servers in the network. Alternatively, alfred can be configured to distribute the local information via IPv4 multicast. This is configured by setting the IPv4 multicast group address in the -4 option. + Compilation ------------ +=========== alfred depends on: - * librt (usually part of libc) - * IPv6 support in the kernel/host system - * libnl-3 - support for netlink sockets - * libnl-3-genl - support for generic netlink messages + +* librt (usually part of libc) +* IPv6 support in the kernel/host system +* libnl-3 - support for netlink sockets +* libnl-3-genl - support for generic netlink messages and optionally: - * libgps - if you want to distribute GPS information - * libcap - if you want extra security by dropping unneeded privileges -To compile alfred, simply type: +* libgps - if you want to distribute GPS information +* libcap - if you want extra security by dropping unneeded privileges + +To compile alfred, simply type:: - $ make + $ make -This will compile alfred, batadv-vis & alfred-gpsd. To install, use +This will compile alfred, batadv-vis & alfred-gpsd. To install, use:: - $ make install + $ make install (with the right privileges). -If you don't want to compile batadv-vis, add the directive CONFIG_ALFRED_VIS=n: +If you don't want to compile batadv-vis, add the directive CONFIG_ALFRED_VIS=n:: - $ make CONFIG_ALFRED_VIS=n - $ make CONFIG_ALFRED_VIS=n install + $ make CONFIG_ALFRED_VIS=n + $ make CONFIG_ALFRED_VIS=n install If you don't want to compile alfred-gpsd, add the directive -CONFIG_ALFRED_GPSD=n: +CONFIG_ALFRED_GPSD=n:: + + $ make CONFIG_ALFRED_GPSD=n + $ make CONFIG_ALFRED_GPSD=n install - $ make CONFIG_ALFRED_GPSD=n - $ make CONFIG_ALFRED_GPSD=n install +If don't want to compile with libcap to drop privileges, use:: -If don't want to compile with libcap to drop privileges, use: + $ make CONFIG_ALFRED_CAPABILITIES=n + $ make CONFIG_ALFRED_CAPABILITIES=n install - $ make CONFIG_ALFRED_CAPABILITIES=n - $ make CONFIG_ALFRED_CAPABILITIES=n install Usage ------ +===== First, alfred must run as daemon (server) in background to be used. This can either be done by some init-scripts from your distribution (if you have @@ -97,14 +106,14 @@ having all nodes in master mode is possible (for maximum decentrality and overhead). To put it together, let us start alfred in master mode on our bridge br0 -(assuming that this bridge includes the batman interface bat0): +(assuming that this bridge includes the batman interface bat0):: - $ alfred -i br0 -m + $ alfred -i br0 -m Now that the server is running, let us input some data. This can be done by -using the alfred binary in client mode from the command line: +using the alfred binary in client mode from the command line:: - $ cat /etc/hostname | alfred -s 64 + $ cat /etc/hostname | alfred -s 64 This will set the hostname as data for datatype 64. Note that 0 - 63 are reserved (please send us an e-mail if you want to register a datatype), and can @@ -113,12 +122,13 @@ to assign a version to your data which can be filtered by other alfred users. Skipping the parameter entirely has the same effect as setting the parameter to 0 ('-V 0'). -After the hostname has been set on a few alfred hosts, the can be retrieved again: +After the hostname has been set on a few alfred hosts, the can be retrieved +again:: - $ alfred -r 64 -{ "fe:f1:00:00:01:01", "OpenWRT-node-1\x0a" }, -{ "fe:f1:00:00:02:01", "OpenWRT-node-2\x0a" }, -{ "fe:f1:00:00:03:01", "OpenWRT-node-3\x0a" }, + $ alfred -r 64 + { "fe:f1:00:00:01:01", "OpenWRT-node-1\x0a" }, + { "fe:f1:00:00:02:01", "OpenWRT-node-2\x0a" }, + { "fe:f1:00:00:03:01", "OpenWRT-node-3\x0a" }, Note that the information must be periodically written again to alfred, otherwise it will timeout and alfred will forget about it (after 10 minutes). @@ -129,8 +139,9 @@ unix sockets (client connects and talks to servers). On the other hand, "slaves" and "masters" are the roles alfred can take over in the network between different machines (slaves send information to masters). + Vis ---- +=== batadv-vis can be used to visualize your batman-adv mesh network. It read the neighbor information and local client table and distributes this information via @@ -139,98 +150,100 @@ the whole picture of the network. batadv-vis, similar to to alfred, combines server (daemon) and client functionality in the 'batadv-vis' binary. The batadv-vis server must be started -to let batadv-vis work: +to let batadv-vis work:: - $ batadv-vis -i bat0 -s + $ batadv-vis -i bat0 -s This server will read the neighbor and client information from batman-adv every 10 seconds and set it in alfred via unix socket. Obviously, the alfred server must run too to get this information set. -To get a graphviz-compatible vis output, simply type: - $ batadv-vis -digraph { - subgraph "cluster_fe:f0:00:00:04:01" { - "fe:f0:00:00:04:01" - } - "fe:f0:00:00:04:01" -> "fe:f0:00:00:05:01" [label="1.000"] - "fe:f0:00:00:04:01" -> "fe:f0:00:00:03:01" [label="1.004"] - "fe:f0:00:00:04:01" -> "00:00:43:05:00:04" [label="TT"] - "fe:f0:00:00:04:01" -> "fe:f1:00:00:04:01" [label="TT"] - subgraph "cluster_fe:f0:00:00:02:01" { - "fe:f0:00:00:02:01" - } - "fe:f0:00:00:02:01" -> "fe:f0:00:00:03:01" [label="1.000"] - "fe:f0:00:00:02:01" -> "fe:f0:00:00:01:01" [label="1.008"] - "fe:f0:00:00:02:01" -> "fe:f0:00:00:08:01" [label="1.000"] - "fe:f0:00:00:02:01" -> "fe:f1:00:00:02:01" [label="TT"] - "fe:f0:00:00:02:01" -> "00:00:43:05:00:02" [label="TT"] - subgraph "cluster_fe:f0:00:00:08:01" { - "fe:f0:00:00:08:01" - } -[...] -} - -For a json line formatted output, use: - - $ batadv-vis -f json -{ "primary" : "fe:f0:00:00:04:01" } -{ "router" : "fe:f0:00:00:04:01", "neighbor" : "fe:f0:00:00:05:01", "label" : "1.000" } -{ "router" : "fe:f0:00:00:04:01", "neighbor" : "fe:f0:00:00:03:01", "label" : "1.008" } -{ "router" : "fe:f0:00:00:04:01", "gateway" : "00:00:43:05:00:04", "label" : "TT" } -{ "router" : "fe:f0:00:00:04:01", "gateway" : "fe:f1:00:00:04:01", "label" : "TT" } -{ "primary" : "fe:f0:00:00:02:01" } -{ "router" : "fe:f0:00:00:02:01", "neighbor" : "fe:f0:00:00:03:01", "label" : "1.000" } -{ "router" : "fe:f0:00:00:02:01", "neighbor" : "fe:f0:00:00:01:01", "label" : "1.016" } -{ "router" : "fe:f0:00:00:02:01", "neighbor" : "fe:f0:00:00:08:01", "label" : "1.000" } -{ "router" : "fe:f0:00:00:02:01", "gateway" : "fe:f1:00:00:02:01", "label" : "TT" } -{ "router" : "fe:f0:00:00:02:01", "gateway" : "00:00:43:05:00:02", "label" : "TT" } -{ "primary" : "fe:f0:00:00:08:01" } -[...] - -and for output where the complete document is json, use: - - $ batadv-vis -f jsondoc -{ - "source_version" : "2013.3.0-14-gcd34783", - "algorithm" : 4, - "vis" : [ - { "primary" : "fe:f0:00:00:04:01", - "neighbors" : [ - { "router" : "fe:f0:00:00:04:01", - "neighbor" : "fe:f0:00:00:05:01", - "metric" : "1.000" }, - { "router" : "fe:f0:00:00:04:01", - "neighbor" : "fe:f0:00:00:03:01", - "metric" : "1.008" } - ], - "clients" : [ - "00:00:43:05:00:04", - "fe:f1:00:00:04:01" - ] - }, - { "primary" : "fe:f0:00:00:02:01", - "neighbors" : [ - { "router" : "fe:f0:00:00:02:01", - "neighbor" : "fe:f0:00:00:03:01", - "metric" : "1.000" }, - { "router" : "fe:f0:00:00:02:01", - "neighbor" : "fe:f0:00:00:01:01", - "metric" : "1.016" }, - { "router" : "fe:f0:00:00:02:01", - "neighbor" : "fe:f0:00:00:08:01", - "metric" : "1.000" } - ], - "clients" : [ - "fe:f1:00:00:02:01", - "00:00:43:05:00:02" - ] - }, - { "primary" : "fe:f0:00:00:08:01", -[...] +To get a graphviz-compatible vis output, simply type:: + + $ batadv-vis + digraph { + subgraph "cluster_fe:f0:00:00:04:01" { + "fe:f0:00:00:04:01" + } + "fe:f0:00:00:04:01" -> "fe:f0:00:00:05:01" [label="1.000"] + "fe:f0:00:00:04:01" -> "fe:f0:00:00:03:01" [label="1.004"] + "fe:f0:00:00:04:01" -> "00:00:43:05:00:04" [label="TT"] + "fe:f0:00:00:04:01" -> "fe:f1:00:00:04:01" [label="TT"] + subgraph "cluster_fe:f0:00:00:02:01" { + "fe:f0:00:00:02:01" + } + "fe:f0:00:00:02:01" -> "fe:f0:00:00:03:01" [label="1.000"] + "fe:f0:00:00:02:01" -> "fe:f0:00:00:01:01" [label="1.008"] + "fe:f0:00:00:02:01" -> "fe:f0:00:00:08:01" [label="1.000"] + "fe:f0:00:00:02:01" -> "fe:f1:00:00:02:01" [label="TT"] + "fe:f0:00:00:02:01" -> "00:00:43:05:00:02" [label="TT"] + subgraph "cluster_fe:f0:00:00:08:01" { + "fe:f0:00:00:08:01" + } + [...] + } + +For a json line formatted output, use:: + + $ batadv-vis -f json + { "primary" : "fe:f0:00:00:04:01" } + { "router" : "fe:f0:00:00:04:01", "neighbor" : "fe:f0:00:00:05:01", "label" : "1.000" } + { "router" : "fe:f0:00:00:04:01", "neighbor" : "fe:f0:00:00:03:01", "label" : "1.008" } + { "router" : "fe:f0:00:00:04:01", "gateway" : "00:00:43:05:00:04", "label" : "TT" } + { "router" : "fe:f0:00:00:04:01", "gateway" : "fe:f1:00:00:04:01", "label" : "TT" } + { "primary" : "fe:f0:00:00:02:01" } + { "router" : "fe:f0:00:00:02:01", "neighbor" : "fe:f0:00:00:03:01", "label" : "1.000" } + { "router" : "fe:f0:00:00:02:01", "neighbor" : "fe:f0:00:00:01:01", "label" : "1.016" } + { "router" : "fe:f0:00:00:02:01", "neighbor" : "fe:f0:00:00:08:01", "label" : "1.000" } + { "router" : "fe:f0:00:00:02:01", "gateway" : "fe:f1:00:00:02:01", "label" : "TT" } + { "router" : "fe:f0:00:00:02:01", "gateway" : "00:00:43:05:00:02", "label" : "TT" } + { "primary" : "fe:f0:00:00:08:01" } + [...] + +and for output where the complete document is json, use:: + + $ batadv-vis -f jsondoc + { + "source_version" : "2013.3.0-14-gcd34783", + "algorithm" : 4, + "vis" : [ + { "primary" : "fe:f0:00:00:04:01", + "neighbors" : [ + { "router" : "fe:f0:00:00:04:01", + "neighbor" : "fe:f0:00:00:05:01", + "metric" : "1.000" }, + { "router" : "fe:f0:00:00:04:01", + "neighbor" : "fe:f0:00:00:03:01", + "metric" : "1.008" } + ], + "clients" : [ + "00:00:43:05:00:04", + "fe:f1:00:00:04:01" + ] + }, + { "primary" : "fe:f0:00:00:02:01", + "neighbors" : [ + { "router" : "fe:f0:00:00:02:01", + "neighbor" : "fe:f0:00:00:03:01", + "metric" : "1.000" }, + { "router" : "fe:f0:00:00:02:01", + "neighbor" : "fe:f0:00:00:01:01", + "metric" : "1.016" }, + { "router" : "fe:f0:00:00:02:01", + "neighbor" : "fe:f0:00:00:08:01", + "metric" : "1.000" } + ], + "clients" : [ + "fe:f1:00:00:02:01", + "00:00:43:05:00:02" + ] + }, + { "primary" : "fe:f0:00:00:08:01", + [...] + Alfred-gpsd ------------ +=========== Alfred-gpsd can be used to distibute GPS location information about your batman-adv mesh network. This information could be, for example, @@ -242,31 +255,32 @@ on the command line, which is useful for static nodes without a GPS. Alfred-gpsd, similar to to alfred, combines server (daemon) and client functionality in the 'alfred-gpsd' binary. The alfred-gpsd server must be started to distribute location information. When retrieving -location information from gpsd, it should be started with: +location information from gpsd, it should be started with:: - $ alfred-gpsd -s + $ alfred-gpsd -s -For a static location, use: +For a static location, use:: - $ alfred-gpsd -s -l 48.858222,2.2945,358 + $ alfred-gpsd -s -l 48.858222,2.2945,358 This server will set the location in alfred via unix socket. Obviously, the alfred server must run too to get this information set. When using gpsd, it updates alfred every 2 seconds. With a static location, the update it made every 5 minutes. -To get JSON formatted output, use: +To get JSON formatted output, use:: - $ alfred-gpsd -[ - { "source" : "f6:00:48:13:d3:1e", "tpv" : {"class":"TPV","tag":"RMC","device":"/dev/ttyACM0","mode":3,"time":"2013-10-01T10:43:20.000Z","ept":0.005,"lat":52.575485000,"lon":-1.339716667,"alt":122.500,"epx":10.199,"epy":15.720,"epv":31.050,"track":0.0000,"speed":0.010,"climb":0.000,"eps":31.44} }, - { "source" : "8e:4c:77:b3:65:b4", "tpv" : {"class":"TPV","device":"command line","time":"2013-10-01T10:43:05.129Z","lat":48.858222,"lon":2.2945,"alt":358.000000,"mode":3} } -] + $ alfred-gpsd + [ + { "source" : "f6:00:48:13:d3:1e", "tpv" : {"class":"TPV","tag":"RMC","device":"/dev/ttyACM0","mode":3,"time":"2013-10-01T10:43:20.000Z","ept":0.005,"lat":52.575485000,"lon":-1.339716667,"alt":122.500,"epx":10.199,"epy":15.720,"epv":31.050,"track":0.0000,"speed":0.010,"climb":0.000,"eps":31.44} }, + { "source" : "8e:4c:77:b3:65:b4", "tpv" : {"class":"TPV","device":"command line","time":"2013-10-01T10:43:05.129Z","lat":48.858222,"lon":2.2945,"alt":358.000000,"mode":3} } + ] See gpsd_json(5) for documentation of the tpv object. + Running alfred as non-root user -------------------------------- +=============================== Alfred currently requires special capabilities and access rights to work correctly. The user root is normally the only user having these @@ -274,25 +288,26 @@ capabilities/rights on a standard Linux system. Operations requiring special capabilities: - * bind to device - * creating the unix socket - * accessing the debugfs filesystem +* bind to device +* creating the unix socket +* accessing the debugfs filesystem The first operation can still be executed when the admin grants the special capability CAP_NET_RAW+CAP_NET_ADMIN to anyone executing the alfred binary. The unix socket can also be moved using the parameter '-u' to a different -directory which can be accessed by the user. +directory which can be accessed by the user:: - $ sudo setcap cap_net_admin,cap_net_raw+ep alfred - $ ./alfred -u alfred.sock -i eth0 + $ sudo setcap cap_net_admin,cap_net_raw+ep alfred + $ ./alfred -u alfred.sock -i eth0 The user running alfred must still be in a group which is allowed to access /sys/kernel/debugfs to correctly choose best neighbors for communication. It is possible (but not recommended) to disable the neighbor selection/prioritization using the parameter '-b none'. + License -------- +======= alfred, batadv-vis and alfred-gpsd are licensed under the terms of version 2 of the GNU General Public License (GPL). Please see the LICENSE file. @@ -303,23 +318,25 @@ programs to include this header file (e.g. for communicating with alfred via unix sockets) without enforcing the restrions of the GPL license on this third party program. + Contact -------- +======= As alfred was developed to help on batman-adv, we share communication channels. Please send us comments, experiences, questions, anything :) -IRC: #batman on irc.freenode.org -Mailing-list: b.a.t.m.a.n(a)lists.open-mesh.org (optional subscription - at https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n) +IRC: + #batman on irc.freenode.org +Mailing-list: + b.a.t.m.a.n(a)open-mesh.org (optional subscription at + https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n) -If you have test reports/patches/ideas, please read the wiki for further instruction -on how to contribute: +If you have test reports/patches/ideas, please read the wiki for further +instruction on how to contribute: https://www.open-mesh.org/projects/open-mesh/wiki/Contribute You can also contact the Authors: -Simon Wunderlich <sw(a)simonwunderlich.de> -Sven Eckelmann <sven(a)open-mesh.com> - +* Marek Lindner <mareklindner(a)neomailbox.ch> +* Simon Wunderlich <sw(a)simonwunderlich.de>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2017