B.A.T.M.A.N

b.a.t.m.a.n@lists.open-mesh.org

15 participants
4308 discussions

Start a nNew thread

[B.A.T.M.A.N.] request to unsubscribe
by Krishnathiepan Rasanayagam 09 Jun '15

09 Jun '15

Dear Admin, Please unsubscribe me from the mailing list. thank you. -- Best regards, Krishna.

2 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Fix kerneldoc over 80 column lines
by Sven Eckelmann 09 Jun '15

09 Jun '15

Kerneldoc required single line documentation in the past (before 2009). Therefore, the 80 columns limit per line check of checkpatch was disabled for kerneldoc. But kerneldoc is not excluded anymore from it and checkpatch now enabled the check again. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/icmp_socket.c | 4 ++-- net/batman-adv/network-coding.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index 07061bc..8d8a7d2 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -337,8 +337,8 @@ err: } /** - * batadv_socket_receive_packet - schedule an icmp packet to be sent to userspace - * on an icmp socket. + * batadv_socket_receive_packet - schedule an icmp packet to be sent to + * userspace on an icmp socket. * @socket_client: the socket this packet belongs to * @icmph: pointer to the header of the icmp packet * @icmp_len: total length of the icmp packet diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index f0a50f3..3c89119 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -872,8 +872,8 @@ free: } /** - * batadv_nc_update_nc_node - updates stored incoming and outgoing nc node structs - * (best called on incoming OGMs) + * batadv_nc_update_nc_node - updates stored incoming and outgoing nc node + * structs (best called on incoming OGMs) * @bat_priv: the bat priv with all the soft interface information * @orig_node: orig node originating the ogm packet * @orig_neigh_node: neighboring orig node from which we received the ogm packet -- 2.1.4

2 3

[B.A.T.M.A.N.] pull request: batman-adv 20150603
by Antonio Quartulli 04 Jun '15

04 Jun '15

Hello David, here you have our second batch of patches intended for net-next. In this patchset you won't find any new features, but quite some code cleanup work, a bunch of code style fixes and also comments corrections by Markus Pargmann. Moreover you have a patch from Sven Eckelmann removing an unnecessary NULL check in batadv_iv_ogm_update_seqnos(). Please pull or let me know of any problem! Thanks a lot, Antonio The following changes since commit df905ceae3883f024282d00824ce33040097ac86: Merge branch 'sfc-next' (2015-06-02 12:57:39 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to f372d09059a67f57b3d2b5eab8c05b0ddb8ca92f: batman-adv: Remove unnecessary ret variable in algo_register (2015-06-03 15:57:25 +0200) ---------------------------------------------------------------- Included changes: - code re-arrangement for better reading and understanding - code style fixups - comments corrections - remove unnecessary NULL check in batadv_iv_ogm_update_seqnos() - make boolean functions explicitly return a bool result - remove unnecessary variables in algo_register() and algo_select() ---------------------------------------------------------------- Markus Pargmann (11): batman-adv: iv_ogm_aggregate_new, simplify error handling batman-adv: iv_ogm_queue_add, Simplify expressions batman-adv: iv_ogm_orig_update, style, add missing brackets batman-adv: iv_ogm, Fix dup_status comment batman-adv: iv_ogm, fix coding style batman-adv: iv_ogm, fix comment function name batman-adv: types, Fix comment on bcast_own batman-adv: main, Convert is_my_mac() to bool batman-adv: main, batadv_compare_eth return bool batman-adv: Remove unnecessary ret variable batman-adv: Remove unnecessary ret variable in algo_register Sven Eckelmann (1): batman-adv: Remove unnecessary check for orig_ifinfo not NULL net/batman-adv/bat_iv_ogm.c | 46 ++++++++++++++++++++++----------------------- net/batman-adv/main.c | 29 ++++++++++++---------------- net/batman-adv/main.h | 4 ++-- net/batman-adv/types.h | 7 ++++--- 4 files changed, 41 insertions(+), 45 deletions(-)

2 13

[B.A.T.M.A.N.] [PATCH 1/6] alfred: Reduce MAX_PAYLOAD by the size of the UDP header
by Sven Eckelmann 01 Jun '15

01 Jun '15

The len field in the UDP header is 16 bit long. It can therefore store a value of up to (2 ** 16 - 1). This value is currently used for MAX_PAYLOAD. But the UDP len field not only stores the payload length but also the udp header itself. Thus the length of MAX_PAYLOAD has to be reduced by the size of udphdr to make sure that the payload can still be sent. Reported-by: Hans-Werner Hilse <hwhilse(a)gmail.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- alfred.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alfred.h b/alfred.h index 8fc8ab1..7c308e5 100644 --- a/alfred.h +++ b/alfred.h @@ -26,4 +26,5 @@ #include <net/ethernet.h> #include <netinet/in.h> +#include <netinet/udp.h> #include <stdint.h> #include <time.h> @@ -138,5 +139,5 @@ struct globals { #define debugFree(ptr, num) free(ptr) -#define MAX_PAYLOAD ((1 << 16) - 1) +#define MAX_PAYLOAD ((1 << 16) - 1 - sizeof(struct udphdr)) extern const struct in6_addr in6addr_localmcast; -- 2.1.4

2 7

[B.A.T.M.A.N.] [PATCH maint] batman-adv: avoid DAT to mess up LAN state
by Antonio Quartulli 01 Jun '15

01 Jun '15

When a node running DAT receives an ARP request from the LAN for the first time, it is likely that this node will request the ARP entry through the distributed ARP table (DAT) in the mesh. Once a DAT reply is received the asking node must check if the MAC address for which the IP address has been asked is local. If it is, the node must drop the ARP reply bceause the client should have replied on its own locally. Forwarding this reply means fooling any L2 bridge (e.g. Ethernet switches) lying between the batman-adv node and the LAN. This happens because the L2 bridge will think that the client sending the ARP reply lies somewhere in the mesh, while this node is sitting in the same LAN. Reported-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- net/batman-adv/distributed-arp-table.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index fb54e6a..6d0b471 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -1138,6 +1138,9 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, * @bat_priv: the bat priv with all the soft interface information * @skb: packet to check * @hdr_size: size of the encapsulation header + * + * Returns true if the packet was snooped and consumed by DAT. False if the + * packet has to be delivered to the interface */ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, struct sk_buff *skb, int hdr_size) @@ -1145,7 +1148,7 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, uint16_t type; __be32 ip_src, ip_dst; uint8_t *hw_src, *hw_dst; - bool ret = false; + bool dropped = false; unsigned short vid; if (!atomic_read(&bat_priv->distributed_arp_table)) @@ -1174,12 +1177,17 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, /* if this REPLY is directed to a client of mine, let's deliver the * packet to the interface */ - ret = !batadv_is_my_client(bat_priv, hw_dst, vid); + dropped = !batadv_is_my_client(bat_priv, hw_dst, vid); + + /* if this REPLY is sent on behalf of a client of mine, let's drop the + * packet because the client will reply by itself + */ + dropped |= batadv_is_my_client(bat_priv, hw_src, vid); out: - if (ret) + if (dropped) kfree_skb(skb); - /* if ret == false -> packet has to be delivered to the interface */ - return ret; + /* if dropped == false -> deliver to the interface */ + return dropped; } /** -- 2.4.2

1 1

[B.A.T.M.A.N.] [PATCH 1/4] batman-adv: Return EINVAL on invalid gw_bandwidth change
by Sven Eckelmann 31 May '15

31 May '15

Invalid speed settings by the user are currently acknowledged as correct but not stored. Instead the return of the store operation of the file "gw_bandwidth" should indicate that the given value is not acceptable. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- net/batman-adv/gateway_common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 39cf44c..f907a20 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -157,7 +157,7 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff, ret = batadv_parse_gw_bandwidth(net_dev, buff, &down_new, &up_new); if (!ret) - goto end; + return -EINVAL; if (!down_new) down_new = 1; @@ -181,7 +181,6 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff, atomic_set(&bat_priv->gw.bandwidth_up, up_new); batadv_gw_tvlv_container_update(bat_priv); -end: return count; } -- 2.1.4

1 3

[B.A.T.M.A.N.] pull request: batman-adv 2015-05-29
by Antonio Quartulli 31 May '15

31 May '15

Hello David, after quite some time of silence (mostly due to me being rather busy and not because we did not have any active development) here you have my first batch intended for net-next/linux-4.1. In this patchset you have quite some code cleanup and style fixes. A big chunk of the cleanup work has been performed by Markus Pargmann, followed by a couple of checkpatch fixes brought by Marek Lindner. Then we have a patch by Sven Eckelmann that disables some of the features we had enabled by default, because not all the users having them enabled at compile time are aware of those. For example distributions like debian enables any compile-time option without asking the user, thus having him using all these features without his explicit consent with potentially unexpected behaviours. Therefore the decision to disable by default not-so-user-safe options. This is all for now. Please pull or let me know of any problem! Thanks a lot! The following changes since commit a74eab639ec502eb744528ef7c271576d670aa7a: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next (2015-05-28 20:23:01 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 8ea64e27080eb66dc26f64f28485c0bc9fc06b36: batman-adv: Use common declaration order in *_send_skb_(packet|unicast) (2015-05-29 10:13:37 +0200) ---------------------------------------------------------------- Included changes: - checkpatch fixes - code cleanup - debugfs component is now compiled only if DEBUG_FS is selected - update copyright years - disable by default not-so-user-safe features ---------------------------------------------------------------- Antonio Quartulli (1): batman-adv: Use common declaration order in *_send_skb_(packet|unicast) Marek Lindner (2): batman-adv: checkpatch - comparison to NULL could be rewritten batman-adv: checkpatch - spaces preferred around that '*' Markus Pargmann (8): batman-adv: debugfs, avoid compiling for !DEBUG_FS batman-adv: tvlv realloc, move error handling into if block batman-adv: Makefile, Sort alphabetically batman-adv: iv_ogm_iface_enable, direct return values batman-adv: iv_ogm_aggr_packet, bool return value batman-adv: iv_ogm_send_to_if, declare char* as const batman-adv: iv_ogm_can_aggregate, code readability batman-adv: iv_ogm_orig_update, remove unnecessary brackets Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (4): batman-adv: update copyright years for 2015 batman-adv: Check total_size when queueing fragments batman-adv: Use only queued fragments when merging batman-adv: Use safer default config for optional features net/batman-adv/Makefile | 6 +- net/batman-adv/bat_algo.h | 2 +- net/batman-adv/bat_iv_ogm.c | 120 ++++++++++++++++----------------- net/batman-adv/bitarray.c | 2 +- net/batman-adv/bitarray.h | 2 +- net/batman-adv/bridge_loop_avoidance.c | 2 +- net/batman-adv/bridge_loop_avoidance.h | 2 +- net/batman-adv/debugfs.c | 10 +-- net/batman-adv/debugfs.h | 36 +++++++++- net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/distributed-arp-table.h | 2 +- net/batman-adv/fragmentation.c | 22 +++--- net/batman-adv/fragmentation.h | 2 +- net/batman-adv/gateway_client.c | 2 +- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/gateway_common.h | 2 +- net/batman-adv/hard-interface.c | 2 +- net/batman-adv/hard-interface.h | 2 +- net/batman-adv/hash.c | 2 +- net/batman-adv/hash.h | 2 +- net/batman-adv/icmp_socket.c | 2 +- net/batman-adv/icmp_socket.h | 2 +- net/batman-adv/main.c | 18 ++--- net/batman-adv/main.h | 6 +- net/batman-adv/multicast.c | 2 +- net/batman-adv/multicast.h | 2 +- net/batman-adv/network-coding.c | 6 +- net/batman-adv/network-coding.h | 2 +- net/batman-adv/originator.c | 2 +- net/batman-adv/originator.h | 2 +- net/batman-adv/packet.h | 2 +- net/batman-adv/routing.c | 2 +- net/batman-adv/routing.h | 2 +- net/batman-adv/send.c | 4 +- net/batman-adv/send.h | 2 +- net/batman-adv/soft-interface.c | 6 +- net/batman-adv/soft-interface.h | 2 +- net/batman-adv/sysfs.c | 2 +- net/batman-adv/sysfs.h | 2 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/translation-table.h | 2 +- net/batman-adv/types.h | 4 +- 43 files changed, 165 insertions(+), 137 deletions(-)

2 17

[B.A.T.M.A.N.] The Joker attacks
by Simon Wunderlich 19 May '15

19 May '15

After laying low for quite some time, the Joker finally makes its appearance! "The Joker" - a penetration testing and research tool to test security aspects of batman-adv networks - was developed by security researchers Pedro Larbig and Alexander Oberle at TU Darmstadt (Germany), and we finally got permission to release the source code to the public. The tool currently supports the following tests: * Peer/Route flooding: flood fake OGMs * Blackhole: announce to neighbors that the best route is via the attacker node * Loop Forming: create local loops on multi-hop paths * Fuzzing: modify packets randomly to create malformed packets Pedro & Alexander developed the tool in order to facilitate their mesh network security research. Their work focuses on B.A.T.M.A.N. Advanced version 2011.1.0 and concluded that this version was performing pretty well in the Peer/Route and fuzzing tests. Albeit not being able to prevent maliciously provoked loops/blackholes entirely, B.A.T.M.A.N. Advanced did recover quickly when needed, according to their study. To instigate further interest in mesh network security the 'Joker' code base is being published alongside this announcement. Hopefully, the Joker inspires security researchers as well as developers to investigate and fix issues in the B.A.T.M.A.N. protocol and/or implementation. We will also accept contributions for the Joker through the usual channels. Note that the tool does currently not work with the more recent versions 2013.4.0 or 2014.4.0 and later - patches are welcome. Happy routing, The B.A.T.M.A.N. team

1 0

[B.A.T.M.A.N.] [PATCH] fix algorithm, which was unintentional changed on update from 2013 to 2014
by Ruben Wisniewski 17 May '15

17 May '15

This patch restores the unintentional change on commit http://www.open-mesh.org/projects/batman-adv/repository/revisions/0853ec7fa… Original the algorithm uses kbit for calculation, now the values are stored as "mbit*10" so we have to multiply it with 100 to restore the old behavior. Signed-off-by: Ruben Wisniewsi <ruben(a)vfn-nrw.de> --- net/batman-adv/gateway_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 1f50661..6f00584 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -185,7 +185,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv) switch (atomic_read(&bat_priv->gw_sel_class)) { case 1: /* fast connection */ tmp_gw_factor = tq_avg * tq_avg; - tmp_gw_factor *= gw_node->bandwidth_down; + tmp_gw_factor *= gw_node->bandwidth_down * 100; tmp_gw_factor *= 100 * 100; tmp_gw_factor /= gw_divisor; -- 2.4.0

2 1

[B.A.T.M.A.N.] [PATCH] fixes a uint32 overflow
by Ruben Wisniewski 17 May '15

17 May '15

Signed-off-by: Ruben Wisniewsi <ruben(a)vfn-nrw.de> --- net/batman-adv/gateway_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index bb01586..1f50661 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -153,7 +153,7 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv) struct batadv_neigh_node *router; struct batadv_neigh_ifinfo *router_ifinfo; struct batadv_gw_node *gw_node, *curr_gw = NULL; - uint32_t max_gw_factor = 0, tmp_gw_factor = 0; + uint64_t max_gw_factor = 0, tmp_gw_factor = 0; uint32_t gw_divisor; uint8_t max_tq = 0; uint8_t tq_avg; -- 2.4.0

2 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N