Skip to content
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

Jump to bottom

Correctly process APPLICATION/SYSTEM DESCRIBE requests #1226

Merged
merged 1 commit into from
Jan 13, 2017
Merged

Correctly process APPLICATION/SYSTEM DESCRIBE requests #1226

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions communication/src/protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ ProtocolError Protocol::handle_received_message(Message& message,
// 4 bytes header, 1 byte token, 2 bytes location path
// 2 bytes optional single character location path for describe flags
int descriptor_type = DESCRIBE_ALL;
if (message.length()>8)
if (message.length()>8 && queue[8] <= DESCRIBE_ALL) {
descriptor_type = queue[8];
} else if (message.length() > 8) {
LOG(WARN, "Invalid DESCRIBE flags %02x", queue[8]);
}
error = send_description(token, msg_id, descriptor_type);
break;
}
Expand Down Expand Up @@ -466,7 +469,8 @@ ProtocolError Protocol::send_description(token_t token, message_id_t msg_id, int
appender.append('}');
int msglen = appender.next() - (uint8_t*) buf;
message.set_length(msglen);
LOG(INFO,"Sending describe message");
LOG(INFO,"Sending %s%s describe message", desc_flags & DESCRIBE_SYSTEM ? "S" : "",
desc_flags & DESCRIBE_APPLICATION ? "A" : "");
ProtocolError error = channel.send(message);
if (error==NO_ERROR && descriptor.app_state_selector_info)
{
Expand Down
11 changes: 10 additions & 1 deletion communication/src/spark_protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,6 +1399,8 @@ bool SparkProtocol::send_description(int description_flags, msg& message)
int desc_len = description(queue + 2, message.token, queue[2], queue[3], description_flags);
queue[0] = (desc_len >> 8) & 0xff;
queue[1] = desc_len & 0xff;
LOG(INFO,"Sending %s%s describe message", description_flags & DESCRIBE_SYSTEM ? "S" : "",
description_flags & DESCRIBE_APPLICATION ? "A" : "");
return blocking_send(queue, desc_len + 2)>=0;
}

Expand All @@ -1408,7 +1410,14 @@ bool SparkProtocol::handle_message(msg& message, token_t token, CoAPMessageType:
{
case CoAPMessageType::DESCRIBE:
{
if (!send_description(DESCRIBE_SYSTEM, message) || !send_description(DESCRIBE_APPLICATION, message)) {
int desc_flags = DESCRIBE_ALL;
if (message.len > 8 && queue[8] <= DESCRIBE_ALL) {
desc_flags = queue[8];
} else if (message.len > 8) {
LOG(WARN, "Invalid DESCRIBE flags %02x", queue[8]);
}

if (!send_description(desc_flags, message)) {
return false;
}
break;
Expand Down