Merge pull request #36 from pespin/pack-big-endian

Konstantin Podshumok · web-flow · commit 657389cc7be8 · 2017-08-21T16:22:07.000+03:00
command: Pack struct in big-endian byte order
diff --git a/smpplib/command.py b/smpplib/command.py
@@ -168,7 +168,7 @@ def _generate_int(self, field):
         fmt = self._pack_format(field)
         data = getattr(self, field)
         if data:
-            return struct.pack(fmt, data)
+            return struct.pack(">" + fmt, data)
         else:
             return consts.NULL_STRING
 
@@ -268,9 +268,8 @@ def _parse_int(self, field, data, pos):
         Return (data, pos) tuple."""
 
         size = self.params[field].size
-        field_value = getattr(self, field)
-        unpacked_data = self._unpack(self._pack_format(field),
-            data[pos:pos + size])
+        fmt = self._pack_format(field)
+        unpacked_data = struct.unpack(">" + fmt, data[pos:pos + size])
         field_value = ''.join(map(str, unpacked_data))
         setattr(self, field, field_value)
         pos += size
diff --git a/smpplib/pdu.py b/smpplib/pdu.py
@@ -132,10 +132,6 @@ def parse(self, data):
         if len(data) > 16:
             self.parse_params(data[16:])
 
-    def _unpack(self, fmt, data):
-        """Unpack values. Uses struct.unpack. TODO: remove this"""
-        return struct.unpack(fmt, data)
-
     def generate(self):
         """Generate raw PDU"""
 
