Calculate the average link throughput using a counter based on the

cumulative total of all active links rather than basing it on the
total of PROTO_MP traffic.

This fixes a problem whereby Cisco routers send PROTO_IP packets only
when there's only one link (hmm, what a good idea!).

1 files changed, 12 insertions, 4 deletions

diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index e52c31b..7b81fd9 100644
--- a/usr.sbin/ppp/link.c
+++ b/usr.sbin/ppp/link.c
@@ -67,16 +67,24 @@
 
 static void Despatch(struct bundle *, struct link *, struct mbuf *, u_short);
 
-void
+static inline void
 link_AddInOctets(struct link *l, int n)
 {
-  throughput_addin(&l->throughput, n);
+  if (l->stats.gather) {
+    throughput_addin(&l->stats.total, n);
+    if (l->stats.parent)
+      throughput_addin(l->stats.parent, n);
+  }
 }
 
-void
+static inline void
 link_AddOutOctets(struct link *l, int n)
 {
-  throughput_addout(&l->throughput, n);
+  if (l->stats.gather) {
+    throughput_addout(&l->stats.total, n);
+    if (l->stats.parent)
+      throughput_addout(l->stats.parent, n);
+  }
 }
 
 void