netbird/FreeBSD-ports
0
0
Fork 0
mirror of https://github.com/netbirdio/FreeBSD-ports.git synced 2026-05-22 18:42:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

sysutils/usbtop: Fixes for FreeBSD.

Browse Source 
Add patches needed for proper operation under FreeBSD.

Approved by: yuri (maintainer)
This commit is contained in:
Hans Petter Selasky
2021-08-10 09:47:03 +02:00
parent 3f3a026707
commit 972a2a5984
1 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sysutils/usbtop/files/patch-src_usb__bus.cpp
+47
View File
@@ -0,0 +1,47 @@
--- src/usb_bus.cpp.orig 2021-08-09 11:19:20 UTC
+++ src/usb_bus.cpp
@@ -28,6 +28,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef __FreeBSD__
+#include <stdint.h>
+#include <sys/endian.h>
+#include <dev/usb/usb_pf.h>
+#endif
+
#include <usbtop/usb_bus.h>
#include <usbtop/tools.h>
@@ -41,8 +47,26 @@ usbtop::UsbBus::~UsbBus()
}
}
+#ifdef __FreeBSD__
void usbtop::UsbBus::push(const pcap_pkthdr* h, const u_char* bytes)
{
+ const size_t psize = h->len;
+ const double time = (double)h->ts.tv_sec + ((double)h->ts.tv_usec) / 1000000.0;
+ const struct usbpf_pkthdr *up = (const struct usbpf_pkthdr *)bytes;
+ size_t payload;
+ UsbStats::direction_type direction;
+
+ if (psize < sizeof(*up))
+ return;
+
+ payload = le32toh(up->up_totlen) - sizeof(*up) - le32toh(up->up_frames) * USBPF_FRAME_HDR_LEN;
+ direction = (up->up_type == USBPF_XFERTAP_DONE) ? UsbStats::from_device : UsbStats::to_device;
+ _stats.push(time, payload, direction);
+ get_device(up->up_address).push(time, payload, direction);
+}
+#else
+void usbtop::UsbBus::push(const pcap_pkthdr* h, const u_char* bytes)
+{
// Get the packet size and timestamp
const size_t psize = h->len;
const double time = (double)h->ts.tv_sec + ((double)h->ts.tv_usec)/(1000000.0);
@@ -72,3 +96,4 @@ void usbtop::UsbBus::push(const pcap_pkthdr* h, const
_stats.push(time, psize, direction);
get_device(device_id).push(time, psize, direction);
}
+#endif