Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Server - Add network configuration for force scan #518

Merged
merged 1 commit into from
Jul 8, 2024
Merged

Server - Add network configuration for force scan #518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions server/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import urllib.parse
from http.server import BaseHTTPRequestHandler, HTTPServer
from socketserver import ThreadingMixIn
import ipaddress

# Terminal color capability for all platforms
try:
Expand Down Expand Up @@ -82,12 +83,20 @@
DEBUGMODE = os.getenv("DEBUGMODE", "no").lower() == "yes"
HOST = os.getenv("HOST", None)
BROADCAST = os.getenv("BROADCAST", None)

# Set up broadcast address
if HOST and not BROADCAST:
BROADCAST = HOST.split('.')
BROADCAST[3] = '255'
BROADCAST = '.'.join(BROADCAST)
NETWORK = None

# If HOST specified, set up broadcast address and calculate network
if HOST:
if not BROADCAST:
BROADCAST = HOST.split('.')
BROADCAST[3] = '255'
BROADCAST = '.'.join(BROADCAST)
host_ip = ipaddress.IPv4Address(HOST)
broadcast_ip = ipaddress.IPv4Address(BROADCAST)
host_bits = int(host_ip)
broadcast_bits = int(broadcast_ip)
mask_length = 32 - (broadcast_bits - host_bits).bit_length()
NETWORK = str(ipaddress.IPv4Network(f"{host_ip}/{mask_length}", strict=False))

# Logging
log = logging.getLogger(__name__)
Expand Down Expand Up @@ -677,6 +686,8 @@ def api(port):
print(" Using Host IP: %s%s%s" % (cyan, HOST, dim))
if BROADCAST:
print(" Using Broadcast IP: %s%s%s" % (cyan, BROADCAST, dim))
if NETWORK:
print(" Using Network: %s%s%s" % (cyan, NETWORK, dim))
print(" UDP Ports: %s%d%s, %s%d%s, %s%d%s" % (cyan, UDPPORT, dim, cyan, UDPPORTS, dim, cyan, UDPPORTAPP, dim))
print(" TCP Port: %s%d%s" % (cyan, TCPPORT, dim))
print(" API Port: %s%d%s" % (cyan, APIPORT, dim))
Expand Down Expand Up @@ -719,7 +730,10 @@ def api(port):
# discover=True, wantips=None, wantids=None, snapshot=None, assume_yes=False, tuyadevices=[],
# maxdevices=0)
try:
found = scanner.devices(forcescan=True, verbose=False, discover=False, assume_yes=True, tuyadevices=tuyadevices)
if NETWORK:
found = scanner.devices(forcescan=[NETWORK], verbose=False, discover=False, assume_yes=True, tuyadevices=tuyadevices)
else:
found = scanner.devices(forcescan=True, verbose=False, discover=False, assume_yes=True, tuyadevices=tuyadevices)
except Exception as err:
log.error(f"Error during scanner.devices() {err}")
found = []
Expand Down
Loading