diff --git a/CHANGES b/CHANGES index e0d13d1335..67d9717d32 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-135 | 2019-03-07 13:14:00 -0800 + + * Fix typos in dnp3-protocol.pac (g0nzu1) + 2.6-132 | 2019-03-06 15:30:58 -0800 * GH-219: revert a breaking change to |x| operator for interval/time (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index 2ce4bd41ab..81bc4b1ee3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-132 +2.6-135 diff --git a/src/analyzer/protocol/dnp3/dnp3-protocol.pac b/src/analyzer/protocol/dnp3/dnp3-protocol.pac index 7e1e7ad1af..154fdc8be3 100644 --- a/src/analyzer/protocol/dnp3/dnp3-protocol.pac +++ b/src/analyzer/protocol/dnp3/dnp3-protocol.pac @@ -73,7 +73,7 @@ type DNP3_Response = record { default -> unknown: Debug_Byte; }; } &byteorder = bigendian - &length= 9 + addin_header.len - 5 - 1' + &length= 9 + addin_header.len - 5 - 1; type DNP3_Application_Request_Header = record { empty: bytestring &length = 0; # Work-around BinPAC problem. @@ -117,7 +117,7 @@ type Response_Objects(function_code: uint8) = record { 0x0301 -> diwoflag: Response_Data_Object(function_code, object_header.qualifier_field, object_header.object_type_field )[ ( object_header.number_of_item / 8 ) + 1*( object_header.number_of_item > ( (object_header.number_of_item / 8)*8 ) ) ]; 0x0a01 -> bowoflag: Response_Data_Object(function_code, object_header.qualifier_field, object_header.object_type_field )[ ( object_header.number_of_item / 8 ) + 1*( object_header.number_of_item > ( (object_header.number_of_item / 8)*8 ) )]; 0x0c03 -> bocmd_PM: Response_Data_Object(function_code, object_header.qualifier_field, object_header.object_type_field )[ ( object_header.number_of_item / 8 ) + 1*( object_header.number_of_item > ( (object_header.number_of_item / 8)*8 ) )]; - default -> ojbects: Response_Data_Object(function_code, object_header.qualifier_field, object_header.object_type_field )[ object_header.number_of_item]; + default -> objects: Response_Data_Object(function_code, object_header.qualifier_field, object_header.object_type_field )[ object_header.number_of_item]; }; };