From 7241aa6a385d8cae566bbdde99cdd5da1e2c18b1 Mon Sep 17 00:00:00 2001
From: Xenofon Foukas <x.foukas@sms.ed.ac.uk>
Date: Wed, 23 Dec 2015 12:17:52 +0200
Subject: [PATCH] Added support for parameters in handlers

---
 openair2/ENB_APP/enb_agent_common.c  | 6 +++---
 openair2/ENB_APP/enb_agent_common.h  | 7 ++++---
 openair2/ENB_APP/enb_agent_handler.c | 2 +-
 openair2/ENB_APP/enb_agent_mac.c     | 2 +-
 openair2/ENB_APP/enb_agent_mac.h     | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/openair2/ENB_APP/enb_agent_common.c b/openair2/ENB_APP/enb_agent_common.c
index 132044cf1f..a8ac24144b 100644
--- a/openair2/ENB_APP/enb_agent_common.c
+++ b/openair2/ENB_APP/enb_agent_common.c
@@ -98,7 +98,7 @@ int prp_create_header(uint32_t xid, Protocol__PrpType type,  Protocol__PrpHeader
 }
 
 
-int enb_agent_hello(uint32_t xid, Protocol__ProgranMessage **msg) {
+int enb_agent_hello(uint32_t xid, const void *params, Protocol__ProgranMessage **msg) {
  
   Protocol__PrpHeader *header;
   if (prp_create_header(xid, PROTOCOL__PRP_TYPE__PRPT_HELLO, &header) != 0)
@@ -150,7 +150,7 @@ int enb_agent_destroy_hello_message(Protocol__ProgranMessage *msg) {
 }
 
 
-int enb_agent_echo_request(uint32_t xid, Protocol__ProgranMessage **msg) {
+int enb_agent_echo_request(uint32_t xid, const void* params, Protocol__ProgranMessage **msg) {
   Protocol__PrpHeader *header;
   if (prp_create_header(xid, PROTOCOL__PRP_TYPE__PRPT_ECHO_REQUEST, &header) != 0)
     goto error;
@@ -199,7 +199,7 @@ int enb_agent_destroy_echo_request(Protocol__ProgranMessage *msg) {
 
 
 
-int enb_agent_echo_reply(uint32_t xid, Protocol__ProgranMessage **msg) {
+int enb_agent_echo_reply(uint32_t xid, const void *params, Protocol__ProgranMessage **msg) {
   Protocol__PrpHeader *header;
   if (prp_create_header(xid, PROTOCOL__PRP_TYPE__PRPT_ECHO_REPLY, &header) != 0)
     goto error;
diff --git a/openair2/ENB_APP/enb_agent_common.h b/openair2/ENB_APP/enb_agent_common.h
index 3fb0d366ac..5aac604c1e 100644
--- a/openair2/ENB_APP/enb_agent_common.h
+++ b/openair2/ENB_APP/enb_agent_common.h
@@ -49,6 +49,7 @@
 
 typedef int (*enb_agent_message_decoded_callback)(
 	uint32_t xid,
+	const void *params,
 	Protocol__ProgranMessage **msg
 );
 
@@ -59,13 +60,13 @@ int enb_agent_deserialize_message(void *data, int size, Protocol__ProgranMessage
 
 int prp_create_header(uint32_t xid, Protocol__PrpType type, Protocol__PrpHeader **header);
 
-int enb_agent_hello(uint32_t xid, Protocol__ProgranMessage **msg);
+int enb_agent_hello(uint32_t xid, const void *params, Protocol__ProgranMessage **msg);
 int enb_agent_destroy_hello(Protocol__ProgranMessage *msg);
 
-int enb_agent_echo_request(uint32_t xid, Protocol__ProgranMessage **msg);
+int enb_agent_echo_request(uint32_t xid, const void *params, Protocol__ProgranMessage **msg);
 int enb_agent_destroy_echo_request(Protocol__ProgranMessage *msg);
 
-int enb_agent_echo_reply(uint32_t xid, Protocol__ProgranMessage **msg);
+int enb_agent_echo_reply(uint32_t xid, const void *params, Protocol__ProgranMessage **msg);
 int enb_agent_destroy_echo_reply(Protocol__ProgranMessage *msg);
 
 
diff --git a/openair2/ENB_APP/enb_agent_handler.c b/openair2/ENB_APP/enb_agent_handler.c
index 2457ddbfdc..dd39a7315a 100644
--- a/openair2/ENB_APP/enb_agent_handler.c
+++ b/openair2/ENB_APP/enb_agent_handler.c
@@ -83,7 +83,7 @@ Protocol__ProgranMessage* enb_agent_handle_message (uint32_t xid,
 
   }
 
-  err_code= ((*messages_callback[decoded_message->msg_case-1][decoded_message->msg_dir-1])(xid, &reply_message));
+  err_code= ((*messages_callback[decoded_message->msg_case-1][decoded_message->msg_dir-1])(xid, (void *) decoded_message, &reply_message));
   if ( err_code < 0 ){
     goto error;
   }
diff --git a/openair2/ENB_APP/enb_agent_mac.c b/openair2/ENB_APP/enb_agent_mac.c
index 0399d53d18..4b299ca919 100644
--- a/openair2/ENB_APP/enb_agent_mac.c
+++ b/openair2/ENB_APP/enb_agent_mac.c
@@ -40,7 +40,7 @@
 #include "LAYER2/RLC/rlc.h"
 #include "log.h"
 
-int enb_agent_mac_reply(uint32_t xid, Protocol__ProgranMessage **msg){
+int enb_agent_mac_reply(uint32_t xid, const void *params, Protocol__ProgranMessage **msg){
   
   void *buffer;
   int size;
diff --git a/openair2/ENB_APP/enb_agent_mac.h b/openair2/ENB_APP/enb_agent_mac.h
index 6d36bbb6a1..590570630e 100644
--- a/openair2/ENB_APP/enb_agent_mac.h
+++ b/openair2/ENB_APP/enb_agent_mac.h
@@ -68,7 +68,7 @@ typedef struct {
 } report_config_t;
 
 
-int enb_agent_mac_reply(uint32_t xid, Protocol__ProgranMessage **msg);
+int enb_agent_mac_reply(uint32_t xid, const void *params, Protocol__ProgranMessage **msg);
 
 int enb_agent_mac_stats_reply(uint32_t xid, const report_config_t *report_config, Protocol__ProgranMessage **msg);