Skip to content

✨(issue-150) additional connect_data #152

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
kurenai-ryu wants to merge 3 commits into
base: master
Choose a base branch
from
Open

✨(issue-150) additional connect_data #152

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80ec171
:sparkles:(issue-150) additional connect_data
Oct 18, 2022
1979cf5
:bug:(issue-150) add recv retry
Oct 18, 2022
b816b8b
:bug:(issue-150) keep style
Oct 18, 2022
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
12 changes: 9 additions & 3 deletions zk/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ def __test_tcp_top(self, packet):
return size!
"""
if len(packet)<=8:
if self.verbose: print('incomplete response? ' + codecs.encode(packet,'hex'))
return 0
tcp_header = unpack('<HHI', packet[:8])
if tcp_header[0] == const.MACHINE_PREPARE_DATA_1 and tcp_header[1] == const.MACHINE_PREPARE_DATA_2:
Expand All @@ -249,7 +250,12 @@ def __send_command(self, command, command_string=b'', response_size=8):
self.__tcp_data_recv = self.__sock.recv(response_size + 8)
self.__tcp_length = self.__test_tcp_top(self.__tcp_data_recv)
if self.__tcp_length == 0:
raise ZKNetworkError("TCP packet invalid")
#retries once! TODO: determine if only in connection packet
if self.verbose: print('retry recv!')
self.__tcp_data_recv = self.__sock.recv(response_size + 8)
self.__tcp_length = self.__test_tcp_top(self.__tcp_data_recv)
if self.__tcp_length == 0:
raise ZKNetworkError("TCP packet invalid")
self.__header = unpack('<4H', self.__tcp_data_recv[8:16])
self.__data_recv = self.__tcp_data_recv[8:]
else:
Expand Down Expand Up @@ -356,7 +362,7 @@ def __encode_time(self, t):
)
return d

def connect(self):
def connect(self, connect_data=b''):
"""
connect to the device

Expand All @@ -370,7 +376,7 @@ def connect(self):
self.__create_socket()
self.__session_id = 0
self.__reply_id = const.USHRT_MAX - 1
cmd_response = self.__send_command(const.CMD_CONNECT)
cmd_response = self.__send_command(const.CMD_CONNECT, connect_data)
self.__session_id = self.__header[2]
if cmd_response.get('code') == const.CMD_ACK_UNAUTH:
if self.verbose: print ("try auth")
Expand Down