vrr/open5gs
2
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2026-04-28 03:19:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[NAS] add support for 30-seconds unit for GPRS3 timer

Browse source
This commit is contained in:
Bostjan Meglic 2025-03-10 13:11:19 +01:00 • committed by Sukchan Lee
parent 63d26667bc
commit fa3edde329
2 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

54
lib/nas/common/conv.c
View file

@ -131,56 +131,66 @@ int ogs_nas_gprs_timer_3_from_sec(
gprs_timer->unit = OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_2_SS;
gprs_timer->value = timer_value / 2;
} else {
if (timer_value%60 != 0) {
ogs_error("Not multiples of 1 minute");
if (timer_value%30 != 0) {
ogs_error("Not multiples of 30 seconds");
return OGS_ERROR;
}
timer_value /= 60; /* multiples of 1 minute */
timer_value /= 30; /* multiples of 30 seconds */
if (timer_value <= 31) {
gprs_timer->unit = OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_MM;
gprs_timer->unit = OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_30_SS;
gprs_timer->value = timer_value;
} else {
if (timer_value%10 != 0) {
ogs_error("Not multiples of decihours(= 10 minutes)");
if (timer_value%2 != 0) {
ogs_error("Not multiples of 1 minute");
return OGS_ERROR;
}
timer_value /= 10; /* multiples of decihours = 10 mintues */
timer_value /= 2; /* multiples of 1 minute */
if (timer_value <= 31) {
gprs_timer->unit = OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_10_MM;
gprs_timer->unit = OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_MM;
gprs_timer->value = timer_value;
} else {
if (timer_value%6 != 0) {
ogs_error("Not multiples of 1 hour");
if (timer_value%10 != 0) {
ogs_error("Not multiples of decihours(= 10 minutes)");
return OGS_ERROR;
}
timer_value /= 6; /* multiples of 1 hour */
timer_value /= 10; /* multiples of decihours = 10 mintues */
if (timer_value <= 31) {
gprs_timer->unit =
OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_HH;
gprs_timer->unit = OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_10_MM;
gprs_timer->value = timer_value;
} else {
if (timer_value%10 != 0) {
ogs_error("Not multiples of 10 hours");
if (timer_value%6 != 0) {
ogs_error("Not multiples of 1 hour");
return OGS_ERROR;
}
timer_value /= 10; /* multiples of 10 hours */
timer_value /= 6; /* multiples of 1 hour */
if (timer_value <= 31) {
gprs_timer->unit =
OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_10_HH;
OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_HH;
gprs_timer->value = timer_value;
} else {
if (timer_value%32 != 0) {
if (timer_value%10 != 0) {
ogs_error("Not multiples of 10 hours");
return OGS_ERROR;
}
timer_value /= 32; /* multiples of 320 hours */
timer_value /= 10; /* multiples of 10 hours */
if (timer_value <= 31) {
gprs_timer->unit =
OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_320_HH;
OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_10_HH;
gprs_timer->value = timer_value;
} else {
ogs_error("Overflow!");
return OGS_ERROR;
if (timer_value%32 != 0) {
ogs_error("Not multiples of 10 hours");
return OGS_ERROR;
}
timer_value /= 32; /* multiples of 320 hours */
if (timer_value <= 31) {
gprs_timer->unit =
OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_320_HH;
gprs_timer->value = timer_value;
} else {
ogs_error("Overflow!");
return OGS_ERROR;
}
}
}
}

4
tests/unit/nas-message-test.c
View file

@ -410,9 +410,9 @@ static void ogs_nas_eps_message_test9(abts_case *tc, void *data)
ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*2);
ABTS_INT_EQUAL(tc, OGS_OK, rv);
ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_MM,
ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_30_SS,
gprs_timer.unit);
ABTS_INT_EQUAL(tc, 2, gprs_timer.value);
ABTS_INT_EQUAL(tc, 4, gprs_timer.value);
rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*2+1);
ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*30);