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

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

batman-adv: make the GW module correctly talk to the new VLAN-TT 



The gateway code is now adapted in order to correctly
interact with the Translation Table component by using the
vlan ID

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

net/batman-adv/gateway_client.c

+18 −3
Original line number Diff line number Diff line
@@ -726,7 +726,20 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len) 
	return true;

}



/* this call might reallocate skb data */

/**

 * batadv_gw_out_of_range - check if the dhcp request destination is the best gw

 * @bat_priv: the bat priv with all the soft interface information

 * @skb: the outgoing packet

 *

 * Check if the skb is a DHCP request and if it is sent to the current best GW

 * server. Due to topology changes it may be the case that the GW server

 * previously selected is not the best one anymore.

 *

 * Returns true if the packet destination is unicast and it is not the best gw,

 * false otherwise.

 *

 * This call might reallocate skb data.

 */

bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,

			    struct sk_buff *skb)

{
@@ -737,6 +750,9 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, 
	bool ret, out_of_range = false;

	unsigned int header_len = 0;

	uint8_t curr_tq_avg;

	unsigned short vid;



	vid = batadv_get_vid(skb, 0);



	ret = batadv_gw_is_dhcp_target(skb, &header_len);

	if (!ret)
@@ -744,8 +760,7 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, 


	ethhdr = (struct ethhdr *)skb->data;

	orig_dst_node = batadv_transtable_search(bat_priv, ethhdr->h_source,

						 ethhdr->h_dest,

						 BATADV_NO_FLAGS);

						 ethhdr->h_dest, vid);

	if (!orig_dst_node)

		goto out;