Skip to content

long SMS decode and unbind handle #75

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

long SMS decode and unbind handle #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a82e6be
long SMS decode and unbind handle
ywshzh Dec 19, 2018
819e567
add udhi_field in Param
ywshzh Dec 23, 2018
f027851
add timeout to members
ywshzh Dec 23, 2018
02f79dd
Update consts.py
ywshzh Aug 5, 2019
a78a542
keep a newline in the end of the files
ywshzh Aug 5, 2019
b49df45
use the const SMPP_GSMFEAT_UDHI
ywshzh Aug 5, 2019
66cc1bd
just one line
ywshzh Aug 5, 2019
a5bf5ca
long SMS decode and unbind handle
ywshzh Dec 19, 2018
0c87c0b
long SMS decode and unbind handle
ywshzh Aug 9, 2019
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
25 changes: 18 additions & 7 deletions smpplib/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@

from smpplib import consts, exceptions, smpp

logger = logging.getLogger('smpplib.client')

logger = logging.getLogger(__name__)

class SimpleSequenceGenerator(object):

Expand Down Expand Up @@ -67,8 +66,9 @@ class Client(object):
def __init__(self, host, port, timeout=5, sequence_generator=None):
self.host = host
self.port = int(port)
self.timeout = timeout
self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self._socket.settimeout(timeout)
self._socket.settimeout(self.timeout)
if sequence_generator is None:
sequence_generator = SimpleSequenceGenerator()
self.sequence_generator = sequence_generator
Expand Down Expand Up @@ -106,7 +106,8 @@ def connect(self):
try:
if self._socket is None:
self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self._socket.connect((self.host, self.port))
self._socket.settimeout(self.timeout)
self._socket.connect((self.host, self.port))
self.state = consts.SMPP_CLIENT_STATE_OPEN
except socket.error:
raise exceptions.ConnectionError("Connection refused")
Expand Down Expand Up @@ -264,7 +265,11 @@ def set_message_received_handler(self, func):
def set_message_sent_handler(self, func):
"""Set new function to handle message sent event"""
self.message_sent_handler = func


def set_unbind_handler(self, func):
"""Set new function to handle message sent event"""
self.unbind_handler = func

@staticmethod
def message_received_handler(pdu, **kwargs):
"""Custom handler to process received message. May be overridden"""
Expand All @@ -279,6 +284,11 @@ def message_sent_handler(pdu, **kwargs):
"""
logger.warning('Message sent handler (Override me)')

@staticmethod
def unbind_handler(pdu, **kwargs):
"""Custom handler to process unbind. May be overridden"""
logger.warning('unbind received handler (Override me)')

def read_once(self, ignore_error_codes=None):
"""Read a PDU and act"""
try:
Expand All @@ -299,8 +309,9 @@ def read_once(self, ignore_error_codes=None):
)

if pdu.command == 'unbind': # unbind_res
logger.info('Unbind command received')
return
logger.warning('Unbind command received')
self.state = consts.SMPP_CLIENT_STATE_OPEN
self.unbind_handler(pdu)
elif pdu.command == 'submit_sm_resp':
self.message_sent_handler(pdu=pdu)
elif pdu.command == 'deliver_sm':
Expand Down
55 changes: 45 additions & 10 deletions smpplib/command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ class Command(pdu.PDU):
"""SMPP PDU Command class"""

params = {}

#UDHI params(Message identifier/Message parts/Message part number)
params_udhi_order = ('sar_msg_ref_num', 'sar_total_segments', 'sar_segment_seqnum')

def __init__(self, command, need_sequence=True, **kwargs):
super(Command, self).__init__(**kwargs)

Expand Down Expand Up @@ -271,6 +273,30 @@ def _parse_string(self, field, data, pos, length=None):

return data, pos

def _parse_udhi(self, field, data, pos, length):
"""Parse long message param (GSM UDHI)
Return (pos, length) tuple."""

udhi_field = self.params[field].udhi_field
udhi_flag = int(getattr(self, udhi_field))

#01xxxxxx UDHI, only for MT message
if udhi_flag & consts.SMPP_GSMFEAT_UDHI:
udhi_data = struct.unpack(">" + "b", data[pos:pos + 1])
udhi_len = int(udhi_data[0])
length = length - udhi_len - 1
pos += 3

for field_udhi in self.params_udhi_order:
size = self.params[field_udhi].size
fmt = self._int_pack_format(field_udhi)
unpacked_data = struct.unpack(">" + fmt, data[pos:pos + size])
field_value = ''.join(map(str, unpacked_data))
setattr(self, field_udhi, field_value)
pos += size

return pos, length

def _parse_ostring(self, field, data, pos, length=None):
"""
Parse an octet string from a PDU.
Expand All @@ -279,7 +305,8 @@ def _parse_ostring(self, field, data, pos, length=None):

if length is None:
length_field = self.params[field].len_field
length = int(getattr(self, length_field))
length = int(getattr(self, length_field))
pos, length = self._parse_udhi(field, data, pos, length)

setattr(self, field, data[pos:pos + length])
pos += length
Expand Down Expand Up @@ -363,14 +390,14 @@ def __init__(self, **kwargs):
if kwargs.get('type') not in (int, str, ostr, flag):
raise ValueError("Invalid parameter type: %s" % kwargs.get('type'))

valid_keys = ('type', 'size', 'min', 'max', 'len_field')
valid_keys = ('type', 'size', 'min', 'max', 'len_field', 'udhi_field')
for k in kwargs:
if k not in valid_keys:
raise KeyError("Key '%s' not allowed here" % k)

self.type = kwargs.get('type')

for param in ('size', 'min', 'max', 'len_field'):
for param in ('size', 'min', 'max', 'len_field', 'udhi_field'):
if param in kwargs:
setattr(self, param, kwargs[param])

Expand Down Expand Up @@ -472,7 +499,7 @@ class DataSM(Command):
'dest_network_type': Param(type=int, size=1),
'dest_bearer_type': Param(type=int, size=1),
'dest_telematics_id': Param(type=int, size=2),
'sar_msg_ref_num': Param(type=int, size=2),
'sar_msg_ref_num': Param(type=int, size=1),
'sar_total_segments': Param(type=int, size=1),
'sar_segment_seqnum': Param(type=int, size=1),
'more_messages_to_send': Param(type=int, size=1),
Expand Down Expand Up @@ -620,6 +647,11 @@ class SubmitSM(Command):

# Up to 254 octets of short message user data
short_message = None

#UDHI params(Message identifier/Message parts/Message part number)
sar_msg_ref_num = 0
sar_total_segments = 0
sar_segment_seqnum = 0

# Optional are taken from params list and are set dynamically when
# __init__ is called.
Expand All @@ -641,15 +673,16 @@ class SubmitSM(Command):
'data_coding': Param(type=int, size=1),
'sm_default_msg_id': Param(type=int, size=1),
'sm_length': Param(type=int, size=1),
'short_message': Param(type=ostr, max=254, len_field='sm_length'),

'short_message': Param(type=ostr, max=254,
len_field='sm_length',
udhi_field='esm_class'),
# Optional params
'user_message_reference': Param(type=int, size=2),
'source_port': Param(type=int, size=2),
'source_addr_subunit': Param(type=int, size=2),
'destination_port': Param(type=int, size=2),
'dest_addr_subunit': Param(type=int, size=1),
'sar_msg_ref_num': Param(type=int, size=2),
'sar_msg_ref_num': Param(type=int, size=1),
'sar_total_segments': Param(type=int, size=1),
'sar_segment_seqnum': Param(type=int, size=1),
'more_messages_to_send': Param(type=int, size=1),
Expand Down Expand Up @@ -745,13 +778,15 @@ class DeliverSM(SubmitSM):
'data_coding': Param(type=int, size=1),
'sm_default_msg_id': Param(type=int, size=1),
'sm_length': Param(type=int, size=1),
'short_message': Param(type=ostr, max=254, len_field='sm_length'),
'short_message': Param(type=ostr, max=254,
len_field='sm_length',
udhi_field='esm_class'),

# Optional params
'user_message_reference': Param(type=int, size=2),
'source_port': Param(type=int, size=2),
'destination_port': Param(type=int, size=2),
'sar_msg_ref_num': Param(type=int, size=2),
'sar_msg_ref_num': Param(type=int, size=1),
'sar_total_segments': Param(type=int, size=1),
'sar_segment_seqnum': Param(type=int, size=1),
'user_response_code': Param(type=int, size=1),
Expand Down
1 change: 1 addition & 0 deletions smpplib/consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,3 +382,4 @@
2: 'H',
4: 'L',
}