PROTO_AGENT: don't send ACKs, formatting

openair2/LAYER2/PROTO_AGENT/proto_agent.h

@@ -37,8 +37,10 @@
 
 #ifndef PROTO_AGENT_H_
 #define PROTO_AGENT_H_
-#include "proto_agent_common.h"
 #include "ENB_APP/enb_config.h" // for enb properties
+/* avoid warnings */
+#undef NUM_MAX_ENB
+#include "proto_agent_common.h"
 
 
 void * proto_agent_receive(void *args);

openair2/LAYER2/PROTO_AGENT/proto_agent_common.h

@@ -95,13 +95,11 @@ int proto_agent_echo_reply(mod_id_t mod_id, const void *params, Protocol__Flexsp
 int proto_agent_destroy_echo_reply(Protocol__FlexsplitMessage *msg);
 
 int proto_agent_pdcp_data_req(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
-int proto_agent_pdcp_data_req_ack(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
+int proto_agent_pdcp_data_req_process(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
 int proto_agent_destroy_pdcp_data_req(Protocol__FlexsplitMessage *msg);
-int proto_agent_destroy_pdcp_data_req_ack(Protocol__FlexsplitMessage *msg);
 int proto_agent_pdcp_data_ind(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
 int proto_agent_destroy_pdcp_data_ind(Protocol__FlexsplitMessage *msg);
-int proto_agent_pdcp_data_ind_ack(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
-int proto_agent_destroy_pdcp_data_ind_ack(Protocol__FlexsplitMessage *msg);
+int proto_agent_pdcp_data_ind_process(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
 
 int just_print(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg);
 
@@ -119,7 +117,7 @@ typedef struct _data_req_args data_req_args;
 typedef struct _dl_data_args dl_data_args;
 
 struct _data_req_args{
-  protocol_ctxt_t* ctxt;
+  const protocol_ctxt_t* ctxt;
   srb_flag_t srb_flag;
   MBMS_flag_t MBMS_flag;
   rb_id_t rb_id; 

openair2/LAYER2/PROTO_AGENT/proto_agent_handler.c

@@ -40,13 +40,13 @@
 #include "assertions.h"
 
 proto_agent_message_decoded_callback proto_agent_messages_callback[][3] = {
-  {proto_agent_hello, 0, 0},
-  {proto_agent_echo_reply, 0, 0},
-  {0, just_print, 0},
-  {proto_agent_pdcp_data_req_ack, 0, 0},
-  {0, proto_agent_get_ack_result, 0},
-  {proto_agent_pdcp_data_ind_ack, 0, 0},
-  {0, just_print, 0},
+  {proto_agent_hello, 0, 0},                 /* agent hello */
+  {proto_agent_echo_reply, 0, 0},            /* echo */
+  {0, just_print, 0},                        /* just print */
+  {proto_agent_pdcp_data_req_process, 0, 0}, /* PDCP data REQ */
+  {0, proto_agent_get_ack_result, 0},        /* get ACK result */
+  {proto_agent_pdcp_data_ind_process, 0, 0}, /* PDCP data IND */
+  {0, just_print, 0},                        /* just print */
 };
 
 proto_agent_message_destruction_callback proto_message_destruction_callback[] = {
@@ -54,10 +54,9 @@ proto_agent_message_destruction_callback proto_message_destruction_callback[] =
   proto_agent_destroy_echo_request,
   proto_agent_destroy_echo_reply,
   proto_agent_destroy_pdcp_data_req,
-  proto_agent_destroy_pdcp_data_req_ack,
+  0,
   proto_agent_destroy_pdcp_data_ind,
-  proto_agent_destroy_pdcp_data_ind_ack,
-
+  0,
 };
 
 //static const char *proto_agent_direction2String[] = {
@@ -129,9 +128,8 @@ uint8_t *proto_agent_pack_message(Protocol__FlexsplitMessage *msg, int *size)
     goto error;
   }
   
-  //TODO call proper destroy function
-  
-  err_code = ((*proto_message_destruction_callback[msg->msg_case-1])(msg));
+  if (proto_message_destruction_callback[msg->msg_case-1])
+    err_code = ((*proto_message_destruction_callback[msg->msg_case-1])(msg));
   
   DevAssert(buffer !=NULL);