From b7e20f550ec16536ac9557e561ce17a050e83bd1 Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Sat, 5 Mar 2016 10:56:03 -0800
Subject: [PATCH] Use proper bssid/client hw when calling handshake captured
 callback

---
 src/crypto.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/crypto.cpp b/src/crypto.cpp
index 4abbf84..c5b44b4 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -553,8 +553,10 @@ void WPA2Decrypter::try_add_keys(const Dot11Data& dot11, const RSNHandshake& hs)
             keys_[addr_p] = session;
             #ifdef TINS_HAVE_WPA2_CALLBACKS
                 if (handshake_captured_callback_) {
-                    handshake_captured_callback_(it->second.ssid(), addr_p.first,
-                                                 addr_p.second);
+                    address_type bssid = dot11.bssid_addr();
+                    address_type client = (bssid == addr_p.first) ? addr_p.second
+                                                                  : addr_p.first;
+                    handshake_captured_callback_(it->second.ssid(), bssid, client);
                 }
             #endif // TINS_HAVE_WPA2_CALLBACKS
         }