From 6da1ad8b4e7a0eaddb60750123a5a51228945e1c Mon Sep 17 00:00:00 2001
From: Conrad Lara - KG6JEI <KG6JEI@amsat.org>
Date: Thu, 11 Sep 2014 21:29:54 -0700
Subject: [PATCH] feature: Change SSID format to include rf channel bandwidth
 and protocol version

From now on all node SSID's will be NAME-<rf bandwidth>-v<protocol version>

tag: RequiresProtocolIncrement
---
 files/etc/config.mesh/_setup         |  2 +-
 files/etc/config.mesh/_setup.default |  2 +-
 files/etc/config.mesh/wireless       |  2 +-
 files/www/cgi-bin/channelmaps.pm     |  2 +-
 files/www/cgi-bin/setup              | 18 +++++++++++++++---
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/files/etc/config.mesh/_setup b/files/etc/config.mesh/_setup
index d098c8c3..f50ac8eb 100644
--- a/files/etc/config.mesh/_setup
+++ b/files/etc/config.mesh/_setup
@@ -1,7 +1,7 @@
 wifi_proto = static
 wifi_ip = 10.<MAC2>
 wifi_mask = 255.0.0.0
-wifi_ssid = BroadbandHamnet-v2
+wifi_ssid = BroadbandHamnet
 wifi_mode = adhoc
 wifi_txpower = 19
 wifi_channel = 1
diff --git a/files/etc/config.mesh/_setup.default b/files/etc/config.mesh/_setup.default
index 260ed687..d232109e 100644
--- a/files/etc/config.mesh/_setup.default
+++ b/files/etc/config.mesh/_setup.default
@@ -1,7 +1,7 @@
 wifi_proto = static
 wifi_ip = 10.<MAC2>
 wifi_mask = 255.0.0.0
-wifi_ssid = BroadbandHamnet-v2
+wifi_ssid = BroadbandHamnet
 wifi_mode = adhoc
 wifi_txpower = 19
 wifi_channel = 1
diff --git a/files/etc/config.mesh/wireless b/files/etc/config.mesh/wireless
index 91945f7f..a59b11ad 100644
--- a/files/etc/config.mesh/wireless
+++ b/files/etc/config.mesh/wireless
@@ -10,7 +10,7 @@ config wifi-iface
 	option device   radio0
 	option network	wifi
 	option mode     <wifi_mode>
-	option ssid     "<wifi_ssid>"
+	option ssid     "<wifi_ssid>-<wifi_chanbw>-v2"
 	option encryption none
 
 config wifi-iface
diff --git a/files/www/cgi-bin/channelmaps.pm b/files/www/cgi-bin/channelmaps.pm
index 877ca887..2bb6004e 100644
--- a/files/www/cgi-bin/channelmaps.pm
+++ b/files/www/cgi-bin/channelmaps.pm
@@ -151,7 +151,7 @@ sub is_wifi_chanbw_valid
     my $boardinfo=hardware_info();
     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
             return 0;
diff --git a/files/www/cgi-bin/setup b/files/www/cgi-bin/setup
index e1387f5a..ca8f7186 100755
--- a/files/www/cgi-bin/setup
+++ b/files/www/cgi-bin/setup
@@ -171,8 +171,13 @@ if($parms{button_save})
 	    push @errors, "invalid WiFi IP address";
 	}
     }
-	      
-    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 )
     {
@@ -488,7 +493,14 @@ else
 if($wifi_proto ne "disabled")
 {
     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")
     {