From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 10 Apr 2020 22:23:12 +0000 (+0200)
Subject: nlbwmon: update to latest Git HEAD
X-Git-Url: http://git.openwrt.org/?p=feed%2Fpackages.git;a=commitdiff_plain;h=d81d777a0f009fe74d233de307a03f9951d6b960

nlbwmon: update to latest Git HEAD

e757e06 nfnetlink: allow specifying the socket buffer size
33c77cb nfnetlink: properly handle nl_recvmsgs() failures
95cced5 protocol: Include whitespace when reading names

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/net/nlbwmon/Makefile b/net/nlbwmon/Makefile
index be4fb0c78f..0d7eba23ce 100644
--- a/net/nlbwmon/Makefile
+++ b/net/nlbwmon/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/jow-/nlbwmon.git
-PKG_SOURCE_DATE:=2019-06-13
-PKG_SOURCE_VERSION:=e921ca0af9957d3cb05797acfb8bde4d7d2278e5
-PKG_MIRROR_HASH:=1f6ed5086e978beeba4c22c255b4ed893d598119c3f2c03061501464910ea421
+PKG_SOURCE_DATE:=2020-04-11
+PKG_SOURCE_VERSION:=e757e064dca95c305f91687de972970f44a414b7
+PKG_MIRROR_HASH:=07943a286bfe002759f5753fb2c4cfed2fc6f84e04944f8791eca8962e6bc069
 
 CMAKE_INSTALL:=1
 
diff --git a/net/nlbwmon/files/nlbwmon.config b/net/nlbwmon/files/nlbwmon.config
index 3b15396021..6cde4a9cf1 100644
--- a/net/nlbwmon/files/nlbwmon.config
+++ b/net/nlbwmon/files/nlbwmon.config
@@ -1,4 +1,9 @@
 config nlbwmon
+	# The buffer size for receiving netlink conntrack results, in bytes.
+	# If the chosen size is too small, accounting information might get
+	# lost, leading to skewed traffic counting results
+	option netlink_buffer_size 524288
+
 	# Interval at which the temporary in-memory database is committed to
 	# the persistent database directory
 	option commit_interval 24h
diff --git a/net/nlbwmon/files/nlbwmon.init b/net/nlbwmon/files/nlbwmon.init
index 7d8a655cbd..c12b838644 100755
--- a/net/nlbwmon/files/nlbwmon.init
+++ b/net/nlbwmon/files/nlbwmon.init
@@ -64,6 +64,7 @@ parse_config() {
 	mkdir -p "$dir"
 	procd_append_param command -o "$dir"
 
+	add_option "$cfg" -b netlink_buffer_size 524288
 	add_option "$cfg" -i commit_interval 24h
 	add_option "$cfg" -r refresh_interval 30s
 	add_option "$cfg" -p protocol_database /usr/share/nlbwmon/protocols