diff mbox

batctl: fix backbone address in tcpdump for bla request frames

Message ID 1407335643-2124-1-git-send-email-sw@simonwunderlich.de (mailing list archive)
State Accepted, archived
Commit b904124b928f45bbb9100f9719b2e1b9b78858dd
Headers

Commit Message

Simon Wunderlich Aug. 6, 2014, 2:34 p.m. UTC 
  From: Simon Wunderlich <simon@open-mesh.com>

hw_src just contains another copy of the destination. The backbone
sending the request is setting its mac address into Ethernet source, so
print that instead.

For reference, see the documentation:
http://www.open-mesh.org/projects/batman-adv/wiki/Bridge-loop-avoidance-Protocol

Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
---
 tcpdump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Marek Lindner Aug. 11, 2014, 4:52 a.m. UTC | #1 
On Wednesday 06 August 2014 16:34:03 Simon Wunderlich wrote:
> From: Simon Wunderlich <simon@open-mesh.com>
> 
> hw_src just contains another copy of the destination. The backbone
> sending the request is setting its mac address into Ethernet source, so
> print that instead.
> 
> For reference, see the documentation:
> http://www.open-mesh.org/projects/batman-adv/wiki/Bridge-loop-avoidance-Prot
> ocol
> 
> Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
> ---
>  tcpdump.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied in revision b904124.

Thanks,
Marek
diff mbox

Patch

diff --git a/tcpdump.c b/tcpdump.c
index e84617e..ada8938 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -148,7 +148,7 @@  static int dump_bla2_claim(struct ether_header *eth_hdr,
 		break;
 	case BATADV_CLAIM_TYPE_REQUEST:
 		printf("BLA REQUEST, src backbone %s, ",
-		       get_name_by_macaddr((struct ether_addr *)hw_src, read_opt));
+		       get_name_by_macaddr((struct ether_addr *)eth_hdr->ether_shost, read_opt));
 		printf("dst backbone %s\n",
 		       get_name_by_macaddr((struct ether_addr *)eth_hdr->ether_dhost, read_opt));
 		break;