diff --git a/Wi-Fi-Sincoolka 5G.xml b/Wi-Fi-Sincoolka 5G.xml
deleted file mode 100644
index 7ddcb7e..0000000
--- a/Wi-Fi-Sincoolka 5G.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
- Sincoolka 5G
-
-
- 53696E636F6F6C6B61203547
- Sincoolka 5G
-
-
- ESS
- auto
-
-
-
- WPA2
- AES
- true
-
- enabled
- 720
- 128
- disabled
-
- user
-
-
-
- 25
- 0
- 0
- 0
-
-
-
- 25
-
-
- false
- radius.sin.cvut.cz
- 2b 8f 1b 57 33 0d bb a2 d0 7a 6c 51 f7 0e e9 0d da b9 ad 8e
-
- true
- false
-
- 26
-
- false
-
-
- false
- false
-
- true
- true
-
- true
-
-
-
-
-
-
-
-
-
-
-
- false
- 1813427014
-
-
diff --git a/Wi-Fi-Sincoolka.xml b/Wi-Fi-Sincoolka.xml
index 0656bf4..4415f18 100644
--- a/Wi-Fi-Sincoolka.xml
+++ b/Wi-Fi-Sincoolka.xml
@@ -6,9 +6,11 @@
53696E636F6F6C6B61
Sincoolka
+ false
ESS
auto
+ false
@@ -21,46 +23,35 @@
128
disabled
+ true
user
-
-
- 25
- 0
- 0
- 0
-
-
-
- 25
-
-
- false
- radius.sin.cvut.cz
- 2b 8f 1b 57 33 0d bb a2 d0 7a 6c 51 f7 0e e9 0d da b9 ad 8e
-
- true
- false
-
- 26
-
- false
-
-
- false
- false
-
- true
- true
-
- true
-
-
-
-
-
-
-
+
+
+ 21
+ 0
+ 0
+ 311
+
+
+
+
+ radius.sin.cvut.cz
+ 2b 8f 1b 57 33 d bb a2 d0 7a 6c 51 f7 e e9 d da b9 ad 8e
+ true
+
+
+
+
+
+ true
+ anonymous@sin.cvut.cz
+
+
+
+
+
@@ -68,4 +59,4 @@
false
1813427014
-
+
\ No newline at end of file
diff --git a/Wi-Fi-Sincoolka5G.xml b/Wi-Fi-Sincoolka5G.xml
new file mode 100644
index 0000000..8033972
--- /dev/null
+++ b/Wi-Fi-Sincoolka5G.xml
@@ -0,0 +1,62 @@
+
+
+ Sincoolka 5G
+
+
+ 53696E636F6F6C6B61203547
+ Sincoolka 5G
+
+ false
+
+ ESS
+ auto
+ false
+
+
+
+ WPA2
+ AES
+ true
+
+ enabled
+ 10
+ 128
+ disabled
+
+ true
+ user
+
+
+
+ 21
+ 0
+ 0
+ 311
+
+
+
+
+ radius.sin.cvut.cz
+ 2b 8f 1b 57 33 d bb a2 d0 7a 6c 51 f7 e e9 d da b9 ad 8e
+ true
+
+
+
+
+
+ true
+ anonymous@sin.cvut.cz
+
+
+
+
+
+
+
+
+
+ false
+ 1813427014
+
+
\ No newline at end of file
diff --git a/Wi-Fi-SincoolkaFT.xml b/Wi-Fi-SincoolkaFT.xml
new file mode 100644
index 0000000..c51926c
--- /dev/null
+++ b/Wi-Fi-SincoolkaFT.xml
@@ -0,0 +1,62 @@
+
+
+ Sincoolka FT
+
+
+ 53696E636F6F6C6B61204654
+ Sincoolka FT
+
+ false
+
+ ESS
+ auto
+ false
+
+
+
+ WPA2
+ AES
+ true
+
+ enabled
+ 10
+ 128
+ disabled
+
+ true
+ user
+
+
+
+ 21
+ 0
+ 0
+ 311
+
+
+
+
+ radius.sin.cvut.cz
+ 2b 8f 1b 57 33 d bb a2 d0 7a 6c 51 f7 e e9 d da b9 ad 8e
+ true
+
+
+
+
+
+ true
+ anonymous@sin.cvut.cz
+
+
+
+
+
+
+
+
+
+ false
+ 1813427014
+
+
\ No newline at end of file
diff --git a/sin-setup.bat b/sin-setup.bat
index 1d7f8b8..0d4a6a6 100644
--- a/sin-setup.bat
+++ b/sin-setup.bat
@@ -7,12 +7,15 @@ set rights_admin=0
NET SESSION >nul 2>&1
IF NOT %ERRORLEVEL% EQU 0 (
- echo ####### Running as a regular user #########
- echo # The Wi-Fi profiles will be installed #
- echo # for the current user. #
- echo # Run as administrator to install them #
- echo # for all users. #
- echo ###########################################
+ echo ############### !! FRIENDLY NOTICE ##############
+ echo # Please, run this script as an administrator. #
+ echo # Otherwise, the added Wi-Fi network will #
+ echo # NOT remember your username and password. #
+ echo # #
+ echo # Please close this window, right-click the #
+ echo # sin-setup.bat, and select #
+ echo # Run as administrator. #
+ echo #################################################
echo.
pause
) ELSE (
@@ -28,17 +31,31 @@ IF NOT %ERRORLEVEL% EQU 0 (
:main
cls
ECHO What you want to do now?
-ECHO 1. Configure Wi-Fi connection
-rem ECHO 2. Configure Wired connection
-ECHO 3. Print MAC adresses
-ECHO 4. Exit
+ECHO 1. Configure Wi-Fi connection - Sincoolka FT (recommended)
+ECHO 2. Configure Wi-Fi connection - Sincoolka (if the FT does not work properly)
+ECHO 3. Configure Wi-Fi connection - Sincoolka 5G (expert, 5 GHz only)
+ECHO.
+ECHO 4. Remove all Sincoolka profiles
+ECHO.
+IF %rights_admin% EQU 1 (
+ECHO 5. Configure wired connection for 802.1X
+ECHO.
+)
+ECHO 9. Print MAC adresses
+ECHO 0. Exit
+ECHO.
set choice=
set /p choice=Choice:
if not '%choice%'=='' set choice=%choice:~0,1%
-if '%choice%'=='1' goto setup_wifi
-rem if '%choice%'=='2' goto setup_eth
-if '%choice%'=='3' goto print_mac
-if '%choice%'=='4' EXIT
+if '%choice%'=='1' goto setup_wifi_ft
+if '%choice%'=='2' goto setup_wifi
+if '%choice%'=='3' goto setup_wifi_5g
+if '%choice%'=='4' goto cleanup_wifi
+IF %rights_admin% EQU 1 (
+ if '%choice%'=='5' goto setup_eth
+)
+if '%choice%'=='9' goto print_mac
+if '%choice%'=='0' EXIT
ECHO "%choice%" is not valid, try again
ECHO.
goto main
@@ -47,7 +64,22 @@ goto main
-:: Import Sincoolka and Sincoolka 5G Wi-Fi profile
+:: Import Sincoolka FT Wi-Fi profile
+
+:setup_wifi_ft
+cls
+set cmd_user=current
+IF %rights_admin% EQU 1 (
+ set cmd_user=all
+)
+netsh wlan add profile "filename=%mypath%Wi-Fi-SincoolkaFT.xml" user=%cmd_user%
+
+echo.
+
+set /p iface="Press Enter to continue . . . "
+goto main
+
+:: Import Sincoolka Wi-Fi profile
:setup_wifi
cls
@@ -56,7 +88,21 @@ IF %rights_admin% EQU 1 (
set cmd_user=all
)
netsh wlan add profile "filename=%mypath%Wi-Fi-Sincoolka.xml" user=%cmd_user%
-netsh wlan add profile "filename=%mypath%Wi-Fi-Sincoolka 5G.xml" user=%cmd_user%
+
+echo.
+
+set /p iface="Press Enter to continue . . . "
+goto main
+
+:: Import Sincoolka 5G Wi-Fi profile
+
+:setup_wifi_5g
+cls
+set cmd_user=current
+IF %rights_admin% EQU 1 (
+ set cmd_user=all
+)
+netsh wlan add profile "filename=%mypath%Wi-Fi-Sincoolka5G.xml" user=%cmd_user%
echo.
@@ -64,6 +110,17 @@ set /p iface="Press Enter to continue . . . "
goto main
+:cleanup_wifi
+cls
+:: Cleanup all our Wi-Fi profiles
+netsh wlan delete profile name="Sincoolka" i=*
+netsh wlan delete profile name="Sincoolka FT" i=*
+netsh wlan delete profile name="Sincoolka 5G" i=*
+
+echo.
+
+set /p iface="Press Enter to continue . . . "
+goto main
@@ -98,7 +155,7 @@ echo.
:setEth
:: Print all network interfaces
-echo List of Avaliable Interfaces:
+echo List of Available Interfaces:
echo.
wmic nic where 'NOT Manufacturer like "%%Microsoft%%" and PhysicalAdapter=TRUE and NOT Manufacturer like "%%Windows%%"' get Manufacturer,MACAddress,NetConnectionID 2>nul
IF NOT %ERRORLEVEL% EQU 0 (
@@ -134,7 +191,7 @@ goto main
:print_mac
cls
-wmic nic where 'NOT Manufacturer like "%%Microsoft%%" and PhysicalAdapter=TRUE and NOT Manufacturer like "%%Windows%%"' get Manufacturer,MACAddress,NetConnectionID 2>nul
+wmic nic where 'NOT Manufacturer like "%%Microsoft%%" and NOT Manufacturer like "%%Windows%%"' get MACAddress,Caption,NetConnectionID 2>nul
IF NOT %ERRORLEVEL% EQU 0 (
getmac /v 2>nul
IF NOT %ERRORLEVEL% EQU 0 (