Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'newssidformat' into develop

This commit is contained in:
Conrad Lara - KG6JEI 2014-09-11 23:07:10 -07:00
parent 8417274fc4 6da1ad8b4e
commit 0e845a1743
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/etc/config.mesh/_setup
View File

@ -1,7 +1,7 @@
wifi_proto = static wifi_proto = static
wifi_ip = 10.<MAC2> wifi_ip = 10.<MAC2>
wifi_mask = 255.0.0.0 wifi_mask = 255.0.0.0
wifi_ssid = BroadbandHamnet-v2 wifi_ssid = BroadbandHamnet
wifi_mode = adhoc wifi_mode = adhoc
wifi_txpower = 19 wifi_txpower = 19
wifi_channel = 1 wifi_channel = 1

2
files/etc/config.mesh/_setup.default
View File

@ -1,7 +1,7 @@
wifi_proto = static wifi_proto = static
wifi_ip = 10.<MAC2> wifi_ip = 10.<MAC2>
wifi_mask = 255.0.0.0 wifi_mask = 255.0.0.0
wifi_ssid = BroadbandHamnet-v2 wifi_ssid = BroadbandHamnet
wifi_mode = adhoc wifi_mode = adhoc
wifi_txpower = 19 wifi_txpower = 19
wifi_channel = 1 wifi_channel = 1

2
files/etc/config.mesh/wireless
View File

@ -10,7 +10,7 @@ config wifi-iface
option device radio0 option device radio0
option network wifi option network wifi
option mode <wifi_mode> option mode <wifi_mode>
option ssid "<wifi_ssid>" option ssid "<wifi_ssid>-<wifi_chanbw>-v2"
option encryption none option encryption none
config wifi-iface config wifi-iface

2
files/www/cgi-bin/channelmaps.pm
View File

@ -151,7 +151,7 @@ sub is_wifi_chanbw_valid
my $boardinfo=hardware_info(); my $boardinfo=hardware_info();
if ( ( exists($boardinfo->{'rfband'}) ) && ( $boardinfo->{'rfband'} == "2400" ) && ( $wifi_chanbw != 20 ) ) if ( ( exists($boardinfo->{'rfband'}) ) && ( $boardinfo->{'rfband'} == "2400" ) && ( $wifi_chanbw != 20 ) )
{ {
if ( (( length $wifi_ssid >= 33 ) || ( length $wifi_ssid == 0 )) || ( $wifi_ssid =~ /BroadBandHamnet-v.*/i )) if ( (( length $wifi_ssid >= 33 ) || ( length $wifi_ssid == 0 )) || ( $wifi_ssid =~ /BroadBandHamnet/i ))
{ {
# 2.4ghz and default ssid not 20mhz wide -- Invalid chan_bw # 2.4ghz and default ssid not 20mhz wide -- Invalid chan_bw
return 0; return 0;

16
files/www/cgi-bin/setup
View File

@ -172,7 +172,12 @@ if($parms{button_save})
} }
} }
push (@errors, "invalid WiFi SSID") unless length $wifi_ssid <= 32; if ($config eq "mesh"){
push (@errors, "invalid WiFi SSID") unless length $wifi_ssid <= 27;
} else
{
push (@errors, "invalid WiFi SSID") unless length $wifi_ssid <= 32;
}
if ( is_channel_valid($wifi_channel) != 1 ) if ( is_channel_valid($wifi_channel) != 1 )
{ {
@ -488,7 +493,14 @@ else
if($wifi_proto ne "disabled") if($wifi_proto ne "disabled")
{ {
print "<tr><td>SSID</td>\n"; print "<tr><td>SSID</td>\n";
print "<td><input type=text size=15 name=wifi_ssid value='$wifi_ssid'></td></tr>\n"; print "<td><input type=text size=15 name=wifi_ssid value='$wifi_ssid'>";
if ($config eq "mesh")
{
print "-$wifi_chanbw-v2</td></tr>\n";
} else
{
print "</td></tr>\n";
}
if($wifi_mode eq "ap") if($wifi_mode eq "ap")
{ {