Merge pull request #307 from fmeisel/master

SST and SD range update

src/gnb.cpp

@@ -70,7 +70,7 @@ static nr::gnb::GnbConfig *ReadConfigYaml()
         SingleSlice s{};
         s.sst = yaml::GetInt32(nssai, "sst", 1, 0xFF);
         if (yaml::HasField(nssai, "sd"))
-            s.sd = octet3{yaml::GetInt32(nssai, "sd", 1, 0xFFFFFF)};
+            s.sd = octet3{yaml::GetInt32(nssai, "sd", 0, 0xFFFFFF)};
         result->nssai.slices.push_back(s);
     }
 

src/ue.cpp

@@ -117,7 +117,7 @@ static nr::ue::UeConfig *ReadConfigYaml()
             SingleSlice s{};
             s.sst = yaml::GetInt32(sNssai, "sst", 1, 0xFF);
             if (yaml::HasField(sNssai, "sd"))
-                s.sd = octet3{yaml::GetInt32(sNssai, "sd", 1, 0xFFFFFF)};
+                s.sd = octet3{yaml::GetInt32(sNssai, "sd", 0, 0xFFFFFF)};
             result->initials.defaultConfiguredNssai.slices.push_back(s);
         }
     }
@@ -129,7 +129,7 @@ static nr::ue::UeConfig *ReadConfigYaml()
             SingleSlice s{};
             s.sst = yaml::GetInt32(sNssai, "sst", 1, 0xFF);
             if (yaml::HasField(sNssai, "sd"))
-                s.sd = octet3{yaml::GetInt32(sNssai, "sd", 1, 0xFFFFFF)};
+                s.sd = octet3{yaml::GetInt32(sNssai, "sd", 0, 0xFFFFFF)};
             result->initials.configuredNssai.slices.push_back(s);
         }
     }
@@ -182,7 +182,7 @@ static nr::ue::UeConfig *ReadConfigYaml()
                 s.sNssai = SingleSlice{};
                 s.sNssai->sst = yaml::GetInt32(slice, "sst", 1, 0xFF);
                 if (yaml::HasField(slice, "sd"))
-                    s.sNssai->sd = octet3{yaml::GetInt32(slice, "sd", 1, 0xFFFFFF)};
+                    s.sNssai->sd = octet3{yaml::GetInt32(slice, "sd", 0, 0xFFFFFF)};
             }
 
             std::string type = yaml::GetString(sess, "type");
@@ -472,4 +472,4 @@ int main(int argc, char **argv)
 
     while (true)
         Loop();
-}
\ No newline at end of file
+}

src/utils/yaml_utils.cpp

@@ -171,4 +171,4 @@ std::vector<YAML::Node> GetSequence(const YAML::Node &node, const std::string &n
     return res;
 }
 
-} // namespace yaml
\ No newline at end of file
+} // namespace yaml