frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Change method of calculating channel and security

Browse Source
This commit is contained in:
Joe Haig 2016-08-12 17:29:56 +00:00
parent fe3b0e9513
commit c7ed97dd8b
2 changed files with 132 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
includes/configure_client.php
View File

@ -5,121 +5,121 @@
* *
*/ */
function DisplayWPAConfig(){ function DisplayWPAConfig(){
$status = ''; $status = '';
?> ?>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="panel panel-primary"> <div class="panel panel-primary">
<div class="panel-heading"><i class="fa fa-signal fa-fw"></i> Configure client <div class="panel-heading"><i class="fa fa-signal fa-fw"></i> Configure client
</div> </div>
<!-- /.panel-heading --> <!-- /.panel-heading -->
<div class="panel-body"> <div class="panel-body">
<?php echo $status; ?> <?php echo $status; ?>
<h4>Client settings</h4> <h4>Client settings</h4>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<?php <?php
// save WPA settings // save WPA settings
if( isset($_POST['SaveWPAPSKSettings']) ) { if( isset($_POST['SaveWPAPSKSettings']) ) {
$config = 'ctrl_interface=DIR='. RASPI_WPA_CTRL_INTERFACE .' GROUP=netdev $config = 'ctrl_interface=DIR='. RASPI_WPA_CTRL_INTERFACE .' GROUP=netdev
update_config=1 update_config=1
'; ';
$networks = $_POST['Networks']; $networks = $_POST['Networks'];
for( $x = 0; $x < $networks; $x++ ) { for( $x = 0; $x < $networks; $x++ ) {
$network = ''; $network = '';
$ssid = escapeshellarg( $_POST['ssid'.$x] ); $ssid = escapeshellarg( $_POST['ssid'.$x] );
$psk = escapeshellarg( $_POST['psk'.$x] ); $psk = escapeshellarg( $_POST['psk'.$x] );
if ( strlen($psk) >2 ) { if ( strlen($psk) >2 ) {
exec( 'wpa_passphrase '.$ssid. ' ' . $psk,$network ); exec( 'wpa_passphrase '.$ssid. ' ' . $psk,$network );
foreach($network as $b) { foreach($network as $b) {
$config .= "$b $config .= "$b
"; ";
} }
} }
} }
exec( "echo '$config' > /tmp/wifidata", $return ); exec( "echo '$config' > /tmp/wifidata", $return );
system( 'sudo cp /tmp/wifidata ' . RASPI_WPA_SUPPLICANT_CONFIG, $returnval ); system( 'sudo cp /tmp/wifidata ' . RASPI_WPA_SUPPLICANT_CONFIG, $returnval );
if( $returnval == 0 ) { if( $returnval == 0 ) {
echo '<div class="alert alert-success alert-dismissable">Wifi settings updated successfully echo '<div class="alert alert-success alert-dismissable">Wifi settings updated successfully
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'; <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
} else { } else {
echo '<div class="alert alert-danger alert-dismissable">Wifi settings failed to be updated echo '<div class="alert alert-danger alert-dismissable">Wifi settings failed to be updated
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'; <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
} }
// scan networks // scan networks
} elseif( isset($_POST['Scan']) ) { } elseif( isset($_POST['Scan']) ) {
$return = ''; $return = '';
exec( 'sudo wpa_cli scan',$return ); exec( 'sudo wpa_cli scan',$return );
sleep(3); sleep(3);
exec( 'sudo wpa_cli scan_results',$return ); exec( 'sudo wpa_cli scan_results',$return );
for( $shift = 0; $shift < 4; $shift++ ) { for( $shift = 0; $shift < 4; $shift++ ) {
array_shift($return); array_shift($return);
} }
// display output // display output
echo '<form method="POST" action="?page=wpa_conf" id="wpa_conf_form"><input type="hidden" id="Networks" name="Networks" /><div class="network" id="networkbox"></div>'; echo '<form method="POST" action="?page=wpa_conf" id="wpa_conf_form"><input type="hidden" id="Networks" name="Networks" /><div class="network" id="networkbox"></div>';
echo '<div class="row"><div class="col-lg-6"><input type="submit" class="btn btn-primary" value="Scan for networks" name="Scan" /> <input type="button" class="btn btn-primary" value="Add network" onClick="AddNetwork();" /> <input type="submit" class="btn btn-primary" value="Save" name="SaveWPAPSKSettings" onmouseover="UpdateNetworks(this)" id="Save" disabled /></div></div>'; echo '<div class="row"><div class="col-lg-6"><input type="submit" class="btn btn-primary" value="Scan for networks" name="Scan" /> <input type="button" class="btn btn-primary" value="Add network" onClick="AddNetwork();" /> <input type="submit" class="btn btn-primary" value="Save" name="SaveWPAPSKSettings" onmouseover="UpdateNetworks(this)" id="Save" disabled /></div></div>';
echo '<h4>Networks found</h4><div class="table-responsive"><table class="table table-hover">'; echo '<h4>Networks found</h4><div class="table-responsive"><table class="table table-hover">';
echo '<thead><tr><th></th><th>SSID</th><th>Channel</th><th>Signal</th><th>Security</th></tr></thead><tbody>'; echo '<thead><tr><th></th><th>SSID</th><th>Channel</th><th>Signal</th><th>Security</th></tr></thead><tbody>';
foreach( $return as $network ) { foreach( $return as $network ) {
$arrNetwork = preg_split("/[\t]+/",$network); $arrNetwork = preg_split("/[\t]+/",$network);
$bssid = $arrNetwork[0]; $bssid = $arrNetwork[0];
$channel = ConvertToChannel($arrNetwork[1]); $channel = ConvertToChannel($arrNetwork[1]);
$signal = $arrNetwork[2] . " dBm"; $signal = $arrNetwork[2] . " dBm";
$security = $arrNetwork[3]; $security = $arrNetwork[3];
$ssid = $arrNetwork[4]; $ssid = $arrNetwork[4];
echo '<tr><td><input type="button" class="btn btn-outline btn-primary" value="Connect" onClick="AddScanned(\''.$ssid.'\')" /></td> <td><strong>' . $ssid . "</strong></td> <td>" . $channel . "</td><td>" . $signal . "</td><td>". ConvertToSecurity($security) ."</td></tr>"; echo '<tr><td><input type="button" class="btn btn-outline btn-primary" value="Connect" onClick="AddScanned(\''.$ssid.'\')" /></td> <td><strong>' . $ssid . "</strong></td> <td>" . $channel . "</td><td>" . $signal . "</td><td>". ConvertToSecurity($security) ."</td></tr>";
} }
echo '</tbody></table>'; echo '</tbody></table>';
} else { } else {
// default action, output configured network(s) // default action, output configured network(s)
exec(' sudo cat ' . RASPI_WPA_SUPPLICANT_CONFIG, $return); exec(' sudo cat ' . RASPI_WPA_SUPPLICANT_CONFIG, $return);
$ssid = array(); $ssid = array();
$psk = array(); $psk = array();
foreach($return as $a) { foreach($return as $a) {
if(preg_match('/SSID/i',$a)) { if(preg_match('/SSID/i',$a)) {
$arrssid = explode("=",$a); $arrssid = explode("=",$a);
$ssid[] = str_replace('"','',$arrssid[1]); $ssid[] = str_replace('"','',$arrssid[1]);
} }
if(preg_match('/psk/i',$a)) { if(preg_match('/psk/i',$a)) {
$arrpsk = explode("=",$a); $arrpsk = explode("=",$a);
$psk[] = str_replace('"','',$arrpsk[1]); $psk[] = str_replace('"','',$arrpsk[1]);
} }
} }
$numSSIDs = count($ssid); $numSSIDs = count($ssid);
$output = '<form method="POST" action="?page=wpa_conf" id="wpa_conf_form"><input type="hidden" id="Networks" name="Networks" /><div class="network" id="networkbox">'; $output = '<form method="POST" action="?page=wpa_conf" id="wpa_conf_form"><input type="hidden" id="Networks" name="Networks" /><div class="network" id="networkbox">';
if ( $numSSIDs > 0 ) { if ( $numSSIDs > 0 ) {
for( $ssids = 0; $ssids < $numSSIDs; $ssids++ ) { for( $ssids = 0; $ssids < $numSSIDs; $ssids++ ) {
$output .= '<div id="Networkbox'.$ssids.'" class="NetworkBoxes"> $output .= '<div id="Networkbox'.$ssids.'" class="NetworkBoxes">
<div class="row"><div class="form-group col-md-4"><label for="code">Network '.$ssids.'</label></div></div> <div class="row"><div class="form-group col-md-4"><label for="code">Network '.$ssids.'</label></div></div>
<div class="row"><div class="form-group col-md-4"><label for="code" id="lssid0">SSID</label><input type="text" class="form-control" id="ssid0" name="ssid'.$ssids.'" value="'.$ssid[$ssids].'" onkeyup="CheckSSID(this)" /></div></div> <div class="row"><div class="form-group col-md-4"><label for="code" id="lssid0">SSID</label><input type="text" class="form-control" id="ssid0" name="ssid'.$ssids.'" value="'.$ssid[$ssids].'" onkeyup="CheckSSID(this)" /></div></div>
<div class="row"><div class="form-group col-md-4"><label for="code" id="lpsk0">PSK</label><input type="password" class="form-control" id="psk0" name="psk'.$ssids.'" value="'.$psk[$ssids].'" onkeyup="CheckPSK(this)" /></div></div> <div class="row"><div class="form-group col-md-4"><label for="code" id="lpsk0">PSK</label><input type="password" class="form-control" id="psk0" name="psk'.$ssids.'" value="'.$psk[$ssids].'" onkeyup="CheckPSK(this)" /></div></div>
<div class="row"><div class="form-group col-md-4"><input type="button" class="btn btn-outline btn-primary" value="Delete" onClick="DeleteNetwork('.$ssids.')" /></div></div>'; <div class="row"><div class="form-group col-md-4"><input type="button" class="btn btn-outline btn-primary" value="Delete" onClick="DeleteNetwork('.$ssids.')" /></div></div>';
} }
$output .= '</div><!-- /#Networkbox -->'; $output .= '</div><!-- /#Networkbox -->';
} else { } else {
$status = '<div class="alert alert-warning alert-dismissable">Not connected $status = '<div class="alert alert-warning alert-dismissable">Not connected
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'; <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>';
} }
$output .= '<div class="row"><div class="col-lg-6"><input type="submit" class="btn btn-primary" value="Scan for networks" name="Scan" /> <input type="button" class="btn btn-primary" value="Add network" onClick="AddNetwork();" /> <input type="submit" class="btn btn-primary" value="Save" name="SaveWPAPSKSettings" onmouseover="UpdateNetworks(this)" id="Save" disabled />'; $output .= '<div class="row"><div class="col-lg-6"><input type="submit" class="btn btn-primary" value="Scan for networks" name="Scan" /> <input type="button" class="btn btn-primary" value="Add network" onClick="AddNetwork();" /> <input type="submit" class="btn btn-primary" value="Save" name="SaveWPAPSKSettings" onmouseover="UpdateNetworks(this)" id="Save" disabled />';
$output .= '</form>'; $output .= '</form>';
echo $output; echo $output;
} }
?> ?>
<script type="text/Javascript">UpdateNetworks(this)</script> <script type="text/Javascript">UpdateNetworks(this)</script>
</form> </form>
</div><!-- ./ Panel body --> </div><!-- ./ Panel body -->
</div><!-- /.panel-primary --> </div><!-- /.panel-primary -->
</div><!-- /.col-lg-12 --> </div><!-- /.col-lg-12 -->
</div><!-- /.row --> </div><!-- /.row -->
<?php <?php
} }

70
includes/functions.php
View File

@ -85,18 +85,12 @@ function ParseConfig( $arrConfig ) {
* @return $channel * @return $channel
*/ */
function ConvertToChannel( $freq ) { function ConvertToChannel( $freq ) {
$channel = ($freq - 2407)/5;
$base = 2412; if ($channel > 0 && $channel < 14) {
$channel = 1; return $channel;
for( $x = 0; $x < 13; $x++ ) { } else {
if( $freq != $base ) { return 'Invalid Channel';
$base = $base + 5; }
$channel++;
} else {
return $channel;
}
}
return "Invalid Channel";
} }
/** /**
@ -105,36 +99,28 @@ function ConvertToChannel( $freq ) {
* @return string * @return string
*/ */
function ConvertToSecurity( $security ) { function ConvertToSecurity( $security ) {
$options = array();
switch( $security ) { preg_match_all('/\[([^\]]+)\]/s', $security, $matches);
case "[WPA2-PSK-CCMP][ESS]": foreach($matches[1] as $match) {
return "WPA2-PSK (AES)"; if (preg_match('/^(WPA\d?)/', $match, $protocol_match)) {
break; $protocol = $protocol_match[1];
case "[WPA2-PSK-TKIP][ESS]": $matchArr = explode('-', $match);
return "WPA2-PSK (TKIP)"; if (count($matchArr) > 2) {
break; $options[] = $protocol . ' ('. $matchArr[2] .')';
case "[WPA2-PSK-CCMP][WPS][ESS]": } else {
return "WPA/WPA2-PSK (TKIP/AES)"; $options[] = $protocol;
break; }
case "[WPA2-PSK-TKIP+CCMP][WPS][ESS]": }
return "WPA2-PSK (TKIP/AES) with WPS"; }
break;
case "[WPA-PSK-TKIP+CCMP][WPS][ESS]": if (count($options) === 0) {
return "WPA-PSK (TKIP/AES) with WPS"; // This could also be WEP but wpa_supplicant doesn't have a way to determine
break; // this.
case "[WPA-PSK-TKIP][WPA2-PSK-CCMP][WPS][ESS]": // And you shouldn't be using WEP these days anyway.
return "WPA/WPA2-PSK (TKIP/AES)"; return 'Open';
break; } else {
case "[WPA-PSK-TKIP+CCMP][WPA2-PSK-TKIP+CCMP][ESS]": return implode('<br />', $options);
return "WPA/WPA2-PSK (TKIP/AES)"; }
break;
case "[WPA-PSK-TKIP][ESS]":
return "WPA-PSK (TKIP)";
break;
case "[WEP][ESS]":
return "WEP";
break;
}
} }
/** /**