Better handling of LREAL, LINT, and ULINT CIP data types; Version 4.3.2

Author: pjkundert

server/enip/client.py

@@ -137,7 +137,7 @@ def parse_context( sender_context ):
 # client.CIP_TYPES
 # 
 #     The supported CIP data types, and their CIP 'tag_type' values, byte sizes and validators.  We
-# are generous with the "signed" types (eg. SINT, INT, DINT), and we actually allow the full
+# are generous with the "signed" types (eg. SINT, INT, DINT, LINT), and we actually allow the full
 # unsigned range, plus the negative range.  There is little risk to doing this, as all provided
 # values will fit legitimately into the data type without loss.  It does however, make acceptance of
 # automatically generated data easier, as we don't need to really know if the data is signed or
@@ -167,6 +167,9 @@ def bool_validate( b ):
     'SSTRING':	(parser.SSTRING.tag_type, 0,				str ),
     'BOOL':	(parser.BOOL.tag_type,	parser.BOOL.struct_calcsize,	bool_validate ),
     'REAL': 	(parser.REAL.tag_type,	parser.REAL.struct_calcsize,	float ),
+    'LREAL': 	(parser.LREAL.tag_type,	parser.LREAL.struct_calcsize,	float ),
+    'LINT':	(parser.LINT.tag_type,	parser.LINT.struct_calcsize,	lambda x: int_validate( x, -2**63, 2**64-1 )), # extra range
+    'ULINT':	(parser.ULINT.tag_type,	parser.ULINT.struct_calcsize,	lambda x: int_validate( x,  0,     2**64-1 )),
     'DINT':	(parser.DINT.tag_type,	parser.DINT.struct_calcsize,	lambda x: int_validate( x, -2**31, 2**32-1 )), # extra range
     'UDINT':	(parser.UDINT.tag_type,	parser.UDINT.struct_calcsize,	lambda x: int_validate( x,  0,     2**32-1 )),
     'INT':	(parser.INT.tag_type,	parser.INT.struct_calcsize,	lambda x: int_validate( x, -2**15, 2**16-1 )), # extra range

server/enip/get_attribute.py

@@ -158,16 +158,19 @@ class proxy( object ):
 
     """
     CIP_TYPES			= {
-        "real":		( parser.REAL,	"REAL" ),		# <name>: (<class>, <data-path> )
-        "sint":		( parser.SINT,	"SINT" ),
-        "usint":	( parser.USINT,	"USINT" ),
-        "int":		( parser.INT,	"INT" ),
-        "uint":		( parser.UINT,	"UINT" ),
-        "dint":		( parser.DINT,	"DINT" ),
-        "udint":	( parser.UDINT,	"UDINT" ),
-        "bool":		( parser.BOOL,	"BOOL" ),
-        "word":		( parser.WORD,	"WORD" ),
-        "dword":	( parser.DWORD,	"DWORD" ),
+        "real":		( parser.REAL,		"REAL" ),		# <name>: (<class>, <data-path> )
+        "lreal":	( parser.LREAL,		"LREAL" ),
+        "sint":		( parser.SINT,		"SINT" ),
+        "usint":	( parser.USINT,		"USINT" ),
+        "int":		( parser.INT,		"INT" ),
+        "uint":		( parser.UINT,		"UINT" ),
+        "dint":		( parser.DINT,		"DINT" ),
+        "udint":	( parser.UDINT,		"UDINT" ),
+        "lint":		( parser.LINT,		"LINT" ),
+        "ulint":	( parser.ULINT,		"ULINT" ),
+        "bool":		( parser.BOOL,		"BOOL" ),
+        "word":		( parser.WORD,		"WORD" ),
+        "dword":	( parser.DWORD,		"DWORD" ),
         "ipaddr":	( parser.IPADDR,	"IPADDR" ),		# a network-order UDINT as a dotted-quad
         "string":	( parser.STRING,	"STRING.string" ),
         "sstring":	( parser.SSTRING,	"SSTRING.string" ),

server/enip/main.py

@@ -1117,9 +1117,15 @@ def __setitem__( self, key, value ):
         typenames		= {
             "BOOL":	( parser.BOOL,	0 ),
             "INT":	( parser.INT,	0 ),
+            "UINT":	( parser.UINT,	0 ),
+            "LINT":	( parser.LINT,	0 ),
+            "ULINT":	( parser.ULINT,	0 ),
             "DINT":	( parser.DINT,	0 ),
+            "UDINT":	( parser.UDINT,	0 ),
             "SINT":	( parser.SINT,	0 ),
+            "USINT":	( parser.USINT,	0 ),
             "REAL":	( parser.REAL,  0.0 ),
+            "LREAL":	( parser.LREAL,  0.0 ),
             "SSTRING":	( parser.SSTRING, '' ),
             "STRING":	( parser.STRING, '' ),
         }

server/enip/parser.py

@@ -225,7 +225,7 @@ class DINT( TYPE ):
     struct_calcsize		= struct.calcsize( struct_format )
 
 class ULINT( TYPE ):
-    """An EtherNet/IP LINT; 64-bit unsigned integer"""
+    """An EtherNet/IP ULINT; 64-bit unsigned integer"""
     tag_type			= 0x00c9
     struct_format		= '<Q'
     struct_calcsize		= struct.calcsize( struct_format )
@@ -1738,6 +1738,7 @@ class typed_data( cpppo.dfa ):
     INT		yes		= 0x00c3	# 2 bytes
     DINT	yes		= 0x00c4	# 4 bytes
     REAL	yes		= 0x00ca	# 4 bytes
+    LREAL	yes		= 0x00cb	# 8 bytes
     USINT	yes		= 0x00c6	# 1 byte
     UINT	yes		= 0x00c7	# 2 bytes
     WORD			= 0x00d2	# 2 byte (16-bit boolean array)
@@ -1756,7 +1757,10 @@ class typed_data( cpppo.dfa ):
         UINT.tag_type:		UINT,
         DINT.tag_type:		DINT,
         UDINT.tag_type:		UDINT,
+        LINT.tag_type:		LINT,
+        ULINT.tag_type:		ULINT,
         REAL.tag_type:		REAL,
+        LREAL.tag_type:		LREAL,
         SSTRING.tag_type:	SSTRING,
         STRING.tag_type:	STRING,
     }

version.py

@@ -1,2 +1,2 @@
-__version_info__		= ( 4, 3, 1 )
+__version_info__		= ( 4, 3, 2 )
 __version__			= '.'.join( map( str, __version_info__ ))