ports/net/pload/files/patch-ioctl__stat.c
J.R. Oldroyd 82f3677256 net/pload: Fix command-line args and unit display.
This patch updates the port to fix the fact that the code calls
XtAppInitialize() which eats the command-line args and so causes ps(1)
to not display them. The command-line args are now saved before and restored
after the call to XtAppInitialize().

Also, correct the display of the units of total byte counts to show as "B",
"kB", "GB" etc, rather than the imprecise/incorrect "b", "k", "G" etc.

PR:		267710
Approved by:	J.R. Oldroyd (maintainer)
2023-01-16 18:33:55 +01:00

106 lines
2.6 KiB
C

--- ioctl_stat.c.orig 2000-02-01 07:11:24 UTC
+++ ioctl_stat.c
@@ -30,6 +30,12 @@
#include <fcntl.h> /* open */
#include <sys/ioctl.h> /* ioctl */
#include <errno.h>
+#ifdef __FreeBSD__
+#include <sys/sysctl.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/if_mib.h>
+#endif
#ifndef STREAMS /* Linux, FreeBSD, NetBSD, Ultrix */
# include <sys/socket.h> /* socket */
@@ -39,8 +45,10 @@
# include <linux/if_ppp.h>
# else /* most everything else */
# include <net/if.h>
-# include <net/ppp_defs.h>
-# include <net/if_ppp.h>
+# if !defined(__FreeBSD__)
+# include <net/ppp_defs.h>
+# include <net/if_ppp.h>
+# endif /* ! __FreeBSD__ */
# endif /* linux && __GLIBC__ < 2 */
#else /* STREAMS */ /* Solaris, SunOS, OSF/1, SVR4 */
# include <net/ppp_defs.h>
@@ -61,8 +69,18 @@ void getsocket(if_data *ifd)
void ioctl_stat(if_data *ifd)
{
struct ifreq ifr;
+#ifdef __FreeBSD__
+ static int if_ix = -1;
+ struct ifmibdata ifmd;
+ size_t ifmd_sz = sizeof(ifmd);
+ int nr_ifs;
+ size_t nr_ifs_sz = sizeof(nr_ifs);
+ int name[6];
+ int i;
+#else
struct ifpppstatsreq req;
-
+#endif
+
if (!ifd->s) getsocket(ifd);
memset(&ifr, 0, sizeof(ifr));
@@ -76,7 +94,9 @@ void ioctl_stat(if_data *ifd)
return;
}
+#ifndef __FreeBSD__
memset(&req, 0, sizeof(req));
+#endif
#ifdef linux
req.stats_ptr = (caddr_t) &req.stats;
@@ -84,18 +104,36 @@ void ioctl_stat(if_data *ifd)
#define ifr_name ifr__name
#endif
- strncpy(req.ifr_name, ifd->device, sizeof(req.ifr_name));
- if (ioctl(ifd->s, SIOCGPPPSTATS, &req) != 0)
- {
- /* shouldn't fail if SIOCGIFFLAGS worked... */
- ifd->in_bytes = 0UL;
- ifd->out_bytes = 0UL;
- return;
+#ifdef __FreeBSD__
+ name[0] = CTL_NET;
+ name[1] = PF_LINK;
+ name[2] = NETLINK_GENERIC;
+ name[3] = IFMIB_IFDATA;
+ name[5] = IFDATA_GENERAL;
+
+ if (if_ix < 0) {
+ if (sysctlbyname("net.link.generic.system.ifcount", (void *) &nr_ifs, &nr_ifs_sz, (void *) 0, 0) < 0) {
+ return;
+ }
+ for (i = 1; i <= nr_ifs; i++) {
+ name[4] = i; /* row of the ifmib table */
+
+ if (sysctl(name, 6, (void *) &ifmd, &ifmd_sz, (void *) 0, 0) < 0) {
+ continue;
+ }
+ if (strncmp(ifmd.ifmd_name, ifr.ifr_name, strlen(ifr.ifr_name)) == 0) {
+ if_ix = i;
+ break;
+ }
+ }
}
-
- ifd->in_bytes = (unsigned long)req.stats.p.ppp_ibytes;
- ifd->out_bytes = (unsigned long)req.stats.p.ppp_obytes;
-
+ name[4] = if_ix;
+ if (sysctl(name, 6, (void *) &ifmd, &ifmd_sz, (void *) 0, 0) >= 0) {
+ ifd->in_bytes = ifmd.ifmd_data.ifi_ibytes;
+ ifd->out_bytes = ifmd.ifmd_data.ifi_obytes;
+ }
+#endif
+
return;
}