From 860cdba94d4cb6d1de1ba59f4a0f1dd68f761549 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Wed, 10 Jun 2020 20:28:44 +0200
Subject: [PATCH] subservicve passed to handleRequest()

---
 tmtcservices/PusServiceBase.cpp | 3 ++-
 tmtcservices/PusServiceBase.h   | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tmtcservices/PusServiceBase.cpp b/tmtcservices/PusServiceBase.cpp
index b1d97293..c27defe6 100644
--- a/tmtcservices/PusServiceBase.cpp
+++ b/tmtcservices/PusServiceBase.cpp
@@ -29,7 +29,8 @@ ReturnValue_t PusServiceBase::performOperation(uint8_t opCode) {
 			this->currentPacket.setStoreAddress(message.getStorageId());
 			//	info << "Service " << (uint16_t) this->serviceId << ": new packet!" << std::endl;
 
-			ReturnValue_t return_code = this->handleRequest();
+			ReturnValue_t return_code = this->handleRequest(currentPacket.getSubService());
+
 			// debug << "Service " << (uint16_t)this->serviceId << ": handleRequest returned: " << (int)return_code << std::endl;
 			if (return_code == RETURN_OK) {
 				this->verifyReporter.sendSuccessReport(
diff --git a/tmtcservices/PusServiceBase.h b/tmtcservices/PusServiceBase.h
index d318ff1e..dbb1754c 100644
--- a/tmtcservices/PusServiceBase.h
+++ b/tmtcservices/PusServiceBase.h
@@ -30,7 +30,10 @@ void setStaticFrameworkObjectIds();
  * All PUS Services are System Objects, so an Object ID needs to be specified on construction.
  * \ingroup pus_services
  */
-class PusServiceBase : public ExecutableObjectIF, public AcceptsTelecommandsIF, public SystemObject, public HasReturnvaluesIF {
+class PusServiceBase : public ExecutableObjectIF,
+        public AcceptsTelecommandsIF,
+        public SystemObject,
+        public HasReturnvaluesIF {
 	friend void (Factory::setStaticFrameworkObjectIds)();
 public:
 	/**
@@ -63,7 +66,7 @@ public:
 	 * @return	The returned status_code is directly taken as main error code in the Verification Report.
 	 * 			On success, RETURN_OK shall be returned.
 	 */
-	virtual ReturnValue_t handleRequest() = 0;
+	virtual ReturnValue_t handleRequest(uint8_t subservice) = 0;
 	/**
 	 * In performService, implementations can handle periodic, non-TC-triggered activities.
 	 * The performService method is always called.