FlexRAN refactor+format MAC stats function

openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.h

@@ -51,11 +51,12 @@ int flexran_agent_mac_destroy_sr_info(Protocol__FlexranMessage *msg);
 int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__FlexranMessage **msg);
 int flexran_agent_mac_destroy_sf_trigger(Protocol__FlexranMessage *msg);
 
-/* Statistics reply protocol message constructor and destructor */
-int flexran_agent_mac_stats_reply(mid_t mod_id,
+/* Statistics reply protocol message constructors (for UE and cell stats) and destructor */
+int flexran_agent_mac_stats_reply_ue(mid_t mod_id,
                                      Protocol__FlexUeStatsReport **ue_report,
                                      int      n_ue,
-                                  uint32_t ue_flags,
+                                     uint32_t ue_flags);
+int flexran_agent_mac_stats_reply_cell(mid_t mod_id,
                                        Protocol__FlexCellStatsReport **cell_report,
                                        int      n_cc,
                                        uint32_t cc_flags);

openair2/ENB_APP/flexran_agent_handler.c

@@ -297,9 +297,8 @@ int flexran_agent_stats_reply(mid_t enb_id,
 
   /* MAC reply split */
   if (flexran_agent_get_mac_xface(enb_id)
-      && flexran_agent_mac_stats_reply(enb_id,
-                                       ue_report, n_ue, ue_flags,
-                                       cell_report, n_cc, cell_flags) < 0) {
+      && (flexran_agent_mac_stats_reply_ue(enb_id, ue_report, n_ue, ue_flags) < 0
+         || flexran_agent_mac_stats_reply_cell(enb_id, cell_report, n_cc, cell_flags) < 0)) {
     err_code = PROTOCOL__FLEXRAN_ERR__MSG_BUILD;
     goto error;
   }