From: Antonio Quartulli <ordex@autistici.org>
To: "B.A.T.M.A.N" <b.a.t.m.a.n@lists.open-mesh.org>
Subject: [B.A.T.M.A.N.] [PATCHv2 2/3] batman-adv: throw uevent in userspace on gateway add/change/del event
Date: Mon, 9 May 2011 11:52:23 +0200 [thread overview]
Message-ID: <1304934744-6599-2-git-send-email-ordex@autistici.org> (raw)
In-Reply-To: <1304579589-5222-1-git-send-email-ordex@autistici.org>
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).
The gateway election mechanism has been a little revised. Now the
gw_election is trigered by an atomic_t flag (gw_reselect) which is is set
to 1 in case of election needed, avoding to set curr_gw to NULL.
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
gateway_client.c | 31 ++++++++++++++++++++++++-------
main.c | 1 +
types.h | 1 +
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/gateway_client.c b/gateway_client.c
index 65f3953..8a7090c 100644
--- a/gateway_client.c
+++ b/gateway_client.c
@@ -20,6 +20,7 @@
*/
#include "main.h"
+#include "bat_sysfs.h"
#include "gateway_client.h"
#include "gateway_common.h"
#include "hard-interface.h"
@@ -105,17 +106,18 @@ static void gw_select(struct bat_priv *bat_priv, struct gw_node *new_gw_node)
void gw_deselect(struct bat_priv *bat_priv)
{
- gw_select(bat_priv, NULL);
+ atomic_set(&bat_priv->gw_reselect, 1);
}
void gw_election(struct bat_priv *bat_priv)
{
struct hlist_node *node;
struct gw_node *gw_node, *curr_gw = NULL, *curr_gw_tmp = NULL;
- struct neigh_node *router;
+ struct neigh_node *router = NULL;
uint8_t max_tq = 0;
uint32_t max_gw_factor = 0, tmp_gw_factor = 0;
int down, up;
+ char gw_addr[18] = { '\0' };
/**
* The batman daemon checks here if we already passed a full originator
@@ -127,7 +129,7 @@ void gw_election(struct bat_priv *bat_priv)
return;
curr_gw = gw_get_selected_gw_node(bat_priv);
- if (curr_gw)
+ if (!atomic_dec_not_zero(&bat_priv->gw_reselect))
goto out;
rcu_read_lock();
@@ -186,9 +188,8 @@ void gw_election(struct bat_priv *bat_priv)
}
if (curr_gw != curr_gw_tmp) {
- router = orig_node_get_router(curr_gw_tmp->orig_node);
- if (!router)
- goto unlock;
+ if (curr_gw_tmp)
+ router = orig_node_get_router(curr_gw_tmp->orig_node);
if ((curr_gw) && (!curr_gw_tmp))
bat_dbg(DBG_BATMAN, bat_priv,
@@ -209,8 +210,24 @@ void gw_election(struct bat_priv *bat_priv)
curr_gw_tmp->orig_node->gw_flags,
router->tq_avg);
- neigh_node_free_ref(router);
+ if (router)
+ neigh_node_free_ref(router);
gw_select(bat_priv, curr_gw_tmp);
+ rcu_read_unlock();
+
+ /* Throw the gateway event to the userspace */
+ if (!curr_gw_tmp) {
+ throw_uevent(bat_priv, UEV_GW, UEV_DEL, NULL);
+ goto out;
+ }
+
+ sprintf(gw_addr, "%pM", curr_gw_tmp->orig_node->orig);
+
+ if (curr_gw)
+ throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr);
+ else
+ throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr);
+ goto out;
}
unlock:
diff --git a/main.c b/main.c
index 0a7cee0..ca060a9 100644
--- a/main.c
+++ b/main.c
@@ -111,6 +111,7 @@ int mesh_init(struct net_device *soft_iface)
if (vis_init(bat_priv) < 1)
goto err;
+ atomic_set(&bat_priv->gw_reselect, 0);
atomic_set(&bat_priv->mesh_state, MESH_ACTIVE);
goto end;
diff --git a/types.h b/types.h
index fab70e8..87b890e 100644
--- a/types.h
+++ b/types.h
@@ -173,6 +173,7 @@ struct bat_priv {
struct delayed_work orig_work;
struct delayed_work vis_work;
struct gw_node __rcu *curr_gw; /* rcu protected pointer */
+ atomic_t gw_reselect;
struct hard_iface __rcu *primary_if; /* rcu protected pointer */
struct vis_info *my_vis_info;
};
--
1.7.3.4
next prev parent reply other threads:[~2011-05-09 9:52 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-05 7:13 [B.A.T.M.A.N.] batman-adv: added uevent support for gw and gw propagation for clients Antonio Quartulli
2011-05-05 7:13 ` [B.A.T.M.A.N.] [PATCH 1/3] batman-adv: add wrapper function to throw uevent in userspace Antonio Quartulli
2011-05-05 13:34 ` Andrew Lunn
2011-05-08 19:21 ` Antonio Quartulli
2011-05-08 20:11 ` Andrew Lunn
2011-05-08 20:13 ` Antonio Quartulli
2011-05-05 7:13 ` [B.A.T.M.A.N.] [PATCH 2/3] batman-adv: throw uevent in userspace on gateway add/change/del event Antonio Quartulli
2011-05-05 7:13 ` [B.A.T.M.A.N.] [PATCH 3/3] batman-adv: improved gateway tq-based selection Antonio Quartulli
2011-05-05 13:46 ` Andrew Lunn
2011-05-08 20:57 ` Antonio Quartulli
2011-05-09 9:52 ` [B.A.T.M.A.N.] [PATCHv2 1/3] batman-adv: add wrapper function to throw uevent in userspace Antonio Quartulli
2011-05-09 9:52 ` Antonio Quartulli [this message]
2011-05-09 9:52 ` [B.A.T.M.A.N.] [PATCHv2 3/3] batman-adv: improved gateway tq-based selection Antonio Quartulli
2011-05-09 13:02 ` [B.A.T.M.A.N.] [PATCHv3 1/3] batman-adv: add wrapper function to throw uevent in userspace Antonio Quartulli
2011-05-10 5:08 ` Andrew Lunn
2011-05-10 6:29 ` Antonio Quartulli
2011-06-11 10:10 ` Marek Lindner
2011-06-11 12:45 ` Antonio Quartulli
2011-06-11 10:07 ` Marek Lindner
2011-05-09 13:02 ` [B.A.T.M.A.N.] [PATCHv3 2/3] batman-adv: throw uevent in userspace on gateway add/change/del event Antonio Quartulli
2011-06-11 10:15 ` [B.A.T.M.A.N.] [PATCHv4 " Marek Lindner
2011-06-11 10:21 ` [B.A.T.M.A.N.] [PATCHv5 " Marek Lindner
2011-06-12 10:09 ` Marek Lindner
2011-05-09 13:02 ` [B.A.T.M.A.N.] [PATCHv3 3/3] batman-adv: improved gateway tq-based selection Antonio Quartulli
2011-05-09 14:48 ` Andrew Lunn
2011-05-09 20:26 ` Antonio Quartulli
2011-05-09 20:30 ` [B.A.T.M.A.N.] [PATCHv4 " Antonio Quartulli
2011-05-09 21:15 ` [B.A.T.M.A.N.] [PATCHv5 " Antonio Quartulli
2011-06-11 10:25 ` [B.A.T.M.A.N.] [PATCHv6 " Marek Lindner
2011-06-12 10:11 ` Marek Lindner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1304934744-6599-2-git-send-email-ordex@autistici.org \
--to=ordex@autistici.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).