Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 27 Jul 2018 10:38:13 +0000 (UTC)
From:      Eugene Grosbein <eugen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r475423 - in head/net/mpd5: . files
Message-ID:  <201807271038.w6RAcDCa071770@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: eugen
Date: Fri Jul 27 10:38:13 2018
New Revision: 475423
URL: https://svnweb.freebsd.org/changeset/ports/475423

Log:
  net/mpd5: add a fix from upstream r2247
  
  Prevent reporting wrong traffic accounting data in very rare case
  of failure of netgraph statistical socket data flow.

Added:
  head/net/mpd5/files/patch-fixstats   (contents, props changed)
Modified:
  head/net/mpd5/Makefile

Modified: head/net/mpd5/Makefile
==============================================================================
--- head/net/mpd5/Makefile	Fri Jul 27 10:27:40 2018	(r475422)
+++ head/net/mpd5/Makefile	Fri Jul 27 10:38:13 2018	(r475423)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpd
 DISTVERSION=	5.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}
 PKGNAMESUFFIX=	5

Added: head/net/mpd5/files/patch-fixstats
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/mpd5/files/patch-fixstats	Fri Jul 27 10:38:13 2018	(r475423)
@@ -0,0 +1,30 @@
+Index: src/bund.c
+===================================================================
+--- src/bund.c	(revision 2246)
++++ src/bund.c	(revision 2247)
+@@ -1394,9 +1394,9 @@ BundUpdateStats(Bund b)
+     b->stats.runts	  += abs(stats.runts - b->oldStats.runts);
+     b->stats.dupFragments += abs(stats.dupFragments - b->oldStats.dupFragments);
+     b->stats.dropFragments += abs(stats.dropFragments - b->oldStats.dropFragments);
++    b->oldStats = stats;
+   }
+ 
+-  b->oldStats = stats;
+ #else
+     NgFuncGetStats64(b, l, &b->stats);
+ #endif
+Index: src/link.c
+===================================================================
+--- src/link.c	(revision 2246)
++++ src/link.c	(revision 2247)
+@@ -1359,9 +1359,9 @@ LinkUpdateStats(Link l)
+         l->stats.runts	  += abs(stats.runts - l->oldStats.runts);
+         l->stats.dupFragments += abs(stats.dupFragments - l->oldStats.dupFragments);
+         l->stats.dropFragments += abs(stats.dropFragments - l->oldStats.dropFragments);
++	l->oldStats = stats;
+     }
+ 
+-    l->oldStats = stats;
+ #else
+     NgFuncGetStats64(l->bund, l->bundleIndex, &l->stats);
+ #endif

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807271038.w6RAcDCa071770>