From 5d7eb1667f20f57421bddeea71ac416e74fa6900 Mon Sep 17 00:00:00 2001
From: root <root@debian-BULLSEYE-live-builder-AMD64>
Date: Wed, 9 Aug 2023 23:33:55 -0400
Subject: [PATCH] rfkill bluetooth flag (option for blocking bluetooth leak)

---
 wipri | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/wipri b/wipri
index 8202042..1b81499 100644
--- a/wipri
+++ b/wipri
@@ -135,6 +135,7 @@ echo "   continuously changing [coordinated/simultaneous] times/addresses to mim
 echo "-p [static smartphone mimic] Set single static Samsung/Apple MAC identity"
 echo "-P [changing smartphone mimics] continously changing Samsung/Apple at rand times/mac addr"
 echo "-M [random machine-id change] - unique identifier"
+echo "-b [block bluetooth] using rfkill"
 echo "-r [randomizes mac continually changing times/addresses]" 
 echo "-m [Static MAC (Your Choice) Here]"
 echo "-i [rand (valid) MAC identity]"
@@ -278,7 +279,6 @@ function watchdev() {
 			if [ "$dstatus" != "up" ]; then
 				echo -e "${GREEN}$netdev${ENDCOLOR} ${RED}VERIFIED AWAY${ENDCOLOR}\n" && sleep .5
 				echo -e "${BLUE}TURNING $netdev RADIO${ENDCOLOR} ${RED}OFF${ENDCOLOR} ${BLUE}to prevent (WiFi Probe Req) SSID leaks${ENDCOLOR}\n" && sleep .5
-				#rfkill block bluetooth			# delete the hash at beginning of line to turn off bluetooth as well
 				nmcli radio wifi off || echo -e "${RED}ERR FAILED TO TURN OFF RADIO - requires nmcli${ENDCOLOR}\n"			
 				echo -e "${GREEN}TURNED WIFI RADIO${ENDCOLOR} ${RED}OFF${ENDCOLOR}"
 				continue 2
@@ -357,7 +357,7 @@ notify() {
 
 ##########################################################
 # flags
-while getopts ":d:wapPMrm:ihRsAH" arg; do
+while getopts ":d:wapPMbrm:ihRsAH" arg; do
 	case $arg in
 
 #####################################################################
@@ -366,7 +366,7 @@ while getopts ":d:wapPMrm:ihRsAH" arg; do
 	netdev=${OPTARG}
 	echo -e "device is ${RED}$netdev${ENDCOLOR}" 
 	export netdev				  	  
-	  ;;
+     ;;
 
 ######################################################################
 	# watches device and if disconnected long enough, bring down to prev identifier leaks
@@ -432,7 +432,7 @@ while getopts ":d:wapPMrm:ihRsAH" arg; do
      M)
 	echo -e "${RED}Removing Old machine-id To Prevent Tracking...${ENDCOLOR}"
 	rm -f /var/lib/dbus/machine-id /etc/machine-id || {
-	echo -e "${RED}ERR! DOES MACHINE-ID FILE EXIST?${ENDCOLOR}\n" 
+		echo -e "${RED}ERR! DOES MACHINE-ID FILE EXIST?${ENDCOLOR}\n" 
 	}
 	echo -e "${BLUE}Generating New Unique machine-id...${ENDCOLOR}"
 	dbus-uuidgen --ensure=/etc/machine-id && dbus-uuidgen --ensure && {
@@ -441,6 +441,13 @@ while getopts ":d:wapPMrm:ihRsAH" arg; do
 	}
 	;;
 
+######################################################################
+	# b - rfkill block bluetooth (to prevent accidental leakage)
+     b)
+	rfkill block bluetooth
+	echo -e "${RED}Bluetooth Blocked By rfkill${ENDCOLOR}"
+     ;;
+
 ######################################################################
     # Continually randomizing MAC address mode [changing times/addresses- all brands]
      r)