Regression #13323 ยป 13323.patch
| src/etc/inc/captiveportal.inc | ||
|---|---|---|
|
$cpzoneprefix = CPPREFIX . $config['captiveportal'][$cpzone]['zoneid'];
|
||
|
$cpips = $cpzoneprefix . '_cpips';
|
||
|
$authtag = $cpzoneprefix . '_auth';
|
||
|
$passthrutag = $cpzoneprefix . '_passthru';
|
||
|
$passthrutag = $cpzoneprefix . '_auth';
|
||
|
$rdr_ports = captiveportal_zone_portalports($cpcfg);
|
||
|
|
||
|
foreach (explode(",", $cpcfg['interface']) as $cpifgrp) {
|
||
| ... | ... | |
|
$rules .= "pass out quick on {$realif} proto tcp from {$cpip} port {$portalias} to any flags any ridentifier {$captiveportal_increment()} keep state(sloppy)\n";
|
||
|
}
|
||
|
/* Allowed IP/MAC passthrough */
|
||
|
$rules .= "pass in quick from any to any tagged {$passthrutag} ridentifier {$captiveportal_increment()} keep state\n";
|
||
|
/* block non-authenticated clients access to internet */
|
||
|
$rules .= "block in quick on {$realif} from any to ! <{$cpips}> ! tagged {$authtag} ridentifier {$captiveportal_increment()}\n";
|
||
|
}
|
||
|
}
|
||
| ... | ... | |
|
|
||
|
$cpzoneprefix = CPPREFIX . $config['captiveportal'][$cpzone]['zoneid'];
|
||
|
if ($anchor == 'passthrumac') {
|
||
|
$tag = $cpzoneprefix . '_passthru';
|
||
|
$tag = $cpzoneprefix . '_auth';
|
||
|
} else {
|
||
|
$tag = $cpzoneprefix . '_' . $anchor;
|
||
|
}
|
||
| ... | ... | |
|
global $g, $config, $cpzone;
|
||
|
|
||
|
$cpzoneprefix = CPPREFIX . $config['captiveportal'][$cpzone]['zoneid'];
|
||
|
$tag = $cpzoneprefix . '_passthru';
|
||
|
$tag = $cpzoneprefix . '_auth';
|
||
|
|
||
|
if (empty($ipent['sn'])) {
|
||
|
$ipent['sn'] = '32';
|
||
| ... | ... | |
|
}
|
||
|
|
||
|
$cpzoneprefix = CPPREFIX . $config['captiveportal'][$cpzone]['zoneid'];
|
||
|
$tag = $cpzoneprefix . '_passthru';
|
||
|
$tag = $cpzoneprefix . '_auth';
|
||
|
$table = $cpzoneprefix . '_hostname_' . $hostnameid;
|
||
|
$host = 'hostname_' . $hostnameid;
|
||
|
list($pipeup, $pipedown) = captiveportal_pipe_configure($ipent, 'allowed', false);
|
||