Skip to content

Refactored Client.read_pdu() #198

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

Merged
code-of-kpp merged 1 commit into from
Apr 15, 2022
Merged

Refactored Client.read_pdu() #198

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
43 changes: 22 additions & 21 deletions smpplib/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,39 +226,40 @@ def send_pdu(self, p):

return True

def _recv_exact(self, exact_size):
"""
Keep reading from self._socket until exact_size bytes have been read
"""
parts = []
received = 0
while received < exact_size:
try:
part = self._socket.recv(exact_size - received)
except socket.timeout:
raise
except socket.error as e:
self.logger.warning(e)
raise exceptions.ConnectionError()
if not part:
raise exceptions.ConnectionError()
received += len(part)
parts.append(part)
return b"".join(parts)

def read_pdu(self):
"""Read PDU from the SMSC"""

self.logger.debug('Waiting for PDU...')

try:
raw_len = self._socket.recv(4)
except socket.timeout:
raise
except socket.error as e:
self.logger.warning(e)
raise exceptions.ConnectionError()
if not raw_len:
raise exceptions.ConnectionError()
raw_len = self._recv_exact(4)

try:
length = struct.unpack('>L', raw_len)[0]
except struct.error:
self.logger.warning('Receive broken pdu... %s', repr(raw_len))
raise exceptions.PDUError('Broken PDU')

raw_pdu = raw_len
while len(raw_pdu) < length:
try:
raw_pdu_part = self._socket.recv(length - len(raw_pdu))
except socket.timeout:
raise
except socket.error as e:
self.logger.warning(e)
raise exceptions.ConnectionError()
if not raw_pdu_part:
raise exceptions.ConnectionError()
raw_pdu += raw_pdu_part
raw_pdu = raw_len + self._recv_exact(length - 4)

self.logger.debug('<<%s (%d bytes)', binascii.b2a_hex(raw_pdu), len(raw_pdu))

Expand Down