LTE to NR conversions

nfapi/open-nFAPI/pnf/public_inc/nfapi_pnf_interface.h

@@ -25,9 +25,12 @@ extern "C" {
 #include "nfapi_interface.h"
 #include "debug.h"
 #include <openair2/PHY_INTERFACE/IF_Module.h>
+#include "nfapi_nr_interface.h"
+#include "nfapi_nr_interface_scf.h"
 
 #include <sys/types.h>
 
+
 /*! This enum is used to describe the states of the pnf 
  */
 typedef enum
@@ -166,7 +169,7 @@ typedef struct nfapi_pnf_config
 	 * 	The client is expected to send the PARAM.response after receiving the
 	 *  PARAM.request. This can be done in the call back. 
 	 */
-	int (*param_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfapi_param_request_t* req);
+	int (*param_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfapi_nr_param_request_scf_t* req);
 	
 	/*! A callback for the CONFIG.request
 	 *  \param config A pointer to the pnf configuration
@@ -178,7 +181,7 @@ typedef struct nfapi_pnf_config
 	 * 	The client is expected to send the CONFIG.response after receiving the
 	 *  CONFIG.request. This can be done in the call back. 
 	 */
-	int (*config_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfapi_config_request_t* req);
+	int (*config_req)(nfapi_pnf_config_t* config, nfapi_pnf_phy_config_t* phy, nfapi_nr_config_request_scf_t* req);
 	
 	/*! A callback for the START.request
 	 *  \param config A pointer to the pnf configuration

nfapi/open-nFAPI/pnf/src/pnf.c

@@ -26,7 +26,8 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-
+#include "nfapi_nr_interface.h"
+#include "nfapi_nr_interface_scf.h"
 #include "pnf.h"
 
 #define MAX_SCTP_STREAMS 16
@@ -267,7 +268,7 @@ void pnf_handle_param_request(pnf_t* pnf, void *pRecvMsg, int recvMsgLen)
 	}
 	else
 	{
-		nfapi_param_request_t req;
+		nfapi_nr_param_request_scf_t req;
 		
 		nfapi_pnf_config_t* config = &(pnf->_public);
 	
@@ -340,7 +341,7 @@ void pnf_handle_config_request(pnf_t* pnf, void *pRecvMsg, int recvMsgLen)
 	}
 	else
 	{
-		nfapi_config_request_t req;
+		nfapi_nr_config_request_scf_t req;
 
 		NFAPI_TRACE(NFAPI_TRACE_INFO, "CONFIG.request received\n");
 	
@@ -1393,8 +1394,15 @@ int pnf_connect(pnf_t* pnf)
 
 int pnf_send_message(pnf_t* pnf, uint8_t *msg, uint32_t len, uint16_t stream)
 {
+	
 	if (pnf->sctp)
 	{
+		printf("\nPNF SENDS: \n");
+		for(int i=0; i<len; i++){
+			printf("%d", msg[i]);
+		}
+		printf("\n");
+
 		if (sctp_sendmsg(pnf->p5_sock, msg, len, NULL, 0, 42/*config->sctp_stream_number*/, 0, stream/*P5_STREAM_ID*/, 0, 0) < 0)
 		{
 			NFAPI_TRACE(NFAPI_TRACE_ERROR, "sctp_sendmsg failed errno: %d\n", errno);
@@ -1486,6 +1494,13 @@ int pnf_read_dispatch_message(pnf_t* pnf)
 		}
 		else
 		{
+			// print the received message
+			printf("\n MESSAGE RECEIVED: \n");
+			for(int i=0; i<message_size; i++){
+				printf("%d", read_buffer[i]);
+			}
+			printf("\n");
+
 			if (flags & MSG_NOTIFICATION)
 			{
 				NFAPI_TRACE(NFAPI_TRACE_INFO, "Notification received from %s:%u\n", inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));

nfapi/open-nFAPI/pnf/src/pnf_interface.c

@@ -19,6 +19,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include "nfapi_nr_interface.h"
+#include "nfapi_nr_interface_scf.h"
 
 nfapi_pnf_config_t* nfapi_pnf_config_create()
 {