The following commit has been merged in the master branch: commit 19595e054d35820e026caac314414e435287e3ae Author: Antonio Quartulli ordex@autistici.org Date: Sun Jun 12 11:58:58 2011 +0200
batman-adv: throw uevent in userspace on gateway add/change/del event
In case of new default gw, changing the default gw or deleting the default gw a uevent is triggered with type=gw, action=add/change/del and data={GW_ORIG_ADDRESS} (if any).
Signed-off-by: Antonio Quartulli ordex@autistici.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de Signed-off-by: Sven Eckelmann sven@narfation.org
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 0350c0c..6381864 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -179,6 +179,7 @@ void gw_election(struct bat_priv *bat_priv) { struct gw_node *curr_gw = NULL, *next_gw = NULL; struct neigh_node *router = NULL; + char gw_addr[18] = { '\0' };
/** * The batman daemon checks here if we already passed a full originator @@ -200,6 +201,8 @@ void gw_election(struct bat_priv *bat_priv) goto out;
if (next_gw) { + sprintf(gw_addr, "%pM", next_gw->orig_node->orig); + router = orig_node_get_router(next_gw->orig_node); if (!router) { gw_deselect(bat_priv); @@ -210,12 +213,14 @@ void gw_election(struct bat_priv *bat_priv) if ((curr_gw) && (!next_gw)) { bat_dbg(DBG_BATMAN, bat_priv, "Removing selected gateway - no gateway in range\n"); + throw_uevent(bat_priv, UEV_GW, UEV_DEL, NULL); } else if ((!curr_gw) && (next_gw)) { bat_dbg(DBG_BATMAN, bat_priv, "Adding route to gateway %pM (gw_flags: %i, tq: %i)\n", next_gw->orig_node->orig, next_gw->orig_node->gw_flags, router->tq_avg); + throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr); } else { bat_dbg(DBG_BATMAN, bat_priv, "Changing route to gateway %pM " @@ -223,6 +228,7 @@ void gw_election(struct bat_priv *bat_priv) next_gw->orig_node->orig, next_gw->orig_node->gw_flags, router->tq_avg); + throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr); }
gw_select(bat_priv, next_gw);