From 6b7bc7660331a617aee1b88c13a1bf153de979b6 Mon Sep 17 00:00:00 2001 From: Matias Fontanini Date: Sun, 8 May 2016 20:46:11 -0700 Subject: [PATCH] Forward NetworkInterface argument when calling PacketSender::send_l2 --- src/dot11/dot11_base.cpp | 2 +- src/dot3.cpp | 2 +- src/ethernetII.cpp | 2 +- src/radiotap.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dot11/dot11_base.cpp b/src/dot11/dot11_base.cpp index f507bb1..f647d4d 100644 --- a/src/dot11/dot11_base.cpp +++ b/src/dot11/dot11_base.cpp @@ -201,7 +201,7 @@ void Dot11::send(PacketSender& sender, const NetworkInterface& iface) { addr.sll_halen = 6; addr.sll_ifindex = iface.id(); memcpy(&(addr.sll_addr), header_.addr1, 6); - sender.send_l2(*this, (struct sockaddr*)&addr, (uint32_t)sizeof(addr)); + sender.send_l2(*this, (struct sockaddr*)&addr, (uint32_t)sizeof(addr), iface); #else sender.send_l2(*this, 0, 0, iface); #endif diff --git a/src/dot3.cpp b/src/dot3.cpp index 5eba707..bfa718d 100644 --- a/src/dot3.cpp +++ b/src/dot3.cpp @@ -112,7 +112,7 @@ void Dot3::send(PacketSender& sender, const NetworkInterface& iface) { addr.sll_ifindex = iface.id(); memcpy(&(addr.sll_addr), header_.dst_mac, sizeof(header_.dst_mac)); - sender.send_l2(*this, (struct sockaddr*)&addr, (uint32_t)sizeof(addr)); + sender.send_l2(*this, (struct sockaddr*)&addr, (uint32_t)sizeof(addr), iface); #endif } #endif // !_WIN32 || TINS_HAVE_PACKET_SENDER_PCAP_SENDPACKET diff --git a/src/ethernetII.cpp b/src/ethernetII.cpp index edce30d..bc54543 100644 --- a/src/ethernetII.cpp +++ b/src/ethernetII.cpp @@ -140,7 +140,7 @@ void EthernetII::send(PacketSender& sender, const NetworkInterface& iface) { addr.sll_ifindex = iface.id(); memcpy(&(addr.sll_addr), header_.dst_mac, address_type::address_size); - sender.send_l2(*this, (struct sockaddr*)&addr, (uint32_t)sizeof(addr)); + sender.send_l2(*this, (struct sockaddr*)&addr, (uint32_t)sizeof(addr), iface); #endif } diff --git a/src/radiotap.cpp b/src/radiotap.cpp index 3865516..4579e6e 100644 --- a/src/radiotap.cpp +++ b/src/radiotap.cpp @@ -487,7 +487,7 @@ void RadioTap::send(PacketSender& sender, const NetworkInterface& iface) { std::copy(dot11_addr.begin(), dot11_addr.end(), addr.sll_addr); } - sender.send_l2(*this, (struct sockaddr*)&addr, (uint32_t)sizeof(addr)); + sender.send_l2(*this, (struct sockaddr*)&addr, (uint32_t)sizeof(addr), iface); #else sender.send_l2(*this, 0, 0, iface); #endif