MTS

Author: Kirill Kirsanov

client.py

@@ -112,21 +112,34 @@ def SendMessages(self):
                     self.sendMessage(sphone, dphone, message)
         self.lock.release()
 
-    def sendMessage(self, sphone, tphone, message):
+    def sendMessage(self, sphone, tphone, message, op='tele2'):
         from . import gsm
+        cfg = dict()
+
+        nonums = "".join(filter(lambda x: not x.isdigit(), sphone))
+
+        if len(nonums)>0:
+            cfg['source_addr_ton'] = consts.SMPP_TON_ALNUM
+            cfg['source_addr_npi'] = consts.SMPP_TON_UNK
+            cfg['dest_addr_ton'] = consts.SMPP_TON_INTL
+            cfg['dest_addr_npi'] = consts.SMPP_NPI_ISDN
+        else:
+            cfg['source_addr_ton']=consts.SMPP_TON_NWSPEC
+            cfg['source_addr_npi'] = consts.SMPP_NPI_ISDN
+            cfg['dest_addr_ton'] = consts.SMPP_TON_NATNL
+            cfg['dest_addr_npi'] = consts.SMPP_NPI_ISDN
 
         try:
             parts, encoding_flag, msg_type_flag = gsm.make_parts(message)
 
             for part in parts:
                 pdu = self.send_message(
 
-                    source_addr_ton=consts.SMPP_TON_NWSPEC,
-                    source_addr_npi=consts.SMPP_NPI_ISDN,
+                    source_addr_ton=cfg['source_addr_ton'],
+                    source_addr_npi=cfg['source_addr_npi'],
                     source_addr=sphone,  # '1591',
-
-                    dest_addr_ton=consts.SMPP_TON_NATNL,
-                    dest_addr_npi=consts.SMPP_NPI_ISDN,
+                    dest_addr_ton=cfg['dest_addr_ton'],
+                    dest_addr_npi=cfg['dest_addr_npi'],
                     # Make sure thease two params are byte strings, not unicode:
                     destination_addr=tphone,
                     short_message=part,

command.py

@@ -152,7 +152,7 @@ def generate_params(self):
                 elif param.type is ostr:
                     value = self._generate_ostring(field)
                     if value:
-                        body += value
+                        body += value#.encode('utf8')
             #print value
         return body
 

pdu.py

@@ -284,15 +284,3 @@ def generate(self):
 
         return header + body
 
-
-        # 1
-        # big1 = b'0000005b00000005000000002c046bde0001013739353331343938343836000001313539312331313635303538310003000000000000000001311383000200000202000ca0373930343334393030303002040002001a0501000123'
-        # hearbeat
-        # ok = b'00000010800000150000000000000001'
-        # Тест
-        # test_rur = b'0000006200000005000000002d9e68ce000101373935333134393834383600000131353931233137383838303237000300000000000008000804220435044104421383000200000202000ca037393034333439303030300204000200200501000123'
-
-        # id:2108317357 sub:001 dlvrd:001 submit date:1611081450 done date:1611081450 stat:DELIVRD err:000 text:<unprintable_text>
-
-        # asd
-        # 0000005c0000000500000000369d7077000101373935333134393834383600000131353931233139313837313000030000000000000000034173641383000200000202000ca037393034333439303030300204000200370501000123'