From 311b9d5ffe2328e1ddb8d1c70871b5a6184ebef7 Mon Sep 17 00:00:00 2001
From: Conrad Lara - KG6JEI <KG6JEI@amsat.org>
Date: Fri, 10 Jul 2015 18:50:28 -0700
Subject: [PATCH 1/3] bugfix: Nodes are showing up as encrypted when they are
 not.

The code makes the assumption that the connection has not been modified to be encrypted (Standard is not under AREDN V3 protocol) but this may need to be changed in the future.
---
 files/usr/local/bin/wscan | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/usr/local/bin/wscan b/files/usr/local/bin/wscan
index 848324bb..ac17c245 100755
--- a/files/usr/local/bin/wscan
+++ b/files/usr/local/bin/wscan
@@ -175,7 +175,7 @@ while(1)
   
   $mode = "";                                                             
   $signal = 0;
-  $key = "none";
+  $key = "";
   ++$iters;                                                               
   $bbchan = `iw $iface info | grep channel | cut -d\\  -f2`;
 

From cc74123ad32d893086ba28470195a4a6f3092bc2 Mon Sep 17 00:00:00 2001
From: Conrad Lara - KG6JEI <KG6JEI@amsat.org>
Date: Fri, 10 Jul 2015 18:56:30 -0700
Subject: [PATCH 2/3] bugfix: vtund was missing from arednsysupgrad.conf

---
 files/etc/arednsysupgrade.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/etc/arednsysupgrade.conf b/files/etc/arednsysupgrade.conf
index a8a58c79..4adbe891 100644
--- a/files/etc/arednsysupgrade.conf
+++ b/files/etc/arednsysupgrade.conf
@@ -17,6 +17,7 @@
 /etc/config.mesh/_setup.ports.nat
 /etc/config.mesh/_setup.services.dmz
 /etc/config.mesh/_setup.services.nat
+/etc/config.mesh/vtun
 /etc/config.router/_setup
 /etc/config.router/_setup.dhcp
 /etc/config.router/_setup.ports

From 3c0f3ad14415322728c5c6c54083a904f38df129 Mon Sep 17 00:00:00 2001
From: Darryl Quinn <dman776@gmail.com>
Date: Sun, 12 Jul 2015 23:26:09 -0500
Subject: [PATCH 3/3] bugfix: tunnel install not posting to same page

---
 files/www/cgi-bin/tunfunc.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/www/cgi-bin/tunfunc.pm b/files/www/cgi-bin/tunfunc.pm
index cd894e03..e10dd6d8 100644
--- a/files/www/cgi-bin/tunfunc.pm
+++ b/files/www/cgi-bin/tunfunc.pm
@@ -198,7 +198,7 @@ sub vpn_setup_required()
     }
     print "<tr><td align=center><br><b>";
     print "Tunnel software needs to be installed.<br/>";
-    print "<form method='post' action='/cgi-bin/vpn' enctype='multipart/form-data'>\n";
+    print "<form method='post' action='/cgi-bin/$navpage' enctype='multipart/form-data'>\n";
     print "<input type=submit name=button_install value='Click to install' class='btn_tun_install' />";
     print "</form>";
     print "</b></td></tr>\n";