Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8cbd81d authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Antonio Quartulli
Browse files

batman-adv: make the AP isolation attribute VLAN specific 



AP isolation has to be enabled on one VLAN interface only.
This patch moves the AP isolation attribute to the per-vlan
interface attribute set, enabling it to have a different
value depending on the selected vlan.

Signed-off-by: default avatarAntonio Quartulli <antonio@open-mesh.com>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
parent 90f4435d

Documentation/ABI/testing/sysfs-class-net-mesh

+3 −2
Original line number Diff line number Diff line
@@ -6,13 +6,14 @@ Description: 
                Indicates whether the batman protocol messages of the

                mesh <mesh_iface> shall be aggregated or not.



What:           /sys/class/net/<mesh_iface>/mesh/ap_isolation

What:           /sys/class/net/<mesh_iface>/mesh/<vlan_subdir>/ap_isolation

Date:           May 2011

Contact:        Antonio Quartulli <antonio@meshcoding.com>

Description:

                Indicates whether the data traffic going from a

                wireless client to another wireless client will be

                silently dropped.

                silently dropped. <vlan_subdir> is empty when referring

		to the untagged lan.



What:           /sys/class/net/<mesh_iface>/mesh/bonding

Date:           June 2010

net/batman-adv/soft-interface.c

+4 −2
Original line number Diff line number Diff line
@@ -381,7 +381,8 @@ 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))

	if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest,

				  vid))

		goto dropped;



	netif_rx(skb);
@@ -458,6 +459,8 @@ int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) 
	vlan->vid = vid;

	atomic_set(&vlan->refcount, 1);



	atomic_set(&vlan->ap_isolation, 0);



	err = batadv_sysfs_add_vlan(bat_priv->soft_iface, vlan);

	if (err) {

		kfree(vlan);
@@ -657,7 +660,6 @@ static int batadv_softif_init_late(struct net_device *dev) 
#ifdef CONFIG_BATMAN_ADV_DAT

	atomic_set(&bat_priv->distributed_arp_table, 1);

#endif

	atomic_set(&bat_priv->ap_isolation, 0);

	atomic_set(&bat_priv->gw_mode, BATADV_GW_MODE_OFF);

	atomic_set(&bat_priv->gw_sel_class, 20);

	atomic_set(&bat_priv->gw.bandwidth_down, 100);

net/batman-adv/sysfs.c

+3 −2
Original line number Diff line number Diff line
@@ -453,7 +453,6 @@ BATADV_ATTR_SIF_BOOL(distributed_arp_table, S_IRUGO | S_IWUSR, 
		     batadv_dat_status_update);

#endif

BATADV_ATTR_SIF_BOOL(fragmentation, S_IRUGO | S_IWUSR, batadv_update_min_mtu);

BATADV_ATTR_SIF_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL);

static BATADV_ATTR(routing_algo, S_IRUGO, batadv_show_bat_algo, NULL);

static BATADV_ATTR(gw_mode, S_IRUGO | S_IWUSR, batadv_show_gw_mode,

		   batadv_store_gw_mode);
@@ -483,7 +482,6 @@ static struct batadv_attribute *batadv_mesh_attrs[] = { 
	&batadv_attr_distributed_arp_table,

#endif

	&batadv_attr_fragmentation,

	&batadv_attr_ap_isolation,

	&batadv_attr_routing_algo,

	&batadv_attr_gw_mode,

	&batadv_attr_orig_interval,
@@ -499,10 +497,13 @@ static struct batadv_attribute *batadv_mesh_attrs[] = { 
	NULL,

};



BATADV_ATTR_VLAN_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL);



/**

 * batadv_vlan_attrs - array of vlan specific sysfs attributes

 */

static struct batadv_attribute *batadv_vlan_attrs[] = {

	&batadv_attr_vlan_ap_isolation,

	NULL,

};

net/batman-adv/translation-table.c

+20 −7
Original line number Diff line number Diff line
@@ -1482,8 +1482,19 @@ 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 (src && atomic_read(&bat_priv->ap_isolation)) {

	/* 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) {

		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))
@@ -2547,22 +2558,22 @@ void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv) 
}



bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, uint8_t *src,

			   uint8_t *dst)

			   uint8_t *dst, unsigned short vid)

{

	struct batadv_tt_local_entry *tt_local_entry = NULL;

	struct batadv_tt_global_entry *tt_global_entry = NULL;

	struct batadv_softif_vlan *vlan;

	bool ret = false;



	if (!atomic_read(&bat_priv->ap_isolation))

	vlan = batadv_softif_vlan_get(bat_priv, vid);

	if (!vlan || !atomic_read(&vlan->ap_isolation))

		goto out;



	tt_local_entry = batadv_tt_local_hash_find(bat_priv, dst,

						   BATADV_NO_FLAGS);

	tt_local_entry = batadv_tt_local_hash_find(bat_priv, dst, vid);

	if (!tt_local_entry)

		goto out;



	tt_global_entry = batadv_tt_global_hash_find(bat_priv, src,

						     BATADV_NO_FLAGS);

	tt_global_entry = batadv_tt_global_hash_find(bat_priv, src, vid);

	if (!tt_global_entry)

		goto out;
@@ -2572,6 +2583,8 @@ bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, uint8_t *src, 
	ret = true;



out:

	if (vlan)

		batadv_softif_vlan_free_ref(vlan);

	if (tt_global_entry)

		batadv_tt_global_entry_free_ref(tt_global_entry);

	if (tt_local_entry)

net/batman-adv/translation-table.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void batadv_tt_free(struct batadv_priv *bat_priv); 
bool batadv_is_my_client(struct batadv_priv *bat_priv, const uint8_t *addr,

			 unsigned short vid);

bool batadv_is_ap_isolated(struct batadv_priv *bat_priv, uint8_t *src,

			   uint8_t *dst);

			   uint8_t *dst, unsigned short vid);

void batadv_tt_local_commit_changes(struct batadv_priv *bat_priv);

bool batadv_tt_global_client_is_roaming(struct batadv_priv *bat_priv,

					uint8_t *addr, unsigned short vid);