Skip to content

Fix: Corrected issue #233 with struct.pack() #234

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
thats-i-t wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Corrected issue #233 with struct.pack() #234

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,18 @@ share/python-wheels/
*.egg
MANIFEST

# artifacts from installing package in editable mode
CMakeFiles/
CMakeCache.txt
install_manifest.txt
Release/*
*/Release/*
pyxcp/*.exe
*.vcxproj
*.filters
*.cmake
*.sln

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
Expand Down
7 changes: 6 additions & 1 deletion pyxcp/transport/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,12 @@ def _prepare_request(self, cmd, *data):
else:
packet = bytes(flatten(cmd_bytes, data))

header = self.HEADER.pack(len(packet), self.counter_send)
nr_args_expected = len(self.HEADER.unpack(b"\x00" * self.HEADER.size))
if nr_args_expected == 2:
header = self.HEADER.pack(len(packet), self.counter_send)
else: # if nr_args_expected == 1
header = self.HEADER.pack(len(packet))

self.counter_send = (self.counter_send + 1) & 0xFFFF

frame = header + packet
Expand Down