Add CoAP_Res_t to resource handler

lobaro · Nov 28, 2017 · 7c9e216 · 7c9e216
1 parent 4a8087d
commit 7c9e216
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/src/coap_interaction.c b/src/coap_interaction.c
@@ -330,7 +330,7 @@ CoAP_Result_t _rom CoAP_StartNotifyInteractions(CoAP_Res_t* pRes) {
 
 		//Call Notify Handler of resource and add to interaction list
 		if (newIA->pRespMsg != NULL && pRes->Notifier != NULL &&
-				pRes->Notifier(pObserver, newIA->pRespMsg) == HANDLER_OK) { //<------ call notify handler of resource
+				pRes->Notifier(pObserver, newIA->pRespMsg, pRes) == HANDLER_OK) { //<------ call notify handler of resource
 
 			newIA->Role = COAP_ROLE_NOTIFICATION;
 			newIA->State = COAP_STATE_READY_TO_NOTIFY;

diff --git a/src/coap_main.c b/src/coap_main.c
@@ -394,7 +394,7 @@ static void handleServerInteraction(CoAP_Interaction_t* pIA) {
 
 		// Call of external set resource handler
 		// could change type and code of message (ACK & EMPTY above only a guess!)
-		CoAP_HandlerResult_t Res = pIA->pRes->Handler(pIA->pReqMsg, pIA->pRespMsg);
+		CoAP_HandlerResult_t Res = pIA->pRes->Handler(pIA->pReqMsg, pIA->pRespMsg, pIA->pRes);
 
 		// Check return value of handler:
 		// a) everything fine - we got an response to send
@@ -535,7 +535,7 @@ static void handleNotifyInteraction(CoAP_Interaction_t* pIA) {
 				pIA->UpdatePendingNotification = false;
 				pIA->pRespMsg->MessageID = CoAP_GetNextMid();
 				//call notifier
-				if (pIA->pRes->Notifier(pIA->pObserver, pIA->pRespMsg) == HANDLER_ERROR) {
+				if (pIA->pRes->Notifier(pIA->pObserver, pIA->pRespMsg, pIA->pRes) == HANDLER_ERROR) {
 					RemoveObserveOptionFromMsg(pIA->pRespMsg);
 					CoAP_RemoveInteractionsObserver(pIA, pIA->pRespMsg->Token);
 				} else { //good response
@@ -571,7 +571,7 @@ static void handleNotifyInteraction(CoAP_Interaction_t* pIA) {
 				pIA->ResConfirmState = NOT_SET;
 
 				//call notifier
-				if (pIA->pRes->Notifier(pIA->pObserver, pIA->pRespMsg) == HANDLER_ERROR) {
+				if (pIA->pRes->Notifier(pIA->pObserver, pIA->pRespMsg, pIA->pRes) == HANDLER_ERROR) {
 					RemoveObserveOptionFromMsg(pIA->pRespMsg);
 					CoAP_RemoveInteractionsObserver(pIA, pIA->pRespMsg->Token);
 				} else { //good response

diff --git a/src/coap_resource.c b/src/coap_resource.c
@@ -167,7 +167,7 @@ CoAP_Result_t _rom CoAP_NVloadObservers(uint8_t* pRawPage) {
 }
 
 
-CoAP_HandlerResult_t _rom WellKnown_GetHandler(CoAP_Message_t* pReq, CoAP_Message_t* pResp) {
+CoAP_HandlerResult_t _rom WellKnown_GetHandler(CoAP_Message_t* pReq, CoAP_Message_t* pResp, CoAP_Res_t* res) {
 //	static uint8_t wellknownStr[500];
 //	uint8_t* pWr = wellknownStr;
 

diff --git a/src/liblobaro_coap.h b/src/liblobaro_coap.h
@@ -280,9 +280,11 @@ typedef enum {
 	HANDLER_ERROR = 2
 } CoAP_HandlerResult_t;
 
-typedef CoAP_HandlerResult_t (*CoAP_ResourceHandler_fPtr_t)(CoAP_Message_t* pReq, CoAP_Message_t* pResp);
+typedef struct CoAP_Res CoAP_Res_t;
+
+typedef CoAP_HandlerResult_t (*CoAP_ResourceHandler_fPtr_t)(CoAP_Message_t* pReq, CoAP_Message_t* pResp, CoAP_Res_t* pResource);
 // TODO: Can we use the CoAP_ResourceHandler_fPtr_t signature also for notifiers?
-typedef CoAP_HandlerResult_t (*CoAP_ResourceNotifier_fPtr_t)(CoAP_Observer_t* pObserver, CoAP_Message_t* pResp);
+typedef CoAP_HandlerResult_t (*CoAP_ResourceNotifier_fPtr_t)(CoAP_Observer_t* pObserver, CoAP_Message_t* pResp, CoAP_Res_t* pResource);
 
 typedef struct {
 	uint16_t Cf;    // Content-Format