From 61d6a840d01acf1aa744ed8c97c6acd903ce2ccc Mon Sep 17 00:00:00 2001
From: Stephen Beaver <sbeaver@netgate.com>
Date: Wed, 22 Jun 2016 10:49:15 -0400
Subject: Allow IGMP Proxy logging verbosity to be selected via system log
 settings (PR 2901)

(cherry picked from commit 2bd0585e30e5ec8fc3b79ca3f579bf9a7c1bcbc8)
---
 src/etc/inc/services.inc                   |  7 ++++++-
 src/usr/local/www/status_logs_settings.php | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 6ee7a07..00c5b59 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -1634,7 +1634,12 @@ EOD;
 	fclose($igmpfl);
 	unset($igmpconf);
 
-	mwexec_bg("/usr/local/sbin/igmpproxy -v {$g['tmp_path']}/igmpproxy.conf");
+	if (isset($config['syslog']['igmpxverbose'])) {
+		mwexec_bg("/usr/local/sbin/igmpproxy -v {$g['tmp_path']}/igmpproxy.conf");
+	} else {
+		mwexec_bg("/usr/local/sbin/igmpproxy {$g['tmp_path']}/igmpproxy.conf");
+	}
+
 	log_error(gettext("Started IGMP proxy service."));
 
 	return 0;
diff --git a/src/usr/local/www/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php
index 7d05457..155f527 100644
--- a/src/usr/local/www/status_logs_settings.php
+++ b/src/usr/local/www/status_logs_settings.php
@@ -94,6 +94,7 @@ $pconfig['rawfilter'] = isset($config['syslog']['rawfilter']);
 $pconfig['filterdescriptions'] = $config['syslog']['filterdescriptions'];
 $pconfig['disablelocallogging'] = isset($config['syslog']['disablelocallogging']);
 $pconfig['logfilesize'] = $config['syslog']['logfilesize'];
+$pconfig['igmpxverbose'] = isset($config['syslog']['igmpxverbose']);
 
 if (!$pconfig['nentries']) {
 	$pconfig['nentries'] = 50;
@@ -170,11 +171,14 @@ if ($_POST['resetlogs'] == gettext("Reset Log Files")) {
 		$config['syslog']['nologprivatenets'] = $_POST['logprivatenets'] ? false : true;
 		$config['syslog']['nolognginx'] = $_POST['lognginx'] ? false : true;
 		$config['syslog']['rawfilter'] = $_POST['rawfilter'] ? true : false;
+		$config['syslog']['igmpxverbose'] = $_POST['igmpxverbose'] ? true : false;
+
 		if (is_numeric($_POST['filterdescriptions']) && $_POST['filterdescriptions'] > 0) {
 			$config['syslog']['filterdescriptions'] = $_POST['filterdescriptions'];
 		} else {
 			unset($config['syslog']['filterdescriptions']);
 		}
+
 		if ($config['syslog']['enable'] == false) {
 			unset($config['syslog']['remoteserver']);
 			unset($config['syslog']['remoteserver2']);
@@ -312,6 +316,13 @@ $section->addInput(new Form_Checkbox(
 	$pconfig['rawfilter']
 ))->setHelp(gettext('If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information, but it is more difficult to read.'));
 
+$section->addINput(new Form_Checkbox(
+	'igmpxverbose',
+	'IGMP Proxy',
+	'Enable verbose logging (Default is terse logging)',
+	$pconfig['igmpxverbose']
+));
+
 $section->addInput(new Form_Select(
 	'filterdescriptions',
 	'Where to show rule descriptions',
-- 
cgit v1.1