more sdap pdcp

openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c

@@ -199,12 +199,12 @@ int V(int semid,int idx){
  int nr_pdcp_entity_process_sdu(nr_pdcp_entity_t *entity,
                                       char *buffer,
                                       int size,
-                                      uint16_t sdu_id,
+                                      int sdu_id,
                                       char *pdu_buffer,
                                       int pdu_max_size)
 {
   uint32_t count;
-  int      sn;
+  int     sn;
   int      header_size;
   int      integrity_size;
   char    *buf = buffer;
@@ -226,15 +226,14 @@ int V(int semid,int idx){
   // sn = count & entity->sn_max;
   if(sdu_id>0){
     entity->tx_next = sdu_id;
-    entity->tx_next++;
-
-    sn = sdu_id;
+    count = entity->tx_next;
   }else{
     count = entity->tx_next;
     entity->tx_next++;
-    sn = count & entity->sn_max;
   }
-  // LOG_I(PDCP,"sn *********** %d\n",sn);
+    sn = count & entity->sn_max;
+  
+  // LOG_I(PDCP,"sn *********** %d  entity->sn_max  %d \n",sn,entity->sn_max);
 
   /* D/C bit is only to be set for DRBs */
   if (entity->type == NR_PDCP_DRB_AM || entity->type == NR_PDCP_DRB_UM) {

openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h

@@ -217,7 +217,7 @@ void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity,
 int nr_pdcp_entity_process_sdu(nr_pdcp_entity_t *entity,
                                       char *buffer,
                                       int size,
-                                      uint16_t sdu_id,
+                                      int sdu_id,
                                       char *pdu_buffer,
                                       int pdu_max_size);
 void nr_pdcp_entity_set_security(nr_pdcp_entity_t *entity,

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -1258,7 +1258,7 @@ bool nr_pdcp_data_req_srb(ue_id_t ue_id,
 bool nr_pdcp_data_req_drb(protocol_ctxt_t *ctxt_pP,
                           const srb_flag_t srb_flagP,
                           const rb_id_t rb_id,
-                          const mui_t muiP,
+                          const int muiP,
                           const confirm_t confirmP,
                           const sdu_size_t sdu_buffer_size,
                           unsigned char *const sdu_buffer,

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h

@@ -106,7 +106,7 @@ bool nr_pdcp_data_req_srb(ue_id_t ue_id,
 bool nr_pdcp_data_req_drb(protocol_ctxt_t *ctxt_pP,
                           const srb_flag_t srb_flagP,
                           const rb_id_t rb_id,
-                          const mui_t muiP,
+                          const int muiP,
                           const confirm_t confirmP,
                           const sdu_size_t sdu_buffer_size,
                           unsigned char *const sdu_buffer,

openair2/SDAP/nr_sdap/nr_sdap.c

@@ -72,7 +72,7 @@ typedef struct {
   int             shm_offset;
   unsigned int    offset;
   instance_t      cxtx_instance;
-  uint16_t        num;
+  int        num;
 } sdap_data_req_queue_item;
 
 typedef struct {
@@ -84,7 +84,7 @@ bool sdap_data_req(protocol_ctxt_t *ctxt_p,
                    const ue_id_t ue_id,
                    const srb_flag_t srb_flag,
                    const rb_id_t rb_id,
-                   const mui_t mui,
+                   const int mui,
                    const confirm_t confirm,
                    const sdu_size_t sdu_buffer_size,
                    unsigned char *sdu_buffer,
@@ -133,7 +133,7 @@ bool enqueue_sdap_data_req(protocol_ctxt_t *ctxt_p,
                    const ue_id_t ue_id,
                    const srb_flag_t srb_flag,
                    const rb_id_t rb_id,
-                   const mui_t mui,
+                   const uint16_t mui,
                    const confirm_t confirm,
                    const sdu_size_t sdu_buffer_size,
                    unsigned char *sdu_buffer,

openair2/SDAP/nr_sdap/nr_sdap.h

@@ -36,7 +36,7 @@ bool sdap_data_req(protocol_ctxt_t *ctxt_p,
                    const ue_id_t ue_id,
                    const srb_flag_t srb_flag,
                    const rb_id_t rb_id,
-                   const mui_t mui,
+                   const int mui,
                    const confirm_t confirm,
                    const sdu_size_t sdu_buffer_size,
                    unsigned char *sdu_buffer,
@@ -51,7 +51,7 @@ bool enqueue_sdap_data_req(protocol_ctxt_t *ctxt_p,
                    const ue_id_t ue_id,
                    const srb_flag_t srb_flag,
                    const rb_id_t rb_id,
-                   const mui_t mui,
+                   const uint16_t mui,
                    const confirm_t confirm,
                    const sdu_size_t sdu_buffer_size,
                    unsigned char *sdu_buffer,

openair2/SDAP/nr_sdap/nr_sdap_entity.c

@@ -87,7 +87,7 @@ bool nr_sdap_tx_entity(nr_sdap_entity_t *entity,
                               protocol_ctxt_t *ctxt_p,
                               const srb_flag_t srb_flag,
                               const rb_id_t rb_id,
-                              const mui_t mui,
+                              const int mui,
                               const confirm_t confirm,
                               const sdu_size_t sdu_buffer_size,
                               unsigned char *const sdu_buffer,

openair2/SDAP/nr_sdap/nr_sdap_entity.h

@@ -94,7 +94,7 @@ typedef struct nr_sdap_entity_s {
                     protocol_ctxt_t *ctxt_p,
                     const srb_flag_t srb_flag,
                     const rb_id_t rb_id,
-                    const mui_t mui,
+                    const uint16_t mui,
                     const confirm_t confirm,
                     const sdu_size_t sdu_buffer_size,
                     unsigned char *const sdu_buffer,
@@ -128,7 +128,7 @@ bool nr_sdap_tx_entity(nr_sdap_entity_t *entity,
                               protocol_ctxt_t *ctxt_p,
                               const srb_flag_t srb_flag,
                               const rb_id_t rb_id,
-                              const mui_t mui,
+                              const int mui,
                               const confirm_t confirm,
                               const sdu_size_t sdu_buffer_size,
                               unsigned char *const sdu_buffer,