paulmataruso/open5gs
1
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2025-10-23 16:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AMF] Refactor AMF Region ID Handling (#3778)

Browse Source 
- Changed amf_region_id type from uint16_t to uint8_t in context.h.
- Updated context.c to use ogs_amf_region_id() for extracting and comparing
  the region ID.
This commit is contained in:
Sukchan Lee
2025-03-16 12:22:39 +09:00
parent 9e6b86b84e
commit 10b161fbb9
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sbi/context.h
View File

@@ -364,7 +364,7 @@ typedef struct ogs_sbi_sepp_info_s {
typedef struct ogs_sbi_amf_info_s {
uint16_t amf_set_id;
uint16_t amf_region_id;
uint8_t amf_region_id;
int num_of_guami;
ogs_guami_t guami[OGS_MAX_NUM_OF_SERVED_GUAMI];

16
src/amf/context.c
View File

@@ -1108,7 +1108,7 @@ int amf_context_nf_info(void)
nf_info->amf.amf_set_id =
ogs_amf_set_id(&self.served_guami[next_new_i].amf_id);
nf_info->amf.amf_region_id =
self.served_guami[next_new_i].amf_id.region;
ogs_amf_region_id(&self.served_guami[next_new_i].amf_id);
next_found = false;
info_i = 0;
@@ -1116,7 +1116,7 @@ int amf_context_nf_info(void)
self.num_of_served_guami; served_i++) {
if ((ogs_amf_set_id(&self.served_guami[served_i].amf_id) ==
nf_info->amf.amf_set_id) &&
(self.served_guami[served_i].amf_id.region ==
(ogs_amf_region_id(&self.served_guami[served_i].amf_id) ==
nf_info->amf.amf_region_id)) {
nf_info->amf.guami[info_i] = self.served_guami[served_i];
nf_info->amf.num_of_guami++;
@@ -1125,10 +1125,14 @@ int amf_context_nf_info(void)
if (!next_found) {
int handled_i;
for (handled_i = 0; handled_i < served_i; handled_i++) {
if ((ogs_amf_set_id(&self.served_guami[handled_i].amf_id) ==
ogs_amf_set_id(&self.served_guami[served_i].amf_id)) &&
(self.served_guami[handled_i].amf_id.region ==
self.served_guami[served_i].amf_id.region)) {
if ((ogs_amf_set_id(
&self.served_guami[handled_i].amf_id) ==
ogs_amf_set_id(
&self.served_guami[served_i].amf_id)) &&
(ogs_amf_region_id(
&self.served_guami[handled_i].amf_id) ==
ogs_amf_region_id(
&self.served_guami[served_i].amf_id))) {
break;
}
next_found = true;