Merge pull request #282 from zeridon/improve-manufacturer-checking

Improve manufacturer checking

Author: andrewjfreyer

monitor.sh

@@ -25,7 +25,7 @@
 # ----------------------------------------------------------------------------------------
 
 #VERSION NUMBER
-export version=0.2.198
+export version=0.2.200
 
 #COLOR OUTPUT FOR RICH OUTPUT 
 ORANGE=$'\e[1;33m'
@@ -1100,7 +1100,9 @@ while true; do
 					publish_presence_message  \
 					"id=$addr" \
 					"confidence=$device_state" \
+					"name=${known_public_device_name[$addr]}" \
 					"type=KNOWN_MAC"
+
 				done
 
 			elif [[ $mqtt_topic_branch =~ .*ADD\ STATIC\ DEVICE.* ]] || [[ $mqtt_topic_branch =~ .*DELETE\ STATIC\ DEVICE.* ]]; then 

support/btle

@@ -348,8 +348,8 @@ btle_text_listener () {
 
 		#DEFINE VARAIBLES
 		while IFS= read -r line; do
-
-
+			#maintain the pipe for faster machines. 
+			printf "%s\n" "" > packet_pipe
 			if [[ $line =~ ^\> ]] || [[ $line =~ ^\< ]] || [[ $line =~ RSSI ]]; then
 				[[ $line =~ RSSI ]] && packet="$packet~$line"
 				if [[ $packet =~ ^\> ]]; then 

support/data

@@ -33,6 +33,23 @@ determine_manufacturer () {
 		#EXCEPTION FOR SUSPECT PRODUCTS
 		[[ $address =~ ^FF:FF ]] && manufacturer="SIG Unassigned or Noncompliant OEM"
 
+		# If no cache try if we have ieee-data
+		if [ -z "$manufacturer" ] ; then
+			_temp=$(echo ${address:0:8} | sed 's/://gi')
+			_found=false
+			local remote_result=''
+			if [ ! ${_found} ] && [ -f /var/lib/ieee-data/oui.csv ] ; then
+				remote_result=$(egrep ",${_temp}," /var/lib/ieee-data/oui.csv | cut -d\, -f3)
+				_found=true
+			fi
+			if [ ! ${_found} ] && [ -f /usr/share/ieee-data/oui.csv ] ; then
+				remote_result=$(egrep ",${_temp}," /var/lib/ieee-data/oui.csv | cut -d\, -f3)
+				_found=true
+			fi
+			[ -n "$remote_result" ] && echo "${address:0:8} $remote_result" >> .manufacturer_cache
+			manufacturer="$remote_result"
+		fi
+
 		#IF CACHE DOES NOT EXIST, USE MACVENDORS.COM
 		if [ -z "$manufacturer" ]; then 
 			local remote_result=$(curl -sL https://api.macvendors.com/${address:0:8} | grep -vi "error" | head -1 | sed 's/[^A-Za-z ]//gi')
@@ -48,4 +65,4 @@ determine_manufacturer () {
 		[ -z "$manufacturer" ] && manufacturer="Unknown" && echo "${address:0:8}	Unknown" >> .manufacturer_cache
 		echo "$manufacturer"
 	fi 
-}
+}

support/mqtt

@@ -163,10 +163,9 @@ mqtt_error_handler () {
 
 	if [ -n "$received" ]; then 
 		#ERRORS 
-		[[ ${received^^} =~ .*"NO ROUTE TO HOST".* ]] && return_value=1 && print_message="networking errors, no route to host - check username, password, and host address"
-		[[ ${received^^} =~ .*"CONNECTION REFUSED".* ]] && return_value=1 && print_message="mqtt broker refused connection - check username, password, and host address"
+		[[ ${received^^} =~ .*CONNECTION.* ]] && [[ ${received^^} =~ .*REFUSED.* ]] && return_value=1 && print_message="mqtt broker refused connection - check username, password, and host address"
 		[[ ${received^^} =~ .*NETWORK.* ]] && [[ ${received^^} =~ .*UNREACHABLE.* ]] && return_value=0 && print_message="network is down. enqueuing command to try again after a delay"
-		[[ ${received^^} =~ .*"LOOKUP ERROR".* ]] && return_value=0 && print_message="issue connecting to mqtt server (lookup error). enqueuing command to try again after a delay"
+		[[ ${received^^} =~ .*LOOKUP.* ]] && [[ ${received^^} =~ .*ERROR.* ]] && return_value=0 && print_message="issue connecting to mqtt server (lookup error). enqueuing command to try again after a delay"
 
 
 		if [ -n "$last_error_message" ] && [ "$last_error_message" == "$print_message" ]; then