From f485299bd518d4753bd1c2075890f9487f62e5ad Mon Sep 17 00:00:00 2001
From: Sebastian Kinne <contact@sebkinne.com>
Date: Fri, 7 Apr 2017 14:28:56 +1000
Subject: [PATCH] Updated Captiveportal for Bash Bunny v1.1

---
 payloads/library/Captiveportal/README.md   | 11 +++++------
 payloads/library/Captiveportal/payload.txt | 10 ++++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/payloads/library/Captiveportal/README.md b/payloads/library/Captiveportal/README.md
index d6dc1789..f7c6a683 100644
--- a/payloads/library/Captiveportal/README.md
+++ b/payloads/library/Captiveportal/README.md
@@ -1,7 +1,7 @@
 # Captive Portal for the Bash Bunny
 
 Author: Sebkinne  
-Version: 1.1
+Version: 1.2
 
 ## Description
 
@@ -17,8 +17,7 @@ To capture more information from the user, simply add more form inputs to *porta
 
 ## STATUS
 
-| LED              | Status                              |
-| ---------------- | ----------------------------------- |
-| Green (blinking) | The captive portal is starting up   |
-| Blue (solid)     | The captive portal is ready for use |
-
+| LED      | Status                              |
+| ---------| ----------------------------------- |
+| SETUP    | The captive portal is starting up   |
+| ATTACK   | The captive portal is ready for use |
diff --git a/payloads/library/Captiveportal/payload.txt b/payloads/library/Captiveportal/payload.txt
index 13e8649e..073d1edc 100644
--- a/payloads/library/Captiveportal/payload.txt
+++ b/payloads/library/Captiveportal/payload.txt
@@ -2,7 +2,7 @@
 #
 # Title:         Captiveportal
 # Author:        Sebkinne
-# Version:       1.1
+# Version:       1.2
 
 # Add or remove inputs here
 INPUTS=(username password)
@@ -11,11 +11,13 @@ INPUTS=(username password)
 ATTACKMODE RNDIS_ETHERNET
 #ATTACKMODE ECM_ETHERNET
 
+
 ##################################################################
 #                  DO NOT EDIT BELOW THIS LINE                   #
 ##################################################################
 
-source bunny_helpers.sh
+
+GET SWITCH_POSITION
 WORKINGPATH="/root/udisk/payloads/$SWITCH_POSITION"
 
 # Sets up iptable forwarding and filters
@@ -35,7 +37,7 @@ function startCaptiveportal() {
     ./captiveportal ${INPUTS[@]}
 }
 
-LED G 200
+LED SETUP
 setupNetworking
 startCaptiveportal &
-LED B 0
+LED ATTACK