Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/s7comm-protocol.pac
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,12 @@ type ROSCTR_ACK(is_orig: bool) = record {
parameter_length: uint16;
data_length: uint16;
error_data: S7Comm_Error;
function_code: uint8;
additional_data: bytestring &restofdata;
} &let {
is_originator: bool = is_orig;
error_class: uint8 = error_data.error_class;
error_code: uint8 = error_data.error_code;
function_code = 0xff;
deliver: bool = $context.flow.process_rosctr_ack(this);
} &byteorder=bigendian;

Expand Down
4 changes: 4 additions & 0 deletions tests/baseline/analyzer.s7ident/s7comm.log
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@ XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 F 172.17.0.2
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 T 172.17.0.2 33028 172.17.0.2 102 7 User-Data 5 0x44 Request: CPU Functions 0x01 Read SZL - -
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 F 172.17.0.2 102 172.17.0.2 33028 7 User-Data 5 0x84 Response: CPU Functions 0x01 Read SZL No error 0x00
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 T 172.17.0.2 33028 172.17.0.2 102 1 Job-Request 6 0x1d Start Upload - - - -
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 F 172.17.0.2 102 172.17.0.2 33028 2 ACK 6 - - - - Unknown error class-0xd2 0x41
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 T 172.17.0.2 33028 172.17.0.2 102 1 Job-Request 7 0x1d Start Upload - - - -
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 F 172.17.0.2 102 172.17.0.2 33028 2 ACK 7 - - - - Unknown error class-0xd2 0x41
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 T 172.17.0.2 33028 172.17.0.2 102 1 Job-Request 8 0x1d Start Upload - - - -
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 F 172.17.0.2 102 172.17.0.2 33028 2 ACK 8 - - - - Unknown error class-0xd2 0x41
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 T 172.17.0.2 33028 172.17.0.2 102 1 Job-Request 9 0x1d Start Upload - - - -
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 F 172.17.0.2 102 172.17.0.2 33028 2 ACK 9 - - - - Unknown error class-0xd2 0x41
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 T 172.17.0.2 33028 172.17.0.2 102 1 Job-Request 10 0x04 Read Variable - - - -
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 172.17.0.2 33028 172.17.0.2 102 F 172.17.0.2 102 172.17.0.2 33028 3 ACK-Data 10 0x04 Read Variable - - No error 0x00
#close XXXX-XX-XX-XX-XX-XX
1 change: 1 addition & 0 deletions tests/baseline/analyzer.snap7/s7comm.log
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 134.217.61.131 51212 134.217.61.211 102 F 13
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 134.217.61.131 51212 134.217.61.211 102 T 134.217.61.131 51212 134.217.61.211 102 1 Job-Request 20 0x1f End Upload - - - -
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 134.217.61.131 51212 134.217.61.211 102 F 134.217.61.211 102 134.217.61.131 51212 3 ACK-Data 20 0x1f End Upload - - No error 0x00
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 134.217.61.131 51212 134.217.61.211 102 T 134.217.61.131 51212 134.217.61.211 102 1 Job-Request 21 0x1d Start Upload - - - -
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 134.217.61.131 51212 134.217.61.211 102 F 134.217.61.211 102 134.217.61.131 51212 2 ACK 21 - - - - Unknown error class-0xd2 0x0c
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 134.217.61.131 51212 134.217.61.211 102 T 134.217.61.131 51212 134.217.61.211 102 7 User-Data 22 0x47 Request: Time Functions 0x01 Read Clock - -
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 134.217.61.131 51212 134.217.61.211 102 F 134.217.61.211 102 134.217.61.131 51212 7 User-Data 22 0x87 Response: Time Functions 0x01 Read Clock No error 0x00
XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 134.217.61.131 51212 134.217.61.211 102 T 134.217.61.131 51212 134.217.61.211 102 7 User-Data 23 0x47 Request: Time Functions 0x02 Set Clock - -
Expand Down