X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/2321aecff01fb9aa2fda156bb59bca6d16bd7c5d..86849d295b1eb9e18746d8a4fa196fe7b9dce0dc:/components/netspeeds.c

diff --git a/components/netspeeds.c b/components/netspeeds.c
index c846a2c..0029177 100644
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -5,50 +5,60 @@
 #include "../util.h"
 
 #if defined(__linux__)
+	#include <stdint.h>
+
 	const char *
 	netspeed_rx(const char *interface)
 	{
-		static int valid;
-		static unsigned long long rxbytes;
-		unsigned long oldrxbytes;
+		uintmax_t oldrxbytes;
+		static uintmax_t rxbytes;
 		extern const unsigned int interval;
 		char path[PATH_MAX];
 
 		oldrxbytes = rxbytes;
-		snprintf(path, sizeof(path), "/sys/class/net/%s/statistics/rx_bytes", interface);
-		if (pscanf(path, "%llu", &rxbytes) != 1) {
+
+		if (esnprintf(path, sizeof(path),
+		              "/sys/class/net/%s/statistics/rx_bytes",
+		              interface) < 0) {
+			return NULL;
+		}
+		if (pscanf(path, "%ju", &rxbytes) != 1) {
 			return NULL;
 		}
-		if (!valid) {
-			valid = 1;
+		if (oldrxbytes == 0) {
 			return NULL;
 		}
 
-		return fmt_scaled((rxbytes - oldrxbytes) / interval * 1000);
+		return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
+		                 1024);
 	}
 
 	const char *
 	netspeed_tx(const char *interface)
 	{
-		static int valid;
-		static unsigned long long txbytes;
-		unsigned long oldtxbytes;
+		uintmax_t oldtxbytes;
+		static uintmax_t txbytes;
 		extern const unsigned int interval;
 		char path[PATH_MAX];
 
 		oldtxbytes = txbytes;
-		snprintf(path, sizeof(path), "/sys/class/net/%s/statistics/tx_bytes", interface);
-		if (pscanf(path, "%llu", &txbytes) != 1) {
+
+		if (esnprintf(path, sizeof(path),
+		              "/sys/class/net/%s/statistics/tx_bytes",
+		              interface) < 0) {
+			return NULL;
+		}
+		if (pscanf(path, "%ju", &txbytes) != 1) {
 			return NULL;
 		}
-		if (!valid) {
-			valid = 1;
+		if (oldtxbytes == 0) {
 			return NULL;
 		}
 
-		return fmt_scaled((txbytes - oldtxbytes) / interval * 1000);
+		return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
+		                 1024);
 	}
-#elif defined(__OpenBSD__)
+#elif defined(__OpenBSD__) | defined(__FreeBSD__)
 	#include <string.h>
 	#include <ifaddrs.h>
 	#include <sys/types.h>
@@ -60,16 +70,18 @@
 	{
 		struct ifaddrs *ifal, *ifa;
 		struct if_data *ifd;
-		static uint64_t oldrxbytes;
-		uint64_t rxbytes = 0;
-		const char *rxs;
+		uintmax_t oldrxbytes;
+		static uintmax_t rxbytes;
 		extern const unsigned int interval;
-		char if_ok = 0;
+		int if_ok = 0;
+
+		oldrxbytes = rxbytes;
 
 		if (getifaddrs(&ifal) == -1) {
 			warn("getifaddrs failed");
 			return NULL;
 		}
+		rxbytes = 0;
 		for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
 			if (!strcmp(ifa->ifa_name, interface) &&
 			   (ifd = (struct if_data *)ifa->ifa_data)) {
@@ -81,10 +93,12 @@
 			warn("reading 'if_data' failed");
 			return NULL;
 		}
+		if (oldrxbytes == 0) {
+			return NULL;
+		}
 
-		rxs = oldrxbytes ? fmt_scaled((rxbytes - oldrxbytes) /
-		                              interval * 1000) : NULL;
-		return (oldrxbytes = rxbytes, rxs);
+		return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
+		                 1024);
 	}
 
 	const char *
@@ -92,16 +106,18 @@
 	{
 		struct ifaddrs *ifal, *ifa;
 		struct if_data *ifd;
-		static uint64_t oldtxbytes;
-		uint64_t txbytes = 0;
-		const char *txs;
+		uintmax_t oldtxbytes;
+		static uintmax_t txbytes;
 		extern const unsigned int interval;
-		char if_ok = 0;
+		int if_ok = 0;
+
+		oldtxbytes = txbytes;
 
 		if (getifaddrs(&ifal) == -1) {
 			warn("getifaddrs failed");
 			return NULL;
 		}
+		txbytes = 0;
 		for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
 			if (!strcmp(ifa->ifa_name, interface) &&
 			   (ifd = (struct if_data *)ifa->ifa_data)) {
@@ -113,9 +129,11 @@
 			warn("reading 'if_data' failed");
 			return NULL;
 		}
+		if (oldtxbytes == 0) {
+			return NULL;
+		}
 
-		txs = oldtxbytes ? fmt_scaled((txbytes - oldtxbytes) /
-		                              interval * 1000) : NULL;
-		return (oldtxbytes = txbytes, txs);
+		return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
+		                 1024);
 	}
 #endif