Skip to content

fix: return the correct attribute count on partial attribute-list responses #597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrAlaskan wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −4
Open

fix: return the correct attribute count on partial attribute-list responses #597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 18 additions & 4 deletions source/src/cip/cipcommon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,6 +1133,7 @@ EipStatus GetAttributeList(CipInstance *instance,

EipUint16 attribute_number = 0;
CipAttributeStruct *attribute = NULL;
CipUint attributes_returned = 0;

CipOctet *attribute_count_responst_position =
message_router_response->message.current_message_position;
Expand Down Expand Up @@ -1161,7 +1162,7 @@ EipStatus GetAttributeList(CipInstance *instance,
message_router_response->message.current_message_position;
message_router_response->message.current_message_position =
attribute_count_responst_position;
AddIntToMessage(attribute_count_request,
AddIntToMessage(attributes_returned,
&message_router_response
->message); // Add current amount of attributes
message_router_response->message.current_message_position =
Expand Down Expand Up @@ -1198,6 +1199,7 @@ EipStatus GetAttributeList(CipInstance *instance,
AddSintToMessage(0, &message_router_response->message); // Reserved, shall be 0
message_router_response->general_status = kCipErrorAttributeListError;
}
attributes_returned++;
}
// If we are there, we returned all elements
message_router_response->message.used_message_length -= 2; // Correct count from Move above
Expand All @@ -1206,7 +1208,7 @@ EipStatus GetAttributeList(CipInstance *instance,
message_router_response->message.current_message_position =
attribute_count_responst_position;
AddIntToMessage(
attribute_count_request,
attributes_returned,
&message_router_response->message); // Add current amount of attributes
message_router_response->message.current_message_position =
save_current_position;
Expand Down Expand Up @@ -1239,6 +1241,7 @@ EipStatus SetAttributeList(CipInstance *instance,

EipUint16 attribute_number = 0;
CipAttributeStruct *attribute = NULL;
CipUint attributes_returned = 0;

CipOctet *attribute_count_responst_position =
message_router_response->message.current_message_position;
Expand Down Expand Up @@ -1267,7 +1270,7 @@ EipStatus SetAttributeList(CipInstance *instance,
message_router_response->message.current_message_position;
message_router_response->message.current_message_position =
attribute_count_responst_position;
AddIntToMessage(attribute_count_request,
AddIntToMessage(attributes_returned,
&message_router_response
->message); // Add current amount of attributes
message_router_response->message.current_message_position =
Expand Down Expand Up @@ -1306,6 +1309,16 @@ EipStatus SetAttributeList(CipInstance *instance,
message_router_response->general_status =
kCipErrorAttributeListError;
} else {
attributes_returned++;
message_router_response->message.used_message_length -= 2; // Correct count from Move above
CipOctet *const save_current_position =
message_router_response->message.current_message_position;
message_router_response->message.current_message_position =
attribute_count_responst_position;
AddIntToMessage(attributes_returned,
&message_router_response->message);
message_router_response->message.current_message_position =
save_current_position;
message_router_response->general_status = kCipErrorPartialTransfer;
return kEipStatusOkSend;
}
Expand All @@ -1316,6 +1329,7 @@ EipStatus SetAttributeList(CipInstance *instance,
AddSintToMessage(0, &message_router_response->message); // Reserved, shall be 0
message_router_response->general_status = kCipErrorAttributeListError;
}
attributes_returned++;
}
// If we are there, we returned all elements
message_router_response->message.used_message_length -=
Expand All @@ -1325,7 +1339,7 @@ EipStatus SetAttributeList(CipInstance *instance,
message_router_response->message.current_message_position =
attribute_count_responst_position;
AddIntToMessage(
attribute_count_request,
attributes_returned,
&message_router_response->message); // Add current amount of attributes
message_router_response->message.current_message_position =
save_current_position;
Expand Down
Loading