pull request: batman-adv 2014-01-09
Subsystems (3)
Hello David,
this is a batch of patches intended for net-next/linux-3.14.
Here we start with patches 1, 2 and 3 that are minor cleanups:
- fix a typ0 in a header guard define
- substitute the FSF address with the URL in every file (checkpatch still complains about the text I used, but this is what the rest of the networking code is doing)
- minor optimisation of ntohl usage
Then we have patch 4 that improves the bat-GW selection feature by deselecting the current GW on client mode deactivation. This allows userspace to get a meaningful uevent on a further client mode reactivation.
Patches 5 and 6 are other minor refactorings:
- a function renaming (gw_deselect() -> gw_reselect()) to better reflect its behaviour
- remove parenthesis around return expressions
Patch 7 is yet another improvement to the bat-GW feature: now all the DHCP packets are sent via bat-unicast messages. With this we achieves to goals:
1) the DHCP protocol becomes even more reliable in sparse wireless mesh networks, where broadcast packets do not always make their way through
2) the broadcast overhead due to DHCP packets in dense wireless networks is now reduced as we only use unicasts.
In the end patches from 8 to 13 implement a new feature: the Extended Isolation (which is basically it is an extension of the already existing AP Isolation concept).
This new mechanism allows the user to prevent communications from a generic client A to a generic client B (located in two different point of the mesh network) based on the value of the skb->mark field. This can be seen as a first step towards a netfilter integration in a mesh-wide environment. For more documentation about this new mechanism, please read [1].
Please pull or let me know of any problem!
Thanks a lot,
Antonio
[1] http://www.open-mesh.org/projects/batman-adv/wiki/Extended-isolation
p.s. thanks for notifying me the merge of net into net-next! In this way I avoided you to deal with some ugly merge conflicts :)
The following changes since commit 80077935cad223b292d4a03e901a953b20a36593:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (2014-01-08 01:11:19 -0500)
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 42cb0bef0176572e2e826b49d697c653eedd7fce:
batman-adv: set the isolation mark in the skb if needed (2014-01-08 20:49:46 +0100)
----------------------------------------------------------------
Included changes:
- substitute FSF address with URL
- deselect current bat-GW when GW-client mode gets deactivated
- send every DHCP packet using bat-unicast messages when GW-client mode is enabled
- implement the Extended Isolation mechanism (it is an enhancement of the already existing batman-AP-isolation). This mechanism allows the user to drop packets exchanged by selected clients by using netfilter marks.
- fix typ0 in header guard
- minor code cleanups
----------------------------------------------------------------
Antonio Quartulli (13):
batman-adv: properly rename define in distributed arp table header file
batman-adv: don't switch byte order too often if not needed
batman-adv: remove FSF address from GPL disclaimer
batman-adv: deselect current GW on client mode switch off
batman-adv: rename gw_deselect() to gw_reselect()
batman-adv: remove parenthesis from return statements
batman-adv: send every DHCP packet as bat-unicast
batman-adv: add isolation_mark sysfs attribute
batman-adv: mark a local client as isolated when needed
batman-adv: print the new BATADV_TT_CLIENT_ISOLA flag
batman-adv: extend the ap_isolation mechanism
batman-adv: create helper function to get AP isolation status
batman-adv: set the isolation mark in the skb if needed
Documentation/ABI/testing/sysfs-class-net-mesh | 8 + net/batman-adv/Makefile | 4 +- net/batman-adv/bat_algo.h | 4 +- net/batman-adv/bat_iv_ogm.c | 4 +- net/batman-adv/bitarray.c | 4 +- net/batman-adv/bitarray.h | 4 +- net/batman-adv/bridge_loop_avoidance.c | 4 +- net/batman-adv/bridge_loop_avoidance.h | 4 +- net/batman-adv/debugfs.c | 4 +- net/batman-adv/debugfs.h | 4 +- net/batman-adv/distributed-arp-table.c | 10 +- net/batman-adv/distributed-arp-table.h | 10 +- net/batman-adv/fragmentation.c | 4 +- net/batman-adv/fragmentation.h | 4 +- net/batman-adv/gateway_client.c | 215 ++++++++++++------------- net/batman-adv/gateway_client.h | 10 +- net/batman-adv/gateway_common.c | 6 +- net/batman-adv/gateway_common.h | 4 +- net/batman-adv/hard-interface.c | 4 +- net/batman-adv/hard-interface.h | 4 +- net/batman-adv/hash.c | 4 +- net/batman-adv/hash.h | 4 +- net/batman-adv/icmp_socket.c | 4 +- net/batman-adv/icmp_socket.h | 4 +- net/batman-adv/main.c | 30 +++- net/batman-adv/main.h | 7 +- net/batman-adv/network-coding.c | 4 +- net/batman-adv/network-coding.h | 4 +- net/batman-adv/originator.c | 4 +- net/batman-adv/originator.h | 4 +- net/batman-adv/packet.h | 5 +- net/batman-adv/routing.c | 12 +- net/batman-adv/routing.h | 4 +- net/batman-adv/send.c | 20 ++- net/batman-adv/send.h | 14 +- net/batman-adv/soft-interface.c | 107 +++++++----- net/batman-adv/soft-interface.h | 4 +- net/batman-adv/sysfs.c | 92 ++++++++++- net/batman-adv/sysfs.h | 4 +- net/batman-adv/translation-table.c | 76 ++++++--- net/batman-adv/translation-table.h | 8 +- net/batman-adv/types.h | 18 ++- 42 files changed, 437 insertions(+), 311 deletions(-)
PATCH 1/13 batman-adv: properly rename define in distributed arp table header file
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/distributed-arp-table.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/batman-adv/distributed-arp-table.h +3 -3
@@ -17,8 +17,8 @@* 02110-1301, USA */ -#ifndef _NET_BATMAN_ADV_ARP_H_ -#define _NET_BATMAN_ADV_ARP_H_ +#ifndef _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_ +#define _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_#ifdef CONFIG_BATMAN_ADV_DAT
@@ -169,4 +169,4 @@ static inline void batadv_dat_inc_counter(struct batadv_priv *bat_priv,#endif /* CONFIG_BATMAN_ADV_DAT */ -#endif /* _NET_BATMAN_ADV_ARP_H_ */ +#endif /* _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_ */
Signature · 1 line
1.8.5.2
PATCH 2/13 batman-adv: don't switch byte order too often if not needed
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
If possible, operations like ntohs/ntohl should not be performed too often. Use a variable to locally store the converted value and then use it.
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/routing.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
net/batman-adv/routing.c +5 -3
@@ -1135,6 +1135,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,int hdr_size =sizeof (*bcast_packet);int ret =NET_RX_DROP ;int32_t seq_diff; +uint32_t seqno;/* drop packet if it has not necessary minimum size */ if (unlikely (!pskb_may_pull (skb, hdr_size)))
@@ -1170,12 +1171,13 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,spin_lock_bh (&orig_node->bcast_seqno_lock); + seqno =ntohl (bcast_packet->seqno);/* check whether the packet is a duplicate */ if (batadv_test_bit (orig_node->bcast_bits, orig_node->last_bcast_seqno, -ntohl (bcast_packet->seqno))) + seqno)) goto spin_unlock; - seq_diff =ntohl (bcast_packet->seqno) - orig_node->last_bcast_seqno; + seq_diff = seqno - orig_node->last_bcast_seqno;/* check whether the packet is old and the host just restarted. */ if (batadv_window_protected(bat_priv, seq_diff,
@@ -1186,7 +1188,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb,* if required. */ if (batadv_bit_get_packet (bat_priv, orig_node->bcast_bits, seq_diff,1 )) - orig_node->last_bcast_seqno =ntohl (bcast_packet->seqno); + orig_node->last_bcast_seqno = seqno;spin_unlock_bh (&orig_node->bcast_seqno_lock);
Signature · 1 line
1.8.5.2
PATCH 3/13 batman-adv: remove FSF address from GPL disclaimer
In reply to Antonio QuartulliAs suggested by checkpatch, remove all the references to the FSF address since the kernel already has one reference in its documentation.
In this way it is easier to update it in case of future changes.
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/Makefile | 4 +--- net/batman-adv/bat_algo.h | 4 +--- net/batman-adv/bat_iv_ogm.c | 4 +--- net/batman-adv/bitarray.c | 4 +--- net/batman-adv/bitarray.h | 4 +--- net/batman-adv/bridge_loop_avoidance.c | 4 +--- net/batman-adv/bridge_loop_avoidance.h | 4 +--- net/batman-adv/debugfs.c | 4 +--- net/batman-adv/debugfs.h | 4 +--- net/batman-adv/distributed-arp-table.c | 4 +--- net/batman-adv/distributed-arp-table.h | 4 +--- net/batman-adv/fragmentation.c | 4 +--- net/batman-adv/fragmentation.h | 4 +--- net/batman-adv/gateway_client.c | 4 +--- net/batman-adv/gateway_client.h | 4 +--- net/batman-adv/gateway_common.c | 4 +--- net/batman-adv/gateway_common.h | 4 +--- net/batman-adv/hard-interface.c | 4 +--- net/batman-adv/hard-interface.h | 4 +--- net/batman-adv/hash.c | 4 +--- net/batman-adv/hash.h | 4 +--- net/batman-adv/icmp_socket.c | 4 +--- net/batman-adv/icmp_socket.h | 4 +--- net/batman-adv/main.c | 4 +--- net/batman-adv/main.h | 4 +--- net/batman-adv/network-coding.c | 4 +--- net/batman-adv/network-coding.h | 4 +--- net/batman-adv/originator.c | 4 +--- net/batman-adv/originator.h | 4 +--- net/batman-adv/packet.h | 4 +--- net/batman-adv/routing.c | 4 +--- net/batman-adv/routing.h | 4 +--- net/batman-adv/send.c | 4 +--- net/batman-adv/send.h | 4 +--- net/batman-adv/soft-interface.c | 4 +--- net/batman-adv/soft-interface.h | 4 +--- net/batman-adv/sysfs.c | 4 +--- net/batman-adv/sysfs.h | 4 +--- net/batman-adv/translation-table.c | 4 +--- net/batman-adv/translation-table.h | 4 +--- net/batman-adv/types.h | 4 +--- 41 files changed, 41 insertions(+), 123 deletions(-)
net/batman-adv/Makefile +1 -3
@@ -13,9 +13,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA +# along with this program; if not, see <http://www.gnu.org/licenses/>. # obj-$(CONFIG_BATMAN_ADV) += batman-adv.o
net/batman-adv/bat_algo.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_BAT_ALGO_H_
net/batman-adv/bat_iv_ogm.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/bitarray.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/bitarray.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_BITARRAY_H_
net/batman-adv/bridge_loop_avoidance.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/bridge_loop_avoidance.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_BLA_H_
net/batman-adv/debugfs.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/debugfs.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_DEBUGFS_H_
net/batman-adv/distributed-arp-table.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <linux/if_ether.h>
net/batman-adv/distributed-arp-table.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_
net/batman-adv/fragmentation.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/fragmentation.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_FRAGMENTATION_H_
net/batman-adv/gateway_client.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/gateway_client.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_GATEWAY_CLIENT_H_
net/batman-adv/gateway_common.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/gateway_common.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_GATEWAY_COMMON_H_
net/batman-adv/hard-interface.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/hard-interface.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_
net/batman-adv/hash.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/hash.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_HASH_H_
net/batman-adv/icmp_socket.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/icmp_socket.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_
net/batman-adv/main.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <linux/crc32c.h>
net/batman-adv/main.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_MAIN_H_
net/batman-adv/network-coding.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <linux/debugfs.h>
net/batman-adv/network-coding.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_NETWORK_CODING_H_
net/batman-adv/originator.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/originator.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_ORIGINATOR_H_
net/batman-adv/packet.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_PACKET_H_
net/batman-adv/routing.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/routing.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_ROUTING_H_
net/batman-adv/send.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/send.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_SEND_H_
net/batman-adv/soft-interface.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/soft-interface.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_
net/batman-adv/sysfs.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/sysfs.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_SYSFS_H_
net/batman-adv/translation-table.c +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h"
net/batman-adv/translation-table.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_
net/batman-adv/types.h +1 -3
@@ -12,9 +12,7 @@* General Public License for more details. * * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA +* along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_TYPES_H_
Signature · 1 line
1.8.5.2
PATCH 4/13 batman-adv: deselect current GW on client mode switch off
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
When switching from gw_mode client to either off or server the current selected gateway has to be deselected. In this way when client mode is enabled again a gateway re-election is forced and a GW_ADD event is consequently sent.
The current behaviour instead is to keep the current gateway leading to no GW_ADD event when gw_mode client is selected for a second time
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>
--- net/batman-adv/gateway_client.c | 5 +++++ net/batman-adv/sysfs.c | 9 +++++++++ 2 files changed, 14 insertions(+)
net/batman-adv/gateway_client.c +5 -0
@@ -205,6 +205,11 @@ void batadv_gw_check_client_stop(struct batadv_priv *bat_priv)if (!curr_gw)return ; +/* deselect the current gateway so that next time that client mode is +* enabled a proper GW_ADD event can be sent +*/ +batadv_gw_select (bat_priv,NULL ); +/* if batman-adv is switching the gw client mode off and a gateway was * already selected, send a DEL uevent */
net/batman-adv/sysfs.c +9 -0
@@ -406,6 +406,15 @@ static ssize_t batadv_store_gw_mode(struct kobject *kobj,batadv_info (net_dev,"Changing gw mode from: %s to: %s\n" , curr_gw_mode_str, buff); +/* Invoking batadv_gw_reselect() is not enough to really de-select the +* current GW. It will only instruct the gateway client code to perform +* a re-election the next time that this is needed. +* +* When gw client mode is being switched off the current GW must be +* de-selected explicitly otherwise no GW_ADD uevent is thrown on +* client mode re-activation. This is operation is performed in +* batadv_gw_check_client_stop(). +*/ batadv_gw_deselect (bat_priv);/* always call batadv_gw_check_client_stop() before changing the gateway * state
Signature · 1 line
1.8.5.2
PATCH 5/13 batman-adv: rename gw_deselect() to gw_reselect()
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
The function batadv_gw_deselect() is actually not deselecting anything. It is just informing the GW code to perform a re-election procedure when possible.
The current gateway is not being touched at all and therefore the name of this function is rather misleading.
Rename it to batadv_gw_reselect() to batadv_gw_reselect() to make its behaviour easier to grasp.
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/gateway_client.c | 35 +++++++++++++++++++++++------------ net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 2 +- net/batman-adv/sysfs.c | 8 ++++---- 4 files changed, 29 insertions(+), 18 deletions(-)
net/batman-adv/gateway_client.c +23 -12
@@ -103,7 +103,18 @@ static void batadv_gw_select(struct batadv_priv *bat_priv,spin_unlock_bh (&bat_priv->gw.list_lock); } -void batadv_gw_deselect (struct batadv_priv *bat_priv) +/** +* batadv_gw_reselect - force a gateway reselection +* @bat_priv: the bat priv with all the soft interface information +* +* Set a flag to remind the GW component to perform a new gateway reselection. +* However this function does not ensure that the current gateway is going to be +* deselected. The reselection mechanism may elect the same gateway once again. +* +* This means that invoking batadv_gw_reselect() does not guarantee a gateway +* change and therefore a uevent is not necessarily expected. +*/ +void batadv_gw_reselect (struct batadv_priv *bat_priv) {atomic_set (&bat_priv->gw.reselect,1 ); }
@@ -242,7 +253,7 @@ void batadv_gw_election(struct batadv_priv *bat_priv) router =batadv_orig_node_get_router (next_gw->orig_node);if (!router) { -batadv_gw_deselect (bat_priv); +batadv_gw_reselect (bat_priv); goto out; } }
@@ -294,11 +305,11 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv, curr_gw_orig =batadv_gw_get_selected_orig (bat_priv);if (!curr_gw_orig) - goto deselect; + goto reselect; router_gw =batadv_orig_node_get_router (curr_gw_orig);if (!router_gw) - goto deselect; + goto reselect;/* this node already is the gateway */ if (curr_gw_orig == orig_node)
@@ -326,8 +337,8 @@ void batadv_gw_check_election(struct batadv_priv *bat_priv,"Restarting gateway selection: better gateway found (tq curr: %i, tq new: %i)\n" , gw_tq_avg, orig_tq_avg); -deselect: -batadv_gw_deselect (bat_priv); +reselect: +batadv_gw_reselect (bat_priv); out:if (curr_gw_orig)batadv_orig_node_free_ref (curr_gw_orig);
@@ -457,7 +468,7 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv,*/ curr_gw =batadv_gw_get_selected_gw_node (bat_priv);if (gw_node == curr_gw) -batadv_gw_deselect (bat_priv); +batadv_gw_reselect (bat_priv); } out:
@@ -483,7 +494,7 @@ void batadv_gw_node_purge(struct batadv_priv *bat_priv)struct batadv_gw_node *gw_node, *curr_gw;struct hlist_node *node_tmp;unsigned long timeout =msecs_to_jiffies (2 *BATADV_PURGE_TIMEOUT ); -int do_deselect =0 ; +int do_reselect =0 ; curr_gw =batadv_gw_get_selected_gw_node (bat_priv);
@@ -497,7 +508,7 @@ void batadv_gw_node_purge(struct batadv_priv *bat_priv)continue ;if (curr_gw == gw_node) - do_deselect =1 ; + do_reselect =1 ;hlist_del_rcu (&gw_node->list);batadv_gw_node_free_ref (gw_node);
@@ -505,9 +516,9 @@ void batadv_gw_node_purge(struct batadv_priv *bat_priv)spin_unlock_bh (&bat_priv->gw.list_lock); -/* gw_deselect() needs to acquire the gw_list_lock */ -if (do_deselect) -batadv_gw_deselect (bat_priv); +/* gw_reselect() needs to acquire the gw_list_lock */ +if (do_reselect) +batadv_gw_reselect (bat_priv);if (curr_gw)batadv_gw_node_free_ref (curr_gw);
net/batman-adv/gateway_client.h +1 -1
@@ -19,7 +19,7 @@#define _NET_BATMAN_ADV_GATEWAY_CLIENT_H_void batadv_gw_check_client_stop (struct batadv_priv *bat_priv); -void batadv_gw_deselect (struct batadv_priv *bat_priv); +void batadv_gw_reselect (struct batadv_priv *bat_priv);void batadv_gw_election (struct batadv_priv *bat_priv);struct batadv_orig_node *batadv_gw_get_selected_orig (struct batadv_priv *bat_priv);
net/batman-adv/gateway_common.c +1 -1
@@ -162,7 +162,7 @@ ssize_t batadv_gw_bandwidth_set(struct net_device *net_dev, char *buff,if ((down_curr == down_new) && (up_curr == up_new))return count; -batadv_gw_deselect (bat_priv); +batadv_gw_reselect (bat_priv); batadv_info(net_dev, "Changing gateway bandwidth from: '%u.%u/%u.%u MBit' to: '%u.%u/%u.%u MBit'\n", down_curr / 10, down_curr % 10, up_curr / 10, up_curr % 10,
net/batman-adv/sysfs.c +4 -4
@@ -327,10 +327,10 @@ static ssize_t batadv_show_bat_algo(struct kobject *kobj,return sprintf (buff,"%s\n" , bat_priv->bat_algo_ops->name); } -static void batadv_post_gw_deselect (struct net_device *net_dev) +static void batadv_post_gw_reselect (struct net_device *net_dev) {struct batadv_priv *bat_priv =netdev_priv (net_dev); -batadv_gw_deselect (bat_priv); +batadv_gw_reselect (bat_priv); } static ssize_t batadv_show_gw_mode(struct kobject *kobj, struct attribute *attr,
@@ -415,7 +415,7 @@ static ssize_t batadv_store_gw_mode(struct kobject *kobj,* client mode re-activation. This is operation is performed in * batadv_gw_check_client_stop(). */ -batadv_gw_deselect (bat_priv); +batadv_gw_reselect (bat_priv);/* always call batadv_gw_check_client_stop() before changing the gateway * state */
@@ -468,7 +468,7 @@ BATADV_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * BATADV_JITTER,BATADV_ATTR_SIF_UINT (hop_penalty,S_IRUGO |S_IWUSR ,0 ,BATADV_TQ_MAX_VALUE ,NULL );BATADV_ATTR_SIF_UINT (gw_sel_class,S_IRUGO |S_IWUSR ,1 ,BATADV_TQ_MAX_VALUE , - batadv_post_gw_deselect); + batadv_post_gw_reselect); static BATADV_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, batadv_show_gw_bwidth, batadv_store_gw_bwidth);#ifdef CONFIG_BATMAN_ADV_DEBUG
Signature · 1 line
1.8.5.2
PATCH 6/13 batman-adv: remove parenthesis from return statements
In reply to Antonio QuartulliRemove parenthesis around return expression as suggested by checkpatch.
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/distributed-arp-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/distributed-arp-table.c +1 -1
@@ -139,7 +139,7 @@ static int batadv_compare_dat(const struct hlist_node *node, const void *data2) const void *data1 = container_of(node, struct batadv_dat_entry, hash_entry); -return (memcmp (data1, data2,sizeof (__be32)) ==0 ?1 :0 ); +return memcmp (data1, data2,sizeof (__be32)) ==0 ?1 :0 ; }/**
Signature · 1 line
1.8.5.2
PATCH 7/13 batman-adv: send every DHCP packet as bat-unicast
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
In different situations it is possible that the DHCP server or client uses broadcast Ethernet frames to send messages to each other. The GW component in batman-adv takes care of using bat-unicast packets to bring broadcast DHCP Discover/Requests to the "best" server.
On the way back the DHCP server usually sends unicasts, but upon client request it may decide to use broadcasts as well.
This patch improves the GW component so that it now snoops and sends as unicast all the DHCP packets, no matter if they were generated by a DHCP server or client.
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/distributed-arp-table.c | 4 +- net/batman-adv/gateway_client.c | 171 +++++++++++++++------------------ net/batman-adv/gateway_client.h | 4 +- net/batman-adv/send.c | 16 ++- net/batman-adv/send.h | 10 +- net/batman-adv/soft-interface.c | 76 ++++++++------- net/batman-adv/types.h | 12 +++ 7 files changed, 153 insertions(+), 140 deletions(-)
net/batman-adv/distributed-arp-table.c +2 -2
@@ -1037,9 +1037,9 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,if (hdr_size ==sizeof (struct batadv_unicast_4addr_packet )) err =batadv_send_skb_via_tt_4addr (bat_priv, skb_new,BATADV_P_DAT_CACHE_REPLY , - vid); +NULL , vid);else - err =batadv_send_skb_via_tt (bat_priv, skb_new, vid); + err =batadv_send_skb_via_tt (bat_priv, skb_new,NULL , vid);if (err !=NET_XMIT_DROP ) {batadv_inc_counter (bat_priv,BATADV_CNT_DAT_CACHED_REPLY_TX );
net/batman-adv/gateway_client.c +76 -95
258 lines not on this page · raw message
net/batman-adv/gateway_client.h +3 -1
@@ -32,7 +32,9 @@ void batadv_gw_node_delete(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node);void batadv_gw_node_purge (struct batadv_priv *bat_priv);int batadv_gw_client_seq_print_text (struct seq_file *seq,void *offset); -bool batadv_gw_is_dhcp_target (struct sk_buff *skb,unsigned int *header_len);bool batadv_gw_out_of_range (struct batadv_priv *bat_priv,struct sk_buff *skb); +enum batadv_dhcp_recipient +batadv_gw_dhcp_recipient_get (struct sk_buff *skb,unsigned int *header_len, +uint8_t *chaddr);#endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */
net/batman-adv/send.c +13 -3
@@ -319,13 +319,23 @@ out:*/ int batadv_send_skb_via_tt_generic (struct batadv_priv *bat_priv,struct sk_buff *skb,int packet_type, -int packet_subtype,unsigned short vid) +int packet_subtype,uint8_t *dst_hint, +unsigned short vid) {struct ethhdr *ethhdr = (struct ethhdr *)skb->data;struct batadv_orig_node *orig_node; +uint8_t *src, *dst; + + src = ethhdr->h_source; + dst = ethhdr->h_dest; + +/* if we got an hint! let's send the packet to this client (if any) */ +if (dst_hint) { + src =NULL ; + dst = dst_hint; + } + orig_node =batadv_transtable_search (bat_priv, src, dst, vid); - orig_node =batadv_transtable_search (bat_priv, ethhdr->h_source, - ethhdr->h_dest, vid);return batadv_send_skb_unicast (bat_priv, skb, packet_type, packet_subtype, orig_node, vid); }
net/batman-adv/send.h +6 -4
@@ -38,7 +38,8 @@ bool batadv_send_skb_prepare_unicast_4addr(struct batadv_priv *bat_priv, int packet_subtype);int batadv_send_skb_via_tt_generic (struct batadv_priv *bat_priv,struct sk_buff *skb,int packet_type, -int packet_subtype,unsigned short vid); +int packet_subtype,uint8_t *dst_hint, +unsigned short vid);int batadv_send_skb_via_gw (struct batadv_priv *bat_priv,struct sk_buff *skb,unsigned short vid);
@@ -55,11 +56,11 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,* Returns NET_XMIT_DROP in case of error or NET_XMIT_SUCCESS otherwise. */ static inline int batadv_send_skb_via_tt (struct batadv_priv *bat_priv, -struct sk_buff *skb, +struct sk_buff *skb,uint8_t *dst_hint,unsigned short vid) {return batadv_send_skb_via_tt_generic (bat_priv, skb,BATADV_UNICAST ,0 , - vid); + dst_hint, vid); }/**
@@ -79,11 +80,12 @@ static inline int batadv_send_skb_via_tt(struct batadv_priv *bat_priv,static inline int batadv_send_skb_via_tt_4addr (struct batadv_priv *bat_priv,struct sk_buff *skb,int packet_subtype, +uint8_t *dst_hint,unsigned short vid) {return batadv_send_skb_via_tt_generic (bat_priv, skb,BATADV_UNICAST_4ADDR , - packet_subtype, vid); + packet_subtype, dst_hint, vid); }#endif /* _NET_BATMAN_ADV_SEND_H_ */
net/batman-adv/soft-interface.c +41 -35
111 lines not on this page · raw message
net/batman-adv/types.h +12 -0
@@ -34,6 +34,18 @@#endif /* CONFIG_BATMAN_ADV_DAT */ /** +* enum batadv_dhcp_recipient - dhcp destination +* @BATADV_DHCP_NO: packet is not a dhcp message +* @BATADV_DHCP_TO_SERVER: dhcp message is directed to a server +* @BATADV_DHCP_TO_CLIENT: dhcp message is directed to a client +*/ +enum batadv_dhcp_recipient { +BATADV_DHCP_NO =0 , +BATADV_DHCP_TO_SERVER , +BATADV_DHCP_TO_CLIENT , +}; + +/** * BATADV_TT_REMOTE_MASK - bitmask selecting the flags that are sent over the * wire only */
Signature · 1 line
1.8.5.2
PATCH 8/13 batman-adv: add isolation_mark sysfs attribute
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
This attribute can be used to set and read the value and the mask of the skb mark which will be used to classify the source non-mesh client as ISOLATED. In this way a client can be advertised as such and the mark can potentially be restored at the receiving node before delivering the skb.
This can be helpful for creating network wide netfilter policies.
This sysfs file expects a string of the shape "$mark/$mask". Where $mark has to be a 32-bit number in any base, while $mask must be a 32bit mask expressed in hex base. Only bits in $mark covered by the bitmask are really stored.
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- Documentation/ABI/testing/sysfs-class-net-mesh | 8 +++ net/batman-adv/soft-interface.c | 2 + net/batman-adv/sysfs.c | 71 ++++++++++++++++++++++++++ net/batman-adv/types.h | 2 + 4 files changed, 83 insertions(+)
Documentation/ABI/testing/sysfs-class-net-mesh +8 -0
@@ -68,6 +68,14 @@ Description: Defines the penalty which will be applied to an originator message's tq-field on every hop. +What: /sys/class/net/<mesh_iface>/mesh/isolation_mark +Date: Nov 2013 +Contact: Antonio Quartulli <[email protected]> +Description: + Defines the isolation mark (and its bitmask) which + is used to classify clients as "isolated" by the + Extended Isolation feature. + What: /sys/class/net/<mesh_iface>/mesh/network_coding Date: Nov 2012 Contact: Martin Hundeboll <[email protected]>
net/batman-adv/soft-interface.c +2 -0
@@ -701,6 +701,8 @@ static int batadv_softif_init_late(struct net_device *dev)#endif bat_priv->tt.last_changeset =NULL ; bat_priv->tt.last_changeset_len =0 ; + bat_priv->isolation_mark =0 ; + bat_priv->isolation_mark_mask =0 ;/* randomize initial seqno to avoid collision */ get_random_bytes (&random_seqno,sizeof (random_seqno));
net/batman-adv/sysfs.c +71 -0
89 lines not on this page · raw message
net/batman-adv/types.h +2 -0
@@ -697,6 +697,8 @@ struct batadv_priv {#ifdef CONFIG_BATMAN_ADV_DEBUG atomic_t log_level;#endif +uint32_t isolation_mark; +uint32_t isolation_mark_mask;atomic_t bcast_seqno;atomic_t bcast_queue_left;atomic_t batman_queue_left;
Signature · 1 line
1.8.5.2
PATCH 9/13 batman-adv: mark a local client as isolated when needed
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
A client sending packets which mark matches the value configured via sysfs has to be identified as isolated using the TT_CLIENT_ISOLA flag.
The match is mask based, meaning that only bits set in the mask are compared with those in the mark value.
If the configured mask is equal to 0 no operation is performed.
Such flag is then advertised within the classic client announcement mechanism.
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/main.h | 2 ++ net/batman-adv/packet.h | 1 + net/batman-adv/soft-interface.c | 7 ++++--- net/batman-adv/translation-table.c | 16 +++++++++++++++- net/batman-adv/translation-table.h | 2 +- 5 files changed, 23 insertions(+), 5 deletions(-)
net/batman-adv/main.h +2 -0
@@ -70,6 +70,8 @@#define BATADV_NULL_IFINDEX 0/* dummy ifindex used to avoid iface checks */ +#define BATADV_NO_MARK 0 +#define BATADV_NUM_WORDS BITS_TO_LONGS(BATADV_TQ_LOCAL_WINDOW_SIZE)#define BATADV_LOG_BUF_LEN 8192/* has to be a power of 2 */
net/batman-adv/packet.h +1 -0
@@ -115,6 +115,7 @@ enum batadv_tt_client_flags {BATADV_TT_CLIENT_DEL =BIT (0 ),BATADV_TT_CLIENT_ROAM =BIT (1 ),BATADV_TT_CLIENT_WIFI =BIT (4 ), +BATADV_TT_CLIENT_ISOLA =BIT (5 ),BATADV_TT_CLIENT_NOPURGE =BIT (8 ),BATADV_TT_CLIENT_NEW =BIT (9 ), BATADV_TT_CLIENT_PENDING = BIT(10),
net/batman-adv/soft-interface.c +4 -3
@@ -119,7 +119,7 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p)batadv_tt_local_remove (bat_priv, old_addr,BATADV_NO_FLAGS ,"mac address changed" , false);batadv_tt_local_add (dev, addr->sa_data,BATADV_NO_FLAGS , -BATADV_NULL_IFINDEX ); +BATADV_NULL_IFINDEX ,BATADV_NO_MARK ); }return 0 ;
@@ -199,7 +199,8 @@ static int batadv_interface_tx(struct sk_buff *skb,/* Register the client MAC in the transtable */ if (!is_multicast_ether_addr (ethhdr->h_source)) { client_added =batadv_tt_local_add (soft_iface, ethhdr->h_source, - vid, skb->skb_iif); + vid, skb->skb_iif, + skb->mark);if (!client_added) goto dropped; }
@@ -489,7 +490,7 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid)*/ batadv_tt_local_add (bat_priv->soft_iface, bat_priv->soft_iface->dev_addr, vid, -BATADV_NULL_IFINDEX ); +BATADV_NULL_IFINDEX ,BATADV_NO_MARK );spin_lock_bh (&bat_priv->softif_vlan_list_lock);hlist_add_head_rcu (&vlan->list, &bat_priv->softif_vlan_list);
net/batman-adv/translation-table.c +15 -1
@@ -474,11 +474,13 @@ static void batadv_tt_global_free(struct batadv_priv *bat_priv,* @vid: VLAN identifier * @ifindex: index of the interface where the client is connected to (useful to * identify wireless clients) +* @mark: the value contained in the skb->mark field of the received packet (if +* any) * * Returns true if the client was successfully added, false otherwise. */ bool batadv_tt_local_add (struct net_device *soft_iface,const uint8_t *addr, -unsigned short vid,int ifindex) +unsigned short vid,int ifindex,uint32_t mark) {struct batadv_priv *bat_priv =netdev_priv (soft_iface);struct batadv_tt_local_entry *tt_local;
@@ -489,6 +491,7 @@ bool batadv_tt_local_add(struct net_device *soft_iface, const uint8_t *addr,int hash_added, table_size, packet_size_max;bool ret = false, roamed_back = false;uint8_t remote_flags; +uint32_t match_mark;if (ifindex !=BATADV_NULL_IFINDEX ) in_dev =dev_get_by_index (&init_net, ifindex);
@@ -613,6 +616,17 @@ check_roaming:else tt_local->common.flags &= ~BATADV_TT_CLIENT_WIFI ; +/* check the mark in the skb: if it's equal to the configured +* isolation_mark, it means the packet is coming from an isolated +* non-mesh client +*/ + match_mark = (mark & bat_priv->isolation_mark_mask); +if (bat_priv->isolation_mark_mask && + match_mark == bat_priv->isolation_mark) + tt_local->common.flags |=BATADV_TT_CLIENT_ISOLA ; +else + tt_local->common.flags &= ~BATADV_TT_CLIENT_ISOLA ; +/* if any "dynamic" flag has been modified, resend an ADD event for this * entry so that all the nodes can get the new flags */
net/batman-adv/translation-table.h +1 -1
@@ -20,7 +20,7 @@int batadv_tt_init (struct batadv_priv *bat_priv);bool batadv_tt_local_add (struct net_device *soft_iface,const uint8_t *addr, -unsigned short vid,int ifindex); +unsigned short vid,int ifindex,uint32_t mark);uint16_t batadv_tt_local_remove (struct batadv_priv *bat_priv,const uint8_t *addr,unsigned short vid,const char *message,bool roaming);
Signature · 1 line
1.8.5.2
PATCH 10/13 batman-adv: print the new BATADV_TT_CLIENT_ISOLA flag
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
Print the new BATADV_TT_CLIENT_ISOLA flag properly in the Local and Global Translation Table output.
The character 'I' is used in the flags column to indicate that the entry is marked as isolated.
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/translation-table.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
net/batman-adv/translation-table.c +8 -4
@@ -887,7 +887,7 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset)seq_printf (seq,"Locally retrieved addresses (from %s) announced via TT (TTVN: %u):\n" , net_dev->name, (uint8_t )atomic_read (&bat_priv->tt.vn)); -seq_printf (seq," %-13s %s %-7s %-9s (%-10s)\n" ,"Client" ,"VID" , +seq_printf (seq," %-13s %s %-8s %-9s (%-10s)\n" ,"Client" ,"VID" ,"Flags" ,"Last seen" ,"CRC" );for (i =0 ; i < hash->size; i++) {
@@ -915,7 +915,7 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) } seq_printf(seq, - " * %pM %4i [%c%c%c%c%c] %3u.%03u (%#.8x)\n", + " * %pM %4i [%c%c%c%c%c%c] %3u.%03u (%#.8x)\n", tt_common_entry->addr, BATADV_PRINT_VID(tt_common_entry->vid), (tt_common_entry->flags &
@@ -927,6 +927,8 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) BATADV_TT_CLIENT_PENDING ? 'X' : '.'), (tt_common_entry->flags &BATADV_TT_CLIENT_WIFI ?'W' :'.' ), + (tt_common_entry->flags & +BATADV_TT_CLIENT_ISOLA ?'I' :'.' ), no_purge ?0 : last_seen_secs, no_purge ?0 : last_seen_msecs, vlan->tt.crc);
@@ -1459,13 +1461,14 @@ batadv_tt_global_print_entry(struct batadv_priv *bat_priv, last_ttvn =atomic_read (&best_entry->orig_node->last_ttvn);seq_printf (seq, -" %c %pM %4i (%3u) via %pM (%3u) (%#.8x) [%c%c%c]\n" , +" %c %pM %4i (%3u) via %pM (%3u) (%#.8x) [%c%c%c%c]\n" ,'*' , tt_global_entry->common.addr,BATADV_PRINT_VID (tt_global_entry->common.vid), best_entry->ttvn, best_entry->orig_node->orig, last_ttvn, vlan->tt.crc, (flags &BATADV_TT_CLIENT_ROAM ?'R' :'.' ), (flags &BATADV_TT_CLIENT_WIFI ?'W' :'.' ), + (flags &BATADV_TT_CLIENT_ISOLA ?'I' :'.' ), (flags &BATADV_TT_CLIENT_TEMP ?'T' :'.' ));batadv_orig_node_vlan_free_ref (vlan);
@@ -1490,13 +1493,14 @@ print_list: last_ttvn =atomic_read (&orig_entry->orig_node->last_ttvn);seq_printf (seq, -" %c %pM %4d (%3u) via %pM (%3u) (%#.8x) [%c%c%c]\n" , +" %c %pM %4d (%3u) via %pM (%3u) (%#.8x) [%c%c%c%c]\n" ,'+' , tt_global_entry->common.addr,BATADV_PRINT_VID (tt_global_entry->common.vid), orig_entry->ttvn, orig_entry->orig_node->orig, last_ttvn, vlan->tt.crc, (flags &BATADV_TT_CLIENT_ROAM ?'R' :'.' ), (flags &BATADV_TT_CLIENT_WIFI ?'W' :'.' ), + (flags &BATADV_TT_CLIENT_ISOLA ?'I' :'.' ), (flags &BATADV_TT_CLIENT_TEMP ?'T' :'.' ));batadv_orig_node_vlan_free_ref (vlan);
Signature · 1 line
1.8.5.2
A message that is not in the archive (sent off-list or not yet received): 1389279182-3256-1-git-send-email-antonio-x4xJYDvStAgysxA8WJXlww@public.gmane.org
PATCH 11/13 batman-adv: extend the ap_isolation mechanism
From: Antonio Quartulli <[email protected]>
Change the AP isolation mechanism to not only "isolate" WIFI clients but also all those marked with the more generic "isolation flag" (BATADV_TT_CLIENT_ISOLA).
The result is that when AP isolation is on any unicast packet originated by an "isolated" client and directed to another "isolated" client is dropped at the source node.
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/translation-table.c | 5 +++++ 1 file changed, 5 insertions(+)
net/batman-adv/translation-table.c +5 -0
@@ -1869,6 +1869,11 @@ _batadv_is_ap_isolated(struct batadv_tt_local_entry *tt_local_entry, tt_global_entry->common.flags & BATADV_TT_CLIENT_WIFI) ret = true; +/* check if the two clients are marked as isolated */ +if (tt_local_entry->common.flags &BATADV_TT_CLIENT_ISOLA && + tt_global_entry->common.flags &BATADV_TT_CLIENT_ISOLA ) + ret = true; +return ret; }
Signature · 1 line
1.8.5.2
PATCH 12/13 batman-adv: create helper function to get AP isolation status
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
The AP isolation status may be evaluated in different spots. Create an helper function to avoid code duplication.
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/main.c | 26 ++++++++++++++++++++++++++ net/batman-adv/main.h | 1 + net/batman-adv/translation-table.c | 13 +------------ 3 files changed, 28 insertions(+), 12 deletions(-)
net/batman-adv/main.c +26 -0
@@ -1171,6 +1171,32 @@ unsigned short batadv_get_vid(struct sk_buff *skb, size_t header_len)return vid; } +/** +* batadv_vlan_ap_isola_get - return the AP isolation status for the given vlan +* @bat_priv: the bat priv with all the soft interface information +* @vid: the VLAN identifier for which the AP isolation attributed as to be +* looked up +* +* Returns true if AP isolation is on for the VLAN idenfied by vid, false +* otherwise +*/ +bool batadv_vlan_ap_isola_get (struct batadv_priv *bat_priv,unsigned short vid) +{ +bool ap_isolation_enabled = false; +struct batadv_softif_vlan *vlan; + +/* if the AP isolation is requested on a VLAN, then check for its +* setting in the proper VLAN private data structure +*/ + vlan =batadv_softif_vlan_get (bat_priv, vid); +if (vlan) { + ap_isolation_enabled =atomic_read (&vlan->ap_isolation); +batadv_softif_vlan_free_ref (vlan); + } + +return ap_isolation_enabled; +} +static int batadv_param_set_ra (const char *val,const struct kernel_param *kp) {struct batadv_algo_ops *bat_algo_ops;
net/batman-adv/main.h +1 -0
@@ -369,5 +369,6 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, uint8_t *dst, uint8_t type, uint8_t version, void *tvlv_value, uint16_t tvlv_value_len);unsigned short batadv_get_vid (struct sk_buff *skb,size_t header_len); +bool batadv_vlan_ap_isola_get (struct batadv_priv *bat_priv,unsigned short vid);#endif /* _NET_BATMAN_ADV_MAIN_H_ */
net/batman-adv/translation-table.c +1 -12
@@ -1900,19 +1900,8 @@ struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv,struct batadv_tt_global_entry *tt_global_entry =NULL ;struct batadv_orig_node *orig_node =NULL ;struct batadv_tt_orig_list_entry *best_entry; -bool ap_isolation_enabled = false; -struct batadv_softif_vlan *vlan; -/* if the AP isolation is requested on a VLAN, then check for its -* setting in the proper VLAN private data structure -*/ - vlan =batadv_softif_vlan_get (bat_priv, vid); -if (vlan) { - ap_isolation_enabled =atomic_read (&vlan->ap_isolation); -batadv_softif_vlan_free_ref (vlan); - } - -if (src && ap_isolation_enabled) { +if (src &&batadv_vlan_ap_isola_get (bat_priv, vid)) { tt_local_entry =batadv_tt_local_hash_find (bat_priv, src, vid);if (!tt_local_entry || (tt_local_entry->common.flags &BATADV_TT_CLIENT_PENDING ))
Signature · 1 line
1.8.5.2
PATCH 13/13 batman-adv: set the isolation mark in the skb if needed
In reply to Antonio QuartulliFrom: Antonio Quartulli <[email protected]>
If a broadcast packet is coming from a client marked as isolated, then mark the skb using the isolation mark so that netfilter (or any other application) can recognise them.
The mark is written in the skb based on the mask value:
only bits set in the mask are substitued by those in the mark value
Signed-off-by Antonio Quartulli <[email protected]>
Signed-off-by Marek Lindner <[email protected]>
--- net/batman-adv/soft-interface.c | 18 ++++++++++++++++-- net/batman-adv/translation-table.c | 26 ++++++++++++++++++++++++++ net/batman-adv/translation-table.h | 2 ++ 3 files changed, 44 insertions(+), 2 deletions(-)
net/batman-adv/soft-interface.c +16 -2
@@ -399,9 +399,23 @@ void batadv_interface_rx(struct net_device *soft_iface,batadv_tt_add_temporary_global_entry (bat_priv, orig_node, ethhdr->h_source, vid); -if (batadv_is_ap_isolated (bat_priv, ethhdr->h_source, ethhdr->h_dest, - vid)) +if (is_multicast_ether_addr (ethhdr->h_dest)) { +/* set the mark on broadcast packets if AP isolation is ON and +* the packet is coming from an "isolated" client +*/ +if (batadv_vlan_ap_isola_get (bat_priv, vid) && +batadv_tt_global_is_isolated (bat_priv, ethhdr->h_source, + vid)) { +/* save bits in skb->mark not covered by the mask and +* apply the mark on the rest +*/ + skb->mark &= ~bat_priv->isolation_mark_mask; + skb->mark |= bat_priv->isolation_mark; + } + }else if (batadv_is_ap_isolated (bat_priv, ethhdr->h_source, + ethhdr->h_dest, vid)) { goto dropped; + }netif_rx (skb); goto out;
net/batman-adv/translation-table.c +26 -0
@@ -3577,3 +3577,29 @@ int batadv_tt_init(struct batadv_priv *bat_priv)return 1 ; } + +/** +* batadv_tt_global_is_isolated - check if a client is marked as isolated +* @bat_priv: the bat priv with all the soft interface information +* @addr: the mac address of the client +* @vid: the identifier of the VLAN where this client is connected +* +* Returns true if the client is marked with the TT_CLIENT_ISOLA flag, false +* otherwise +*/ +bool batadv_tt_global_is_isolated (struct batadv_priv *bat_priv, +const uint8_t *addr,unsigned short vid) +{ +struct batadv_tt_global_entry *tt; +bool ret; + + tt =batadv_tt_global_hash_find (bat_priv, addr, vid); +if (!tt) +return false; + + ret = tt->common.flags &BATADV_TT_CLIENT_ISOLA ; + +batadv_tt_global_entry_free_ref (tt); + +return ret; +}
net/batman-adv/translation-table.h +2 -0
@@ -48,5 +48,7 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv,struct batadv_orig_node *orig_node, const unsigned char *addr, unsigned short vid); +bool batadv_tt_global_is_isolated (struct batadv_priv *bat_priv, +const uint8_t *addr,unsigned short vid);#endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */
Signature · 1 line
1.8.5.2
David Miller
maintainerFrom: Antonio Quartulli <[email protected]>
Date: Thu, 9 Jan 2014 15:52:49 +0100
Quoted 1 line
this is a batch of patches intended for net-next/linux-3.14.
Pulled, thanks Antonio.
Quoted 2 lines
p.s. thanks for notifying me the merge of net into net-next! In this way I avoided you to deal with some ugly merge conflicts :)
No problem.