Attemping to stop filling UL_TTI_REQ queue

This is sort of hacky, but it stops the gNB
from crashing for 2 UEs with the proxy and
4 UEs with our internal proxy.

executables/nr-ue.c

@@ -309,13 +309,10 @@ static void process_queued_nr_nfapi_msgs(NR_UE_MAC_INST_t *mac, int sfn_slot)
     {
       LOG_E(NR_MAC, "[%d %d] No corresponding tx_data_request for given dl_tti_request sfn/slot\n",
             NFAPI_SFNSLOT2SFN(dl_tti_sfn_slot), NFAPI_SFNSLOT2SLOT(dl_tti_sfn_slot));
-      if (!put_queue(&nr_dl_tti_req_queue, dl_tti_request))
-      {
-          LOG_E(NR_PHY, "put_queue failed for dl_tti_request.\n");
+      save_nr_measurement_info(dl_tti_request);
       free(dl_tti_request);
       dl_tti_request = NULL;
     }
-    }
     else if (dl_tti_request->dl_tti_request_body.nPDUs > 0 && tx_data_request->Number_of_PDUs > 0)
     {
       save_nr_measurement_info(dl_tti_request);

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -729,14 +729,23 @@ static void enqueue_nr_nfapi_msg(void *buffer, ssize_t len, nfapi_p7_message_hea
                 LOG_E(NR_PHY, "Message ul_tti_request failed to unpack\n");
                 break;
             }
-            LOG_I(NR_PHY, "Received an NFAPI_NR_PHY_MSG_TYPE_UL_TTI_REQUEST message in SFN/slot %d %d. \n",
+            LOG_I(NR_PHY, "Received an NFAPI_NR_PHY_MSG_TYPE_UL_TTI_REQUEST message in SFN/slot %d %d.\n",
                   ul_tti_request->SFN, ul_tti_request->Slot);
+            if (nr_uci_ind_queue.num_items > 0)
+            {
+                LOG_I(NR_MAC, "Melissa, we added UL_TTI_REQ to queue for sfn slot %d %d\n",
+                      ul_tti_request->SFN, ul_tti_request->Slot);
+                if (!put_queue(&nr_ul_tti_req_queue, ul_tti_request))
+                {
+                    reset_queue(&nr_ul_tti_req_queue);
                     if (!put_queue(&nr_ul_tti_req_queue, ul_tti_request))
                     {
                         LOG_E(NR_PHY, "put_queue failed for ul_tti_request.\n");
                         free(ul_tti_request);
                         ul_tti_request = NULL;
                     }
+                }
+            }
             break;
         }