From 23fabf774ec5d49921331d2a8d6e604046a3dcd7 Mon Sep 17 00:00:00 2001
From: Jean-Michel Lacroix <lacroix@lepine-lacroix.info>
Date: Tue, 10 Nov 2015 13:36:57 -0500
Subject: [PATCH] bandwidthd: Addition of 2 variants of the bandwidthd package.
 Addition of the bandwithd package variant from the oldpackage Addition of the
 bandwidthd-pgsql package variant that can save also in a postgres database.
 Compile tested on CC and trunk (ar71xx and mvebu in both cases) run tested on
 CC (ar71xx) and trunk (r47397 on mvebu)

Signed-off-by: Jean-Michel Lacroix <lacroix@lepine-lacroix.info>
---
 utils/bandwidthd/Makefile                     | 124 ++++++++++++++++++
 .../bandwidthd/files/bandwidthd-pgsql.config  |  13 ++
 utils/bandwidthd/files/bandwidthd-pgsql.init  |  90 +++++++++++++
 utils/bandwidthd/files/bandwidthd.config      |  11 ++
 utils/bandwidthd/files/bandwidthd.init        |  88 +++++++++++++
 utils/bandwidthd/files/logo.gif               | Bin 0 -> 9431 bytes
 .../patches/010-dont-add-host-paths.patch     |  36 +++++
 .../patches/100-fix_config_file_location      |  31 +++++
 8 files changed, 393 insertions(+)
 create mode 100644 utils/bandwidthd/Makefile
 create mode 100644 utils/bandwidthd/files/bandwidthd-pgsql.config
 create mode 100644 utils/bandwidthd/files/bandwidthd-pgsql.init
 create mode 100644 utils/bandwidthd/files/bandwidthd.config
 create mode 100644 utils/bandwidthd/files/bandwidthd.init
 create mode 100644 utils/bandwidthd/files/logo.gif
 create mode 100644 utils/bandwidthd/patches/010-dont-add-host-paths.patch
 create mode 100644 utils/bandwidthd/patches/100-fix_config_file_location

diff --git a/utils/bandwidthd/Makefile b/utils/bandwidthd/Makefile
new file mode 100644
index 0000000000..6cbace921c
--- /dev/null
+++ b/utils/bandwidthd/Makefile
@@ -0,0 +1,124 @@
+#
+# Copyright (C) 2006-2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bandwidthd
+PKG_VERSION:=2.0.1
+PKG_RELEASE:=5
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=@SF/bandwidthd
+PKG_MD5SUM:=aa79aad7bd489fd2cae1f7dc086ca8b6
+
+PKG_MAINTAINER:=Jean-Michel Lacroix <lacroix@lepine-lacroix.info>
+
+PKG_LICENSE:=GPL-2.0
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/bandwidthd/Default
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Bandwidthd
+  URL:=http://bandwidthd.sourceforge.net/
+endef
+
+define Package/bandwidthd
+$(call Package/bandwidthd/Default)
+  TITLE += (without postgresql)
+  VARIANT:=no-pgsql
+  DEPENDS:=+libgd +libpcap
+endef
+
+define Package/bandwidthd-pgsql
+$(call Package/bandwidthd/Default)
+  TITLE += (with postgresql enabled)
+  VARIANT:=pgsql
+  DEPENDS:=+libgd +libpcap +libpq
+endef
+
+define Package/bandwidthd/description
+  A bandwidthd tracking utility.
+endef
+
+define Package/bandwidthd-pgsql/description
+$(call Package/bandwidthd/description)
+With the ability to store in a postgresql database.
+endef
+
+define Package/bandwidthd/daemon
+ This package contains bandwidthd a bandwith tracking utility.
+endef
+
+define Package/bandwidthd-pgsql/daemon
+ This package contains bandwidthd a bandwith tracking utility.
+endef
+
+ifeq ($(BUILD_VARIANT),no-pgsql)
+CONFIGURE_ARGS += \
+	ac_cv_file__sw_lib=no \
+	ac_cv_file__sw_include=no \
+	ac_cv_file__usr_pkg_lib=no \
+	ac_cv_file__usr_pkg_include=no \
+	ac_cv_file__usr_local_pgsql_lib=no \
+	ac_cv_file__usr_local_pgsql_include=no \
+	ac_cv_lib_pq_PQconnectdb=no 
+endif
+
+ifeq ($(BUILD_VARIANT),pgsql)
+CONFIGURE_ARGS += \
+        ac_cv_file__sw_lib=no \
+        ac_cv_file__sw_include=no \
+        ac_cv_file__usr_pkg_lib=no \
+        ac_cv_file__usr_pkg_include=no \
+        ac_cv_file__usr_local_pgsql_lib=no \
+        ac_cv_file__usr_local_pgsql_include=no
+endif
+
+EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
+EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
+
+define Package/bandwidthd/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bandwidthd $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/bandwidthd.config $(1)/etc/config/bandwidthd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/bandwidthd.init $(1)/etc/init.d/bandwidthd
+	$(INSTALL_DIR) $(1)/www
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/htdocs/legend.gif $(1)/www/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/htdocs/logo.gif $(1)/www/
+endef
+
+define Package/bandwidthd-pgsql/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bandwidthd $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/bandwidthd-pgsql.config $(1)/etc/config/bandwidthd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/bandwidthd-pgsql.init $(1)/etc/init.d/bandwidthd
+	$(INSTALL_DIR) $(1)/www/phphtdocs
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/htdocs/legend.gif $(1)/www/
+	$(INSTALL_DATA) ./files/logo.gif $(1)/www/
+	$(INSTALL_DIR) $(1)/usr/share/postgresql
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/schema.postgresql $(1)/usr/share/postgresql
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/phphtdocs/bd_pgsql_purge.sh $(1)/usr/share/postgresql
+endef
+
+define Package/bandwidthd/conffiles
+/etc/config/bandwidthd
+endef
+
+define Package/bandwidthd-pgsql/conffiles
+/etc/config/bandwidthd
+endef
+
+$(eval $(call BuildPackage,bandwidthd))
+$(eval $(call BuildPackage,bandwidthd-pgsql))
diff --git a/utils/bandwidthd/files/bandwidthd-pgsql.config b/utils/bandwidthd/files/bandwidthd-pgsql.config
new file mode 100644
index 0000000000..0f87687925
--- /dev/null
+++ b/utils/bandwidthd/files/bandwidthd-pgsql.config
@@ -0,0 +1,13 @@
+config bandwidthd
+	option dev	br-lan
+	option subnets		"192.168.1.0/24"
+	option skip_intervals	0
+	option graph_cutoff	1024
+	option promiscuous	true
+	option output_cdf	false
+	option recover_cdf	false
+	option filter		ip
+	option graph		true
+	option meta_refresh	150
+	option disabled_pgsql_connect_string	"user = postgres dbname = bandwidthd host = 192.168.1.1"
+	option disabled_sensor_id	"openwrt.mydomain.domain"
diff --git a/utils/bandwidthd/files/bandwidthd-pgsql.init b/utils/bandwidthd/files/bandwidthd-pgsql.init
new file mode 100644
index 0000000000..232fa0cb8f
--- /dev/null
+++ b/utils/bandwidthd/files/bandwidthd-pgsql.init
@@ -0,0 +1,90 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008-2015 OpenWrt.org
+
+START=99
+
+config_cb() {
+	local cfg_type="$1"
+	local cfg_name="$2"
+
+	case "$cfg_type" in
+	        bandwidthd)
+	                append cfgs "$cfg_name"
+	        ;;
+	esac
+}
+
+export_bool() {
+	local option="$1"
+	local section="$2"
+	local _loctmp
+	config_get_bool _loctmp "$section" "$option"
+	if [ -n "$_loctmp" ]; then
+		conffile="${conffile}$option "
+		if [ 1 -eq "$_loctmp" ]; then
+			conffile="${conffile}true"
+		else
+			conffile="${conffile}false"
+		fi
+		conffile="${conffile}\n"
+	fi
+}
+
+export_number() {
+	local option="$1"
+	local section="$2"
+	local _loctmp
+	config_get _loctmp "$section" "$option"
+	if [ -n "$_loctmp" ]; then
+		conffile="${conffile}$option ${_loctmp}\n"
+	fi
+}
+
+export_string() {
+	local option="$1"
+	local section="$2"
+	local _loctmp
+	config_get _loctmp "$section" "$option"
+	if [ -n "$_loctmp" ]; then
+		conffile="${conffile}$option \"${_loctmp}\"\n"
+	fi
+}
+
+start() {
+	local subnet conffile
+
+	[ -d /tmp/bandwidthd ] || mkdir -p /tmp/bandwidthd && cp /www/legend.gif /www/logo.gif /tmp/bandwidthd/
+	[ -e /htdocs ] || ln -s /tmp/bandwidthd /htdocs
+	[ -e /www/bandwidthd ] || ln -s /tmp/bandwidthd /www/bandwidthd
+	rm -f /tmp/bandwidthd.conf
+	touch /tmp/bandwidthd.conf
+	[ -e /etc/bandwidthd.conf ] || ln -s /tmp/bandwidthd.conf /etc/bandwidthd.conf
+	
+	
+	config_load bandwidthd
+	for cfg in $cfgs; do
+		config_get subnets $cfg subnets
+			for subnet in $subnets; do
+				conffile="${conffile}subnet ${subnet}\n"
+			done
+		export_string dev $cfg
+		export_number skip_intervals $cfg
+		export_number graph_cutoff $cfg
+		export_bool promiscuous $cfg
+		export_bool output_cdf $cfg
+		export_bool recover_cdf $cfg
+		export_string filter $cfg
+		export_bool graph $cfg
+		export_number meta_refresh $cfg
+		export_string pgsql_connect_string $cfg
+		export_string sensor_id $cfg
+		[ -n "$conffile" ] && echo -e "$conffile" >>/tmp/bandwidthd.conf
+		unset conffile
+	done
+	cd /
+	service_start /usr/sbin/bandwidthd
+}
+
+stop() {
+	service_stop /usr/sbin/bandwidthd
+}
diff --git a/utils/bandwidthd/files/bandwidthd.config b/utils/bandwidthd/files/bandwidthd.config
new file mode 100644
index 0000000000..0769b1c8ea
--- /dev/null
+++ b/utils/bandwidthd/files/bandwidthd.config
@@ -0,0 +1,11 @@
+config bandwidthd
+	option dev	br-lan
+	option subnets		"192.168.1.0/24"
+	option skip_intervals	0
+	option graph_cutoff	1024
+	option promiscuous	true
+	option output_cdf	false
+	option recover_cdf	false
+	option filter		ip
+	option graph		true
+	option meta_refresh	150
diff --git a/utils/bandwidthd/files/bandwidthd.init b/utils/bandwidthd/files/bandwidthd.init
new file mode 100644
index 0000000000..6483daa2c0
--- /dev/null
+++ b/utils/bandwidthd/files/bandwidthd.init
@@ -0,0 +1,88 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008-2011 OpenWrt.org
+
+START=99
+
+config_cb() {
+	local cfg_type="$1"
+	local cfg_name="$2"
+
+	case "$cfg_type" in
+	        bandwidthd)
+	                append cfgs "$cfg_name"
+	        ;;
+	esac
+}
+
+export_bool() {
+	local option="$1"
+	local section="$2"
+	local _loctmp
+	config_get_bool _loctmp "$section" "$option"
+	if [ -n "$_loctmp" ]; then
+		conffile="${conffile}$option "
+		if [ 1 -eq "$_loctmp" ]; then
+			conffile="${conffile}true"
+		else
+			conffile="${conffile}false"
+		fi
+		conffile="${conffile}\n"
+	fi
+}
+
+export_number() {
+	local option="$1"
+	local section="$2"
+	local _loctmp
+	config_get _loctmp "$section" "$option"
+	if [ -n "$_loctmp" ]; then
+		conffile="${conffile}$option ${_loctmp}\n"
+	fi
+}
+
+export_string() {
+	local option="$1"
+	local section="$2"
+	local _loctmp
+	config_get _loctmp "$section" "$option"
+	if [ -n "$_loctmp" ]; then
+		conffile="${conffile}$option \"${_loctmp}\"\n"
+	fi
+}
+
+start() {
+	local subnet conffile
+
+	[ -d /tmp/bandwidthd ] || mkdir -p /tmp/bandwidthd && cp /www/legend.gif /www/logo.gif /tmp/bandwidthd/
+	[ -e /htdocs ] || ln -s /tmp/bandwidthd /htdocs
+	[ -e /www/bandwidthd ] || ln -s /tmp/bandwidthd /www/bandwidthd
+	rm -f /tmp/bandwidthd.conf
+	touch /tmp/bandwidthd.conf
+	[ -e /etc/bandwidthd.conf ] || ln -s /tmp/bandwidthd.conf /etc/bandwidthd.conf
+	
+	
+	config_load bandwidthd
+	for cfg in $cfgs; do
+		config_get subnets $cfg subnets
+			for subnet in $subnets; do
+				conffile="${conffile}subnet ${subnet}\n"
+			done
+		export_string dev $cfg
+		export_number skip_intervals $cfg
+		export_number graph_cutoff $cfg
+		export_bool promiscuous $cfg
+		export_bool output_cdf $cfg
+		export_bool recover_cdf $cfg
+		export_string filter $cfg
+		export_bool graph $cfg
+		export_number meta_refresh $cfg
+		[ -n "$conffile" ] && echo -e "$conffile" >>/tmp/bandwidthd.conf
+		unset conffile
+	done
+	cd /
+	service_start /usr/sbin/bandwidthd
+}
+
+stop() {
+	service_stop /usr/sbin/bandwidthd
+}
diff --git a/utils/bandwidthd/files/logo.gif b/utils/bandwidthd/files/logo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2ffec5605b72c48f49d8ee3dc069e80baccd6aa7
GIT binary patch
literal 9431
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

literal 0
HcmV?d00001

diff --git a/utils/bandwidthd/patches/010-dont-add-host-paths.patch b/utils/bandwidthd/patches/010-dont-add-host-paths.patch
new file mode 100644
index 0000000000..59a57373db
--- /dev/null
+++ b/utils/bandwidthd/patches/010-dont-add-host-paths.patch
@@ -0,0 +1,36 @@
+diff --git a/configure b/configure
+index 4c2546e..e516137 100755
+--- a/configure
++++ b/configure
+@@ -2439,11 +2439,6 @@ if test -n "$x_libraries" && test "x$x_libraries" != xNONE ; then
+ 	LDFLAGS="$LDFLAGS -L$x_libraries"
+ fi
+ 
+-# May be equired for BSD
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-
+-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-
+ #Check for Darwin sw directory
+ echo "$as_me:2448: checking for /sw/lib" >&5
+ echo $ECHO_N "checking for /sw/lib... $ECHO_C" >&6
+@@ -2505,9 +2500,6 @@ fi
+ fi
+ echo "$as_me:2506: result: $ac_cv_file__usr_pkg_lib" >&5
+ echo "${ECHO_T}$ac_cv_file__usr_pkg_lib" >&6
+-if test $ac_cv_file__usr_pkg_lib = yes; then
+-  LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+-fi
+ 
+ echo "$as_me:2512: checking for /usr/pkg/include" >&5
+ echo $ECHO_N "checking for /usr/pkg/include... $ECHO_C" >&6
+@@ -3092,9 +3084,6 @@ fi
+ fi
+ echo "$as_me:3093: result: $ac_cv_file__usr_local_pgsql_lib" >&5
+ echo "${ECHO_T}$ac_cv_file__usr_local_pgsql_lib" >&6
+-if test $ac_cv_file__usr_local_pgsql_lib = yes; then
+-  LDFLAGS="$LDFLAGS -L/usr/local/pgsql/lib"
+-fi
+ 
+ echo "$as_me:3099: checking for /usr/local/pgsql/include" >&5
+ echo $ECHO_N "checking for /usr/local/pgsql/include... $ECHO_C" >&6
diff --git a/utils/bandwidthd/patches/100-fix_config_file_location b/utils/bandwidthd/patches/100-fix_config_file_location
new file mode 100644
index 0000000000..ae44cd2e47
--- /dev/null
+++ b/utils/bandwidthd/patches/100-fix_config_file_location
@@ -0,0 +1,31 @@
+--- bandwidthd-2.0.1/bandwidthd.c.orig	2008-05-09 10:06:37.000000000 -0500
++++ bandwidthd-2.0.1/bandwidthd.c	2008-05-09 10:32:54.000000000 -0500
+@@ -255,22 +255,22 @@
+ 
+ 	openlog("bandwidthd", LOG_CONS, LOG_DAEMON);
+ 
+-	if (stat("./etc/bandwidthd.conf", &StatBuf))
++	if (stat("/etc/bandwidthd.conf", &StatBuf))
+ 		{
+ 		chdir(INSTALL_DIR);
+-		if (stat("./etc/bandwidthd.conf", &StatBuf))
++		if (stat("/etc/bandwidthd.conf", &StatBuf))
+ 			{
+-			printf("Cannot find ./etc/bandwidthd.conf or %s/etc/bandwidthd.conf\n", INSTALL_DIR);
+-			syslog(LOG_ERR, "Cannot find ./etc/bandwidthd.conf or %s/etc/bandwidthd.conf", INSTALL_DIR);
++			printf("Cannot find /etc/bandwidthd.conf or %s/etc/bandwidthd.conf\n", INSTALL_DIR);
++			syslog(LOG_ERR, "Cannot find /etc/bandwidthd.conf or %s/etc/bandwidthd.conf", INSTALL_DIR);
+ 			exit(1);
+ 			}
+ 		}
+ 
+-	bdconfig_in = fopen("./etc/bandwidthd.conf", "rt");
++	bdconfig_in = fopen("/etc/bandwidthd.conf", "rt");
+ 	if (!bdconfig_in)
+ 		{
+ 		syslog(LOG_ERR, "Cannot open bandwidthd.conf");
+-		printf("Cannot open ./etc/bandwidthd.conf\n");
++		printf("Cannot open /etc/bandwidthd.conf\n");
+ 		exit(1);
+ 		}
+ 	bdconfig_parse();
-- 
2.30.2