Merge branch 'fix_sst_sd' into 'develop'

Fix sst sd

See merge request oai/cn5g/oai-cn5g-amf!97

src/amf-app/amf_n2.cpp

@@ -2186,7 +2186,13 @@ bool amf_n2::get_common_plmn(
           plmn_slice_support_item.mnc = list[j].b_plmn_list[k].mnc;
 
           for (auto s1 : list[j].b_plmn_list[k].slice_list) {
+            Logger::amf_n2().debug(
+                "S-NSSAI from gNB (SST %s, SD %s)", s1.sst.c_str(),
+                s1.sd.c_str());
             for (auto s2 : amf_cfg.plmn_list[i].slice_list) {
+              Logger::amf_n2().debug(
+                  "S-NSSAI from AMF (SST %d, SD %s)", s2.sst,
+                  std::to_string(s2.sd).c_str());
               if ((s1.sst.compare(std::to_string(s2.sst)) == 0) and
                   (s1.sd.compare(std::to_string(s2.sd)) == 0)) {
                 Logger::amf_n2().debug(

src/ngap/ngapIEs/S-NSSAI.cpp

@@ -77,14 +77,13 @@ bool S_NSSAI::sDEncode2OctetString(Ngap_SD_t* m_sd) {
 bool S_NSSAI::sDdecodefromOctetString(Ngap_SD_t* m_sd) {
   if (!m_sd->buf) return false;
   if (m_sd->size == 3) {
-    sd = ((m_sd->buf[0] >> 16) + (m_sd->buf[1] >> 8) + m_sd->buf[2]);
-
+    sd = ((m_sd->buf[0] << 16) + (m_sd->buf[1] << 8) + m_sd->buf[2]);
+    return true;
   } else if (m_sd->size == 4) {
-    sd = ((m_sd->buf[1] >> 16) + (m_sd->buf[2] >> 8) + m_sd->buf[3]);
+    sd = ((m_sd->buf[1] << 16) + (m_sd->buf[2] << 8) + m_sd->buf[3]);
+    return true;
   }
-  //  sd = *(uint32_t*) m_sd->buf & 0x00ffffff;
-
-  return true;
+  return false;
 }
 
 //------------------------------------------------------------------------------