KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 3 Releases Wiki Activity

WIP: somethings wrong.. #19

Closed
muellerr wants to merge 808 commits from source/master into master
pull from: source/master
merge into: KSat:master
Conversation 0 Commits 808 Files Changed 512 +6 -20
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 06d389ed1e - Show all commits

24
pus/Service2DeviceAccess.cpp
View File

@ -34,29 +34,17 @@ ReturnValue_t Service2DeviceAccess::isValidSubservice(uint8_t subservice) {
ReturnValue_t Service2DeviceAccess::getMessageQueueAndObject( ReturnValue_t Service2DeviceAccess::getMessageQueueAndObject(
uint8_t subservice, const uint8_t* tcData, size_t tcDataLen, uint8_t subservice, const uint8_t* tcData, size_t tcDataLen,
MessageQueueId_t* id, object_id_t* objectId) { MessageQueueId_t* id, object_id_t* objectId) {
ReturnValue_t result = checkAndAcquireTargetID(objectId,tcData,tcDataLen); if(tcDataLen < sizeof(object_id_t)) {
if(result != HasReturnvaluesIF::RETURN_OK) { return CommandingServiceBase::INVALID_TC;
return result; }
} SerializeAdapter::deSerialize(objectId, &tcData,
&tcDataLen, SerializeIF::Endianness::BIG);
result = checkInterfaceAndAcquireMessageQueue(id,objectId); ReturnValue_t result = checkInterfaceAndAcquireMessageQueue(id,objectId);
return result; return result;
} }
ReturnValue_t Service2DeviceAccess::checkAndAcquireTargetID(
object_id_t* objectIdToSet, const uint8_t* tcData, size_t tcDataLen) {
if(SerializeAdapter::deSerialize(objectIdToSet, &tcData,
&tcDataLen, SerializeIF::Endianness::BIG) != RETURN_OK) {
sif::error << "Service 2: Target ID not found. ID: " <<
std::hex << objectIdToSet ;
return CommandingServiceBase::INVALID_TC;
}
else {
return HasReturnvaluesIF::RETURN_OK;
}
}
ReturnValue_t Service2DeviceAccess::checkInterfaceAndAcquireMessageQueue( ReturnValue_t Service2DeviceAccess::checkInterfaceAndAcquireMessageQueue(
MessageQueueId_t * messageQueueToSet, object_id_t *objectId) { MessageQueueId_t * messageQueueToSet, object_id_t *objectId) {
DeviceHandlerIF* possibleTarget = DeviceHandlerIF* possibleTarget =

2
pus/Service2DeviceAccess.h
View File

@ -73,8 +73,6 @@ private:
*/ */
void sendWiretappingTm(CommandMessage* reply,uint8_t subservice); void sendWiretappingTm(CommandMessage* reply,uint8_t subservice);
ReturnValue_t checkAndAcquireTargetID(object_id_t* objectIdToSet,
const uint8_t* tcData, size_t tcDataLen);
ReturnValue_t checkInterfaceAndAcquireMessageQueue( ReturnValue_t checkInterfaceAndAcquireMessageQueue(
MessageQueueId_t* messageQueueToSet, object_id_t* objectId); MessageQueueId_t* messageQueueToSet, object_id_t* objectId);