Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
commit 99a6eb50ef5066e125cedb97bc0fcfcdff4f08cc Author: Antonio Quartulli antonio@open-mesh.com Date: Mon Nov 4 20:59:40 2013 +0100
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
99a6eb50ef5066e125cedb97bc0fcfcdff4f08cc gateway_client.c | 4 ++++ sysfs.c | 9 +++++++++ 2 files changed, 13 insertions(+)
diff --git a/gateway_client.c b/gateway_client.c index 4733ebc..115b7dc 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -202,6 +202,10 @@ 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 */ diff --git a/sysfs.c b/sysfs.c index 5d49d26..313fc82 100644 --- a/sysfs.c +++ b/sysfs.c @@ -403,6 +403,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_deselect() is not enough to really de-select the + * current GW. It will only instruct the gateway clientcode 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