Merge remote-tracking branch 'origin/NR-UE-store-allowed-nssai' into integration_2023_w49

openair2/COMMON/as_message.h

@@ -464,6 +464,13 @@ typedef ul_info_transfer_cnf_t dl_info_transfer_cnf_t;
  */
 typedef ul_info_transfer_ind_t dl_info_transfer_ind_t;
 
+typedef struct nas_pdu_session_req_s {
+  int pdusession_id;
+  int pdusession_type;
+  int sst;
+  int sd;
+} nas_pdu_session_req_t;
+
 /*
  * --------------------------------------------------------------------------
  *          Radio Access Bearer establishment

openair2/COMMON/rrc_messages_def.h

@@ -82,3 +82,4 @@ MESSAGE_DEF(NRRRC_FRAME_PROCESS,        MESSAGE_PRIORITY_MED,       NRRrcFramePr
 
 // eNB: RLC -> RRC messages
 MESSAGE_DEF(RLC_SDU_INDICATION,         MESSAGE_PRIORITY_MED,       RlcSduIndication,           rlc_sdu_indication)
+MESSAGE_DEF(NAS_PDU_SESSION_REQ, MESSAGE_PRIORITY_MED, nas_pdu_session_req_t, nas_pdu_session_req)

openair2/COMMON/rrc_messages_types.h

@@ -92,6 +92,7 @@
 #define NRDuDlReq(mSGpTR)      (mSGpTR)->ittiMsg.nr_du_dl_req
 
 #define NAS_OAI_TUN_NSA(mSGpTR)         (mSGpTR)->ittiMsg.nas_oai_tun_nsa
+#define NAS_PDU_SESSION_REQ(mSGpTR) (mSGpTR)->ittiMsg.nas_pdu_session_req
 
 //-------------------------------------------------------------------------------------------//
 typedef struct RrcStateInd_s {

openair3/NAS/NR_UE/nr_nas_msg_sim.h

@@ -73,6 +73,14 @@
 #define PAYLOAD_CONTAINER_LENGTH_MIN                       3
 #define PAYLOAD_CONTAINER_LENGTH_MAX                       65537
 
+/* List of allowed NSSAI from NAS messaging. */
+typedef struct {
+  int sst;
+  int hplmn_sst;
+  int sd;
+  int hplmn_sd;
+} nr_nas_msg_snssai_t;
+
 /* Security Key for SA UE */
 typedef struct {
   uint8_t kausf[32];

openair3/UTILS/conversions.h

@@ -34,13 +34,19 @@
     (((x & 0x00FF) << 8) | ((x & 0xFF00) >> 8)
 
 # define ntoh_int32_buf(bUF)        \
-    ((*(bUF)) << 24) | ((*((bUF) + 1)) << 16) | ((*((bUF) + 2)) << 8)   \
-  | (*((bUF) + 3))
+    ((*((uint8_t*)bUF)) << 24) | ((*((uint8_t*)bUF + 1)) << 16) | ((*((uint8_t*)bUF + 2)) << 8)   \
+  | (*((uint8_t*)bUF + 3))
 #else
 # define hton_int32(x) (x)
 # define hton_int16(x) (x)
 #endif
 
+#define ntoh_int24_buf(bUF) \
+  ((*(uint8_t*)bUF << 16) | ((*((uint8_t*)bUF + 1)) << 8) | (*((uint8_t*)bUF + 2)))
+
+#define ntoh_int16_buf(bUF) \
+  ((*((uint8_t*)bUF) << 8) | (*((uint8_t*)bUF + 1)))
+
 #define IN_ADDR_TO_BUFFER(X,bUFF) INT32_TO_BUFFER((X).s_addr,(char*)bUFF)
 
 #define IN6_ADDR_TO_BUFFER(X,bUFF)                     \