From 557b064cb164e8ed275bf3e961c285e76b721c45 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Sun, 12 Jun 2011 11:58:58 +0200 Subject: [PATCH] --- yaml --- r: 255613 b: refs/heads/master c: 19595e054d35820e026caac314414e435287e3ae h: refs/heads/master i: 255611: db04057fe5e1ec27d502debe6e9e0d573d4fbd5c v: v3 --- [refs] | 2 +- trunk/net/batman-adv/gateway_client.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5c7b7e81056f..90723a4fa246 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2265c141086474bbae55a5bb3afa1ebb78ccaa7c +refs/heads/master: 19595e054d35820e026caac314414e435287e3ae diff --git a/trunk/net/batman-adv/gateway_client.c b/trunk/net/batman-adv/gateway_client.c index 0350c0cd690e..6381864c1ca4 100644 --- a/trunk/net/batman-adv/gateway_client.c +++ b/trunk/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);