Skip to content

Bugfix/lookup p2p relay hostname #3

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bugfix/lookup p2p relay hostname #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a28a0c8
Merge pull request #11 from jdillenkofer/feature/cleanup-requirements
jdillenkofer Feb 19, 2021
f8eb870
Only use relay hosts for which the dns lookup works
jdillenkofer Feb 19, 2021
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
37 changes: 24 additions & 13 deletions src/baichuan_udp_layer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
DEFAULT_GATEWAY_ADDRESS = None if GATEWAYS == None or GATEWAYS['default'] == None else GATEWAYS['default'][netifaces.AF_INET]
BINDING_IFACE_IP = '' if DEFAULT_GATEWAY_ADDRESS == None else netifaces.ifaddresses(DEFAULT_GATEWAY_ADDRESS[1])[netifaces.AF_INET][0]['addr']

P2P_RELAY_HOSTS = [
socket.gethostbyname("p2p.reolink.com"),
socket.gethostbyname("p2p1.reolink.com"),
socket.gethostbyname("p2p2.reolink.com"),
socket.gethostbyname("p2p3.reolink.com"),
socket.gethostbyname("p2p14.reolink.com"),
socket.gethostbyname("p2p15.reolink.com"),
socket.gethostbyname("p2p6.reolink.com"),
socket.gethostbyname("p2p7.reolink.com"),
socket.gethostbyname("p2p8.reolink.com"),
socket.gethostbyname("p2p9.reolink.com")
P2P_RELAY_HOSTNAMES = [
"p2p.reolink.com",
"p2p1.reolink.com",
"p2p2.reolink.com",
"p2p3.reolink.com",
"p2p14.reolink.com",
"p2p15.reolink.com",
"p2p6.reolink.com",
"p2p7.reolink.com",
"p2p8.reolink.com",
"p2p9.reolink.com"
]

class BaichuanUdpLayer:
Expand All @@ -53,6 +53,17 @@ def __init__(self, device_sid, client_id, communication_port=0):
self.unack_messages = {}
#Generate new client ID to say the cammera that instance is a a new client to broadcast information
self.tid = random.randint(0, 4000)
self.p2p_relay_hosts = self._lookup_available_p2p_hosts()

def _lookup_available_p2p_hosts(self):
relay_hosts = []
for hostname in P2P_RELAY_HOSTNAMES:
try:
host = socket.gethostbyname(hostname)
relay_hosts.append(host)
except socket.gaierror:
pass
return relay_hosts

def discover_device(self):
self.socket.settimeout(0.2)
Expand Down Expand Up @@ -103,9 +114,9 @@ def p2p_discover(self):
index = -1
while True:
index += 1
if index >= len(P2P_RELAY_HOSTS):
if index >= len(self.p2p_relay_hosts):
raise "No P2P host available to register"
host = P2P_RELAY_HOSTS[index]
host = self.p2p_relay_hosts[index]
self._send_p2p_discovery(host)
try:
data, sender = self.socket.recvfrom(4096)
Expand Down