Merge pull request #7935 from kivaisan/fix_invalid_mac_command_case

Cruz Monrreal · web-flow · commit 9346a7e7812e · 2018-09-20T10:14:59.000-05:00
LoRa: Stop processing MAC commands if command id is unknown
diff --git a/features/lorawan/lorastack/mac/LoRaMacCommand.cpp b/features/lorawan/lorastack/mac/LoRaMacCommand.cpp
@@ -304,7 +304,8 @@ lorawan_status_t LoRaMacCommand::process_mac_commands(const uint8_t *payload, ui
                 break;
             default:
                 // Unknown command. ABORT MAC commands processing
-                ret_value = LORAWAN_STATUS_UNSUPPORTED;
+                tr_error("Invalid MAC command (0x%X)!", payload[mac_index]);
+                return LORAWAN_STATUS_UNSUPPORTED;
         }
     }
     return ret_value;

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,8 @@ lorawan_status_t LoRaMacCommand::process_mac_commands(const uint8_t *payload, ui`
`304`	`304`	`break;`
`305`	`305`	`default:`
`306`	`306`	`// Unknown command. ABORT MAC commands processing`
`307`		`- ret_value = LORAWAN_STATUS_UNSUPPORTED;`
	`307`	`+ tr_error("Invalid MAC command (0x%X)!", payload[mac_index]);`
	`308`	`+ return LORAWAN_STATUS_UNSUPPORTED;`
`308`	`309`	`}`
`309`	`310`	`}`
`310`	`311`	`return ret_value;`