From edac1ad04471cdacd7dde9fb54190dc13d29ef29 Mon Sep 17 00:00:00 2001
From: Rich <SiloDS@gmail.com>
Date: Wed, 28 Jul 2021 09:36:39 +0100
Subject: [PATCH] .

---
 app/routes.py | 22 +++++++++++-----------
 config.py     |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/routes.py b/app/routes.py
index 43ee358..55159f3 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -1,6 +1,6 @@
 import subprocess
 
-from config import RPI, debug
+from config import RPI, debug, ClientInterface
 from flask import flash, redirect, render_template, url_for
 from flask_login import current_user, login_required, login_user, logout_user
 
@@ -8,10 +8,10 @@ from app import app
 from app.forms import LoginForm, WPAForm
 from app.models import User, Passwords
 
-CMD_SCAN = "sudo nmcli -t -f SSID,SIGNAL,IN-USE,SECURITY -e yes -m tab device wifi list ifname wlxf81a6719febb --rescan yes"
-CMD_JOIN = "sudo nmcli device wifi connect *SSID* ifname wlxf81a6719febb"
-CMD_JOINPW = "sudo nmcli device wifi connect *SSID* ifname wlxf81a6719febb password *PASSWORD*"
-CMD_DISCONNECT = "sudo nmcli device disconnect wlxf81a6719febb"
+CMD_SCAN = "sudo nmcli -t -f SSID,SIGNAL,IN-USE,SECURITY -e yes -m tab device wifi list ifname wlan1 --rescan yes"
+CMD_JOIN = "sudo nmcli device wifi connect *SSID* ifname wlan1"
+CMD_JOINPW = "sudo nmcli device wifi connect *SSID* ifname wlan1 password *PASSWORD*"
+CMD_DISCONNECT = "sudo nmcli device disconnect wlan1"
 # Error: Connection activation failed: (7) Secrets were required, but not provided.
 # Device 'wlxf81a6719febb' successfully activated with '11111-1111-11111-111111-11111111'
 
@@ -29,7 +29,7 @@ def scan_networks():
         output = subprocess.run(["sudo", "iwgetid"], stdout=subprocess.PIPE).stdout.decode("utf-8")
         current = output.partition("ESSID:")[2].strip().strip('"')
 
-        output = subprocess.run(["sudo", "iwlist", "wlan0", "scan"], stdout=subprocess.PIPE).stdout.decode("utf-8")
+        output = subprocess.run(["sudo", "iwlist", ClientInterface, "scan"], stdout=subprocess.PIPE).stdout.decode("utf-8")
         a = 0
         scan = []
         for line in output.splitlines():
@@ -135,7 +135,7 @@ network={{
                 ssid, form.password.data
             )
             output = subprocess.run(
-                ["sudo", "/usr/sbin/ifdown", "wlan0"], stdout=subprocess.PIPE, stderr=subprocess.PIPE
+                ["sudo", "/usr/sbin/ifdown", ClientInterface], stdout=subprocess.PIPE, stderr=subprocess.PIPE
             ).stdout.decode("utf-8")
             output = subprocess.run(
                 ["sudo", "/usr/bin/systemctl", "stop", "wpa_supplicant"], stdout=subprocess.PIPE, stderr=subprocess.PIPE
@@ -152,7 +152,7 @@ network={{
                     timeout=20,
                 ).stdout.decode("utf-8")
                 output = subprocess.run(
-                    ["sudo", "/usr/sbin/ifup", "wlan0"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=20
+                    ["sudo", "/usr/sbin/ifup", ClientInterface], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=20
                 ).stdout.decode("utf-8")
             except:
                 return render_template("message.html", message="Failt to connected to {}".format(ssid))
@@ -193,7 +193,7 @@ network={{
         )
 
         output = subprocess.run(
-            ["sudo", "/usr/sbin/ifdown", "wlan0"], stdout=subprocess.PIPE, stderr=subprocess.PIPE
+            ["sudo", "/usr/sbin/ifdown", ClientInterface], stdout=subprocess.PIPE, stderr=subprocess.PIPE
         ).stdout.decode("utf-8")
         output = subprocess.run(
             ["sudo", "/usr/bin/systemctl", "stop", "wpa_supplicant"], stdout=subprocess.PIPE, stderr=subprocess.PIPE
@@ -210,7 +210,7 @@ network={{
                 timeout=20,
             ).stdout.decode("utf-8")
             output = subprocess.run(
-                ["sudo", "/usr/sbin/ifup", "wlan0"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=20
+                ["sudo", "/usr/sbin/ifup", ClientInterface], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=20
             ).stdout.decode("utf-8")
         except:
             return render_template("message.html", message="Failt to connected to {}".format(ssid))
@@ -229,7 +229,7 @@ def disconnect(ssid):
         return render_template("message.html", message="Failed to Disconnect from {}".format(ssid))
     else:
         output = subprocess.run(
-            ["sudo", "/usr/sbin/ifdown", "wlan0"], stdout=subprocess.PIPE, stderr=subprocess.PIPE
+            ["sudo", "/usr/sbin/ifdown", ClientInterface], stdout=subprocess.PIPE, stderr=subprocess.PIPE
         ).stdout.decode("utf-8")
 
         return render_template("message.html", message="Sucessfully disconnected from {}".format(ssid))
diff --git a/config.py b/config.py
index ef7b3fb..5f6405e 100644
--- a/config.py
+++ b/config.py
@@ -4,7 +4,7 @@ basedir = os.path.abspath(os.path.dirname(__file__))
 
 debug = False
 RPI = True
-
+ClientInterface = "wlan1"
 
 class Config(object):
     SECRET_KEY = os.environ.get("SECRET_KEY") or "dfsads1!FASASF231(*&FADSs"