@@ -2,7 +2,7 @@

 Source: open5gs

 Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg

 Architecture: any

-Version: 2.6.4.72.e625f.202308130026

+Version: 2.6.4.75.e01f.202308140026

 Maintainer: Harald Welte <laforge@gnumonks.org>

 Uploaders: Sukchan Lee <acetcom@gmail.com>

 Homepage: https://open5gs.org

@@ -31,8 +31,8 @@

  open5gs-udr deb net optional arch=any

  open5gs-upf deb net optional arch=any

 Checksums-Sha1:

- 4b1fbc7eb864cad74ebf481f5ad31604d024d172 14241256 open5gs_2.6.4.72.e625f.202308130026.tar.xz

+ 505eb3d8dbe892ff50b41457f0d60f7f3663396e 14242272 open5gs_2.6.4.75.e01f.202308140026.tar.xz

 Checksums-Sha256:

- a6eac571273bd9fb9645a3e6e2aa71187b1ae2c9984fff3a647fd02aa485bd73 14241256 open5gs_2.6.4.72.e625f.202308130026.tar.xz

+ 86f08deb4914467266156bd78c303fd327126103198926b6194f4a61d1badd7f 14242272 open5gs_2.6.4.75.e01f.202308140026.tar.xz

 Files:

- 26f4288d5845c864dd543401ed9afb17 14241256 open5gs_2.6.4.72.e625f.202308130026.tar.xz

+ becebe815e7caa935a91aa34733936be 14242272 open5gs_2.6.4.75.e01f.202308140026.tar.xz

​

@@ -1 +1 @@

-2.6.4.72-e625f.202308130026

+2.6.4.75-e01f.202308140026

​

@@ -255,5 +255,7 @@

         port: 7777

 time:

+  t3412:

+    value: 540     # 9 mintues * 60 = 540 seconds

   t3512:

     value: 540     # 9 mintues * 60 = 540 seconds

​

@@ -284,5 +284,7 @@

         port: 7777

 time:

+  t3412:

+    value: 540     # 9 mintues * 60 = 540 seconds

   t3512:

     value: 540     # 9 mintues * 60 = 540 seconds

​

@@ -253,5 +253,7 @@

         port: 7777

 time:

+  t3412:

+    value: 540     # 9 mintues * 60 = 540 seconds

   t3512:

     value: 540     # 9 mintues * 60 = 540 seconds

​

@@ -581,3 +581,5 @@

 #    t3423:

 #      value: 720  # 12 minutes * 60 = 720 seconds

 time:

+  t3412:

+    value: 540     # 9 mintues * 60 = 540 seconds

​

@@ -271,5 +271,7 @@

         port: 7777

 time:

+  t3412:

+    value: 540     # 9 mintues * 60 = 540 seconds

   t3512:

     value: 540     # 9 mintues * 60 = 540 seconds

​

@@ -264,5 +264,7 @@

         port: 7777

 time:

+  t3412:

+    value: 540     # 9 mintues * 60 = 540 seconds

   t3512:

     value: 540     # 9 mintues * 60 = 540 seconds

​

@@ -250,5 +250,7 @@

         port: 7777

 time:

+  t3412:

+    value: 540     # 9 mintues * 60 = 540 seconds

   t3512:

     value: 540     # 9 mintues * 60 = 540 seconds

​

@@ -257,5 +257,7 @@

         port: 7777

 time:

+  t3412:

+    value: 540     # 9 mintues * 60 = 540 seconds

   t3512:

     value: 540     # 9 mintues * 60 = 540 seconds

​

@@ -265,5 +265,7 @@

         port: 7777

 time:

+  t3412:

+    value: 540     # 9 mintues * 60 = 540 seconds

   t3512:

     value: 540     # 9 mintues * 60 = 540 seconds

​

@@ -1,8 +1,8 @@

-open5gs (2.6.4.72.e625f.202308130026) unstable; urgency=medium

+open5gs (2.6.4.75.e01f.202308140026) unstable; urgency=medium

   * Automatically generated changelog entry for building the Osmocom nightly feed

- -- Osmocom OBS scripts <info@osmocom.org>  Sun, 13 Aug 2023 00:28:20 +0000

+ -- Osmocom OBS scripts <info@osmocom.org>  Mon, 14 Aug 2023 00:27:45 +0000

 open5gs (2.6.4) unstable; urgency=medium

​

@@ -168,8 +168,8 @@

     "__v" : 0,

     "access_restriction_data" : 32,

     "ambr" : {

-        "downlink" : NumberLong(1024000),

-        "uplink" : NumberLong(1024000)

+        "downlink" : NumberLong(1000000),

+        "uplink" : NumberLong(1000000)

     },

     "network_access_mode" : 2,

     "pdn" : 

@@ -178,8 +178,8 @@

             "_id" : ObjectId("609715fd455bcd38c884ce85"),

             "pcc_rule" :  ,

             "ambr" : {

-                "downlink" : NumberLong(1024000),

-                "uplink" : NumberLong(1024000)

+                "downlink" : NumberLong(1000000),

+                "uplink" : NumberLong(1000000)

             },

             "qos" : {

                 "qci" : 9,

​

@@ -226,7 +226,7 @@

                     }

                     for (n = 0; n < unit; n++)

-                        session->ambr.downlink *= 1024;

+                        session->ambr.downlink *= 1000;

                 } else if (!strcmp(child5_key, "uplink") &&

                         BSON_ITER_HOLDS_DOCUMENT(&child5_iter)) {

                     uint8_t unit = 0;

@@ -246,7 +246,7 @@

                     }

                     for (n = 0; n < unit; n++)

-                        session->ambr.uplink *= 1024;

+                        session->ambr.uplink *= 1000;

                 }

             }

@@ -332,7 +332,7 @@

                                         }

                                         for (n = 0; n < unit; n++)

-                                            pcc_rule->qos.mbr.downlink *= 1024;

+                                            pcc_rule->qos.mbr.downlink *= 1000;

                                     } else if (!strcmp(child8_key, "uplink") &&

                                         BSON_ITER_HOLDS_DOCUMENT(

@@ -361,7 +361,7 @@

                                         }

                                         for (n = 0; n < unit; n++)

-                                            pcc_rule->qos.mbr.uplink *= 1024;

+                                            pcc_rule->qos.mbr.uplink *= 1000;

                                     }

                                 }

                             } else if (!strcmp(child7_key, "gbr") &&

@@ -397,7 +397,7 @@

                                         }

                                         for (n = 0; n < unit; n++)

-                                            pcc_rule->qos.gbr.downlink *= 1024;

+                                            pcc_rule->qos.gbr.downlink *= 1000;

                                     } else if (!strcmp(child8_key, "uplink") &&

                                         BSON_ITER_HOLDS_DOCUMENT(

@@ -426,7 +426,7 @@

                                         }

                                         for (n = 0; n < unit; n++)

-                                            pcc_rule->qos.gbr.uplink *= 1024;

+                                            pcc_rule->qos.gbr.uplink *= 1000;

                                     }

                                 }

                             }

​

@@ -424,7 +424,7 @@

                     }

                     for (n = 0; n < unit; n++)

-                        subscription_data->ambr.downlink *= 1024;

+                        subscription_data->ambr.downlink *= 1000;

                 } else if (!strcmp(child1_key, "uplink") &&

                         BSON_ITER_HOLDS_DOCUMENT(&child1_iter)) {

                     uint8_t unit = 0;

@@ -444,7 +444,7 @@

                     }

                     for (n = 0; n < unit; n++)

-                        subscription_data->ambr.uplink *= 1024;

+                        subscription_data->ambr.uplink *= 1000;

                 }

             }

@@ -593,7 +593,7 @@

                                             }

                                             for (n = 0; n < unit; n++)

-                                                session->ambr.downlink *= 1024;

+                                                session->ambr.downlink *= 1000;

                                         } else if (!strcmp(child5_key,

                                                     "uplink") &&

                                                 BSON_ITER_HOLDS_DOCUMENT(

@@ -624,7 +624,7 @@

                                             }

                                             for (n = 0; n < unit; n++)

-                                                session->ambr.uplink *= 1024;

+                                                session->ambr.uplink *= 1000;

                                         }

                                     }

                                 } else if (!strcmp(child4_key, "smf") &&

​

@@ -127,14 +127,14 @@

      * giving a range of 1600 Mbps to 10 Gbps Mbps in 100 Mbps increaments.

      */

     if (extended2 >= 0b00000001 && extended2 <= 0b00111101) {

-        return 256*1024 + extended2 * 4*1024;

+        return 256*1000 + extended2 * 4*1000;

     } else if (extended2 >= 0b00111110 && extended2 <= 0b10100001) {

-        return 500*1024 + (extended2 - 0b00111101) * 10*1024;

+        return 500*1000 + (extended2 - 0b00111101) * 10*1000;

     } else if (extended2 >= 0b10100010 && extended2 <= 0b11110110) {

-        return 1500*1024 + (extended2 - 0b10100001) * 100*1024;

+        return 1500*1000 + (extended2 - 0b10100001) * 100*1000;

     } else if (extended2 > 0b11110110) {

         ogs_error("Protocol Error : extended2%x", extended2);

-        return 10*1000*1024; /* 10*1000 Mbps */

+        return 10*1000*1000; /* 10*1000 Mbps */

     /*

      * Octet 8

@@ -155,12 +155,12 @@

     } else if (extended >= 0b00000001 && extended <= 0b01001010) {

         return 8600 + extended * 100;

     } else if (extended >= 0b01001011 && extended <= 0b10111010) {

-        return 16*1024 + (extended - 0b01001010) * 1*1024;

+        return 16*1000 + (extended - 0b01001010) * 1*1000;

     } else if (extended >= 0b10111011 && extended <= 0b11111010) {

-        return 128*1024 + (extended - 0b10111010) * 2*1024;

+        return 128*1000 + (extended - 0b10111010) * 2*1000;

     } else if (extended > 0b11111010) {

         ogs_error("Protocol Error : extended%x", extended);

-        return 256*1024; /* 256 Mbps */

+        return 256*1000; /* 256 Mbps */

     /*

      * Octet 4

​

@@ -302,7 +302,7 @@

 } __attribute__ ((packed)) ogs_gtp2_flow_qos_t;

 #define ogs_gtp2_qos_to_bps(br, extended, extended2) \

-    ogs_gtp2_qos_to_kbps(br, extended, extended2) * 1024;

+    ogs_gtp2_qos_to_kbps(br, extended, extended2) * 1000;

 uint64_t ogs_gtp2_qos_to_kbps(uint8_t br, uint8_t extended, uint8_t extended2);

​

@@ -97,11 +97,11 @@

             gprs_timer->unit = OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_1_MM;

             gprs_timer->value = timer_value;

         } else {

-            if (timer_value%10 != 0) {

-                ogs_error("Not multiples of decihours(= 10 minutes)");

+            if (timer_value%6 != 0) {

+                ogs_error("Not multiples of decihours(= 6 minutes)");

                 return OGS_ERROR;

             }

-            timer_value /= 10; /* multiples of decihours = 10 minutes */

+            timer_value /= 6; /* multiples of decihours = 6 minutes */

             if (timer_value <= 31) {

                 gprs_timer->unit = OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_DECI_HH;

                 gprs_timer->value = timer_value;

​

@@ -114,31 +114,31 @@

         length = ogs_max(length, 2);

     }

     /* Set to 16000 Kbps */

-    else if (input > 16000 && input < (17*1024)) {

+    else if (input > 16000 && input < (17*1000)) {

         *br = 0b11111110;

         *extended = 0b01001010;

         length = ogs_max(length, 2);

     }

     /* giving a range of 17 Mbps to 128 Mbps in 1 Mbps increments. */

-    else if (input >= (17*1024) && input <= (128*1024)) {

+    else if (input >= (17*1000) && input <= (128*1000)) {

         *br = 0b11111110;

-        *extended = ((input - (16*1024)) / (1*1024)) + 0b01001010;

+        *extended = ((input - (16*1000)) / (1*1000)) + 0b01001010;

         length = ogs_max(length, 2);

     }

     /* Set to 128 Mbps */

-    else if (input > (128*1024) && input < (130*1024)) {

+    else if (input > (128*1000) && input < (130*1000)) {

         *br = 0b11111110;

         *extended = 0b10111010;

         length = ogs_max(length, 2);

     }

     /* giving a range of 130 Mbps to 256 Mbps in 2 Mbps increments. */

-    else if (input >= (130*1024) && input <= (256*1024)) {

+    else if (input >= (130*1000) && input <= (256*1000)) {

         *br = 0b11111110;

-        *extended = ((input - (128*1024)) / (2*1024)) + 0b10111010;

+        *extended = ((input - (128*1000)) / (2*1000)) + 0b10111010;

         length = ogs_max(length, 2);

     }

     /* Set to 256 Mbps */

-    else if (input > (1*256*1024) && input < (2*256*1024)) {

+    else if (input > (1*256*1000) && input < (2*256*1000)) {

         *br = 0b11111110;

         *extended = 0b11111010;

         length = ogs_max(length, 2);

@@ -157,14 +157,14 @@

      */

     /* giving a range of values from 260M to 500M in 4M increments */

-    else if (input >= (2*256*1024) && input <= (255*256*1024)) {

+    else if (input >= (2*256*1000) && input <= (255*256*1000)) {

         *br = 0b11111110;

         *extended = 0b11111010;

-        *extended2 = (input - (1*256*1024)) / (256*1024);

+        *extended2 = (input - (1*256*1000)) / (256*1000);

         length = ogs_max(length, 3);

     }

     /* if the sending entity want to indicate BR higher than 65280M */

-    else if (input > (255*256*1024)) {

+    else if (input > (255*256*1000)) {

         *br = 0b11111110;

         *extended = 0b11111010;

         *extended2 = 0b11111110;

@@ -262,31 +262,31 @@

         length = ogs_max(length, 2);

     }

     /* Set to 16000 Kbps */

-    else if (input > 16000 && input < (17*1024)) {

+    else if (input > 16000 && input < (17*1000)) {

         *br = 0b11111110;

         *extended = 0b01001010;

         length = ogs_max(length, 2);

     }

     /* giving a range of 17 Mbps to 128 Mbps in 1 Mbps increments. */

-    else if (input >= (17*1024) && input <= (128*1024)) {

+    else if (input >= (17*1000) && input <= (128*1000)) {

         *br = 0b11111110;

-        *extended = ((input - (16*1024)) / (1*1024)) + 0b01001010;

+        *extended = ((input - (16*1000)) / (1*1000)) + 0b01001010;

         length = ogs_max(length, 2);

     }

     /* Set to 128 Mbps */

-    else if (input > (128*1024) && input < (130*1024)) {

+    else if (input > (128*1000) && input < (130*1000)) {

         *br = 0b11111110;

         *extended = 0b10111010;

         length = ogs_max(length, 2);

     }

     /* giving a range of 130 Mbps to 256 Mbps in 2 Mbps increments. */

-    else if (input >= (130*1024) && input <= (256*1024)) {

+    else if (input >= (130*1000) && input <= (256*1000)) {

         *br = 0b11111110;

-        *extended = ((input - (128*1024)) / (2*1024)) + 0b10111010;

+        *extended = ((input - (128*1000)) / (2*1000)) + 0b10111010;

         length = ogs_max(length, 2);

     }

     /* Set to 256 Mbps */

-    else if (input > (256*1024) && input < (260*1024)) {

+    else if (input > (256*1000) && input < (260*1000)) {

         *br = 0b11111110;

         *extended = 0b11111010;

         length = ogs_max(length, 2);

@@ -310,42 +310,42 @@

      */

     /* giving a range of values from 260M to 500M in 4M increments */

-    else if (input >= (260*1024) && input <= (500*1024)) {

+    else if (input >= (260*1000) && input <= (500*1000)) {

         *br = 0b11111110;

         *extended = 0b11111010;

-        *extended2 = (input - (256*1024)) / (4*1024);

+        *extended2 = (input - (256*1000)) / (4*1000);

         length = ogs_max(length, 3);

     }

     /* if a range of values from 500M to 510M */

-    else if (input > (500*1024) && input < (510*1024)) {

+    else if (input > (500*1000) && input < (510*1000)) {

         *br = 0b11111110;

         *extended = 0b11111010;

         *extended2 = 0b00111101;

         length = ogs_max(length, 3);

     }

     /* giving a range of values from 510M to 1500M in 10M increments */

-    else if (input >= (510*1024) && input <= (1500*1024)) {

+    else if (input >= (510*1000) && input <= (1500*1000)) {

         *br = 0b11111110;

         *extended = 0b11111010;

-        *extended2 = (input - (500*1024)) / (10*1024) + 0b00111101;

+        *extended2 = (input - (500*1000)) / (10*1000) + 0b00111101;

         length = ogs_max(length, 3);

     }

     /* if a range of values from 1500M to 1600M */

-    else if (input > (1500*1024) && input < (1600*1024)) {

+    else if (input > (1500*1000) && input < (1600*1000)) {

         *br = 0b11111110;

         *extended = 0b11111010;

         *extended2 = 0b10100001;

         length = ogs_max(length, 3);

     }

     /* giving a range of values from 1600M to 10000M in 100M increments */

-    else if (input >= (1600*1024) && input <= (10*1000*1024)) {

+    else if (input >= (1600*1000) && input <= (10*1000*1000)) {

         *br = 0b11111110;

         *extended = 0b11111010;

-        *extended2 = (input - (1500*1024)) / (100*1024) + 0b10100001;

+        *extended2 = (input - (1500*1000)) / (100*1000) + 0b10100001;

         length = ogs_max(length, 3);

     }

     /* if the sending entity want to indicate BR higher than 10000Mbps */

-    else if (input > (10*1000*1024)) {

+    else if (input > (10*1000*1000)) {

         *br = 0b11111110;

         *extended = 0b11111010;

         *extended2 = 0b11110110;

@@ -361,8 +361,8 @@

 {

     uint8_t length = 0;

-    dl_apn_ambr = dl_apn_ambr / 1024; /* Kbps */

-    ul_apn_ambr = ul_apn_ambr / 1024; /* Kbps */

+    dl_apn_ambr = dl_apn_ambr / 1000; /* Kbps */

+    ul_apn_ambr = ul_apn_ambr / 1000; /* Kbps */

     memset(apn_aggregate_maximum_bit_rate, 0,

         sizeof(ogs_nas_apn_aggregate_maximum_bit_rate_t));

@@ -387,10 +387,10 @@

 {

     uint8_t length = 0;

-    dl_mbr = dl_mbr / 1024; /* Kbps */

-    ul_mbr = ul_mbr / 1024; /* Kbps */

-    dl_gbr = dl_gbr / 1024; /* Kbps */

-    ul_gbr = ul_gbr / 1024; /* Kbps */

+    dl_mbr = dl_mbr / 1000; /* Kbps */

+    ul_mbr = ul_mbr / 1000; /* Kbps */

+    dl_gbr = dl_gbr / 1000; /* Kbps */

+    ul_gbr = ul_gbr / 1000; /* Kbps */

     memset(eps_qos, 0, sizeof(ogs_nas_eps_quality_of_service_t));

​

@@ -172,7 +172,7 @@

     }

     if (self.num_of_ciphering_order == 0) {

-        ogs_error("no amf.security.ciphering_order in '%s'",

+        ogs_error("No amf.security.ciphering_order in '%s'",

                 ogs_app()->file);

         return OGS_ERROR;

     }

@@ -181,6 +181,11 @@

         ogs_error("Not support GPRS Timer 2 %d", (int)self.time.t3502.value);

         return OGS_ERROR;

     }

+    if (!self.time.t3512.value) {

+        ogs_error("No amf.time.t3512.value in '%s'",

+                ogs_app()->file);

+        return OGS_ERROR;

+    }

     if (ogs_nas_gprs_timer_3_from_sec(&gprs_timer, self.time.t3512.value) !=

         OGS_OK) {

         ogs_error("Not support GPRS Timer 3 %d", (int)self.time.t3512.value);

@@ -1024,6 +1029,8 @@

                         } else

                             ogs_warn("unknown key `%s`", t3512_key);

                     }

+                } else if (!strcmp(time_key, "t3412")) {

+                    /* handle config in mme */

                 } else if (!strcmp(time_key, "nf_instance")) {

                     /* handle config in app library */

                 } else if (!strcmp(time_key, "subscription")) {

​

@@ -129,15 +129,14 @@

     network_feature_support->

         ims_voice_over_ps_session_over_3gpp_access_indicator = 1;

-    /* Set T3512 */

-    if (amf_self()->time.t3512.value) {

-        rv = ogs_nas_gprs_timer_3_from_sec(

-                &t3512_value->t, amf_self()->time.t3512.value);

-        ogs_assert(rv == OGS_OK);

-        registration_accept->presencemask |=

-            OGS_NAS_5GS_REGISTRATION_ACCEPT_T3512_VALUE_PRESENT;

-        t3512_value->length = 1;

-    }

+    /* Set T3512 : Mandatory in Open5GS */

+    ogs_assert(amf_self()->time.t3512.value);

+    rv = ogs_nas_gprs_timer_3_from_sec(

+            &t3512_value->t, amf_self()->time.t3512.value);

+    ogs_assert(rv == OGS_OK);

+    registration_accept->presencemask |=

+        OGS_NAS_5GS_REGISTRATION_ACCEPT_T3512_VALUE_PRESENT;

+    t3512_value->length = 1;

     /* Set T3502 */

     if (amf_self()->time.t3502.value) {

​

@@ -75,6 +75,7 @@

         ogs_error("No rat_type");

         goto end;

     }

+    Amf3GppAccessRegistration.pei = amf_ue->pei;

     message.Amf3GppAccessRegistration = &Amf3GppAccessRegistration;

​

@@ -138,15 +138,11 @@

         }

     }

-    /* Set T3412 */

-    t3412_value->unit = OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_DECI_HH;

-    t3412_value->value = 9;

-

-    if (mme_self()->time.t3412.value) {

-        rv = ogs_nas_gprs_timer_from_sec(

-                t3412_value, mme_self()->time.t3412.value);

-        ogs_assert(rv == OGS_OK);

-    }

+    /* Set T3412 : Mandatory in Open5GS */

+    ogs_assert(mme_self()->time.t3412.value);

+    rv = ogs_nas_gprs_timer_from_sec(

+            t3412_value, mme_self()->time.t3412.value);

+    ogs_assert(rv == OGS_OK);

     ogs_debug("    TAIPLMN_ID:%06x,TAC:%d",

             ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id),

​

@@ -191,10 +191,58 @@

         case MME_TIMER_MOBILE_REACHABLE:

             ogs_info("%s Mobile Reachable timer expired", mme_ue->imsi_bcd);

             CLEAR_MME_UE_TIMER(mme_ue->t_mobile_reachable);

-            /* TS 24.301 5.3.5

-             * Upon expiry of the mobile reachable timer the network shall

-             * start the implicit detach timer.

-             */

+        /*

+         * TS 24.301

+         * Section 5.3.5

+         * Handling of the periodic tracking area update timer and

+         * mobile reachable timer (S1 mode only)

+         *

+         * The periodic tracking area updating procedure is used to

+         * periodically notify the availability of the UE to the network.

+         * The procedure is controlled in the UE by timer T3412.

+         * The value of timer T3412 is sent by the network to the UE

+         * in the ATTACH ACCEPT message and can be sent in the TRACKING AREA

+         * UPDATE ACCEPT message. The UE shall apply this value in all tracking

+         * areas of the list of tracking areas assigned to the UE

+         * until a new value is received.

+         *

+         * If timer T3412 received by the UE in an ATTACH ACCEPT or TRACKING

+         * AREA UPDATE ACCEPT message contains an indication that the timer is

+         * deactivated or the timer value is zero, then timer T3412 is

+         * deactivated and the UE shall not perform the periodic tracking area

+         * updating procedure.

+         *

+         * Timer T3412 is reset and started with its initial value,

+         * when the UE changes from EMM-CONNECTED to EMM-IDLE mode.

+         *

+         * Timer T3412 is stopped when the UE enters EMM-CONNECTED mode or

+         * the EMM-DEREGISTERED state. If the UE is attached for emergency

+         * bearer services, and timer T3412 expires, the UE shall not initiate

+         * a periodic tracking area updating procedure, but shall locally detach

+         * from the network. When the UE is camping on a suitable cell, it may

+         * re-attach to regain normal service.

+         *

+         * When a UE is not attached for emergency bearer services, and timer

+         * T3412 expires, the periodic tracking area updating procedure shall

+         * be started and the timer shall be set to its initial value

+         * for the next start.

+         *

+         * If the UE is not attached for emergency bearer services, the mobile

+         * reachable timer shall be longer than T3412. In this case, by default,

+         * the mobile reachable timer is 4 minutes greater than timer T3412.

+         *

+         * Upon expiry of the mobile reachable timer the network shall start

+         * the implicit detach timer. The value of the implicit detach timer is

+         * network dependent. If ISR is activated, the default value of

+         * the implicit detach timer is 4 minutes greater than timer T3423.

+         * If the implicit detach timer expires before the UE contacts

+         * the network, the network shall implicitly detach the UE. If the MME

+         * includes timer T3346 in the TRACKING AREA UPDATE REJECT message or

+         * the SERVICE REJECT message and timer T3346 is greater than timer

+         * T3412, the MME sets the mobile reachable timer and the implicit

+         * detach timer such that the sum of the timer values is greater than

+         * timer T3346.

+         */

             ogs_debug("%s Starting Implicit Detach timer",

                 mme_ue->imsi_bcd);

             ogs_timer_start(mme_ue->t_implicit_detach.timer,

​

@@ -193,6 +193,9 @@

     self.diam_config->cnf_port = DIAMETER_PORT;

     self.diam_config->cnf_port_tls = DIAMETER_SECURE_PORT;

+    /* Set the default T3412 to 9 minutes for backward compatibility. */

+    self.time.t3412.value = 540;

+

     return OGS_OK;

 }

@@ -267,7 +270,7 @@

         return OGS_ERROR;

     }

     if (self.num_of_ciphering_order == 0) {

-        ogs_error("no mme.security.ciphering_order in '%s'",

+        ogs_error("No mme.security.ciphering_order in '%s'",

                 ogs_app()->file);

         return OGS_ERROR;

     }

@@ -276,6 +279,11 @@

         ogs_error("Not support GPRS Timer %d", (int)self.time.t3402.value);

         return OGS_ERROR;

     }

+    if (!self.time.t3412.value) {

+        ogs_error("No mme.time.t3412.value in '%s'",

+                ogs_app()->file);

+        return OGS_ERROR;

+    }

     if (ogs_nas_gprs_timer_from_sec(&gprs_timer, self.time.t3412.value) !=

         OGS_OK) {

         ogs_error("Not support GPRS Timer %d", (int)self.time.t3412.value);

​

@@ -1712,6 +1712,58 @@

         if (OGS_FSM_CHECK(&mme_ue->sm, emm_state_registered)) {

             ogs_debug("Mobile Reachable timer started for IMSI%s",

                 mme_ue->imsi_bcd);

+        /*

+         * TS 24.301

+         * Section 5.3.5

+         * Handling of the periodic tracking area update timer and

+         * mobile reachable timer (S1 mode only)

+         *

+         * The periodic tracking area updating procedure is used to

+         * periodically notify the availability of the UE to the network.

+         * The procedure is controlled in the UE by timer T3412.

+         * The value of timer T3412 is sent by the network to the UE

+         * in the ATTACH ACCEPT message and can be sent in the TRACKING AREA

+         * UPDATE ACCEPT message. The UE shall apply this value in all tracking

+         * areas of the list of tracking areas assigned to the UE

+         * until a new value is received.

+         *

+         * If timer T3412 received by the UE in an ATTACH ACCEPT or TRACKING

+         * AREA UPDATE ACCEPT message contains an indication that the timer is

+         * deactivated or the timer value is zero, then timer T3412 is

+         * deactivated and the UE shall not perform the periodic tracking area

+         * updating procedure.

+         *

+         * Timer T3412 is reset and started with its initial value,

+         * when the UE changes from EMM-CONNECTED to EMM-IDLE mode.

+         *

+         * Timer T3412 is stopped when the UE enters EMM-CONNECTED mode or

+         * the EMM-DEREGISTERED state. If the UE is attached for emergency

+         * bearer services, and timer T3412 expires, the UE shall not initiate

+         * a periodic tracking area updating procedure, but shall locally detach

+         * from the network. When the UE is camping on a suitable cell, it may

+         * re-attach to regain normal service.

+         *

+         * When a UE is not attached for emergency bearer services, and timer

+         * T3412 expires, the periodic tracking area updating procedure shall

+         * be started and the timer shall be set to its initial value

+         * for the next start.

+         *

+         * If the UE is not attached for emergency bearer services, the mobile

+         * reachable timer shall be longer than T3412. In this case, by default,

+         * the mobile reachable timer is 4 minutes greater than timer T3412.

+         *

+         * Upon expiry of the mobile reachable timer the network shall start

+         * the implicit detach timer. The value of the implicit detach timer is

+         * network dependent. If ISR is activated, the default value of

+         * the implicit detach timer is 4 minutes greater than timer T3423.

+         * If the implicit detach timer expires before the UE contacts

+         * the network, the network shall implicitly detach the UE. If the MME

+         * includes timer T3346 in the TRACKING AREA UPDATE REJECT message or

+         * the SERVICE REJECT message and timer T3346 is greater than timer

+         * T3412, the MME sets the mobile reachable timer and the implicit

+         * detach timer such that the sum of the timer values is greater than

+         * timer T3346.

+         */

             ogs_timer_start(mme_ue->t_mobile_reachable.timer,

                 ogs_time_from_sec(mme_self()->time.t3412.value + 240));

         }

​

@@ -178,10 +178,10 @@

                     sess->subscribed_sess_ambr->uplink);

             subscribed_sess_ambr.downlink = ogs_sbi_bitrate_from_string(

                     sess->subscribed_sess_ambr->downlink);

-            if (((subscribed_sess_ambr.uplink / 1024) !=

-                 (session->ambr.uplink / 1024)) ||

-                ((subscribed_sess_ambr.downlink / 1024) !=

-                 (session->ambr.downlink / 1024))) {

+            if (((subscribed_sess_ambr.uplink / 1000) !=

+                 (session->ambr.uplink / 1000)) ||

+                ((subscribed_sess_ambr.downlink / 1000) !=

+                 (session->ambr.downlink / 1000))) {

                 OpenAPI_list_add(PolicyCtrlReqTriggers,

                     (void *)OpenAPI_policy_control_request_trigger_SE_AMBR_CH);

​

@@ -112,26 +112,9 @@

     pcf_ue->access_type = PolicyAssociationRequest->access_type;

     if (PolicyAssociationRequest->pei) {

-        char *type = NULL, *value = NULL;

         if (pcf_ue->pei)

             ogs_free(pcf_ue->pei);

         pcf_ue->pei = ogs_strdup(PolicyAssociationRequest->pei);

-

-        type = ogs_id_get_type(pcf_ue->pei);

-        ogs_assert(type);

-        value = ogs_id_get_value(pcf_ue->pei);

-        ogs_assert(value);

-

-        if (strcmp(type, "imeisv") == 0) {

-            ogs_assert(OGS_OK == ogs_dbi_update_imeisv(pcf_ue->supi, value));

-        } else {

-            ogs_fatal("Unknown Type = %s", type);

-            ogs_assert_if_reached();

-        }

-

-

-        ogs_free(type);

-        ogs_free(value);

     }

     Guami = PolicyAssociationRequest->guami;

​

@@ -98,10 +98,10 @@

                 subscribed_ue_ambr.downlink = ogs_sbi_bitrate_from_string(

                         pcf_ue->subscribed_ue_ambr->downlink);

-                if (((subscribed_ue_ambr.uplink / 1024) !=

-                     (subscription_data.ambr.uplink / 1024)) ||

-                    ((subscribed_ue_ambr.downlink / 1024) !=

-                     (subscription_data.ambr.downlink / 1024))) {

+                if (((subscribed_ue_ambr.uplink / 1000) !=

+                     (subscription_data.ambr.uplink / 1000)) ||

+                    ((subscribed_ue_ambr.downlink / 1000) !=

+                     (subscription_data.ambr.downlink / 1000))) {

                     OpenAPI_list_add(TriggerList,

                             (void *)OpenAPI_request_trigger_UE_AMBR_CH);

​

@@ -184,8 +184,8 @@

     }

     /* Set some sane default if information not present in QoS Profile or APN-AMBR: */

-    sess->session.ambr.downlink = 102400000;

-    sess->session.ambr.uplink = 102400000;

+    sess->session.ambr.downlink = 100000000;

+    sess->session.ambr.uplink = 100000000;

     /* Set Bearer QoS */

     OGS_TLV_STORE_DATA(&sess->gtp.v1.qos, &req->quality_of_service_profile);

​

@@ -294,6 +294,30 @@

                 return false;

             }

+            if (Amf3GppAccessRegistration->pei) {

+                char *type = NULL, *value = NULL;

+                char *pei = NULL;

+

+                pei = ogs_strdup(Amf3GppAccessRegistration->pei);

+                ogs_assert(pei);

+

+                type = ogs_id_get_type(pei);

+                ogs_assert(type);

+                value = ogs_id_get_value(pei);

+                ogs_assert(value);

+

+                if (strcmp(type, "imeisv") == 0) {

+                    ogs_assert(OGS_OK == ogs_dbi_update_imeisv(supi, value));

+                } else {

+                    ogs_fatal("Unknown Type = %s", type);

+                    ogs_assert_if_reached();

+                }

+

+                ogs_free(pei);

+                ogs_free(type);

+                ogs_free(value);

+            }

+

             memset(&sendmsg, 0, sizeof(sendmsg));

             response = ogs_sbi_build_response(

​

@@ -242,7 +242,7 @@

                 sizeof(qos_flow_description0.paramnum_of_param.br);

             ogs_nas_bitrate_from_uint64(

                     &qos_flow_description0.paramnum_of_param.br,

-                    32*1024);

+                    32*1000);

             num_of_param++;

             qos_flow_description0.paramnum_of_param.identifier =

                 OGS_NAX_QOS_FLOW_PARAMETER_ID_GFBR_DOWNLINK;

@@ -250,7 +250,7 @@

                 sizeof(qos_flow_description0.paramnum_of_param.br);

             ogs_nas_bitrate_from_uint64(

                     &qos_flow_description0.paramnum_of_param.br,

-                    48*1024);

+                    48*1000);

             num_of_param++;

             qos_flow_description0.paramnum_of_param.identifier =

                 OGS_NAX_QOS_FLOW_PARAMETER_ID_MFBR_UPLINK;

@@ -258,7 +258,7 @@

                 sizeof(qos_flow_description0.paramnum_of_param.br);

             ogs_nas_bitrate_from_uint64(

                     &qos_flow_description0.paramnum_of_param.br,

-                    16*1024);

+                    16*1000);

             num_of_param++;

             qos_flow_description0.paramnum_of_param.identifier =

                 OGS_NAX_QOS_FLOW_PARAMETER_ID_MFBR_DOWNLINK;

@@ -266,7 +266,7 @@

                 sizeof(qos_flow_description0.paramnum_of_param.br);

             ogs_nas_bitrate_from_uint64(

                     &qos_flow_description0.paramnum_of_param.br,

-                    64*1024);

+                    64*1000);

             num_of_param++;

         }

​

@@ -373,19 +373,19 @@

     ABTS_INT_EQUAL(tc, 31, gprs_timer.value);

     rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*32);

     ABTS_INT_EQUAL(tc, OGS_ERROR, rv);

-    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*10*4);

+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*6*8);

     ABTS_INT_EQUAL(tc, OGS_OK, rv);

     ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_DECI_HH,

             gprs_timer.unit);

-    ABTS_INT_EQUAL(tc, 4, gprs_timer.value);

-    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*10*4+1);

+    ABTS_INT_EQUAL(tc, 8, gprs_timer.value);

+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*6*8+1);

     ABTS_INT_EQUAL(tc, OGS_ERROR, rv);

-    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*10*31);

+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*6*31);

     ABTS_INT_EQUAL(tc, OGS_OK, rv);

     ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_DECI_HH,

             gprs_timer.unit);

     ABTS_INT_EQUAL(tc, 31, gprs_timer.value);

-    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*10*32);

+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*6*32);

     ABTS_INT_EQUAL(tc, OGS_ERROR, rv);

     rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 1);

​