mathieu/jarvis-client
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved server detection

Browse Source
This commit is contained in:
Mathieu B 2021-08-01 10:40:08 +02:00
parent 037f244176
commit 40746b6bbf
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jarvis/utils/server_utils.py
View File

@ -11,7 +11,6 @@ server_ip = None
def send_record_to_server(frame_data): def send_record_to_server(frame_data):
# TODO: use config or even ping to find the server on local network ?
url_service = "http://" + str(get_server_ip()) + ":" + str(get_server_port()) + "/process_audio_request" url_service = "http://" + str(get_server_ip()) + ":" + str(get_server_port()) + "/process_audio_request"
headers = CaseInsensitiveDict() headers = CaseInsensitiveDict()
@ -51,17 +50,20 @@ def get_server_ip():
def find_server_on_network(): def find_server_on_network():
global server_ip global server_ip
# first try on the most common mask 192.168.1.0/24 ip = socket.gethostbyname(socket.gethostname())
server_ip = find_device_on_network_with_opened_port(ipaddress.ip_network("192.168.1.0/24"),
config_utils.get_in_config('SERVER_PORT')) if ip.startswith("192.168.1"):
if server_ip is None: server_ip = find_device_on_network_with_opened_port(ipaddress.ip_network("192.168.1.0/24"),
# then 172.16.0.0/12 config_utils.get_in_config('SERVER_PORT'))
elif ip.startswith("172.16"):
server_ip = find_device_on_network_with_opened_port(ipaddress.ip_network("172.16.0.0/12"), server_ip = find_device_on_network_with_opened_port(ipaddress.ip_network("172.16.0.0/12"),
config_utils.get_in_config('SERVER_PORT')) config_utils.get_in_config('SERVER_PORT'))
if server_ip is None: elif ip.startswith("10."):
# and last but not least the 10.0.0.0/8 (damn that's gonna be long to scan) print("Warning: scanning for server on a huge network, please specify the server's ip in the config.json asap.")
server_ip = find_device_on_network_with_opened_port(ipaddress.ip_network("10.0.0.0/8"), server_ip = find_device_on_network_with_opened_port(ipaddress.ip_network("10.0.0.0/8"),
config_utils.get_in_config('SERVER_PORT')) config_utils.get_in_config('SERVER_PORT'))
else:
return None
print("Found server on : " + str(server_ip)) print("Found server on : " + str(server_ip))
server_ip = server_ip.compressed server_ip = server_ip.compressed