temperature: Improve types

[slstatus.git] / components / netspeeds.c

diff --git a/components/netspeeds.c b/components/netspeeds.c
index ef8bf93..7ab1590 100644 (file)
--- a/components/netspeeds.c
+++ b/components/netspeeds.c
@@ -5,49 +5,135 @@
 #include "../util.h"
 
 #if defined(__linux__)
 #include "../util.h"
 
 #if defined(__linux__)

+       #include <stdint.h>
+

        const char *
        netspeed_rx(const char *interface)
        {
        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;
                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 (pscanf(path, "%llu", &rxbytes) != 1) {
                        return NULL;
                }

-               if (!valid) {
-                       valid = 1;
+               if (oldrxbytes == 0) {

                        return NULL;
                }
 
                        return NULL;
                }
 

-               return fmt_scaled((rxbytes - oldrxbytes) / interval * 1000);
+               return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
+                                1024);

        }
 
        const char *
        netspeed_tx(const char *interface)
        {
        }
 
        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;
                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 (pscanf(path, "%llu", &txbytes) != 1) {
                        return NULL;
                }

-               if (!valid) {
-                       valid = 1;
+               if (oldtxbytes == 0) {

                        return NULL;
                }
 
                        return NULL;
                }
 

-               return fmt_scaled((txbytes - oldtxbytes) / interval * 1000);
+               return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
+                                1024);

        }
 #elif defined(__OpenBSD__)
        }
 #elif defined(__OpenBSD__)

-       /* unimplemented */
+       #include <string.h>
+       #include <ifaddrs.h>
+       #include <sys/types.h>
+       #include <sys/socket.h>
+       #include <net/if.h>
+
+       const char *
+       netspeed_rx(const char *interface)
+       {
+               struct ifaddrs *ifal, *ifa;
+               struct if_data *ifd;
+               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, if_ok = 1;
+                       }
+               }
+               freeifaddrs(ifal);
+               if (!if_ok) {
+                       warn("reading 'if_data' failed");
+                       return NULL;
+               }
+               if (oldrxbytes == 0) {
+                       return NULL;
+               }
+
+               return fmt_human((rxbytes - oldrxbytes) * 1000 / interval,
+                                1024);
+       }
+
+       const char *
+       netspeed_tx(const char *interface)
+       {
+               struct ifaddrs *ifal, *ifa;
+               struct if_data *ifd;
+               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, if_ok = 1;
+                       }
+               }
+               freeifaddrs(ifal);
+               if (!if_ok) {
+                       warn("reading 'if_data' failed");
+                       return NULL;
+               }
+               if (oldtxbytes == 0) {
+                       return NULL;
+               }
+
+               return fmt_human((txbytes - oldtxbytes) * 1000 / interval,
+                                1024);
+       }

 #endif
 #endif