Merge branch 'master' into bootstrap

1 files changed, 52 insertions, 0 deletions

diff --git a/src/etc/rc.captiveportal_configure_mac b/src/etc/rc.captiveportal_configure_mac
new file mode 100755
index 0000000..b0daf68
--- /dev/null
+++ b/src/etc/rc.captiveportal_configure_mac
@@ -0,0 +1,52 @@
+#!/usr/local/bin/php-cgi -f
+<?php
+/*
+	rc.captiveportal_configure_mac
+	part of pfSense (https://www.pfsense.org)
+	Copyright (C) 2015 Ermal Luçi
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("config.inc");
+require("functions.inc");
+require_once("filter.inc");
+require("shaper.inc");
+require("captiveportal.inc");
+
+global $cpzone;
+
+$cpzone = isset($_GET['cpzone']) ? $_GET['cpzone'] : trim($argv[1]);
+$startidx = isset($_GET['startidx']) ? $_GET['startidx'] : trim($argv[2]);
+$stopidx = isset($_GET['cpzone']) ? $_GET['stopidx'] : trim($argv[3]);
+
+$cpzoneidx = $config['captiveportal'][$cpzone]['zoneid'];
+$filename = "{$g['tmp_path']}/{$cpzoneidx}_mac_{$startidx}_{$stopidx}";
+
+//log_error("STARTED: " . time() . " - {$cpzone} : $startidx : {$stopidx} : {$cpzoneidx} : {$filename}");
+captiveportal_passthrumac_configure($filename, $startidx, $stopidx);
+//log_error("STOPPED: " .time() . " - {$cpzone} : $startidx : {$stopidx} : {$cpzoneidx} : {$filename}");
+
+mwexec("/sbin/ipfw -x {$cpzoneidx} -q {$filename}");
+@unlink($filename);
+?>