[B.A.T.M.A.N.] [PATCHv2] batman-adv: send GW_DEL event when the gw client mode is deselected

[B.A.T.M.A.N.] [PATCHv2] batman-adv: send GW_DEL event when the gw client mode is deselected

[Antonio Quartulli]

From: Antonio Quartulli <antonio@open-mesh.com>

Whenever the GW client mode is deselected, a DEL event has
to be sent in order to tell userspace that the current
gateway has been lost. Send the uevent on state change only
if a gateway was currently selected.

Reported-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
---

v2:
- fixed typo
- fixed kernel doc
- fixed comment in sysfs.c


 gateway_client.c | 27 +++++++++++++++++++++++++++
 gateway_client.h |  1 +
 sysfs.c          |  4 ++++
 3 files changed, 32 insertions(+)

diff --git a/gateway_client.c b/gateway_client.c
index 588d27e..edf61da 100644
--- a/gateway_client.c
+++ b/gateway_client.c
@@ -188,6 +188,33 @@ next:
 	return curr_gw;
 }
 
+/**
+ * batadv_gw_check_client_stop - check if client mode has been switched off
+ * @bat_priv: the bat priv with all the soft interface information
+ *
+ * This function assumes the caller has checked that the gw state *is actually
+ * changing*. This function is not supposed to be called when there is no state
+ * change.
+ */
+void batadv_gw_check_client_stop(struct batadv_priv *bat_priv)
+{
+	struct batadv_gw_node *curr_gw;
+
+	if (atomic_read(&bat_priv->gw_mode) != BATADV_GW_MODE_CLIENT)
+		return;
+
+	curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
+	if (!curr_gw)
+		return;
+
+	/* if batman-adv is switching the gw client mode off and a gateway was
+	 * already selected, send a DEL uevent
+	 */
+	batadv_throw_uevent(bat_priv, BATADV_UEV_GW, BATADV_UEV_DEL, NULL);
+
+	batadv_gw_node_free_ref(curr_gw);
+}
+
 void batadv_gw_election(struct batadv_priv *bat_priv)
 {
 	struct batadv_gw_node *curr_gw = NULL, *next_gw = NULL;
diff --git a/gateway_client.h b/gateway_client.h
index 7ef955a..b235cbf 100644
--- a/gateway_client.h
+++ b/gateway_client.h
@@ -20,6 +20,7 @@
 #ifndef _NET_BATMAN_ADV_GATEWAY_CLIENT_H_
 #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_election(struct batadv_priv *bat_priv);
 struct batadv_orig_node *
diff --git a/sysfs.c b/sysfs.c
index 6ec145d..096b511 100644
--- a/sysfs.c
+++ b/sysfs.c
@@ -409,6 +409,10 @@ static ssize_t batadv_store_gw_mode(struct kobject *kobj,
 		    curr_gw_mode_str, buff);
 
 	batadv_gw_deselect(bat_priv);
+	/* always call batadv_gw_check_client_stop() before changing the gateway
+	 * state
+	 */
+	batadv_gw_check_client_stop(bat_priv);
 	atomic_set(&bat_priv->gw_mode, (unsigned int)gw_mode_tmp);
 	batadv_gw_tvlv_container_update(bat_priv);
 	return count;
-- 
1.8.1.5

Re: [B.A.T.M.A.N.] [PATCHv2] batman-adv: send GW_DEL event when the gw client mode is deselected

[Marek Lindner]

On Saturday, July 13, 2013 06:06:00 Antonio Quartulli wrote:
> From: Antonio Quartulli <antonio@open-mesh.com>
> 
> Whenever the GW client mode is deselected, a DEL event has
> to be sent in order to tell userspace that the current
> gateway has been lost. Send the uevent on state change only
> if a gateway was currently selected.
> 
> Reported-by: Marek Lindner <lindner_marek@yahoo.de>
> Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
> ---
> 
> v2:
> - fixed typo
> - fixed kernel doc
> - fixed comment in sysfs.c
> 
> 
>  gateway_client.c | 27 +++++++++++++++++++++++++++
>  gateway_client.h |  1 +
>  sysfs.c          |  4 ++++
>  3 files changed, 32 insertions(+)

Applied in revision 2bde624.

Thanks,
Marek