*/
#ifndef lint
-static char rcsid[] = "$Id: pppstats.c,v 1.19 1997/04/30 06:00:27 paulus Exp $";
+static char rcsid[] = "$Id: pppstats.c,v 1.24 1999/01/20 00:02:21 paulus Exp $";
#endif
#include <stdio.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/ioctl.h>
-#include <net/ppp_defs.h>
#ifndef STREAMS
+#if defined(_linux_) && defined(__powerpc__)
+/* kludge alert! */
+#undef __GLIBC__
+#endif
#include <sys/socket.h> /* *BSD, Linux, NeXT, Ultrix etc. */
-#include <net/if.h>
#ifndef _linux_
+#include <net/if.h>
+#include <net/ppp_defs.h>
#include <net/if_ppp.h>
#else
-#include <net/if_ppp.h>
+/* Linux */
+#if __GLIBC__ >= 2
+#include <asm/types.h> /* glibc 2 conflicts with linux/types.h */
+#include <net/if.h>
+#else
+#include <linux/types.h>
+#include <linux/if.h>
#endif
+#include <linux/ppp_defs.h>
+#include <linux/if_ppp.h>
+#endif /* _linux_ */
#else /* STREAMS */
#include <sys/stropts.h> /* SVR4, Solaris 2, SunOS 4, OSF/1, etc. */
+#include <net/ppp_defs.h>
#include <net/pppio.h>
#endif /* STREAMS */
}
#ifdef _linux_
+ if (creq.stats.c.bytes_out == 0) {
+ creq.stats.c.bytes_out = creq.stats.c.comp_bytes + creq.stats.c.inc_bytes;
+ creq.stats.c.in_count = creq.stats.c.unc_bytes;
+ }
if (creq.stats.c.bytes_out == 0)
creq.stats.c.ratio = 0.0;
else
- creq.stats.c.ratio = (double) creq.stats.c.in_count /
- (double) creq.stats.c.bytes_out;
+ creq.stats.c.ratio = 256.0 * creq.stats.c.in_count /
+ creq.stats.c.bytes_out;
+ if (creq.stats.d.bytes_out == 0) {
+ creq.stats.d.bytes_out = creq.stats.d.comp_bytes + creq.stats.d.inc_bytes;
+ creq.stats.d.in_count = creq.stats.d.unc_bytes;
+ }
if (creq.stats.d.bytes_out == 0)
creq.stats.d.ratio = 0.0;
else
- creq.stats.d.ratio = (double) creq.stats.d.in_count /
- (double) creq.stats.d.bytes_out;
+ creq.stats.d.ratio = 256.0 * creq.stats.d.in_count /
+ creq.stats.d.bytes_out;
#endif
*csp = creq.stats;
W(d.comp_packets),
KBPS(W(d.inc_bytes)),
W(d.inc_packets),
- ccs.d.ratio * 256.0);
+ ccs.d.ratio / 256.0);
printf(" | %8.3f %6u %8.3f %6u %6.2f",
KBPS(W(c.comp_bytes)),
W(c.comp_packets),
KBPS(W(c.inc_bytes)),
W(c.inc_packets),
- ccs.c.ratio * 256.0);
+ ccs.c.ratio / 256.0);
} else {
printf("%8u %6u %8u %6u %6.2f",
W(d.comp_bytes),
W(d.comp_packets),
W(d.inc_bytes),
W(d.inc_packets),
- ccs.d.ratio * 256.0);
+ ccs.d.ratio / 256.0);
printf(" | %8u %6u %8u %6u %6.2f",
W(c.comp_bytes),
W(c.comp_packets),
W(c.inc_bytes),
W(c.inc_packets),
- ccs.c.ratio * 256.0);
+ ccs.c.ratio / 256.0);
}
} else {