cxtx-put-sdap

openair2/SDAP/nr_sdap/nr_sdap.c

@@ -45,6 +45,7 @@ typedef struct {
   bool            rqi;
   int             pdusession_id;
   int             cxtx_offset;
+  instance_t      cxtx_instance;
 } sdap_data_req_queue_item;
 
 typedef struct {
@@ -105,7 +106,8 @@ bool enqueue_sdap_data_req(protocol_ctxt_t *ctxt_p,
                    const uint8_t qfi,
                    const bool rqi,
                    const int pdusession_id,
-                   int cxtx_offset){
+                   int cxtx_offset,
+                   instance_t  cxtx_instance){
     msgbuf writeBuf;
     writeBuf.mytype = 888;
     writeBuf.sq.ctxt_p = ctxt_p;
@@ -123,6 +125,7 @@ bool enqueue_sdap_data_req(protocol_ctxt_t *ctxt_p,
     writeBuf.sq.rqi = rqi;
     writeBuf.sq.pdusession_id = pdusession_id;
     writeBuf.sq.cxtx_offset = 520;
+    writeBuf.sq.cxtx_instance = cxtx_instance;
     int msgId = msgget(0x1234, IPC_CREAT|0777);
     if(msgId == -1){
       printf("获取消息列表id失败\n");
@@ -187,7 +190,19 @@ void *SP_task(void *arg){
         }else{
           printf("消息队列读取成功\n");
           printf("%d\n\n\n",readBuf.sq.cxtx_offset);
-          bool sdap_ret = sdap_data_req(readBuf.sq.ctxt_p,
+
+          protocol_ctxt_t ctxtS;
+          ctxtS.module_id = 0;
+          ctxtS.enb_flag = 1;
+          ctxtS.instance = readBuf.sq.cxtx_instance;
+          ctxtS.rntiMaybeUEid = readBuf.sq.ue_id;
+          ctxtS.frame = 0;
+          ctxtS.subframe = 0;
+          ctxtS.eNB_index = 0;
+          ctxtS.brOption = 0;
+
+
+          bool sdap_ret = sdap_data_req(&ctxtS,
                                         readBuf.sq.ue_id,
                                         readBuf.sq.srb_flag,
                                         readBuf.sq.rb_id,

openair2/SDAP/nr_sdap/nr_sdap.h

@@ -61,7 +61,8 @@ bool enqueue_sdap_data_req(protocol_ctxt_t *ctxt_p,
                    const uint8_t qfi,
                    const bool rqi,
                    const int pdusession_id,
-                   int cxtx_offset);
+                   int cxtx_offset,
+                   instance_t  cxtx_instance);
 
 
 /*

openair3/ocp-gtpu/gtp_itf.cpp

@@ -1111,7 +1111,8 @@ static int Gtpv1uHandleGpdu(int h,
                                         qfi,
                                         rqi,
                                         tunnel->second.pdusession_id,
-                                        cxtx_offset) )
+                                        cxtx_offset,
+                                        inst->addr.originInstance) )
         LOG_E(GTPU,"[%d] down layer refused incoming packet\n", h);
     } else {
       if ( !tunnel->second.callBack(&ctxt,

openair3/ocp-gtpu/gtp_itf.h

@@ -33,7 +33,8 @@ extern "C" {
                                   const uint8_t   qfi,
                                   const bool      rqi,
                                   const int       pdusession_id,
-                                  int         cxtx_offset);
+                                  int         cxtx_offset,
+                                  instance_t  cxtx_instance);
 
   typedef struct openAddr_s {
     char originHost[HOST_NAME_MAX];