Merge pull request #95 from RobertVS-MS/invalid-opcode-failure

Paolo Calao · web-flow · commit 95ce2e13e8ae · 2020-07-14T10:36:46.000+02:00
PDU rejected due to wrong opcode set in 'Request Opcode In Error'
diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
@@ -756,7 +756,7 @@ void ATTClass::findByTypeReq(uint16_t connectionHandle, uint16_t mtu, uint8_t dl
   } *findByTypeReq = (FindByTypeReq*)data;
 
   if (dlen < sizeof(FindByTypeReq)) {
-    sendError(connectionHandle, ATT_OP_FIND_BY_TYPE_RESP, findByTypeReq->startHandle, ATT_ECODE_INVALID_PDU);
+    sendError(connectionHandle, ATT_OP_FIND_BY_TYPE_REQ, findByTypeReq->startHandle, ATT_ECODE_INVALID_PDU);
     return;
   }
 
@@ -794,7 +794,7 @@ void ATTClass::findByTypeReq(uint16_t connectionHandle, uint16_t mtu, uint8_t dl
   }
 
   if (responseLength == 1) {
-    sendError(connectionHandle, ATT_OP_FIND_BY_TYPE_RESP, findByTypeReq->startHandle, ATT_ECODE_ATTR_NOT_FOUND);
+    sendError(connectionHandle, ATT_OP_FIND_BY_TYPE_REQ, findByTypeReq->startHandle, ATT_ECODE_ATTR_NOT_FOUND);
   } else {
     HCI.sendAclPkt(connectionHandle, ATT_CID, responseLength, response);
   }

Original file line number	Diff line number	Diff line change
`@@ -756,7 +756,7 @@ void ATTClass::findByTypeReq(uint16_t connectionHandle, uint16_t mtu, uint8_t dl`
`756`	`756`	`} findByTypeReq = (FindByTypeReq)data;`
`757`	`757`
`758`	`758`	`if (dlen < sizeof(FindByTypeReq)) {`
`759`		`- sendError(connectionHandle, ATT_OP_FIND_BY_TYPE_RESP, findByTypeReq->startHandle, ATT_ECODE_INVALID_PDU);`
	`759`	`+ sendError(connectionHandle, ATT_OP_FIND_BY_TYPE_REQ, findByTypeReq->startHandle, ATT_ECODE_INVALID_PDU);`
`760`	`760`	`return;`
`761`	`761`	`}`
`762`	`762`
`@@ -794,7 +794,7 @@ void ATTClass::findByTypeReq(uint16_t connectionHandle, uint16_t mtu, uint8_t dl`
`794`	`794`	`}`
`795`	`795`
`796`	`796`	`if (responseLength == 1) {`
`797`		`- sendError(connectionHandle, ATT_OP_FIND_BY_TYPE_RESP, findByTypeReq->startHandle, ATT_ECODE_ATTR_NOT_FOUND);`
	`797`	`+ sendError(connectionHandle, ATT_OP_FIND_BY_TYPE_REQ, findByTypeReq->startHandle, ATT_ECODE_ATTR_NOT_FOUND);`
`798`	`798`	`} else {`
`799`	`799`	`HCI.sendAclPkt(connectionHandle, ATT_CID, responseLength, response);`
`800`	`800`	`}`