Repository : ssh://git@open-mesh.org/batctl

On branch : next

commit b904124b928f45bbb9100f9719b2e1b9b78858dd Author: Simon Wunderlich simon@open-mesh.com Date: Wed Aug 6 16:34:03 2014 +0200

batctl: fix backbone address in tcpdump for bla request frames

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...

Signed-off-by: Simon Wunderlich simon@open-mesh.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

b904124b928f45bbb9100f9719b2e1b9b78858dd tcpdump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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;