Hi Simon
was this the only patch which cannot be applied? What about the others I sent? I am still working on the e-mail client issue ....
Kind regards, Andreas
Simon Wunderlich sw@simonwunderlich.de schrieb am 15.02.2016 09:50:18:
Von: Simon Wunderlich sw@simonwunderlich.de An: b.a.t.m.a.n@lists.open-mesh.org Kopie: Andreas Pape APape@phoenixcontact.com Datum: 15.02.2016 09:50 Betreff: Re: [B.A.T.M.A.N.] [PATCH 1/4] batman-adv: Prevent mutliple ARP replies sent by gateways in bla setups with dat enabled
On Friday 12 February 2016 14:51:32 Andreas Pape wrote:
From 2b90abdf53e9ab09d9acfd141c7225de1ae16719 Mon Sep 17 00:00:00 2001 From: Andreas Pape apape@phoenixcontact.com Date: Fri, 12 Feb 2016 10:05:57 +0100 Subject: [PATCH 1/4] batman-adv: Prevent mutliple ARP replies sent by gateways in bla setups with dat enabled
This patch shall make sure that only the backbone gw which has claimed
the
remote destination for the ARP request answers the ARP request directly if
the
MAC address is known due to the local DAT table. This prevents multiple ARP
replies in
a common backbone if more than one gateway already knows the remote mac
searched
for in the ARP request.
This patch looks good in general. I can not apply it though, please
check the
links that Sven posted how to set up your mail client to send patches.
Also,
the commit message seems to have too long lines. Usually your git client
should limit those to ~72 characters per line (I'm not sure about the
actual
limit)
Signed-off-by: Andreas Pape apape@phoenixcontact.com
net/batman-adv/bridge_loop_avoidance.c | 58 ++++++++++++++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.h | 6 +++ net/batman-adv/distributed-arp-table.c | 14 ++++++++ 3 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 0a6c8b8..c70363d 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1906,3 +1906,61 @@ out: batadv_hardif_put(primary_if); return 0; }
+/**
- batadv_check_local_claim
You should put a short description here, like
batadv_check_local_claim - check if the address has been claimed by the
local
backbone
- @bat_priv: the bat priv with all the soft interface information
- @addr: mac address of which the claim status is checked
- @vid: the VLAN ID
- batadv_check_local_claim:
Please remove the repetition of the function name
- addr is checked if this address is claimed by the local device
itself.
- If the address is not claimed at all, claim it.
- returns true if bla is disabled or the mac is claimed by the
device
- returns false if the device addr is already claimed by another
gateway
- */
Should put Return: and then describe the return values. Please checkthe
other
functions for reference.
kerneldoc is parsed automatically and must therefore be in the right
format.
+bool batadv_bla_check_local_claim(struct batadv_priv *bat_priv,
uint8_t
*addr, unsigned short vid) +{
struct batadv_bla_claim search_claim;struct batadv_bla_claim *claim = NULL;struct batadv_hard_iface *primary_if = NULL;bool ret = true;if (atomic_read(&bat_priv->bridge_loop_avoidance)) {You can save an intendation by doing a return here immediately
primary_if = batadv_primary_if_get_selected(bat_priv);if (!primary_if)return ret;I'd prefer a goto here. If we have other stuff to clean up when we change this function later, we may forget that this is not done because we used
return
here.
/* First look if the mac address is claimed */ether_addr_copy(search_claim.addr, addr);search_claim.vid = vid;claim = batadv_claim_hash_find(bat_priv,&search_claim);/* If there is a claim and we are not owner of the
claim,
* return false;*/if (claim) {if
(!batadv_compare_eth(claim->backbone_gw->orig,
primary_if->net_dev->dev_addr)) {
ret = false;}braces not needed
} else {/* If there is no claim, claim the device */batadv_dbg(BATADV_DBG_BLA, bat_priv, "No claimfound for %pM. Claim mac for us.\n",
search_claim.addr);Maybe put something in the debug code where this was called from? This
looks
like a very generic claim message.
batadv_handle_claim(bat_priv,primary_if,- primary_if->net_dev->dev_addr, addr,
vid);I wonder if we should rename the function somehow, since actively
claiming
goes beyond "just checking". Maybe handle_local_claim.?
Also, primary_if can go on the line above I guess.
Cheers, Simon[Anhang "signature.asc" gelöscht von Andreas Pape/Phoenix
Contact]
.................................................................. PHOENIX CONTACT ELECTRONICS GmbH
Sitz der Gesellschaft / registered office of the company: 31812 Bad Pyrmont USt-Id-Nr.: DE811742156 Amtsgericht Hannover HRB 100528 / district court Hannover HRB 100528 Geschäftsführer / Executive Board: Roland Bent, Dr. Martin Heubeck ___________________________________________________________________ Diese E-Mail enthält vertrauliche und/oder rechtlich geschützte Informationen. Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtümlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten Sie diese Mail. Das unerlaubte Kopieren, jegliche anderweitige Verwendung sowie die unbefugte Weitergabe dieser Mail ist nicht gestattet. ---------------------------------------------------------------------------------------------------- This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure, distribution or other use of the material or parts thereof is strictly forbidden. ___________________________________________________________________