added srcid to nas_config for SL

openair2/LAYER2/NR_MAC_COMMON/nr_mac.h

@@ -139,31 +139,6 @@ static inline int get_mac_len(uint8_t* pdu, int pdu_len, uint16_t *mac_ce_len, u
   return true;
 }
 
-static inline int get_mac_len_sl(uint8_t* pdu, int pdu_len, uint16_t *mac_ce_len, uint16_t *mac_subheader_len) {
-  uint8_t sl_sch_header_len = (int)sizeof(NR_SLSCH_MAC_SUBHEADER_FIXED);
-  if (pdu_len < sl_sch_header_len)
-    return false;
-  NR_SLSCH_MAC_SUBHEADER_FIXED *sl_sch_subheader = (NR_SLSCH_MAC_SUBHEADER_FIXED*) pdu;
-  pdu += sl_sch_header_len;
-  if ( pdu_len < sl_sch_header_len + (int)sizeof(NR_MAC_SUBHEADER_SHORT))
-    return false;
-  NR_MAC_SUBHEADER_SHORT *s = (NR_MAC_SUBHEADER_SHORT*) pdu;
-  NR_MAC_SUBHEADER_LONG *l = (NR_MAC_SUBHEADER_LONG*) pdu;
-  if (s->F && pdu_len < sl_sch_header_len + (int)sizeof(NR_MAC_SUBHEADER_LONG))
-    return false;
-  if (s->F) {
-    *mac_subheader_len = sizeof(*l) + sizeof(*sl_sch_subheader);
-    *mac_ce_len = ntohs(l->L);
-  } else {
-    *mac_subheader_len = sizeof(*s) + sizeof(*sl_sch_subheader);
-    *mac_ce_len = s->L;
-  }
-  LOG_D(NR_MAC, "V %hhu, SRC %hu, DST %hhu\n", sl_sch_subheader->V, sl_sch_subheader->SRC, sl_sch_subheader->DST);
-  LOG_D(NR_MAC, "R %hhu, F %hhu, LCID %hhu, L %hu\n", l->R, l->F, l->LCID, ntohs(l->L));
-  LOG_D(NR_MAC, "mac_subheader_len %hu, mac_ce_len %hu\n", *mac_subheader_len, *mac_ce_len);
-  return true;
-}
-    
 // SL BSR MAC CEs
 // TS 38.321 ch. 6.1.3.33
 // Short BSR for a specific logical channel group ID

openair2/RRC/NR_UE/rrc_sl_preconfig.c

@@ -590,7 +590,7 @@ void nr_UE_configure_Sidelink(uint8_t id, uint8_t is_sync_source) {
   sprintf(aprefix, "%s.[%i].%s.[%i]", SL_CONFIG_STRING_SL_PRECONFIGURATION, 0, SL_CONFIG_STRING_UEINFO, 0);
   config_get(SL_UEINFO,sizeof(SL_UEINFO)/sizeof(paramdef_t),aprefix);
   LOG_I(NR_RRC,"SL L2 SRCid %x, SL ipv4 addr X.X.%d.%d\n",ueinfo.srcid,ueinfo.thirdOctet,ueinfo.fourthOctet);
-  nas_config(1,ueinfo.thirdOctet,ueinfo.fourthOctet,"oai_sl_tun");
+  nas_config(1+ueinfo.srcid,ueinfo.thirdOctet,ueinfo.fourthOctet,"oai_sl_tun");
   nr_rrc_mac_config_req_sl_preconfig(id, sl_preconfig, sync_source, ueinfo.srcid);