Merge remote-tracking branch 'origin/simplify-pdu-session-management' into integration_2023_w18b

openair3/NGAP/ngap_gNB_nas_procedures.c

@@ -58,7 +58,7 @@ static void allocCopy(OCTET_STRING_t *out, ngap_pdu_t in)
   out->size = in.length;
 }
 
-static void allocAddrCopy(BIT_STRING_t *out, ngap_transport_layer_addr_t in)
+static void allocAddrCopy(BIT_STRING_t *out, transport_layer_addr_t in)
 {
   if (in.length) {
     out->buf = malloc(in.length);

openair3/ocp-gtpu/gtp_itf.cpp

@@ -762,6 +762,7 @@ int gtpv1u_create_ngu_tunnel(const instance_t instance,
     create_tunnel_resp->gnb_NGu_teid[i]=teid;
     memcpy(create_tunnel_resp->gnb_addr.buffer,addr,sizeof(addr));
     create_tunnel_resp->gnb_addr.length= sizeof(addr);
+    create_tunnel_resp->pdusession_id[i] = create_tunnel_req->pdusession_id[i];
   }
 
   return !GTPNOK;