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

This project is archived. Its data is read-only.

Commit f3163181 authored Nov 04, 2013 by Antonio Quartulli Committed by Antonio Quartulli Jan 08, 2014

batman-adv: deselect current GW on client mode switch off



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 <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>

parent ebf38fb7

net/batman-adv/gateway_client.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -205,6 +205,11 @@ void batadv_gw_check_client_stop(struct batadv_priv *bat_priv)
	if (!curr_gw)		if (!curr_gw)
	return;		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		/* if batman-adv is switching the gw client mode off and a gateway was
	* already selected, send a DEL uevent		* already selected, send a DEL uevent
	*/		*/

net/batman-adv/sysfs.c

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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",		batadv_info(net_dev, "Changing gw mode from: %s to: %s\n",
	curr_gw_mode_str, buff);		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);		batadv_gw_deselect(bat_priv);
	/* always call batadv_gw_check_client_stop() before changing the gateway		/* always call batadv_gw_check_client_stop() before changing the gateway
	* state		* state