X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/22175f0d5792f1d046b6b501c694a3afabc877ed..3f45a5f7caf37ec04bbc3aea5e7def1452d1118c:/components/netspeeds.c

diff --git a/components/netspeeds.c b/components/netspeeds.c
index 9315fef..14b7799 100644
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -5,48 +5,58 @@
 #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;
+		uint64_t oldrxbytes;
+		static uint64_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 (esnprintf(path, sizeof(path),
+		              "/sys/class/net/%s/statistics/rx_bytes",
+		              interface) < 0) {
+			return NULL;
+		}
 		if (pscanf(path, "%llu", &rxbytes) != 1) {
 			return NULL;
 		}
-		if (!valid) {
-			valid = 1;
+		if (oldrxbytes == 0) {
 			return NULL;
 		}
 
-		return fmt_scaled((rxbytes - oldrxbytes) / interval * 1000);
+		return fmt_human_2((rxbytes - oldrxbytes) *
+		                   1000 / interval, "B/s");
 	}
 
 	const char *
 	netspeed_tx(const char *interface)
 	{
-		static int valid;
-		static unsigned long long txbytes;
-		unsigned long oldtxbytes;
+		uint64_t oldtxbytes;
+		static uint64_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 (esnprintf(path, sizeof(path),
+		              "/sys/class/net/%s/statistics/tx_bytes",
+		              interface) < 0) {
+			return NULL;
+		}
 		if (pscanf(path, "%llu", &txbytes) != 1) {
 			return NULL;
 		}
-		if (!valid) {
-			valid = 1;
+		if (oldtxbytes == 0) {
 			return NULL;
 		}
 
-		return fmt_scaled((txbytes - oldtxbytes) / interval * 1000);
+		return fmt_human_2((txbytes - oldtxbytes) *
+		                   1000 / interval, "B/s");
 	}
 #elif defined(__OpenBSD__)
 	#include <string.h>
@@ -60,26 +70,35 @@
 	{
 		struct ifaddrs *ifal, *ifa;
 		struct if_data *ifd;
-		static uint64_t oldrxbytes;
-		uint64_t rxbytes = 0;
-		const char *rxs;
+		uint64_t oldrxbytes;
+		static uint64_t rxbytes;
 		extern const unsigned int interval;
+		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)) {
-				rxbytes += ifd->ifi_ibytes;
+				rxbytes += ifd->ifi_ibytes, if_ok = 1;
 			}
 		}
 		freeifaddrs(ifal);
+		if (!if_ok) {
+			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_2((rxbytes - oldrxbytes) *
+		                   1000 / interval, "B/s");
 	}
 
 	const char *
@@ -87,25 +106,34 @@
 	{
 		struct ifaddrs *ifal, *ifa;
 		struct if_data *ifd;
-		static uint64_t oldtxbytes;
-		uint64_t txbytes = 0;
-		const char *txs;
+		uint64_t oldtxbytes;
+		static uint64_t txbytes;
 		extern const unsigned int interval;
+		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)) {
-				txbytes += ifd->ifi_obytes;
+				txbytes += ifd->ifi_obytes, if_ok = 1;
 			}
 		}
 		freeifaddrs(ifal);
+		if (!if_ok) {
+			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_2((txbytes - oldtxbytes) *
+		                   1000 / interval, "B/s");
 	}
 #endif