B.A.T.M.A.N

b.a.t.m.a.n@lists.open-mesh.org

15 participants
4308 discussions

[B.A.T.M.A.N.] question about min_t() casting in batadv_hardif_min_mtu()
by Dan Carpenter 03 Feb '14

03 Feb '14

Hello Batman devs, I always worry when I see people do min_t(int, foo, bar) and there are a couple cases which concern me in batman. Changing the mtu is allowed for people who have admin rights in their namespace. In other words we check: if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) as opposed to: if (!capable(net->user_ns, CAP_NET_ADMIN)) So mtu has security implications. net/batman-adv/hard-interface.c 240 int batadv_hardif_min_mtu(struct net_device *soft_iface) 241 { 242 struct batadv_priv *bat_priv = netdev_priv(soft_iface); 243 const struct batadv_hard_iface *hard_iface; 244 int min_mtu = ETH_DATA_LEN; 245 246 rcu_read_lock(); 247 list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { 248 if ((hard_iface->if_status != BATADV_IF_ACTIVE) && 249 (hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED)) 250 continue; 251 252 if (hard_iface->soft_iface != soft_iface) 253 continue; 254 255 min_mtu = min_t(int, hard_iface->net_dev->mtu, min_mtu); ^^^ Ok. This is fine because dev_set_mtu() will not allow negative mtus. 256 } 257 rcu_read_unlock(); 258 259 atomic_set(&bat_priv->packet_size_max, min_mtu); 260 261 if (atomic_read(&bat_priv->fragmentation) == 0) 262 goto out; 263 264 /* with fragmentation enabled the maximum size of internally generated 265 * packets such as translation table exchanges or tvlv containers, etc 266 * has to be calculated 267 */ 268 min_mtu = min_t(int, min_mtu, BATADV_FRAG_MAX_FRAG_SIZE); ^^^ Still fine. 269 min_mtu -= sizeof(struct batadv_frag_packet); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ I worry that this could be negative. 270 min_mtu *= BATADV_FRAG_MAX_FRAGMENTS; 271 atomic_set(&bat_priv->packet_size_max, min_mtu); ^^^^^^^ Could a negative cause problems here? 272 273 /* with fragmentation enabled we can fragment external packets easily */ 274 min_mtu = min_t(int, min_mtu, ETH_DATA_LEN); ^^^^^^^ min_mtu would still be negative here. 275 276 out: 277 return min_mtu - batadv_max_header_len(); 278 } regards, dan carpenter

2 2

[B.A.T.M.A.N.] [PATCH maint] batman-adv: remove useless assignment
by Antonio Quartulli 02 Feb '14

02 Feb '14

Introduced by 41b38727749a94c1a65cf0f4be9bfe1cbaf0adeb ("batman-adv: fix potential kernel paging error for unicast transmissions") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- send.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/send.c b/send.c index 2035bd9..75be770 100644 --- a/send.c +++ b/send.c @@ -256,7 +256,7 @@ static int batadv_send_skb_unicast(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, unsigned short vid) { - struct ethhdr *ethhdr = (struct ethhdr *)skb->data; + struct ethhdr *ethhdr; struct batadv_unicast_packet *unicast_packet; int ret = NET_XMIT_DROP; -- 1.8.5.3

2 1

[B.A.T.M.A.N.] [PATCH maint] batman-adv: properly check pskb_may_pull return value
by Antonio Quartulli 02 Feb '14

02 Feb '14

pskb_may_pull() returns 1 on success and 0 in case of failure, therefore checking for the return value being negative does not make sense at all. Fix this by doing the proper check. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- routing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routing.c b/routing.c index f28920f..f7579d0 100644 --- a/routing.c +++ b/routing.c @@ -833,7 +833,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, int is_old_ttvn; /* check if there is enough data before accessing it */ - if (pskb_may_pull(skb, hdr_len + ETH_HLEN) < 0) + if (!pskb_may_pull(skb, hdr_len + ETH_HLEN)) return 0; /* create a copy of the skb (in case of for re-routing) to modify it. */ -- 1.8.5.3

2 2

[B.A.T.M.A.N.] [PATCH next] batctl: switch to net/if.h include to make OpenWrt build happy
by Marek Lindner 02 Feb '14

02 Feb '14

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ioctl.c b/ioctl.c index eccac66..1f827e8 100644 --- a/ioctl.c +++ b/ioctl.c @@ -25,10 +25,10 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <net/if.h> #include <sys/ioctl.h> #include <sys/types.h> #include <sys/socket.h> -#include <linux/if.h> #include <linux/sockios.h> #include <linux/ethtool.h> #include <stdint.h> -- 1.8.5.3

1 1

[B.A.T.M.A.N.] [PATCHv3 next] batman-adv: avoid potential race condition when adding a new neighbour
by Antonio Quartulli 29 Jan '14

29 Jan '14

From: Antonio Quartulli <antonio(a)open-mesh.com> When adding a new neighbour it is important to atomically perform the following: - check if the neighbour already exists - append the neighbour to the proper list If the two operations are not performed in an atomic context it is possible that two concurrent insertions add the same neighbour twice. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- Change from v2: - fix typ0 bat_iv_ogm.c | 22 ++++++++++++++++------ originator.c | 36 ++++++++++++++++++++++++++++++++++++ originator.h | 4 ++++ 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 512159b..c450fb8 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -266,7 +266,7 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, struct batadv_orig_node *orig_neigh) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - struct batadv_neigh_node *neigh_node; + struct batadv_neigh_node *neigh_node = NULL, *tmp_neigh_node; neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, orig_node); if (!neigh_node) @@ -281,14 +281,24 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, neigh_node->orig_node = orig_neigh; neigh_node->if_incoming = hard_iface; - batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Creating new neighbor %pM for orig_node %pM on interface %s\n", - neigh_addr, orig_node->orig, hard_iface->net_dev->name); - spin_lock_bh(&orig_node->neigh_list_lock); - hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); + tmp_neigh_node = batadv_neigh_node_get(orig_node, hard_iface, + neigh_addr); + if (!tmp_neigh_node) { + hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); + } else { + kfree(neigh_node); + batadv_hardif_free_ref(hard_iface); + neigh_node = tmp_neigh_node; + } spin_unlock_bh(&orig_node->neigh_list_lock); + if (!tmp_neigh_node) + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "Creating new neighbor %pM for orig_node %pM on interface %s\n", + neigh_addr, orig_node->orig, + hard_iface->net_dev->name); + out: return neigh_node; } diff --git a/originator.c b/originator.c index 6df12a2..8539416 100644 --- a/originator.c +++ b/originator.c @@ -458,6 +458,42 @@ out: } /** + * batadv_neigh_node_get - retrieve a neighbour from the list + * @orig_node: originator which the neighbour belongs to + * @hard_iface: the interface where this neighbour is connected to + * @addr: the address of the neighbour + * + * Looks for and possibly returns a neighbour belonging to this originator list + * which is connected through the provided hard interface. + * Returns NULL if the neighbour is not found. + */ +struct batadv_neigh_node * +batadv_neigh_node_get(const struct batadv_orig_node *orig_node, + const struct batadv_hard_iface *hard_iface, + const uint8_t *addr) +{ + struct batadv_neigh_node *tmp_neigh_node, *res = NULL; + + rcu_read_lock(); + hlist_for_each_entry_rcu(tmp_neigh_node, &orig_node->neigh_list, list) { + if (!batadv_compare_eth(tmp_neigh_node->addr, addr)) + continue; + + if (tmp_neigh_node->if_incoming != hard_iface) + continue; + + if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) + continue; + + res = tmp_neigh_node; + break; + } + rcu_read_unlock(); + + return res; +} + +/** * batadv_orig_ifinfo_free_rcu - free the orig_ifinfo object * @rcu: rcu pointer of the orig_ifinfo object */ diff --git a/originator.h b/originator.h index 37be290..db3a9ed 100644 --- a/originator.h +++ b/originator.h @@ -29,6 +29,10 @@ void batadv_orig_node_free_ref_now(struct batadv_orig_node *orig_node); struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv, const uint8_t *addr); struct batadv_neigh_node * +batadv_neigh_node_get(const struct batadv_orig_node *orig_node, + const struct batadv_hard_iface *hard_iface, + const uint8_t *addr); +struct batadv_neigh_node * batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, const uint8_t *neigh_addr, struct batadv_orig_node *orig_node); -- 1.8.5.3

2 2

[B.A.T.M.A.N.] [PATCH maint] batman-adv: release vlan object after checking the CRC
by Antonio Quartulli 29 Jan '14

29 Jan '14

There is a refcounter unbalance in the CRC checking routine invoked on OGM reception. A vlan object is retrieved (thus its refcounter is increased by one) but it is never properly released. This leads to a memleak because the vlan object will never be free'd. Fix this by releasing the vlan object after having read the CRC. Reported-by: Russell Senior <russell(a)personaltelco.net> Reported-by: Daniel <daniel(a)makrotopia.org> Reported-by: cmsv <cmsv(a)wirelesspt.net> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- translation-table.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index 3fca99d..097ca01 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2248,6 +2248,7 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node, { struct batadv_tvlv_tt_vlan_data *tt_vlan_tmp; struct batadv_orig_node_vlan *vlan; + uint32_t crc; int i; /* check if each received CRC matches the locally stored one */ @@ -2267,7 +2268,10 @@ static bool batadv_tt_global_check_crc(struct batadv_orig_node *orig_node, if (!vlan) return false; - if (vlan->tt.crc != ntohl(tt_vlan_tmp->crc)) + crc = vlan->tt.crc; + batadv_orig_node_vlan_free_ref(vlan); + + if (crc != ntohl(tt_vlan_tmp->crc)) return false; } -- 1.8.5.3

2 1

[B.A.T.M.A.N.] [PATCH maint] batman-adv: fix TT-TVLV parsing on OGM reception
by Antonio Quartulli 29 Jan '14

29 Jan '14

When accessing a TT-TVLV container in the OGM RX path the variable pointing to the list of changes to apply is altered by mistake. This makes the TT component read data at the wrong position in the OGM packet buffer. Fix it by removing the bogus pointer alteration. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- translation-table.c | 1 - 1 file changed, 1 deletion(-) diff --git a/translation-table.c b/translation-table.c index 097ca01..05c2a9b 100644 --- a/translation-table.c +++ b/translation-table.c @@ -3208,7 +3208,6 @@ static void batadv_tt_update_orig(struct batadv_priv *bat_priv, spin_lock_bh(&orig_node->tt_lock); - tt_change = (struct batadv_tvlv_tt_change *)tt_buff; batadv_tt_update_changes(bat_priv, orig_node, tt_num_changes, ttvn, tt_change); -- 1.8.5.3

2 1

[B.A.T.M.A.N.] Fwd: [Battlemesh] Battlemesh v7 Call for talks and workshops
by Simon Wunderlich 28 Jan '14

28 Jan '14

Hello list, the battlemesh v7 call for talks is out, it would be great to see your WiFi/Mesh related talks and workshops in Leipzig this year. :) If you haven't booked a hotel yet, have a look at the accomodation package [1], where you can get bed and breakfast for the whole week (early bird price for 150EUR until Feb 15th). The event itself is free of charge. Cheers, Simon [1] http://battlemesh.org/BattleMeshV7#Participant_Registration_and_Fee > Do you have an idea or project related to mesh routing protocols? Are you > involved in a community networking project that uses a mesh network? Are > you aware of a related issue that you think should be discussed? > > Your workshop or presentation proposal is welcomed to BattleMeshV7 Leipzig! > > What is Battlemesh? > ------------------- > > The Wireless Battle of the Mesh is an event that aims at bringing together > people from across Europe and beyond to test the performance of different > routing protocols for ad-hoc networks, like Babel, B.A.T.M.A.N., BMX, > OLSR, 802.11s and Static Routing. > > It is a tournament with a social character. If you are a mesh networking > enthusiast, community networking activist, or have an interest in mesh > networks you might want to check this out ! > > The goal of the WirelessBattleMesh events is to set-up hands-on testbed for > each available mesh routing protocol with a standard test procedure for > the different mesh networks. During the different WBM events, similar > hardware and software configuration will be used based on the OpenWRT > BoardSupportPackage and packages for each protocol implementation. The WBM > events are also a great opportunity to develop testing tools for PHY/MAC > radio layers (drivers, scripts and PHY analyzers) . > > This years Battlemesh will take place from 12 - 18 May 2014 in Leipzig, > Germany at the Sublab, Karl-Heine-Straße 93, 04229 Leipzig. > > http://battlemesh.org > > Format and topic of talks > ------------------------- > > Workshops or talks relating directly to open source mesh routing protocols > will be prioritised, but we welcome proposals of anything you think may be > of interest to mesh routing and community networking enthusiasts. > > They may take any format, for example a presentation, talk, discussion, > debate, practical workshop, or film showing. > > To get an idea of the kinds of talks and workshops at the previous events, > see http://battlemesh.org/BattleMeshV6/Agenda, > http://battlemesh.org/BattleMeshV5/Agenda and > http://battlemesh.org/BattleMeshV4/Agenda > > Lightening talks > ---------------- > > Lightening talks are shorter talks which can be submitted later than the > main workshops deadline, to allow everybody to have the opportunity to > present their project/idea. Each lightening talk will be 7 minutes long > followed by 3 minutes of questions. Projector slides can be submitted > before in PDF format to: submissions(a)battlemesh.org > > Submissions > ----------- > > To allow an efficient handling of your proposal, please provide the following information and send them by email to the email to the address below: > * Your name > * What format will it take (talk/workshop/panel discussion/lightening > talk) * Your topic headline > * Your topic description which can be brief (does not need to exceed a > couple of lines) but should provide a reasonable summary of your talk * > The dates of your stay at the event and (optional) preferred day for your > slot * The length of the slot if you wish to do a workshop (all other > slots will be limited to one hour) * Any requirements you need, for > example, a projector. > > Deadline > -------- > > The deadline for proposals is the 1st of May. > > Contact > ------- > > Email your proposals or specific questions to: submissions(a)battlemesh.org > > For general questions, please use the Battlemesh mailing list: > http://ml.ninux.org/mailman/listinfo/battlemesh > > Please forward this message any groups or individuals who might be > interested. > > _______________________________________________ > Battlemesh mailing list > Battlemesh(a)ml.ninux.org > http://ml.ninux.org/mailman/listinfo/battlemesh

1 0

[B.A.T.M.A.N.] [PATCHv2 next] batman-adv: avoid potential race condition when adding a new neighbour
by Antonio Quartulli 27 Jan '14

27 Jan '14

From: Antonio Quartulli <antonio(a)open-mesh.com> When adding a new neighbour it is important to atomically perform the following: - check if the neighbour already exists - append the neighbour to the proper list If the two operations are not performed in an atomic context it is possible that two concurrent insertions add the same neighbour twice. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- Changes from v2: - release hard_iface if we already have a matching neighbour (thanks Marek!) Cheers, bat_iv_ogm.c | 22 ++++++++++++++++------ originator.c | 36 ++++++++++++++++++++++++++++++++++++ originator.h | 4 ++++ 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 512159b..c450fb8 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -266,7 +266,7 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, struct batadv_orig_node *orig_neigh) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - struct batadv_neigh_node *neigh_node; + struct batadv_neigh_node *neigh_node = NULL, *tmp_neigh_node; neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, orig_node); if (!neigh_node) @@ -281,14 +281,24 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, neigh_node->orig_node = orig_neigh; neigh_node->if_incoming = hard_iface; - batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Creating new neighbor %pM for orig_node %pM on interface %s\n", - neigh_addr, orig_node->orig, hard_iface->net_dev->name); - spin_lock_bh(&orig_node->neigh_list_lock); - hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); + tmp_neigh_node = batadv_neigh_node_get(orig_node, hard_iface, + neigh_addr); + if (!tmp_neigh_node) { + hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); + } else { + kfree(neigh_node); + batadv_hardif_free_ref(hard_iface); + neigh_node = tmp_neigh_node; + } spin_unlock_bh(&orig_node->neigh_list_lock); + if (!tmp_neigh_node) + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "Creating new neighbor %pM for orig_node %pM on interface %s\n", + neigh_addr, orig_node->orig, + hard_iface->net_dev->name); + out: return neigh_node; } diff --git a/originator.c b/originator.c index 6df12a2..bb07c92 100644 --- a/originator.c +++ b/originator.c @@ -458,6 +458,42 @@ out: } /** + * batadv_neigh_node_get - retrieve a neighbour from the list + * @orig_node: originator which the neighbour belongs to + * @hard_iface: the interface where this neighbour is connected to + * @addr: the address of the neighbour + * + * Looks for and possibly return a neighbour belonging to this originator list + * which is connected through the provided hard interface. + * Returns NULL if the neighbour is not found. + */ +struct batadv_neigh_node * +batadv_neigh_node_get(const struct batadv_orig_node *orig_node, + const struct batadv_hard_iface *hard_iface, + const uint8_t *addr) +{ + struct batadv_neigh_node *tmp_neigh_node, *res = NULL; + + rcu_read_lock(); + hlist_for_each_entry_rcu(tmp_neigh_node, &orig_node->neigh_list, list) { + if (!batadv_compare_eth(tmp_neigh_node->addr, addr)) + continue; + + if (tmp_neigh_node->if_incoming != hard_iface) + continue; + + if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) + continue; + + res = tmp_neigh_node; + break; + } + rcu_read_unlock(); + + return res; +} + +/** * batadv_orig_ifinfo_free_rcu - free the orig_ifinfo object * @rcu: rcu pointer of the orig_ifinfo object */ diff --git a/originator.h b/originator.h index 37be290..db3a9ed 100644 --- a/originator.h +++ b/originator.h @@ -29,6 +29,10 @@ void batadv_orig_node_free_ref_now(struct batadv_orig_node *orig_node); struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv, const uint8_t *addr); struct batadv_neigh_node * +batadv_neigh_node_get(const struct batadv_orig_node *orig_node, + const struct batadv_hard_iface *hard_iface, + const uint8_t *addr); +struct batadv_neigh_node * batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, const uint8_t *neigh_addr, struct batadv_orig_node *orig_node); -- 1.8.5.3

1 0

[B.A.T.M.A.N.] [PATCH next] batman-adv: avoid potential race condition when adding a new neighbour
by Antonio Quartulli 27 Jan '14

27 Jan '14

From: Antonio Quartulli <antonio(a)open-mesh.com> When adding a new neighbour it is important to atomically perform the following: - check if the neighbour already exists - append the neighbour to the proper list If the two operations are not performed in an atomic context it is possible that two concurrent insertions add the same neighbour twice. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- bat_iv_ogm.c | 21 +++++++++++++++------ originator.c | 36 ++++++++++++++++++++++++++++++++++++ originator.h | 4 ++++ 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 512159b..c6eac80 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -266,7 +266,7 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, struct batadv_orig_node *orig_neigh) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - struct batadv_neigh_node *neigh_node; + struct batadv_neigh_node *neigh_node = NULL, *tmp_neigh_node; neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, orig_node); if (!neigh_node) @@ -281,14 +281,23 @@ batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface, neigh_node->orig_node = orig_neigh; neigh_node->if_incoming = hard_iface; - batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Creating new neighbor %pM for orig_node %pM on interface %s\n", - neigh_addr, orig_node->orig, hard_iface->net_dev->name); - spin_lock_bh(&orig_node->neigh_list_lock); - hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); + tmp_neigh_node = batadv_neigh_node_get(orig_node, hard_iface, + neigh_addr); + if (!tmp_neigh_node) { + hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); + } else { + kfree(neigh_node); + neigh_node = tmp_neigh_node; + } spin_unlock_bh(&orig_node->neigh_list_lock); + if (!tmp_neigh_node) + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "Creating new neighbor %pM for orig_node %pM on interface %s\n", + neigh_addr, orig_node->orig, + hard_iface->net_dev->name); + out: return neigh_node; } diff --git a/originator.c b/originator.c index 6df12a2..bb07c92 100644 --- a/originator.c +++ b/originator.c @@ -458,6 +458,42 @@ out: } /** + * batadv_neigh_node_get - retrieve a neighbour from the list + * @orig_node: originator which the neighbour belongs to + * @hard_iface: the interface where this neighbour is connected to + * @addr: the address of the neighbour + * + * Looks for and possibly return a neighbour belonging to this originator list + * which is connected through the provided hard interface. + * Returns NULL if the neighbour is not found. + */ +struct batadv_neigh_node * +batadv_neigh_node_get(const struct batadv_orig_node *orig_node, + const struct batadv_hard_iface *hard_iface, + const uint8_t *addr) +{ + struct batadv_neigh_node *tmp_neigh_node, *res = NULL; + + rcu_read_lock(); + hlist_for_each_entry_rcu(tmp_neigh_node, &orig_node->neigh_list, list) { + if (!batadv_compare_eth(tmp_neigh_node->addr, addr)) + continue; + + if (tmp_neigh_node->if_incoming != hard_iface) + continue; + + if (!atomic_inc_not_zero(&tmp_neigh_node->refcount)) + continue; + + res = tmp_neigh_node; + break; + } + rcu_read_unlock(); + + return res; +} + +/** * batadv_orig_ifinfo_free_rcu - free the orig_ifinfo object * @rcu: rcu pointer of the orig_ifinfo object */ diff --git a/originator.h b/originator.h index 37be290..db3a9ed 100644 --- a/originator.h +++ b/originator.h @@ -29,6 +29,10 @@ void batadv_orig_node_free_ref_now(struct batadv_orig_node *orig_node); struct batadv_orig_node *batadv_orig_node_new(struct batadv_priv *bat_priv, const uint8_t *addr); struct batadv_neigh_node * +batadv_neigh_node_get(const struct batadv_orig_node *orig_node, + const struct batadv_hard_iface *hard_iface, + const uint8_t *addr); +struct batadv_neigh_node * batadv_neigh_node_new(struct batadv_hard_iface *hard_iface, const uint8_t *neigh_addr, struct batadv_orig_node *orig_node); -- 1.8.5.3

2 2

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N