[PATCH] batctl: fix endianness when reading radiotap header
by Marek Lindner
All radiotap header fields are specified in little endian byte-order.
Header length conversion is necessary on some platforms.
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
---
tcpdump.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tcpdump.c b/tcpdump.c
index 4b9e4f6..1beace1 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -1144,10 +1144,10 @@ static int monitor_header_length(unsigned char *packet_buff, ssize_t buff_len, i
return -1;
radiotap_hdr = (struct radiotap_header*)packet_buff;
- if (buff_len <= radiotap_hdr->it_len)
+ if (buff_len <= le16toh(radiotap_hdr->it_len))
return -1;
else
- return radiotap_hdr->it_len;
+ return le16toh(radiotap_hdr->it_len);
}
return -1;
--
2.25.1
4 weeks, 1 day
b.a.t.m.a.n. specification
by Fernando Gont
Hello, folks,
While looking at batman, I came across your IETF Internet-Draft
https://tools.ietf.org/id/draft-openmesh-b-a-t-m-a-n-00.txt.
Questions:
1) Is this the closest there is to an specification of batman?
2) Does it described the current protocol, or have there been changes
since then that have not been reflected into the internet-draft?
3) Any reason why the draft wasn't published as an IETF RFC?
Thanks!
Cheers,
--
Fernando Gont
SI6 Networks
e-mail: fgont(a)si6networks.com
PGP Fingerprint: 6666 31C6 D484 63B2 8FB1 E3C4 AE25 0D55 1D4E 7492
1 month
configuration issue
by Oguzhan Kayhan
Hello
I am running batman over a openwrt 18.06
default batman config over this firmware is batman-adv 2017.4
I have two systems present..
One board is with 802.11n radio. other is 802.11ac radio
This is the only difference..same image compiled running on both devices..
On 802.11n radio set..
config is as:
batman-adv:
config 'mesh' 'bat0'
option 'aggregated_ogms'
option 'ap_isolation'
option 'bonding'
option 'fragmentation'
option 'gw_bandwidth'
option 'gw_mode'
option 'gw_sel_class'
option 'log_level'
option 'orig_interval'
option 'vis_mode'
option 'bridge_loop_avoidance'
option 'distributed_arp_table'
option 'multicast_mode'
option 'network_coding'
option 'hop_penalty'
option 'isolation_mark'
wireless :
config wifi-iface
option device 'radio0'
option ifname 'mesh0'
option network 'mesh'
option mode 'adhoc'
option ssid 'mesh'
option bssid '02:CA:FE:CA:CA:40'
option mcast_rate '18000'
network:
config interface 'lan'
option type 'bridge'
option ifname 'eth0 bat0'
option proto 'static'
....
config interface 'mesh'
option mtu '1532'
option proto 'batadv'
option mesh 'bat0'
config interface 'bat'
option ifname 'bat0'
option proto 'static'
option mtu '1500'
option ipaddr '172.0.0.10'
option netmask '255.255.255.0'
This configuration works fine..
But if I run same config on the second node with 802.11ac radio.. it fails..
So I dig around and changed the config as follows.. And it started to work..
batman-adv is same..no difference
wireless:
config wifi-iface 'wmesh'
option device 'radio0'
option ifname 'adhoc0'
option network 'bat0_hardif_wlan'
option mode 'adhoc'
option ssid 'mesh'
option mcast_rate '18000'
option bssid '02:CA:FE:CA:CA:40'
network:
config interface 'bat0_hardif_wlan'
option mtu '1532'
option proto 'batadv'
option mesh 'bat0'
config interface 'bat0_hardif_eth0'
option mtu '1532'
option proto 'batadv'
option mesh 'bat0'
option ifname 'eth0'
I have two questions so far..
Why the first config does not work over second system..(Wifi works
fine but. for mesh. i needed to change the config like this)
Second question.. I can live with different config.. Ok..
But I want to use eth0 and eth2 and mesh network as a bridge...
But whenever i add any of this interfaces on bridge.. batman-adv fails..
What am I missing???
1 month
[PATCH 0/5] pull request for net-next: batman-adv 2020-04-27
by Simon Wunderlich
Hi David,
here is a small cleanup pull request of batman-adv to go into net-next.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136:
Linux 5.7-rc1 (2020-04-12 12:35:55 -0700)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20200427
for you to fetch changes up to e73f94d1b6f05f6f22434c63de255a9dec6fd23d:
batman-adv: remove unused inline function batadv_arp_change_timeout (2020-04-24 15:22:41 +0200)
----------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- fix spelling error, by Sven Eckelmann
- drop unneeded types.h include, by Sven Eckelmann
- change random number generation to prandom_u32_max(),
by Sven Eckelmann
- remove unused function batadv_arp_change_timeout(), by Yue Haibing
----------------------------------------------------------------
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (3):
batman-adv: Fix spelling error in term buffer
batman-adv: trace: Drop unneeded types.h include
batman-adv: Utilize prandom_u32_max for random [0, max) values
YueHaibing (1):
batman-adv: remove unused inline function batadv_arp_change_timeout
net/batman-adv/bat_iv_ogm.c | 4 ++--
net/batman-adv/bat_v_elp.c | 2 +-
net/batman-adv/bat_v_ogm.c | 4 ++--
net/batman-adv/distributed-arp-table.h | 5 -----
net/batman-adv/main.h | 2 +-
net/batman-adv/trace.h | 1 -
net/batman-adv/types.h | 2 +-
7 files changed, 7 insertions(+), 13 deletions(-)
1 month
[PATCH 0/4] pull request for net: batman-adv 2020-04-27
by Simon Wunderlich
Hi David,
here are some bugfixes which we would like to have integrated into net.
Please pull or let me know of any problem!
Thank you,
Simon
The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136:
Linux 5.7-rc1 (2020-04-12 12:35:55 -0700)
are available in the Git repository at:
git://git.open-mesh.org/linux-merge.git tags/batadv-net-for-davem-20200427
for you to fetch changes up to 6f91a3f7af4186099dd10fa530dd7e0d9c29747d:
batman-adv: Fix refcnt leak in batadv_v_ogm_process (2020-04-21 10:08:05 +0200)
----------------------------------------------------------------
Here are some batman-adv bugfixes:
- fix random number generation in network coding, by George Spelvin
- fix reference counter leaks, by Xiyu Yang (3 patches)
----------------------------------------------------------------
George Spelvin (1):
batman-adv: fix batadv_nc_random_weight_tq
Xiyu Yang (3):
batman-adv: Fix refcnt leak in batadv_show_throughput_override
batman-adv: Fix refcnt leak in batadv_store_throughput_override
batman-adv: Fix refcnt leak in batadv_v_ogm_process
net/batman-adv/bat_v_ogm.c | 2 +-
net/batman-adv/network-coding.c | 9 +--------
net/batman-adv/sysfs.c | 3 ++-
3 files changed, 4 insertions(+), 10 deletions(-)
1 month
[PATCH net-next] batman-adv: remove unsued inline function batadv_arp_change_timeout
by YueHaibing
There's no callers in-tree.
Signed-off-by: YueHaibing <yuehaibing(a)huawei.com>
---
net/batman-adv/distributed-arp-table.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h
index 2bff2f4a325c..4e031661682a 100644
--- a/net/batman-adv/distributed-arp-table.h
+++ b/net/batman-adv/distributed-arp-table.h
@@ -163,11 +163,6 @@ static inline void batadv_dat_init_own_addr(struct batadv_priv *bat_priv,
{
}
-static inline void batadv_arp_change_timeout(struct net_device *soft_iface,
- const char *name)
-{
-}
-
static inline int batadv_dat_init(struct batadv_priv *bat_priv)
{
return 0;
--
2.17.1
1 month
[PATCH] batman-adv: Fix refcnt leak in batadv_v_ogm_process
by Xiyu Yang
batadv_v_ogm_process() invokes batadv_hardif_neigh_get(), which returns
a reference of the neighbor object to "hardif_neigh" with increased
refcount.
When batadv_v_ogm_process() returns, "hardif_neigh" becomes invalid, so
the refcount should be decreased to keep refcount balanced.
The reference counting issue happens in one exception handling paths of
batadv_v_ogm_process(). When batadv_v_ogm_orig_get() fails to get the
orig node and returns NULL, the refcnt increased by
batadv_hardif_neigh_get() is not decreased, causing a refcnt leak.
Fix this issue by jumping to "out" label when batadv_v_ogm_orig_get()
fails to get the orig node.
Fixes: 9323158ef9f4 ("batman-adv: OGMv2 - implement originators logic")
Signed-off-by: Xiyu Yang <xiyuyang19(a)fudan.edu.cn>
Signed-off-by: Xin Tan <tanxin.ctf(a)gmail.com>
---
net/batman-adv/bat_v_ogm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c
index 969466218999..80b87b1f4e3a 100644
--- a/net/batman-adv/bat_v_ogm.c
+++ b/net/batman-adv/bat_v_ogm.c
@@ -893,7 +893,7 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset,
orig_node = batadv_v_ogm_orig_get(bat_priv, ogm_packet->orig);
if (!orig_node)
- return;
+ goto out;
neigh_node = batadv_neigh_node_get_or_create(orig_node, if_incoming,
ethhdr->h_source);
--
2.7.4
1 month, 1 week
batman cpu usage of multiple instances
by Moritz Warning
Hi,
I have many batman-adv instances (~1000) running on one computer in a Linux network namespace each.
Top shows me that a single kernel worker is handling batman-adv:
PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND
29251 root 20 0 0 0 0 R 99.3 0.0 18:03.27 kworker/u32:3+bat_events
Is there a way to let those multiple batman-adv instances make use of the other cores?
thanks,
Moritz
1 month, 1 week
maximum hop count
by Moritz Warning
Hi,
I run a simulation of 50 batman-adv instances connected on a chain topology:
[node-0] <-> [node1] <-> ... <-> [node49]
Despite there being no packet loss, the nodes at both ends (nodes 0 and 49) only see 32 other nodes.
The second outermost nodes see 33 other nodes and so on until the nodes that are at least 18 hops from both ends (nodes 17 and 32), which see all other 49 nodes.
The OGM TTL is set to 50 [1], but from this experiment, the TTL seems to be 32.
Can someone shed light on this observation?
The batman-adv version used is 2019.4.
Thanks,
Moritz
[0] https://github.com/mwarning/meshnet-lab
[1] https://git.open-mesh.org/batman-adv.git/blob/refs/heads/master:/net/batm...
1 month, 1 week
