Osmocom Open Build Service

open5gs_2.5.8.tar.xz/configs/freeDiameter/cacert.pem Deleted

@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICrDCCAhWgAwIBAgIUX3u0zTLhQTa3lsR92/GelxTGQacwDQYJKoZIhvcNAQEL
-BQAwaDEXMBUGA1UEAwwOY2EubG9jYWxkb21haW4xCzAJBgNVBAYTAktPMQ4wDAYD
-VQQIDAVTZW91bDEOMAwGA1UEBwwFTm93b24xEDAOBgNVBAoMB09wZW41R1MxDjAM
-BgNVBAsMBVRlc3RzMB4XDTIwMDgyMjAwMzkxNloXDTMwMDgyMDAwMzkxNlowaDEX
-MBUGA1UEAwwOY2EubG9jYWxkb21haW4xCzAJBgNVBAYTAktPMQ4wDAYDVQQIDAVT
-ZW91bDEOMAwGA1UEBwwFTm93b24xEDAOBgNVBAoMB09wZW41R1MxDjAMBgNVBAsM
-BVRlc3RzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCuPWKllQ1+hM/wQE08
-xjDBiSx9GQOCEF5dkLK126u4joIhNFig6wfn/Ui0nq88ApUlEREUXB3D33ZEsAkt
-cbwz1UHX2THOeTYX8XdDbkwkbxNOOH902duiQ2UUbf8ve1hsV7+Dr7ue2Fmz4gsR
-lHBv1EsIyPZJQlb4qxET+2++2QIDAQABo1MwUTAdBgNVHQ4EFgQUZPvI16MgF9yo
-OqpLK4XNvT5TSwkwHwYDVR0jBBgwFoAUZPvI16MgF9yoOqpLK4XNvT5TSwkwDwYD
-VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQAwGvKdevLJNDuSXsFpIkTE
-ZRsNnKrprNgbZC4/HkrzpvR1aDQgcSqF12DzSUmoTqzESuMtKvkaLv2IqYko9g4p
-iKVu2jBDKrJq4q63Cy71fxwbtXLrqGaWgbXkepzqyJYjn4Nf/ya0shK7l2rIIDyL
-crvs5/rXN6enLFUQ3n955w==
------END CERTIFICATE-----

open5gs_2.5.8.tar.xz/configs/freeDiameter/hss.cert.pem Deleted

@@ -1,60 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 2 (0x2)
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=ca.localdomain, C=KO, ST=Seoul, L=Nowon, O=Open5GS, OU=Tests
-        Validity
-            Not Before: Aug 22 00:39:17 2020 GMT
-            Not After : Aug 20 00:39:17 2030 GMT
-        Subject: C=KO, ST=Seoul, O=Open5GS, OU=Tests, CN=hss.localdomain
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
-                Modulus:
-                    00:e8:b3:82:96:bd:4a:f6:30:2c:03:60:aa:82:65:
-                    b0:15:32:5f:d3:90:0d:c0:1d:06:62:52:51:c7:12:
-                    36:d7:5c:34:21:ac:4a:44:4d:9b:a5:22:9c:3e:86:
-                    a8:ba:df:02:64:b6:74:f5:95:c4:71:e8:e0:28:1d:
-                    2b:ea:06:94:fa:3c:f1:07:d3:23:55:b6:84:d4:00:
-                    f4:28:08:18:be:c7:38:e1:b7:d9:b4:bf:d3:e1:d3:
-                    d8:13:60:72:e1:e4:d3:31:37:b1:cf:b9:e1:c9:8d:
-                    5e:e2:1c:54:a3:90:b1:69:6f:07:90:ff:68:86:69:
-                    7d:ef:50:69:0d:9d:47:18:39
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                74:20:F9:E9:BD:E1:37:8A:9C:A9:AD:B4:B2:28:7D:44:22:0B:BD:0B
-            X509v3 Authority Key Identifier: 
-                keyid:64:FB:C8:D7:A3:20:17:DC:A8:3A:AA:4B:2B:85:CD:BD:3E:53:4B:09
-
-    Signature Algorithm: sha256WithRSAEncryption
-         ac:aa:85:5a:57:61:6d:7d:f3:c4:2a:b7:73:3f:e9:bc:b9:6d:
-         0a:8f:35:24:13:66:46:14:5e:60:90:3e:32:95:72:5a:21:55:
-         15:fe:ef:30:44:fb:fe:3e:cb:bf:f3:30:ce:3b:bb:4f:c1:64:
-         41:ea:db:99:f2:ca:db:78:03:95:81:91:3c:fa:1d:9c:8a:55:
-         eb:9d:6a:c1:b6:de:44:38:0f:99:b4:66:d5:4e:dd:e7:d5:ba:
-         ff:f2:4b:f6:9a:94:53:55:36:4e:73:2d:da:d1:bb:0f:8f:fb:
-         1a:22:43:28:6a:b4:5d:a3:40:2c:cf:7e:0d:3e:fb:60:ef:92:
-         f3:0e
------BEGIN CERTIFICATE-----
-MIICsjCCAhugAwIBAgIBAjANBgkqhkiG9w0BAQsFADBoMRcwFQYDVQQDDA5jYS5s
-b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMQ4wDAYDVQQH
-DAVOb3dvbjEQMA4GA1UECgwHT3BlbjVHUzEOMAwGA1UECwwFVGVzdHMwHhcNMjAw
-ODIyMDAzOTE3WhcNMzAwODIwMDAzOTE3WjBZMQswCQYDVQQGEwJLTzEOMAwGA1UE
-CAwFU2VvdWwxEDAOBgNVBAoMB09wZW41R1MxDjAMBgNVBAsMBVRlc3RzMRgwFgYD
-VQQDDA9oc3MubG9jYWxkb21haW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-AOizgpa9SvYwLANgqoJlsBUyX9OQDcAdBmJSUccSNtdcNCGsSkRNm6UinD6GqLrf
-AmS2dPWVxHHo4CgdK+oGlPo88QfTI1W2hNQA9CgIGL7HOOG32bS/0+HT2BNgcuHk
-0zE3sc+54cmNXuIcVKOQsWlvB5D/aIZpfe9QaQ2dRxg5AgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBR0IPnpveE3ipyprbSyKH1EIgu9CzAfBgNVHSMEGDAWgBRk
-+8jXoyAX3Kg6qksrhc29PlNLCTANBgkqhkiG9w0BAQsFAAOBgQCsqoVaV2FtffPE
-KrdzP+m8uW0KjzUkE2ZGFF5gkD4ylXJaIVUV/u8wRPv+Psu/8zDOO7tPwWRB6tuZ
-8srbeAOVgZE8+h2cilXrnWrBtt5EOA+ZtGbVTt3n1br/8kv2mpRTVTZOcy3a0bsP
-j/saIkMoarRdo0Asz34NPvtg75LzDg==
------END CERTIFICATE-----

open5gs_2.5.8.tar.xz/configs/freeDiameter/hss.key.pem Deleted

open5gs_2.5.8.tar.xz/configs/freeDiameter/mme.cert.pem Deleted

@@ -1,60 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=ca.localdomain, C=KO, ST=Seoul, L=Nowon, O=Open5GS, OU=Tests
-        Validity
-            Not Before: Aug 22 00:39:17 2020 GMT
-            Not After : Aug 20 00:39:17 2030 GMT
-        Subject: C=KO, ST=Seoul, O=Open5GS, OU=Tests, CN=mme.localdomain
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
-                Modulus:
-                    00:9c:69:25:fc:ee:7f:11:e0:81:f7:b5:51:8f:01:
-                    b8:9e:01:74:03:3e:a5:25:de:6f:28:66:05:6f:7b:
-                    ab:86:0f:09:fc:94:7b:e8:aa:9f:0b:5f:32:27:46:
-                    f0:ca:e2:12:f3:5d:03:80:e9:9a:1d:f0:20:d6:5c:
-                    1b:4b:65:d4:66:e3:b7:63:19:6e:b1:e8:db:6c:24:
-                    df:24:2c:50:f2:1c:8a:33:c1:f7:27:b8:3c:6e:c6:
-                    90:98:ac:43:67:00:6b:3d:ab:39:49:3d:d5:74:77:
-                    6a:0e:38:4e:41:cd:e4:15:63:27:76:b5:9c:75:f8:
-                    cb:6f:cc:5e:f3:a7:68:ef:a5
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                92:69:1E:3F:9F:E2:40:2F:81:24:05:B4:13:AA:8A:65:5C:7C:71:1D
-            X509v3 Authority Key Identifier: 
-                keyid:64:FB:C8:D7:A3:20:17:DC:A8:3A:AA:4B:2B:85:CD:BD:3E:53:4B:09
-
-    Signature Algorithm: sha256WithRSAEncryption
-         74:fc:32:ee:e6:2b:a5:f5:a4:71:64:49:ff:eb:6f:01:30:32:
-         b7:61:62:97:e1:2c:0f:50:62:a8:71:9a:bd:8b:d8:0d:4b:28:
-         ea:b4:5f:1c:30:3e:4c:23:2f:c5:5b:77:ed:48:c2:bb:b7:0c:
-         d9:50:4d:7f:7f:a3:b9:1e:2c:19:33:1e:41:94:e1:14:1b:45:
-         e8:ae:27:aa:5e:78:8e:67:67:19:69:48:e3:e4:c0:c3:a7:85:
-         fd:fd:d6:62:6e:dd:1f:31:2f:bc:9a:d2:fa:82:eb:4b:3e:35:
-         e0:90:db:ed:de:1a:68:33:6f:e6:90:9f:08:64:60:46:91:09:
-         74:15
------BEGIN CERTIFICATE-----
-MIICsjCCAhugAwIBAgIBATANBgkqhkiG9w0BAQsFADBoMRcwFQYDVQQDDA5jYS5s
-b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMQ4wDAYDVQQH
-DAVOb3dvbjEQMA4GA1UECgwHT3BlbjVHUzEOMAwGA1UECwwFVGVzdHMwHhcNMjAw
-ODIyMDAzOTE3WhcNMzAwODIwMDAzOTE3WjBZMQswCQYDVQQGEwJLTzEOMAwGA1UE
-CAwFU2VvdWwxEDAOBgNVBAoMB09wZW41R1MxDjAMBgNVBAsMBVRlc3RzMRgwFgYD
-VQQDDA9tbWUubG9jYWxkb21haW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-AJxpJfzufxHggfe1UY8BuJ4BdAM+pSXebyhmBW97q4YPCfyUe+iqnwtfMidG8Mri
-EvNdA4Dpmh3wINZcG0tl1Gbjt2MZbrHo22wk3yQsUPIcijPB9ye4PG7GkJisQ2cA
-az2rOUk91XR3ag44TkHN5BVjJ3a1nHX4y2/MXvOnaO+lAgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBSSaR4/n+JAL4EkBbQTqoplXHxxHTAfBgNVHSMEGDAWgBRk
-+8jXoyAX3Kg6qksrhc29PlNLCTANBgkqhkiG9w0BAQsFAAOBgQB0/DLu5iul9aRx
-ZEn/628BMDK3YWKX4SwPUGKocZq9i9gNSyjqtF8cMD5MIy/FW3ftSMK7twzZUE1/
-f6O5HiwZMx5BlOEUG0XorieqXniOZ2cZaUjj5MDDp4X9/dZibt0fMS+8mtL6gutL
-PjXgkNvt3hpoM2/mkJ8IZGBGkQl0FQ==
------END CERTIFICATE-----

open5gs_2.5.8.tar.xz/configs/freeDiameter/mme.key.pem Deleted

open5gs_2.5.8.tar.xz/configs/freeDiameter/pcrf.cert.pem Deleted

@@ -1,60 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4 (0x4)
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=ca.localdomain, C=KO, ST=Seoul, L=Nowon, O=Open5GS, OU=Tests
-        Validity
-            Not Before: Aug 22 00:39:17 2020 GMT
-            Not After : Aug 20 00:39:17 2030 GMT
-        Subject: C=KO, ST=Seoul, O=Open5GS, OU=Tests, CN=pcrf.localdomain
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
-                Modulus:
-                    00:b9:1f:b3:a5:74:de:31:97:ac:fa:86:1d:65:86:
-                    c7:be:b1:25:07:01:f3:69:21:7a:6d:ec:d7:c8:ec:
-                    e2:c9:e8:71:a1:07:ce:0e:68:e5:0f:a9:ec:f3:5e:
-                    5e:3e:a4:ea:27:f3:fa:65:36:2d:7c:ce:a8:70:cc:
-                    34:db:51:b2:28:7b:03:bf:78:06:61:7c:44:81:17:
-                    88:f9:c9:16:cb:2e:9f:21:4a:24:28:0a:0f:76:ef:
-                    63:0f:05:a4:ee:52:64:1f:4f:0b:ec:4e:6c:1b:12:
-                    40:43:75:ed:62:16:ec:6a:ba:15:dd:c4:b9:fa:a9:
-                    de:2c:80:f5:84:c5:97:ec:7b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                CD:C4:C9:C1:7F:D9:34:1F:DB:08:61:27:FC:59:A2:C2:CC:19:9A:7B
-            X509v3 Authority Key Identifier: 
-                keyid:64:FB:C8:D7:A3:20:17:DC:A8:3A:AA:4B:2B:85:CD:BD:3E:53:4B:09
-
-    Signature Algorithm: sha256WithRSAEncryption
-         24:3a:da:a7:50:b3:42:ab:e9:87:21:b2:d9:2b:a1:44:0b:5f:
-         bd:ad:c9:8b:b1:ca:d5:2e:65:46:55:80:11:00:33:03:f9:04:
-         b1:31:a2:c9:d2:41:e0:ec:73:bc:9a:3c:31:06:cc:d0:2d:73:
-         1f:b4:93:1c:b0:99:dd:14:27:64:39:7e:c5:ab:53:48:c5:25:
-         e8:88:fd:4e:b8:dd:64:88:b5:b4:89:8b:15:97:8b:e7:c9:fb:
-         23:6c:ed:60:9b:2f:f0:99:7a:75:6c:8e:ea:09:c6:ba:ff:e9:
-         81:3f:97:96:8b:00:58:5b:88:13:e8:8a:39:4c:f6:c9:06:d3:
-         24:66
------BEGIN CERTIFICATE-----
-MIICszCCAhygAwIBAgIBBDANBgkqhkiG9w0BAQsFADBoMRcwFQYDVQQDDA5jYS5s
-b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMQ4wDAYDVQQH
-DAVOb3dvbjEQMA4GA1UECgwHT3BlbjVHUzEOMAwGA1UECwwFVGVzdHMwHhcNMjAw
-ODIyMDAzOTE3WhcNMzAwODIwMDAzOTE3WjBaMQswCQYDVQQGEwJLTzEOMAwGA1UE
-CAwFU2VvdWwxEDAOBgNVBAoMB09wZW41R1MxDjAMBgNVBAsMBVRlc3RzMRkwFwYD
-VQQDDBBwY3JmLmxvY2FsZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQC5H7OldN4xl6z6hh1lhse+sSUHAfNpIXpt7NfI7OLJ6HGhB84OaOUPqezzXl4+
-pOon8/plNi18zqhwzDTbUbIoewO/eAZhfESBF4j5yRbLLp8hSiQoCg9272MPBaTu
-UmQfTwvsTmwbEkBDde1iFuxquhXdxLn6qd4sgPWExZfsewIDAQABo3sweTAJBgNV
-HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
-Y2F0ZTAdBgNVHQ4EFgQUzcTJwX/ZNB/bCGEn/FmiwswZmnswHwYDVR0jBBgwFoAU
-ZPvI16MgF9yoOqpLK4XNvT5TSwkwDQYJKoZIhvcNAQELBQADgYEAJDrap1CzQqvp
-hyGy2SuhRAtfva3Ji7HK1S5lRlWAEQAzA/kEsTGiydJB4OxzvJo8MQbM0C1zH7ST
-HLCZ3RQnZDl+xatTSMUl6Ij9TrjdZIi1tImLFZeL58n7I2ztYJsv8Jl6dWyO6gnG
-uv/pgT+XlosAWFuIE+iKOUz2yQbTJGY=
------END CERTIFICATE-----

open5gs_2.5.8.tar.xz/configs/freeDiameter/pcrf.key.pem Deleted

open5gs_2.5.8.tar.xz/configs/freeDiameter/smf.cert.pem Deleted

@@ -1,60 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 3 (0x3)
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=ca.localdomain, C=KO, ST=Seoul, L=Nowon, O=Open5GS, OU=Tests
-        Validity
-            Not Before: Aug 22 00:39:17 2020 GMT
-            Not After : Aug 20 00:39:17 2030 GMT
-        Subject: C=KO, ST=Seoul, O=Open5GS, OU=Tests, CN=smf.localdomain
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
-                Modulus:
-                    00:ad:d6:cb:88:33:51:23:72:f1:16:29:2a:df:b7:
-                    75:d7:38:9e:da:18:b6:27:73:a8:60:ec:04:8f:d0:
-                    cd:c6:2e:10:ff:bd:c3:c2:a3:d7:53:e7:9e:73:07:
-                    07:a9:59:16:b1:7f:92:79:4d:d8:ee:5a:c7:ed:ef:
-                    37:83:8a:7d:94:08:41:0b:34:68:27:a5:4b:7d:cb:
-                    29:fb:85:c0:21:6e:17:72:32:29:7a:28:be:94:31:
-                    56:d2:85:9f:4b:b1:33:6f:f9:eb:01:9c:e7:2f:68:
-                    94:6b:91:58:a7:80:04:94:3c:b3:19:96:91:31:f7:
-                    c4:81:98:2b:85:8f:5c:f0:fd
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
-                91:4B:EF:65:02:0D:C8:85:FA:4A:3F:29:C0:10:3C:1B:AE:E4:AD:A4
-            X509v3 Authority Key Identifier: 
-                keyid:64:FB:C8:D7:A3:20:17:DC:A8:3A:AA:4B:2B:85:CD:BD:3E:53:4B:09
-
-    Signature Algorithm: sha256WithRSAEncryption
-         a3:6e:4f:00:bd:1a:62:b9:86:0f:35:f6:18:8d:15:61:a2:bc:
-         05:07:f1:73:8d:70:6f:e1:34:f1:ae:87:26:87:13:0b:c8:d8:
-         29:16:70:02:12:73:36:f9:de:43:26:12:7d:9f:d2:20:7c:e2:
-         76:47:0b:14:ba:67:e5:5a:0d:22:3b:00:c8:35:ab:dd:b1:9a:
-         e5:75:b0:86:89:02:15:32:b3:e9:48:c3:e0:38:e1:56:4c:fd:
-         aa:12:96:00:6d:a6:c3:ab:b0:8c:4b:ab:b2:4c:c2:08:26:ab:
-         d6:3f:26:95:4a:da:b8:dd:9a:f8:fe:b9:c2:e3:7a:a3:2f:2c:
-         7f:df
------BEGIN CERTIFICATE-----
-MIICsjCCAhugAwIBAgIBAzANBgkqhkiG9w0BAQsFADBoMRcwFQYDVQQDDA5jYS5s
-b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMQ4wDAYDVQQH
-DAVOb3dvbjEQMA4GA1UECgwHT3BlbjVHUzEOMAwGA1UECwwFVGVzdHMwHhcNMjAw
-ODIyMDAzOTE3WhcNMzAwODIwMDAzOTE3WjBZMQswCQYDVQQGEwJLTzEOMAwGA1UE
-CAwFU2VvdWwxEDAOBgNVBAoMB09wZW41R1MxDjAMBgNVBAsMBVRlc3RzMRgwFgYD
-VQQDDA9zbWYubG9jYWxkb21haW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-AK3Wy4gzUSNy8RYpKt+3ddc4ntoYtidzqGDsBI/QzcYuEP+9w8Kj11PnnnMHB6lZ
-FrF/knlN2O5ax+3vN4OKfZQIQQs0aCelS33LKfuFwCFuF3IyKXoovpQxVtKFn0ux
-M2/56wGc5y9olGuRWKeABJQ8sxmWkTH3xIGYK4WPXPD9AgMBAAGjezB5MAkGA1Ud
-EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
-YXRlMB0GA1UdDgQWBBSRS+9lAg3IhfpKPynAEDwbruStpDAfBgNVHSMEGDAWgBRk
-+8jXoyAX3Kg6qksrhc29PlNLCTANBgkqhkiG9w0BAQsFAAOBgQCjbk8AvRpiuYYP
-NfYYjRVhorwFB/FzjXBv4TTxrocmhxMLyNgpFnACEnM2+d5DJhJ9n9IgfOJ2RwsU
-umflWg0iOwDINavdsZrldbCGiQIVMrPpSMPgOOFWTP2qEpYAbabDq7CMS6uyTMII
-JqvWPyaVStq43Zr4/rnC43qjLyx/3w==
------END CERTIFICATE-----

open5gs_2.5.8.tar.xz/configs/freeDiameter/smf.key.pem Deleted

open5gs_2.5.8.tar.xz/configs/srslte.yaml.in Deleted

@@ -1,232 +0,0 @@
-db_uri: mongodb://localhost/open5gs
-
-logger:
-
-parameter:
-#    no_nrf: true
-#    no_scp: true
-#    no_amf: true
-#    no_smf: true
-#    no_upf: true
-#    no_ausf: true
-#    no_udm: true
-#    no_pcf: true
-#    no_nssf: true
-#    no_bsf: true
-#    no_udr: true
-#    no_mme: true
-#    no_sgwc: true
-#    no_sgwu: true
-#    no_pcrf: true
-#    no_hss: true
-#    use_mongodb_change_stream: true
-
-mme:
-    freeDiameter:
-      identity: mme.localdomain
-      realm: localdomain
-      listen_on: 127.0.0.2
-      no_fwd: true
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
-      connect:
-        - identity: hss.localdomain
-          addr: 127.0.0.8
-
-    s1ap:
-      - addr: 127.0.1.100
-    gtpc:
-      - addr: 127.0.0.2
-    gummei:
-      plmn_id:
-        mcc: 999
-        mnc: 70
-      mme_gid: 2
-      mme_code: 1
-    tai:
-      plmn_id:
-        mcc: 999
-        mnc: 70
-      tac: 7
-    security:
-        integrity_order :  EIA2, EIA1, EIA0 
-        ciphering_order :  EEA0, EEA1, EEA2 
-
-    network_name:
-        full: Open5GS
-
-sgwc:
-    gtpc:
-      - addr: 127.0.0.3
-    pfcp:
-      - addr: 127.0.0.3
-
-smf:
-#    sbi:
-#      - addr: 127.0.0.4
-#        port: 7777
-    pfcp:
-      - addr: 127.0.0.4
-    gtpc:
-      - addr: 127.0.0.4
-      - addr: ::1
-    gtpu:
-      - addr: 127.0.0.4
-      - addr: ::1
-    subnet:
-      - addr: 10.45.0.1/16
-      - addr: 2001:db8:cafe::1/48
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 2001:4860:4860::8888
-      - 2001:4860:4860::8844
-    mtu: 1400
-    freeDiameter:
-      identity: smf.localdomain
-      realm: localdomain
-      listen_on: 127.0.0.4
-      no_fwd: true
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
-      connect:
-        - identity: pcrf.localdomain
-          addr: 127.0.0.9
-amf:
-    sbi:
-      - addr: 127.0.0.5
-        port: 7777
-    ngap:
-      - addr: 127.0.0.5
-    guami:
-      - plmn_id:
-          mcc: 999
-          mnc: 70
-        amf_id:
-          region: 2
-          set: 1
-    tai:
-      - plmn_id:
-          mcc: 999
-          mnc: 70
-        tac: 1
-    plmn_support:
-      - plmn_id:
-          mcc: 999
-          mnc: 70
-        s_nssai:
-          - sst: 1
-    security:
-        integrity_order :  NIA2, NIA1, NIA0 
-        ciphering_order :  NEA0, NEA1, NEA2 
-    network_name:
-        full: Open5GS
-    amf_name: open5gs-amf0
-
-sgwu:
-    pfcp:
-      - addr: 127.0.0.6
-    gtpu:
-      - addr: 127.0.0.6
-
-upf:
-    pfcp:
-      - addr: 127.0.0.7
-    gtpu:
-      - addr: 127.0.0.7
-    subnet:
-      - addr: 10.45.0.1/16
-      - addr: 2001:db8:cafe::1/48
-
-hss:
-    freeDiameter:
-      identity: hss.localdomain
-      realm: localdomain
-      listen_on: 127.0.0.8
-      no_fwd: true
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
-      connect:
-        - identity: mme.localdomain
-          addr: 127.0.0.2
-pcrf:
-    freeDiameter:
-      identity: pcrf.localdomain
-      realm: localdomain
-      listen_on: 127.0.0.9
-      no_fwd: true
-      load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
-          conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
-      connect:
-        - identity: smf.localdomain
-          addr: 127.0.0.4
-
-#nrf:
-#    sbi:
-#      - addr:
-#        - 127.0.0.10
-#        - ::1
-#        port: 7777
-
-ausf:
-    sbi:
-      - addr: 127.0.0.11
-        port: 7777
-
-udm:
-    sbi:
-      - addr: 127.0.0.12
-        port: 7777
-
-pcf:
-    sbi:
-      - addr: 127.0.0.13
-        port: 7777
-
-nssf:
-    sbi:
-      - addr: 127.0.0.14
-        port: 7777
-    nsi:
-      - addr: 127.0.0.10
-        port: 7777
-        s_nssai:
-          sst: 1
-
-bsf:
-    sbi:
-      - addr: 127.0.0.15
-        port: 7777
-
-udr:
-    sbi:
-      - addr: 127.0.0.20
-        port: 7777

open5gs_2.5.8.tar.xz/docker/debian/buster Deleted

open5gs_2.5.8.tar.xz/docker/debian/sid Deleted

open5gs_2.5.8.tar.xz/docker/debian/stretch Deleted

open5gs_2.5.8.tar.xz/docker/fedora/29 Deleted

open5gs_2.5.8.tar.xz/docker/fedora/30 Deleted

open5gs_2.5.8.tar.xz/docker/fedora/31 Deleted

open5gs_2.5.8.tar.xz/docker/fedora/32 Deleted

open5gs_2.5.8.tar.xz/docker/fedora/33 Deleted

open5gs_2.5.8.tar.xz/docker/ubuntu/groovy Deleted

open5gs_2.5.8.tar.xz/docker/ubuntu/hirsute Deleted

open5gs_2.5.8.tar.xz/docs/_pages/about.md Deleted

open5gs_2.5.8.tar.xz/docs/_posts/2023-01-14-release-v2.5.7.md Deleted

@@ -1,29 +0,0 @@
----
-title: "v2.5.7 - Bug Fixes"
-date: 2023-01-14 11:21:00 +0900
-categories:
-  - Release
-tags:
-  - News
-  - Release
-head_inline: "<style> ul { padding-bottom: 1em; } .blue { color: blue; }</style>"
----
-
-#### Security Issues
-- UPF Fixed an infinite loop when ext_len is 0 -- 2319375(https://github.com/open5gs/open5gs/commit/2319375ea7084e6e9f5db6f16853f7f8c146aa86)
-
-#### Bug Fixes
-- PCRF Fixed a crash when switching between video and audio.  (#1981(https://github.com/open5gs/open5gs/issues/1981)) -- lglhust(https://github.com/lglhust)
-- MME Sending UEContextReleaseCommand after Attach-Reject to clear UE Context (#1848(https://github.com/open5gs/open5gs/issues/1848)) -- jmasterfunk84(https://github.com/jmasterfunk84)
-- SBI Case-Insensitive inside MIME message (#1939(https://github.com/open5gs/open5gs/issues/1939)) -- congzee(https://github.com/congzee)
-- AMF Fixed a problem of SMF selection -- (#1929(https://github.com/open5gs/open5gs/pull/1929)) -- miguelbf-alb(https://github.com/miguelbf-alb)
-- AMF Fixed a crash while NG_Reset in response for UE_Context_Release_Command (#1928(https://github.com/open5gs/open5gs/issues/1928)) -- mateuszmichalskiacc(https://github.com/mateuszmichalskiacc)
-- AMF Wrongly sending NG-AP "PDU Session Release" to gNodeB when gNodeB does not have a PDU Session (#1925(https://github.com/open5gs/open5gs/issues/1925)) -- irazairspan(https://github.com/irazairspan)
-- AMF/MME Forgetting the UE Radio Capabilities when UE is sending NAS "De-Registration Request" with "type = Switch-Off" (#1917(https://github.com/open5gs/open5gs/issues/1917)) -- irazairspan(https://github.com/irazairspan)
-- SMF/UPF Fixed stack overflow on small memory like Alpine. (#1911(https://github.com/open5gs/open5gs/issues/1911)) -- maikovisky(https://github.com/maikovisky)
-- AMF/MME Refactoring common_register_state() to prevent a crash (#1912(https://github.com/open5gs/open5gs/issues/1912)) -- lemon1009(https://github.com/lemon1009)
-- UPF Packet buffer must be freed after sending replay message -- (#1936(https://github.com/open5gs/open5gs/pull/1936)) -- lester-001(https://github.com/lester-001)
-- AMF Added safety code to prevent crash while getting amf_ue from sess -- (#1913(https://github.com/open5gs/open5gs/pull/1913)) -- lester-001(https://github.com/lester-001)
-
-Download -- v2.5.7.tar.gz(https://github.com/open5gs/open5gs/archive/v2.5.7.tar.gz)
-{: .notice--info}

open5gs_2.5.8.tar.xz/lib/sbi/custom/any_type.c Deleted

@@ -1,120 +0,0 @@
-#include "any_type.h"
-
-bool OpenAPI_IsInvalid(const OpenAPI_any_type_t * const item)
-{
-    if (item == NULL) return false;
-
-    return (item->type & 0xFF) == OpenAPI_Invalid;
-}
-bool OpenAPI_IsFalse(const OpenAPI_any_type_t * const item)
-{
-    if (item == NULL) return false;
-
-    return (item->type & 0xFF) == OpenAPI_False;
-}
-bool OpenAPI_IsTrue(const OpenAPI_any_type_t * const item)
-{
-    if (item == NULL) return false;
-
-    return (item->type & 0xff) == OpenAPI_True;
-}
-bool OpenAPI_IsBool(const OpenAPI_any_type_t * const item)
-{
-    if (item == NULL) return false;
-
-    return (item->type & (OpenAPI_True | OpenAPI_False)) != 0;
-}
-bool OpenAPI_IsNull(const OpenAPI_any_type_t * const item)
-{
-    if (item == NULL) return false;
-
-    return (item->type & 0xFF) == OpenAPI_NULL;
-}
-bool OpenAPI_IsNumber(const OpenAPI_any_type_t * const item)
-{
-    if (item == NULL) return false;
-
-    return (item->type & 0xFF) == OpenAPI_Number;
-}
-bool OpenAPI_IsString(const OpenAPI_any_type_t * const item)
-{
-    if (item == NULL) return false;
-
-    return (item->type & 0xFF) == OpenAPI_String;
-}
-bool OpenAPI_IsArray(const OpenAPI_any_type_t * const item)
-{
-    if (item == NULL) return false;
-
-    return (item->type & 0xFF) == OpenAPI_Array;
-}
-bool OpenAPI_IsObject(const OpenAPI_any_type_t * const item)
-{
-    if (item == NULL) return false;
-
-    return (item->type & 0xFF) == OpenAPI_Object;
-}
-bool OpenAPI_IsRaw(const OpenAPI_any_type_t * const item)
-{
-    if (item == NULL) return false;
-
-    return (item->type & 0xFF) == OpenAPI_Raw;
-}
-
-OpenAPI_any_type_t *OpenAPI_any_type_create_true(void)
-{
-    return OpenAPI_any_type_create_bool(true);
-}
-
-OpenAPI_any_type_t *OpenAPI_any_type_create_false(void)
-{
-    return OpenAPI_any_type_create_bool(false);
-}
-
-OpenAPI_any_type_t *OpenAPI_any_type_create_bool(bool boolean)
-{
-    OpenAPI_any_type_t *any_type = NULL;
-
-    any_type = ogs_calloc(1, sizeof(*any_type));
-    if (any_type) {
-        any_type->type = boolean ? OpenAPI_True : OpenAPI_False;
-    }
-
-    return any_type;
-}
-
-OpenAPI_any_type_t *OpenAPI_any_type_create_number(double num)
-{
-    OpenAPI_any_type_t *any_type = NULL;
-
-    any_type = ogs_calloc(1, sizeof(*any_type));
-    if (any_type) {
-        any_type->type = OpenAPI_Number;
-        any_type->valuedouble = num;
-    }
-
-    return any_type;
-}
-
-OpenAPI_any_type_t *OpenAPI_any_type_create_string(const char *string)
-{
-    OpenAPI_any_type_t *any_type = NULL;
-
-    any_type = ogs_calloc(1, sizeof(*any_type));
-    if (any_type) {
-        any_type->type = OpenAPI_String;
-        any_type->valuestring = ogs_strdup(string);
-    }
-
-    return any_type;
-}
-
-void OpenAPI_any_type_free(OpenAPI_any_type_t *any_type)
-{
-    if (any_type) {
-        if (any_type->type == OpenAPI_String) {
-            ogs_free(any_type->valuestring);
-        }
-        ogs_free(any_type);
-    }
-}

open5gs_2.5.8.tar.xz/lib/sbi/custom/any_type.h Deleted

@@ -1,53 +0,0 @@
-#ifndef OGS_SBI_ANY_TYPE_H
-#define OGS_SBI_ANY_TYPE_H
-
-#include "ogs-core.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define OpenAPI_Invalid (0)
-#define OpenAPI_False  (1 << 0)
-#define OpenAPI_True   (1 << 1)
-#define OpenAPI_NULL   (1 << 2)
-#define OpenAPI_Number (1 << 3)
-#define OpenAPI_String (1 << 4)
-#define OpenAPI_Array  (1 << 5)
-#define OpenAPI_Object (1 << 6)
-#define OpenAPI_Raw    (1 << 7) /* raw json */
-
-#define OpenAPI_IsReference 256
-#define OpenAPI_StringIsConst 512
-
-typedef struct OpenAPI_any_type_s OpenAPI_any_type_t;
-typedef struct OpenAPI_any_type_s {
-    int type;
-
-    char *valuestring;
-    double valuedouble;
-} OpenAPI_any_type_t;
-
-bool OpenAPI_IsInvalid(const OpenAPI_any_type_t * const item);
-bool OpenAPI_IsFalse(const OpenAPI_any_type_t * const item);
-bool OpenAPI_IsTrue(const OpenAPI_any_type_t * const item);
-bool OpenAPI_IsBool(const OpenAPI_any_type_t * const item);
-bool OpenAPI_IsNull(const OpenAPI_any_type_t * const item);
-bool OpenAPI_IsNumber(const OpenAPI_any_type_t * const item);
-bool OpenAPI_IsString(const OpenAPI_any_type_t * const item);
-bool OpenAPI_IsArray(const OpenAPI_any_type_t * const item);
-bool OpenAPI_IsObject(const OpenAPI_any_type_t * const item);
-bool OpenAPI_IsRaw(const OpenAPI_any_type_t * const item);
-
-OpenAPI_any_type_t *OpenAPI_any_type_create_true(void);
-OpenAPI_any_type_t *OpenAPI_any_type_create_false(void);
-OpenAPI_any_type_t *OpenAPI_any_type_create_bool(bool boolean);
-OpenAPI_any_type_t *OpenAPI_any_type_create_number(double num);
-OpenAPI_any_type_t *OpenAPI_any_type_create_string(const char *string);
-void OpenAPI_any_type_free(OpenAPI_any_type_t *any_type);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OGS_SBI_ANY_TYPE_H */

open5gs_2.5.8.tar.xz/lib/sbi/custom/patch_item.c Deleted

@@ -1,187 +0,0 @@
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include "patch_item.h"
-
-OpenAPI_patch_item_t *OpenAPI_patch_item_create(
-    OpenAPI_patch_operation_e op,
-    char *path,
-    char *from,
-    OpenAPI_any_type_t *value
-)
-{
-    OpenAPI_patch_item_t *patch_item_local_var = ogs_malloc(sizeof(OpenAPI_patch_item_t));
-    ogs_assert(patch_item_local_var);
-
-    patch_item_local_var->op = op;
-    patch_item_local_var->path = path;
-    patch_item_local_var->from = from;
-    patch_item_local_var->value = value;
-
-    return patch_item_local_var;
-}
-
-void OpenAPI_patch_item_free(OpenAPI_patch_item_t *patch_item)
-{
-    if (NULL == patch_item) {
-        return;
-    }
-    ogs_free(patch_item->path);
-    ogs_free(patch_item->from);
-    OpenAPI_any_type_free(patch_item->value);
-    ogs_free(patch_item);
-}
-
-cJSON *OpenAPI_patch_item_convertToJSON(OpenAPI_patch_item_t *patch_item)
-{
-    cJSON *item = NULL;
-
-    if (patch_item == NULL) {
-        ogs_error("OpenAPI_patch_item_convertToJSON() failed PatchItem");
-        return NULL;
-    }
-
-    item = cJSON_CreateObject();
-    if (cJSON_AddStringToObject(item, "op", OpenAPI_patch_operation_ToString(patch_item->op)) == NULL) {
-        ogs_error("OpenAPI_patch_item_convertToJSON() failed op");
-        goto end;
-    }
-
-    if (cJSON_AddStringToObject(item, "path", patch_item->path) == NULL) {
-        ogs_error("OpenAPI_patch_item_convertToJSON() failed path");
-        goto end;
-    }
-
-    if (patch_item->from) {
-    if (cJSON_AddStringToObject(item, "from", patch_item->from) == NULL) {
-        ogs_error("OpenAPI_patch_item_convertToJSON() failed from");
-        goto end;
-    }
-    }
-
-    if (patch_item->value) {
-        if (OpenAPI_IsString(patch_item->value)) {
-            ogs_assert(patch_item->value->valuestring);
-            if (cJSON_AddStringToObject(
-                    item, "value", patch_item->value->valuestring) == NULL) {
-                ogs_error("OpenAPI_patch_item_convertToJSON() failed value");
-                goto end;
-            }
-        } else if (OpenAPI_IsNumber(patch_item->value)) {
-            if (cJSON_AddNumberToObject(
-                    item, "value", patch_item->value->valuedouble) == NULL) {
-                ogs_error("OpenAPI_patch_item_convertToJSON() failed value");
-                goto end;
-            }
-        } else if (OpenAPI_IsBool(patch_item->value)) {
-            if (cJSON_AddBoolToObject(
-                    item, "value", OpenAPI_IsTrue(patch_item->value)) == NULL) {
-                ogs_error("OpenAPI_patch_item_convertToJSON() failed value");
-                goto end;
-            }
-        }
-    }
-
-end:
-    return item;
-}
-
-OpenAPI_patch_item_t *OpenAPI_patch_item_parseFromJSON(cJSON *patch_itemJSON)
-{
-    OpenAPI_patch_item_t *patch_item_local_var = NULL;
-    cJSON *op = cJSON_GetObjectItemCaseSensitive(patch_itemJSON, "op");
-    if (!op) {
-        ogs_error("OpenAPI_patch_item_parseFromJSON() failed op");
-        goto end;
-    }
-
-    OpenAPI_patch_operation_e opVariable;
-    
-    if (!cJSON_IsString(op)) {
-        ogs_error("OpenAPI_patch_item_parseFromJSON() failed op");
-        goto end;
-    }
-    opVariable = OpenAPI_patch_operation_FromString(op->valuestring);
-
-    cJSON *path = cJSON_GetObjectItemCaseSensitive(patch_itemJSON, "path");
-    if (!path) {
-        ogs_error("OpenAPI_patch_item_parseFromJSON() failed path");
-        goto end;
-    }
-
-    
-    if (!cJSON_IsString(path)) {
-        ogs_error("OpenAPI_patch_item_parseFromJSON() failed path");
-        goto end;
-    }
-
-    cJSON *from = cJSON_GetObjectItemCaseSensitive(patch_itemJSON, "from");
-
-    if (from) { 
-    if (!cJSON_IsString(from)) {
-        ogs_error("OpenAPI_patch_item_parseFromJSON() failed from");
-        goto end;
-    }
-    }
-
-    cJSON *value = cJSON_GetObjectItemCaseSensitive(patch_itemJSON, "value");
-    OpenAPI_any_type_t *any_type_value = NULL;
-
-    if (value) { 
-        if (cJSON_IsString(value))
-            any_type_value = OpenAPI_any_type_create_string(value->valuestring);
-        if (cJSON_IsNumber(value))
-            any_type_value = OpenAPI_any_type_create_number(value->valuedouble);
-        if (cJSON_IsTrue(value))
-            any_type_value = OpenAPI_any_type_create_true();
-        if (cJSON_IsFalse(value))
-            any_type_value = OpenAPI_any_type_create_false();
-    }
-
-    patch_item_local_var = OpenAPI_patch_item_create (
-        opVariable,
-        ogs_strdup(path->valuestring),
-        from ? ogs_strdup(from->valuestring) : NULL,
-        any_type_value
-    );
-
-    return patch_item_local_var;
-end:
-    return NULL;
-}
-
-OpenAPI_patch_item_t *OpenAPI_patch_item_copy(OpenAPI_patch_item_t *dst, OpenAPI_patch_item_t *src)
-{
-    cJSON *item = NULL;
-    char *content = NULL;
-
-    ogs_assert(src);
-    item = OpenAPI_patch_item_convertToJSON(src);
-    if (!item) {
-        ogs_error("OpenAPI_patch_item_convertToJSON() failed");
-        return NULL;
-    }
-
-    content = cJSON_Print(item);
-    cJSON_Delete(item);
-
-    if (!content) {
-        ogs_error("cJSON_Print() failed");
-        return NULL;
-    }
-
-    item = cJSON_Parse(content);
-    ogs_free(content);
-    if (!item) {
-        ogs_error("cJSON_Parse() failed");
-        return NULL;
-    }
-
-    OpenAPI_patch_item_free(dst);
-    dst = OpenAPI_patch_item_parseFromJSON(item);
-    cJSON_Delete(item);
-
-    return dst;
-}
-

open5gs_2.5.8.tar.xz/lib/sbi/custom/patch_item.h Deleted

@@ -1,45 +0,0 @@
-/*
- * patch_item.h
- *
- * 
- */
-
-#ifndef _OpenAPI_patch_item_H_
-#define _OpenAPI_patch_item_H_
-
-#include <string.h>
-#include "../openapi/external/cJSON.h"
-#include "../openapi/include/list.h"
-#include "../openapi/model/patch_operation.h"
-
-#include "../custom/any_type.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct OpenAPI_patch_item_s OpenAPI_patch_item_t;
-typedef struct OpenAPI_patch_item_s {
-    OpenAPI_patch_operation_e op;
-    char *path;
-    char *from;
-    OpenAPI_any_type_t *value;
-} OpenAPI_patch_item_t;
-
-OpenAPI_patch_item_t *OpenAPI_patch_item_create(
-    OpenAPI_patch_operation_e op,
-    char *path,
-    char *from,
-    OpenAPI_any_type_t *value
-);
-void OpenAPI_patch_item_free(OpenAPI_patch_item_t *patch_item);
-OpenAPI_patch_item_t *OpenAPI_patch_item_parseFromJSON(cJSON *patch_itemJSON);
-cJSON *OpenAPI_patch_item_convertToJSON(OpenAPI_patch_item_t *patch_item);
-OpenAPI_patch_item_t *OpenAPI_patch_item_copy(OpenAPI_patch_item_t *dst, OpenAPI_patch_item_t *src);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _OpenAPI_patch_item_H_ */
-

open5gs_2.5.8.tar.xz/meson_options.txt Deleted

open5gs_2.5.8.tar.xz/misc/make_certs.sh Deleted

@@ -1,41 +0,0 @@
-#!/bin/sh
-
-if  1 -ne $# 
-then
-    echo You must specify output directory : ./make_certs.sh ./freeDiameter
-
-    exit;
-fi
-
-rm -rf demoCA
-mkdir demoCA
-echo 01 > demoCA/serial
-touch demoCA/index.txt
-
-# CA self certificate
-openssl req  -new -batch -x509 -days 3650 -nodes -newkey rsa:1024 -out $1/cacert.pem -keyout cakey.pem -subj /CN=ca.localdomain/C=KO/ST=Seoul/L=Nowon/O=Open5GS/OU=Tests
-
-#mme
-openssl genrsa -out $1/mme.key.pem 1024
-openssl req -new -batch -out mme.csr.pem -key $1/mme.key.pem -subj /CN=mme.localdomain/C=KO/ST=Seoul/L=Nowon/O=Open5GS/OU=Tests
-openssl ca -cert $1/cacert.pem -days 3650 -keyfile cakey.pem -in mme.csr.pem -out $1/mme.cert.pem -outdir . -batch
-
-#hss
-openssl genrsa -out $1/hss.key.pem 1024
-openssl req -new -batch -out hss.csr.pem -key $1/hss.key.pem -subj /CN=hss.localdomain/C=KO/ST=Seoul/L=Nowon/O=Open5GS/OU=Tests
-openssl ca -cert $1/cacert.pem -days 3650 -keyfile cakey.pem -in hss.csr.pem -out $1/hss.cert.pem -outdir . -batch
-
-#smf
-openssl genrsa -out $1/smf.key.pem 1024
-openssl req -new -batch -out smf.csr.pem -key $1/smf.key.pem -subj /CN=smf.localdomain/C=KO/ST=Seoul/L=Nowon/O=Open5GS/OU=Tests
-openssl ca -cert $1/cacert.pem -days 3650 -keyfile cakey.pem -in smf.csr.pem -out $1/smf.cert.pem -outdir . -batch
-
-#pcrf
-openssl genrsa -out $1/pcrf.key.pem 1024
-openssl req -new -batch -out pcrf.csr.pem -key $1/pcrf.key.pem -subj /CN=pcrf.localdomain/C=KO/ST=Seoul/L=Nowon/O=Open5GS/OU=Tests
-openssl ca -cert $1/cacert.pem -days 3650 -keyfile cakey.pem -in pcrf.csr.pem -out $1/pcrf.cert.pem -outdir . -batch
-
-rm -rf demoCA
-rm -f 01.pem 02.pem 03.pem 04.pem
-rm -f cakey.pem
-rm -f mme.csr.pem hss.csr.pem smf.csr.pem pcrf.csr.pem

open5gs_2.5.8.dsc -> open5gs_2.6.0.dsc Changed

@@ -2,14 +2,14 @@
 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.5.8
+Version: 2.6.0
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Uploaders: Sukchan Lee <acetcom@gmail.com>
 Homepage: https://open5gs.org
 Standards-Version: 4.3.0
 Vcs-Browser: https://github.com/open5gs/open5gs
 Vcs-Git: git://github.com/open5gs/open5gs
-Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev
+Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), cmake, flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev
 Package-List:
  open5gs deb net optional arch=any
  open5gs-amf deb net optional arch=any
@@ -31,8 +31,8 @@
  open5gs-udr deb net optional arch=any
  open5gs-upf deb net optional arch=any
 Checksums-Sha1:
- e897336da0dd76c1ec44566c805b0790198a4625 13114496 open5gs_2.5.8.tar.xz
+ 8fae2425aec86fbd61224c5a9afb6591a4a1bd12 13614968 open5gs_2.6.0.tar.xz
 Checksums-Sha256:
- f3ddbb82da91464a5ffdcb11f039fbf42b0dfe5b200796e8162f0bfb72430575 13114496 open5gs_2.5.8.tar.xz
+ c465024c044022d9874442866d3422dc5e1a93dddc3ddbbd5968f219b8c3070e 13614968 open5gs_2.6.0.tar.xz
 Files:
- 9788e2808cc95a64f41d19c33cfe8307 13114496 open5gs_2.5.8.tar.xz
+ aaa12aae19e5232cc9eff2ecd29b3d4e 13614968 open5gs_2.6.0.tar.xz

open5gs_2.5.8.tar.xz/.github/workflows/meson-ci.yml -> open5gs_2.6.0.tar.xz/.github/workflows/meson-ci.yml Changed

open5gs_2.5.8.tar.xz/.tarball-version -> open5gs_2.6.0.tar.xz/.tarball-version Changed

open5gs_2.5.8.tar.xz/configs/310014.yaml.in -> open5gs_2.6.0.tar.xz/configs/310014.yaml.in Changed

@@ -2,6 +2,17 @@
 
 logger:
 
+tls:
+    enabled: no
+    server:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testserver.key
+      cert: @build_configs_dir@/open5gs/tls/testserver.crt
+    client:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testclient.key
+      cert: @build_configs_dir@/open5gs/tls/testclient.crt
+
 parameter:
 #    no_nrf: true
 #    no_scp: true
@@ -28,14 +39,14 @@
       listen_on: 127.0.0.2
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -95,14 +106,14 @@
       listen_on: 127.0.0.4
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -151,6 +162,9 @@
     subnet:
       - addr: 10.45.0.1/16
       - addr: 2001:db8:cafe::1/48
+    metrics:
+      - addr: 127.0.0.7
+        port: 9090
 
 hss:
     freeDiameter:
@@ -159,14 +173,14 @@
       listen_on: 127.0.0.8
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -177,14 +191,14 @@
       listen_on: 127.0.0.9
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -215,6 +229,9 @@
     sbi:
       - addr: 127.0.0.13
         port: 7777
+    metrics:
+      - addr: 127.0.0.13
+        port: 9090
 
 nssf:
     sbi:
@@ -235,3 +252,7 @@
     sbi:
       - addr: 127.0.0.20
         port: 7777
+
+time:
+  t3512:
+    value: 540     # 9 mintues * 60 = 540 seconds

open5gs_2.5.8.tar.xz/configs/csfb.yaml.in -> open5gs_2.6.0.tar.xz/configs/csfb.yaml.in Changed

@@ -2,6 +2,17 @@
 
 logger:
 
+tls:
+    enabled: no
+    server:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testserver.key
+      cert: @build_configs_dir@/open5gs/tls/testserver.crt
+    client:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testclient.key
+      cert: @build_configs_dir@/open5gs/tls/testclient.crt
+
 parameter:
 #    no_nrf: true
 #    no_scp: true
@@ -28,14 +39,14 @@
       listen_on: 127.0.0.2
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -129,14 +140,14 @@
       listen_on: 127.0.0.4
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -185,6 +196,9 @@
     subnet:
       - addr: 10.45.0.1/16
       - addr: 2001:db8:cafe::1/48
+    metrics:
+      - addr: 127.0.0.7
+        port: 9090
 
 hss:
     freeDiameter:
@@ -193,14 +207,14 @@
       listen_on: 127.0.0.8
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -211,14 +225,14 @@
       listen_on: 127.0.0.9
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -244,6 +258,9 @@
     sbi:
       - addr: 127.0.0.13
         port: 7777
+    metrics:
+      - addr: 127.0.0.13
+        port: 9090
 
 nssf:
     sbi:
@@ -264,3 +281,7 @@
     sbi:
       - addr: 127.0.0.20
         port: 7777
+
+time:
+  t3512:
+    value: 540     # 9 mintues * 60 = 540 seconds

open5gs_2.5.8.tar.xz/configs/freeDiameter/hss.conf.in -> open5gs_2.6.0.tar.xz/configs/freeDiameter/hss.conf.in Changed

open5gs_2.5.8.tar.xz/configs/freeDiameter/meson.build -> open5gs_2.6.0.tar.xz/configs/freeDiameter/meson.build Changed

open5gs_2.5.8.tar.xz/configs/freeDiameter/mme.conf.in -> open5gs_2.6.0.tar.xz/configs/freeDiameter/mme.conf.in Changed

open5gs_2.5.8.tar.xz/configs/freeDiameter/pcrf.conf.in -> open5gs_2.6.0.tar.xz/configs/freeDiameter/pcrf.conf.in Changed

open5gs_2.5.8.tar.xz/configs/freeDiameter/smf.conf.in -> open5gs_2.6.0.tar.xz/configs/freeDiameter/smf.conf.in Changed

open5gs_2.5.8.tar.xz/configs/meson.build -> open5gs_2.6.0.tar.xz/configs/meson.build Changed

open5gs_2.5.8.tar.xz/configs/non3gpp.yaml.in -> open5gs_2.6.0.tar.xz/configs/non3gpp.yaml.in Changed

@@ -2,6 +2,17 @@
 
 logger:
 
+tls:
+    enabled: no
+    server:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testserver.key
+      cert: @build_configs_dir@/open5gs/tls/testserver.crt
+    client:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testclient.key
+      cert: @build_configs_dir@/open5gs/tls/testclient.crt
+
 parameter:
 #    no_nrf: true
 #    no_scp: true
@@ -28,14 +39,14 @@
       listen_on: 127.0.0.2
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -95,14 +106,14 @@
       listen_on: 127.0.0.4
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -153,6 +164,9 @@
     subnet:
       - addr: 10.45.0.1/16
       - addr: 2001:db8:cafe::1/48
+    metrics:
+      - addr: 127.0.0.7
+        port: 9090
 
 hss:
     freeDiameter:
@@ -161,14 +175,14 @@
       listen_on: 127.0.0.8
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -181,14 +195,14 @@
       listen_on: 127.0.0.9
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -214,6 +228,9 @@
     sbi:
       - addr: 127.0.0.13
         port: 7777
+    metrics:
+      - addr: 127.0.0.13
+        port: 9090
 
 nssf:
     sbi:
@@ -233,3 +250,7 @@
     sbi:
       - addr: 127.0.0.20
         port: 7777
+
+time:
+  t3512:
+    value: 540     # 9 mintues * 60 = 540 seconds

open5gs_2.5.8.tar.xz/configs/open5gs/amf.yaml.in -> open5gs_2.6.0.tar.xz/configs/open5gs/amf.yaml.in Changed

@@ -22,6 +22,44 @@
     file: @localstatedir@/log/open5gs/amf.log
 
 #
+# tls:
+#    enabled: auto|yes|no
+#    - auto: Default. Use TLS only if key/cert is available
+#    - yes:  Use TLS always;
+#            reject if no key/cert available
+#    - no:   Don't use TLS if there is an key/cert available
+#
+#    o Server-side Key and Certficiate
+#    server:
+#      key: /etc/open5gs/tls/amf.key
+#      cert: /etc/open5gs/tls/amf.crt
+#
+#    o Client-side does not use TLS
+#    client:
+#      enabled: no
+#      key: /etc/open5gs/tls/amf.key
+#      cert: /etc/open5gs/tls/amf.crt
+#
+#    o Use the specified certificate to verify client
+#    server
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+#    o Use the specified certificate to verify server
+#    client
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+tls:
+    enabled: no
+    server:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/amf.key
+      cert: @sysconfdir@/open5gs/tls/amf.crt
+    client:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/amf.key
+      cert: @sysconfdir@/open5gs/tls/amf.crt
+
+#
 # amf:
 #
 #  <SBI Server>
@@ -29,7 +67,7 @@
 #  o SBI Server(http://<all address available>:80)
 #    sbi:
 #
-#  o SBI Server(http://<any address>:80)
+#  o SBI Server(http://<any address>:7777)
 #    sbi:
 #      - addr:
 #          - 0.0.0.0
@@ -37,20 +75,31 @@
 #        port: 7777
 #
 #  o SBI Server(https://<all address available>:443)
+#  tls:
+#    server:
+#      key: /etc/open5gs/tls/amf.key
+#      cert: /etc/open5gs/tls/amf.crt
+#  amf:
 #    sbi:
-#      - tls:
-#          key: amf.key
-#          pem: amf.pem
 #
-#  o SBI Server(https://127.0.0.5:443, http://::1:80)
+#  o SBI Server(http://127.0.0.5:80, http://::1:80)
+#  tls:
+#    enabled: no
+#    server:
+#      key: /etc/open5gs/tls/amf.key
+#      cert: /etc/open5gs/tls/amf.crt
+#  amf:
 #    sbi:
 #      - addr: 127.0.0.5
-#        tls:
-#          key: amf.key
-#          pem: amf.pem
 #      - addr: ::1
 #
-#  o SBI Server(http://amf.open5gs.org:80)
+#  o SBI Server(https://amf.open5gs.org:443)
+#    Use the specified certificate to verify client
+#
+#  tls:
+#    server:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  amf:
 #    sbi:
 #      - name: amf.open5gs.org
 #
@@ -206,8 +255,8 @@
 #
 #  o Metrics Server(http://<any address>:9090)
 #    metrics:
-#      addr: 0.0.0.0
-#      port: 9090
+#      - addr: 0.0.0.0
+#        port: 9090
 #
 #  <GUAMI>
 #
@@ -295,7 +344,7 @@
     ngap:
       - addr: 127.0.0.5
     metrics:
-        addr: 127.0.0.5
+      - addr: 127.0.0.5
         port: 9090
     guami:
       - plmn_id:
@@ -332,12 +381,24 @@
 #      addr: 127.0.1.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#  o SBI Client(https://127.0.1.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/amf.key
+#      cert: /etc/open5gs/tls/amf.crt
+#  scp:
 #    sbi:
 #      - addr: 127.0.1.10
-#        tls:
-#          key: scp.key
-#          pem: scp.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://scp.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  scp:
+#    sbi:
 #      - name: scp.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fb::1:80)
@@ -376,12 +437,24 @@
 #      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/amf.key
+#      cert: /etc/open5gs/tls/amf.crt
+#  nrf:
 #    sbi:
 #      - addr: 127.0.0.10
-#        tls:
-#          key: nrf.key
-#          pem: nrf.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://nrf.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  nrf:
+#    sbi:
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fa::1:80)
@@ -468,4 +541,13 @@
 #  o Handover Wait Duration (500ms)
 #    handover:
 #        duration: 500
+#
+#  o Timers of 5GS mobility/session management
+#    t3502:
+#      value: 720  # 12 minutes * 60 = 720 seconds
+#    t3512:
+#      value: 3240 # 54 minutes * 60 = 3240 seconds
+#
 time:
+  t3512:
+    value: 540     # 9 mintues * 60 = 540 seconds

open5gs_2.5.8.tar.xz/configs/open5gs/ausf.yaml.in -> open5gs_2.6.0.tar.xz/configs/open5gs/ausf.yaml.in Changed

@@ -22,6 +22,44 @@
     file: @localstatedir@/log/open5gs/ausf.log
 
 #
+# tls:
+#    enabled: auto|yes|no
+#    - auto: Default. Use TLS only if key/cert is available
+#    - yes:  Use TLS always;
+#            reject if no key/cert available
+#    - no:   Don't use TLS if there is an key/cert available
+#
+#    o Server-side Key and Certficiate
+#    server:
+#      key: /etc/open5gs/tls/ausf.key
+#      cert: /etc/open5gs/tls/ausf.crt
+#
+#    o Client-side does not use TLS
+#    client:
+#      enabled: no
+#      key: /etc/open5gs/tls/ausf.key
+#      cert: /etc/open5gs/tls/ausf.crt
+#
+#    o Use the specified certificate to verify client
+#    server
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+#    o Use the specified certificate to verify server
+#    client
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+tls:
+    enabled: no
+    server:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/ausf.key
+      cert: @sysconfdir@/open5gs/tls/ausf.crt
+    client:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/ausf.key
+      cert: @sysconfdir@/open5gs/tls/ausf.crt
+
+#
 # ausf:
 #
 #  <SBI Server>
@@ -29,7 +67,7 @@
 #  o SBI Server(http://<all address available>:80)
 #    sbi:
 #
-#  o SBI Server(http://<any address>:80)
+#  o SBI Server(http://<any address>:7777)
 #    sbi:
 #      - addr:
 #          - 0.0.0.0
@@ -37,20 +75,31 @@
 #        port: 7777
 #
 #  o SBI Server(https://<all address available>:443)
+#  tls:
+#    server:
+#      key: /etc/open5gs/tls/ausf.key
+#      cert: /etc/open5gs/tls/ausf.crt
+#  ausf:
 #    sbi:
-#      - tls:
-#          key: ausf.key
-#          pem: ausf.pem
 #
-#  o SBI Server(https://127.0.0.11:443, http://::1:80)
+#  o SBI Server(http://127.0.0.11:80, http://::1:80)
+#  tls:
+#    enabled: no
+#    server:
+#      key: /etc/open5gs/tls/ausf.key
+#      cert: /etc/open5gs/tls/ausf.crt
+#  ausf:
 #    sbi:
 #      - addr: 127.0.0.11
-#        tls:
-#          key: ausf.key
-#          pem: ausf.pem
 #      - addr: ::1
 #
-#  o SBI Server(http://ausf.open5gs.org:80)
+#  o SBI Server(https://ausf.open5gs.org:443)
+#    Use the specified certificate to verify client
+#
+#  tls:
+#    server:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  ausf:
 #    sbi:
 #      - name: ausf.open5gs.org
 #
@@ -157,12 +206,24 @@
 #      addr: 127.0.1.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#  o SBI Client(https://127.0.1.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/ausf.key
+#      cert: /etc/open5gs/tls/ausf.crt
+#  scp:
 #    sbi:
 #      - addr: 127.0.1.10
-#        tls:
-#          key: scp.key
-#          pem: scp.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://scp.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  scp:
+#    sbi:
 #      - name: scp.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fb::1:80)
@@ -201,12 +262,24 @@
 #      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/ausf.key
+#      cert: /etc/open5gs/tls/ausf.crt
+#  nrf:
 #    sbi:
 #      - addr: 127.0.0.10
-#        tls:
-#          key: nrf.key
-#          pem: nrf.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://nrf.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  nrf:
+#    sbi:
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fa::1:80)

open5gs_2.5.8.tar.xz/configs/open5gs/bsf.yaml.in -> open5gs_2.6.0.tar.xz/configs/open5gs/bsf.yaml.in Changed

@@ -24,6 +24,44 @@
     file: @localstatedir@/log/open5gs/bsf.log
 
 #
+# tls:
+#    enabled: auto|yes|no
+#    - auto: Default. Use TLS only if key/cert is available
+#    - yes:  Use TLS always;
+#            reject if no key/cert available
+#    - no:   Don't use TLS if there is an key/cert available
+#
+#    o Server-side Key and Certficiate
+#    server:
+#      key: /etc/open5gs/tls/bsf.key
+#      cert: /etc/open5gs/tls/bsf.crt
+#
+#    o Client-side does not use TLS
+#    client:
+#      enabled: no
+#      key: /etc/open5gs/tls/bsf.key
+#      cert: /etc/open5gs/tls/bsf.crt
+#
+#    o Use the specified certificate to verify client
+#    server
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+#    o Use the specified certificate to verify server
+#    client
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+tls:
+    enabled: no
+    server:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/bsf.key
+      cert: @sysconfdir@/open5gs/tls/bsf.crt
+    client:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/bsf.key
+      cert: @sysconfdir@/open5gs/tls/bsf.crt
+
+#
 # bsf:
 #
 #  <SBI Server>
@@ -31,7 +69,7 @@
 #  o SBI Server(http://<all address available>:80)
 #    sbi:
 #
-#  o SBI Server(http://<any address>:80)
+#  o SBI Server(http://<any address>:7777)
 #    sbi:
 #      - addr:
 #          - 0.0.0.0
@@ -39,20 +77,31 @@
 #        port: 7777
 #
 #  o SBI Server(https://<all address available>:443)
+#  tls:
+#    server:
+#      key: /etc/open5gs/tls/bsf.key
+#      cert: /etc/open5gs/tls/bsf.crt
+#  bsf:
+#    sbi:
+#
+#  o SBI Server(http://127.0.0.5:80, http://::1:80)
+#  tls:
+#    enabled: no
+#    server:
+#      key: /etc/open5gs/tls/bsf.key
+#      cert: /etc/open5gs/tls/bsf.crt
+#  bsf:
 #    sbi:
-#      - tls:
-#          key: bsf.key
-#          pem: bsf.pem
-#
-#  o SBI Server(https://127.0.0.15:443, http://::1:80)
-#    sbi:
-#      - addr: 127.0.0.15
-#        tls:
-#          key: bsf.key
-#          pem: bsf.pem
+#      - addr: 127.0.0.5
 #      - addr: ::1
 #
-#  o SBI Server(http://bsf.open5gs.org:80)
+#  o SBI Server(https://bsf.open5gs.org:443)
+#    Use the specified certificate to verify client
+#
+#  tls:
+#    server:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  bsf:
 #    sbi:
 #      - name: bsf.open5gs.org
 #
@@ -159,12 +208,24 @@
 #      addr: 127.0.1.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#  o SBI Client(https://127.0.1.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/bsf.key
+#      cert: /etc/open5gs/tls/bsf.crt
+#  scp:
 #    sbi:
 #      - addr: 127.0.1.10
-#        tls:
-#          key: scp.key
-#          pem: scp.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://scp.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  scp:
+#    sbi:
 #      - name: scp.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fb::1:80)
@@ -203,12 +264,24 @@
 #      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/bsf.key
+#      cert: /etc/open5gs/tls/bsf.crt
+#  nrf:
 #    sbi:
 #      - addr: 127.0.0.10
-#        tls:
-#          key: nrf.key
-#          pem: nrf.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://nrf.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  nrf:
+#    sbi:
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fa::1:80)

open5gs_2.6.0.tar.xz/configs/open5gs/hnet Added

open5gs_2.6.0.tar.xz/configs/open5gs/hnet/curve25519-1.key Added

open5gs_2.6.0.tar.xz/configs/open5gs/hnet/curve25519-3.key Added

open5gs_2.6.0.tar.xz/configs/open5gs/hnet/curve25519-5.key Added

open5gs_2.6.0.tar.xz/configs/open5gs/hnet/meson.build Added

@@ -0,0 +1,38 @@
+# Copyright (C) 2022 by Sukchan Lee <acetcom@gmail.com>
+
+# This file is part of Open5GS.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+hnet_sysconfdir = join_paths(open5gs_sysconfdir, 'hnet')
+meson.add_install_script(python3_exe, '-c',
+        mkdir_p.format(hnet_sysconfdir))
+
+hnet_security = '''
+  curve25519-1.key
+  secp256r1-2.key
+  curve25519-3.key
+  secp256r1-4.key
+  curve25519-5.key
+  secp256r1-6.key
+'''.split()
+
+foreach file : hnet_security
+    gen = configure_file(
+            input : file,
+            output : file,
+            configuration : conf_data)
+    meson.add_install_script(python3_exe, '-c',
+            install_conf.format(gen, hnet_sysconfdir))
+endforeach

open5gs_2.6.0.tar.xz/configs/open5gs/hnet/secp256r1-2.key Added

open5gs_2.6.0.tar.xz/configs/open5gs/hnet/secp256r1-4.key Added

open5gs_2.6.0.tar.xz/configs/open5gs/hnet/secp256r1-6.key Added

open5gs_2.5.8.tar.xz/configs/open5gs/meson.build -> open5gs_2.6.0.tar.xz/configs/open5gs/meson.build Changed

open5gs_2.5.8.tar.xz/configs/open5gs/mme.yaml.in -> open5gs_2.6.0.tar.xz/configs/open5gs/mme.yaml.in Changed

open5gs_2.5.8.tar.xz/configs/open5gs/nrf.yaml.in -> open5gs_2.6.0.tar.xz/configs/open5gs/nrf.yaml.in Changed

@@ -22,6 +22,44 @@
     file: @localstatedir@/log/open5gs/nrf.log
 
 #
+# tls:
+#    enabled: auto|yes|no
+#    - auto: Default. Use TLS only if key/cert is available
+#    - yes:  Use TLS always;
+#            reject if no key/cert available
+#    - no:   Don't use TLS if there is an key/cert available
+#
+#    o Server-side Key and Certficiate
+#    server:
+#      key: /etc/open5gs/tls/nrf.key
+#      cert: /etc/open5gs/tls/nrf.crt
+#
+#    o Client-side does not use TLS
+#    client:
+#      enabled: no
+#      key: /etc/open5gs/tls/nrf.key
+#      cert: /etc/open5gs/tls/nrf.crt
+#
+#    o Use the specified certificate to verify client
+#    server
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+#    o Use the specified certificate to verify server
+#    client
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+tls:
+    enabled: no
+    server:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/nrf.key
+      cert: @sysconfdir@/open5gs/tls/nrf.crt
+    client:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/nrf.key
+      cert: @sysconfdir@/open5gs/tls/nrf.crt
+
+#
 # nrf:
 #
 #  <SBI Server>
@@ -37,22 +75,33 @@
 #        port: 7777
 #
 #  o SBI Server(https://<all address available>:443)
+#  tls:
+#    server:
+#      key: /etc/open5gs/tls/nrf.key
+#      cert: /etc/open5gs/tls/nrf.crt
+#  nrf:
+#    sbi:
+#
+#  o SBI Server(http://127.0.0.5:80, http://::1:80)
+#  tls:
+#    enabled: no
+#    server:
+#      key: /etc/open5gs/tls/nrf.key
+#      cert: /etc/open5gs/tls/nrf.crt
+#  nrf:
 #    sbi:
-#        tls:
-#          key: nrf.key
-#          pem: nrf.pem
-#
-#  o SBI Server(https://127.0.0.10:443, http://::1:80)
-#    sbi:
-#      - addr: 127.0.0.10
-#        tls:
-#          key: nrf.key
-#          pem: nrf.pem
+#      - addr: 127.0.0.5
 #      - addr: ::1
 #
-#  o SBI Server(http://nrf.open5gs.org:80)
+#  o SBI Server(https://nrf.open5gs.org:443)
+#    Use the specified certificate to verify client
+#
+#  tls:
+#    server:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  nrf:
 #    sbi:
-#      name: nrf.open5gs.org
+#      - name: nrf.open5gs.org
 #
 #  o SBI Server(http://127.0.0.10:7777)
 #    sbi:
@@ -87,10 +136,10 @@
 #
 nrf:
     sbi:
-      addr:
+      - addr:
         - 127.0.0.10
         - ::1
-      port: 7777
+        port: 7777
 
 #
 # scp:
@@ -102,12 +151,24 @@
 #      addr: 127.0.1.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#  o SBI Client(https://127.0.1.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/nrf.key
+#      cert: /etc/open5gs/tls/nrf.crt
+#  scp:
 #    sbi:
 #      - addr: 127.0.1.10
-#        tls:
-#          key: scp.key
-#          pem: scp.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://scp.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  scp:
+#    sbi:
 #      - name: scp.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fb::1:80)

open5gs_2.5.8.tar.xz/configs/open5gs/nssf.yaml.in -> open5gs_2.6.0.tar.xz/configs/open5gs/nssf.yaml.in Changed

@@ -22,6 +22,44 @@
     file: @localstatedir@/log/open5gs/nssf.log
 
 #
+# tls:
+#    enabled: auto|yes|no
+#    - auto: Default. Use TLS only if key/cert is available
+#    - yes:  Use TLS always;
+#            reject if no key/cert available
+#    - no:   Don't use TLS if there is an key/cert available
+#
+#    o Server-side Key and Certficiate
+#    server:
+#      key: /etc/open5gs/tls/nssf.key
+#      cert: /etc/open5gs/tls/nssf.crt
+#
+#    o Client-side does not use TLS
+#    client:
+#      enabled: no
+#      key: /etc/open5gs/tls/nssf.key
+#      cert: /etc/open5gs/tls/nssf.crt
+#
+#    o Use the specified certificate to verify client
+#    server
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+#    o Use the specified certificate to verify server
+#    client
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+tls:
+    enabled: no
+    server:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/nssf.key
+      cert: @sysconfdir@/open5gs/tls/nssf.crt
+    client:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/nssf.key
+      cert: @sysconfdir@/open5gs/tls/nssf.crt
+
+#
 # nssf:
 #
 #  <SBI Server>
@@ -29,7 +67,7 @@
 #  o SBI Server(http://<all address available>:80)
 #    sbi:
 #
-#  o SBI Server(http://<any address>:80)
+#  o SBI Server(http://<any address>:7777)
 #    sbi:
 #      - addr:
 #          - 0.0.0.0
@@ -37,20 +75,31 @@
 #        port: 7777
 #
 #  o SBI Server(https://<all address available>:443)
+#  tls:
+#    server:
+#      key: /etc/open5gs/tls/nssf.key
+#      cert: /etc/open5gs/tls/nssf.crt
+#  nssf:
+#    sbi:
+#
+#  o SBI Server(http://127.0.0.5:80, http://::1:80)
+#  tls:
+#    enabled: no
+#    server:
+#      key: /etc/open5gs/tls/nssf.key
+#      cert: /etc/open5gs/tls/nssf.crt
+#  nssf:
 #    sbi:
-#      - tls:
-#          key: nssf.key
-#          pem: nssf.pem
-#
-#  o SBI Server(https://127.0.0.14:443, http://::1:80)
-#    sbi:
-#      - addr: 127.0.0.14
-#        tls:
-#          key: nssf.key
-#          pem: nssf.pem
+#      - addr: 127.0.0.5
 #      - addr: ::1
 #
-#  o SBI Server(http://nssf.open5gs.org:80)
+#  o SBI Server(https://nssf.open5gs.org:443)
+#    Use the specified certificate to verify client
+#
+#  tls:
+#    server:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  nssf:
 #    sbi:
 #      - name: nssf.open5gs.org
 #
@@ -212,12 +261,24 @@
 #      addr: 127.0.1.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
+#  o SBI Client(https://127.0.1.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/nssf.key
+#      cert: /etc/open5gs/tls/nssf.crt
+#  scp:
 #    sbi:
 #      - addr: 127.0.1.10
-#        tls:
-#          key: scp.key
-#          pem: scp.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://scp.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  scp:
+#    sbi:
 #      - name: scp.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fb::1:80)
@@ -256,12 +317,24 @@
 #      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/nssf.key
+#      cert: /etc/open5gs/tls/nssf.crt
+#  nrf:
 #    sbi:
 #      - addr: 127.0.0.10
-#        tls:
-#          key: nrf.key
-#          pem: nrf.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://nrf.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  nrf:
+#    sbi:
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fa::1:80)

open5gs_2.5.8.tar.xz/configs/open5gs/pcf.yaml.in -> open5gs_2.6.0.tar.xz/configs/open5gs/pcf.yaml.in Changed

@@ -24,6 +24,44 @@
     file: @localstatedir@/log/open5gs/pcf.log
 
 #
+# tls:
+#    enabled: auto|yes|no
+#    - auto: Default. Use TLS only if key/cert is available
+#    - yes:  Use TLS always;
+#            reject if no key/cert available
+#    - no:   Don't use TLS if there is an key/cert available
+#
+#    o Server-side Key and Certficiate
+#    server:
+#      key: /etc/open5gs/tls/pcf.key
+#      cert: /etc/open5gs/tls/pcf.crt
+#
+#    o Client-side does not use TLS
+#    client:
+#      enabled: no
+#      key: /etc/open5gs/tls/pcf.key
+#      cert: /etc/open5gs/tls/pcf.crt
+#
+#    o Use the specified certificate to verify client
+#    server
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+#    o Use the specified certificate to verify server
+#    client
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+tls:
+    enabled: no
+    server:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/pcf.key
+      cert: @sysconfdir@/open5gs/tls/pcf.crt
+    client:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/pcf.key
+      cert: @sysconfdir@/open5gs/tls/pcf.crt
+
+#
 # pcf:
 #
 #  <SBI Server>
@@ -31,7 +69,7 @@
 #  o SBI Server(http://<all address available>:80)
 #    sbi:
 #
-#  o SBI Server(http://<any address>:80)
+#  o SBI Server(http://<any address>:7777)
 #    sbi:
 #      - addr:
 #          - 0.0.0.0
@@ -39,20 +77,31 @@
 #        port: 7777
 #
 #  o SBI Server(https://<all address available>:443)
+#  tls:
+#    server:
+#      key: /etc/open5gs/tls/pcf.key
+#      cert: /etc/open5gs/tls/pcf.crt
+#  pcf:
+#    sbi:
+#
+#  o SBI Server(http://127.0.0.5:80, http://::1:80)
+#  tls:
+#    enabled: no
+#    server:
+#      key: /etc/open5gs/tls/pcf.key
+#      cert: /etc/open5gs/tls/pcf.crt
+#  pcf:
 #    sbi:
-#      - tls:
-#          key: pcf.key
-#          pem: pcf.pem
-#
-#  o SBI Server(https://127.0.0.13:443, http://::1:80)
-#    sbi:
-#      - addr: 127.0.0.13
-#        tls:
-#          key: pcf.key
-#          pem: pcf.pem
+#      - addr: 127.0.0.5
 #      - addr: ::1
 #
-#  o SBI Server(http://pcf.open5gs.org:80)
+#  o SBI Server(https://pcf.open5gs.org:443)
+#    Use the specified certificate to verify client
+#
+#  tls:
+#    server:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  pcf:
 #    sbi:
 #      - name: pcf.open5gs.org
 #
@@ -151,10 +200,20 @@
 #  o Don't use SCP server => App fails if no NRF available.
 #      delegated: no
 #
+#  <Metrics Server>
+#
+#  o Metrics Server(http://<any address>:9090)
+#    metrics:
+#    - addr: 0.0.0.0
+#      port: 9090
+#
 pcf:
     sbi:
       - addr: 127.0.0.13
         port: 7777
+    metrics:
+      - addr: 127.0.0.13
+        port: 9090
 
 #
 # scp:
@@ -170,10 +229,18 @@
 #    sbi:
 #      - addr: 127.0.1.10
 #        tls:
-#          key: scp.key
-#          pem: scp.pem
+#          key: /etc/open5gs/tls/pcf.key
+#          cert: /etc/open5gs/tls/pcf.crt
 #      - name: scp.open5gs.org
 #
+#  o SBI Client(https://scp.open5gs.org:443)
+#    Use the specified certificate to verify peer
+#
+#    sbi:
+#      - name: scp.open5gs.org
+#        tls:
+#          cacert: /etc/open5gs/tls/ca.crt
+#
 #  o SBI Client(http://fd69:f21d:873c:fb::1:80)
 #    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
 #
@@ -210,12 +277,24 @@
 #      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/pcf.key
+#      cert: /etc/open5gs/tls/pcf.crt
+#  nrf:
 #    sbi:
 #      - addr: 127.0.0.10
-#        tls:
-#          key: nrf.key
-#          pem: nrf.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://nrf.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  nrf:
+#    sbi:
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fa::1:80)

open5gs_2.5.8.tar.xz/configs/open5gs/scp.yaml.in -> open5gs_2.6.0.tar.xz/configs/open5gs/scp.yaml.in Changed

@@ -24,6 +24,44 @@
     file: @localstatedir@/log/open5gs/scp.log
 
 #
+# tls:
+#    enabled: auto|yes|no
+#    - auto: Default. Use TLS only if key/cert is available
+#    - yes:  Use TLS always;
+#            reject if no key/cert available
+#    - no:   Don't use TLS if there is an key/cert available
+#
+#    o Server-side Key and Certficiate
+#    server:
+#      key: /etc/open5gs/tls/scp.key
+#      cert: /etc/open5gs/tls/scp.crt
+#
+#    o Client-side does not use TLS
+#    client:
+#      enabled: no
+#      key: /etc/open5gs/tls/scp.key
+#      cert: /etc/open5gs/tls/scp.crt
+#
+#    o Use the specified certificate to verify client
+#    server
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+#    o Use the specified certificate to verify server
+#    client
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+tls:
+    enabled: no
+    server:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/scp.key
+      cert: @sysconfdir@/open5gs/tls/scp.crt
+    client:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/scp.key
+      cert: @sysconfdir@/open5gs/tls/scp.crt
+
+#
 # scp:
 #
 #  <SBI Server>
@@ -31,7 +69,7 @@
 #  o SBI Server(http://<all address available>:80)
 #    sbi:
 #
-#  o SBI Server(http://<any address>:80)
+#  o SBI Server(http://<any address>:7777)
 #    sbi:
 #      - addr:
 #          - 0.0.0.0
@@ -39,20 +77,31 @@
 #        port: 7777
 #
 #  o SBI Server(https://<all address available>:443)
+#  tls:
+#    server:
+#      key: /etc/open5gs/tls/scp.key
+#      cert: /etc/open5gs/tls/scp.crt
+#  scp:
+#    sbi:
+#
+#  o SBI Server(http://127.0.0.5:80, http://::1:80)
+#  tls:
+#    enabled: no
+#    server:
+#      key: /etc/open5gs/tls/scp.key
+#      cert: /etc/open5gs/tls/scp.crt
+#  scp:
 #    sbi:
-#      - tls:
-#          key: scp.key
-#          pem: scp.pem
-#
-#  o SBI Server(https://127.0.1.10:443, http://::1:80)
-#    sbi:
-#      - addr: 127.0.1.10
-#        tls:
-#          key: scp.key
-#          pem: scp.pem
+#      - addr: 127.0.0.5
 #      - addr: ::1
 #
-#  o SBI Server(http://scp.open5gs.org:80)
+#  o SBI Server(https://scp.open5gs.org:443)
+#    Use the specified certificate to verify client
+#
+#  tls:
+#    server:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  scp:
 #    sbi:
 #      - name: scp.open5gs.org
 #
@@ -126,13 +175,25 @@
 #      addr: 127.0.1.11
 #      port: 7777
 #
-#  o SBI Client(https://127.0.1.11:443, http://next-scp.open5gs.org:80)
+#  o SBI Client(https://127.0.1.11:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/next-scp.key
+#      cert: /etc/open5gs/tls/next-scp.crt
+#  scp:
 #    sbi:
 #      - addr: 127.0.1.11
-#        tls:
-#          key: next-scp.key
-#          pem: next-scp.pem
-#      - name: next-scp.open5gs.org
+#      - addr: ::1
+#
+#  o SBI Client(http://next-scp.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  scp:
+#    sbi:
+#      - name: scp.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fb::1:80)
 #    If prefer_ipv4 is true, http://127.0.1.11:80 is selected.
@@ -169,10 +230,18 @@
 #    sbi:
 #      - addr: 127.0.0.10
 #        tls:
-#          key: nrf.key
-#          pem: nrf.pem
+#          key: /etc/open5gs/tls/scp.key
+#          cert: /etc/open5gs/tls/scp.crt
 #      - name: nrf.open5gs.org
 #
+#  o SBI Client(https://nrf.open5gs.org:443)
+#    Use the specified certificate to verify peer
+#
+#    sbi:
+#      - name: nrf.open5gs.org
+#        tls:
+#          cacert: /etc/open5gs/tls/ca.crt
+#
 #  o SBI Client(http://fd69:f21d:873c:fa::1:80)
 #    If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
 #

open5gs_2.5.8.tar.xz/configs/open5gs/smf.yaml.in -> open5gs_2.6.0.tar.xz/configs/open5gs/smf.yaml.in Changed

@@ -22,6 +22,44 @@
     file: @localstatedir@/log/open5gs/smf.log
 
 #
+# tls:
+#    enabled: auto|yes|no
+#    - auto: Default. Use TLS only if key/cert is available
+#    - yes:  Use TLS always;
+#            reject if no key/cert available
+#    - no:   Don't use TLS if there is an key/cert available
+#
+#    o Server-side Key and Certficiate
+#    server:
+#      key: /etc/open5gs/tls/smf.key
+#      cert: /etc/open5gs/tls/smf.crt
+#
+#    o Client-side does not use TLS
+#    client:
+#      enabled: no
+#      key: /etc/open5gs/tls/smf.key
+#      cert: /etc/open5gs/tls/smf.crt
+#
+#    o Use the specified certificate to verify client
+#    server
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+#    o Use the specified certificate to verify server
+#    client
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+tls:
+    enabled: no
+    server:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/smf.key
+      cert: @sysconfdir@/open5gs/tls/smf.crt
+    client:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/smf.key
+      cert: @sysconfdir@/open5gs/tls/smf.crt
+
+#
 # smf:
 #
 #  <SBI Server>
@@ -29,7 +67,7 @@
 #  o SBI Server(http://<all address available>:80)
 #    sbi:
 #
-#  o SBI Server(http://<any address>:80)
+#  o SBI Server(http://<any address>:7777)
 #    sbi:
 #      - addr:
 #          - 0.0.0.0
@@ -37,20 +75,31 @@
 #        port: 7777
 #
 #  o SBI Server(https://<all address available>:443)
+#  tls:
+#    server:
+#      key: /etc/open5gs/tls/smf.key
+#      cert: /etc/open5gs/tls/smf.crt
+#  smf:
+#    sbi:
+#
+#  o SBI Server(http://127.0.0.5:80, http://::1:80)
+#  tls:
+#    enabled: no
+#    server:
+#      key: /etc/open5gs/tls/smf.key
+#      cert: /etc/open5gs/tls/smf.crt
+#  smf:
 #    sbi:
-#      - tls:
-#          key: smf.key
-#          pem: smf.pem
-#
-#  o SBI Server(https://127.0.0.4:443, http://::1:80)
-#    sbi:
-#      - addr: 127.0.0.4
-#        tls:
-#          key: smf.key
-#          pem: smf.pem
+#      - addr: 127.0.0.5
 #      - addr: ::1
 #
-#  o SBI Server(http://smf.open5gs.org:80)
+#  o SBI Server(https://smf.open5gs.org:443)
+#    Use the specified certificate to verify client
+#
+#  tls:
+#    server:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  smf:
 #    sbi:
 #      - name: smf.open5gs.org
 #
@@ -207,8 +256,8 @@
 #
 #  o Metrics Server(http://<any address>:9090)
 #    metrics:
-#      addr: 0.0.0.0
-#      port: 9090
+#      - addr: 0.0.0.0
+#        port: 9090
 #
 #  <Subnet for UE Pool>
 #
@@ -468,7 +517,7 @@
       - addr: 127.0.0.4
       - addr: ::1
     metrics:
-        addr: 127.0.0.4
+      - addr: 127.0.0.4
         port: 9090
     subnet:
       - addr: 10.45.0.1/16
@@ -497,9 +546,17 @@
 #    sbi:
 #      - addr: 127.0.1.10
 #        tls:
-#          key: scp.key
-#          pem: scp.pem
+#          key: /etc/open5gs/tls/smf.key
+#          cert: /etc/open5gs/tls/smf.crt
+#      - name: scp.open5gs.org
+#
+#  o SBI Client(https://scp.open5gs.org:443)
+#    Use the specified certificate to verify peer
+#
+#    sbi:
 #      - name: scp.open5gs.org
+#        tls:
+#          cacert: /etc/open5gs/tls/ca.crt
 #
 #  o SBI Client(http://fd69:f21d:873c:fb::1:80)
 #    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
@@ -537,12 +594,24 @@
 #      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/smf.key
+#      cert: /etc/open5gs/tls/smf.crt
+#  nrf:
 #    sbi:
 #      - addr: 127.0.0.10
-#        tls:
-#          key: nrf.key
-#          pem: nrf.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://nrf.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  nrf:
+#    sbi:
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fa::1:80)

open5gs_2.6.0.tar.xz/configs/open5gs/tls Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/amf.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkOgAwIBAgIBATANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjVaFw0zMjExMDgyMzM3MjVaMEoxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGDAW
+BgNVBAMMD2FtZi5sb2NhbGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAL5q1eXK8wzvyymrEpxLgdGg8ArHUiGk0BerkwIwOvkJRkqolQx1CVV+
+SZAsnLxrt1+DEb9PTEpqrAXXAWxGtjDCW8FARPFfhziq4B0NPHuTtXusvT+9xF0I
+EY/HFyO/3EYh5vRh5gGZdW5Ukgh4We4Zw/lw0d2BFA2/L5Xz4zOV1P3vSeATyNMq
+4mPWD5xUs0utUzOevmom/+vMO8HGecKv8dpdcM45Gget5pH9OwT0nEAOusW8vYZK
+kCVKNFAvfyCOVzVG82jS8XARrMGzFPfnrkadYrf/sV4OQ7hLc4ZdO83kXubOoCJm
+xrxp7Z8aaXjNEpGW2dZQqU9w57SP9sMCAwEAAaNNMEswCQYDVR0TBAIwADAdBgNV
+HQ4EFgQU2olHBnRSjS69sZRJT5rFpHAQDhcwHwYDVR0jBBgwFoAUsWr6nJm8BCpC
+iGXXfr5gcKIO2kAwDQYJKoZIhvcNAQELBQADggEBAIEUFoQQ1yuR4apyUddE26Hm
+tnYmXWaTFtL3D98rSj+mwyUOOPD/r7JcsK36XUj8bbMZ4avxMJpYhQGV7x8LG1t1
+3mKlq9JAvLzIREe7zvR8BbOmPu8AVO2Z4uCGrSAa1BsxGgobZ5E2btPHR5RVWiQS
+yYhaIjBuUlPqpa20Pc5cKhZKa8bgfdVs/gsZVwa7T6Xr+hMiSlH0uGIUx85oW4sY
+MidmaMRM1dabSo6nTLcQA0k7h3iC4nZ1MpyMpzt98vZCzVZzWlcJ7AW+py9xKUlN
+48TKTdqHSwt5R9cLnrR7fSVzoPrS9H7KHcemP3poSN/E0PlD+Wou8AFBGBgle8o=
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/amf.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/amf.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC+atXlyvMM78sp
+qxKcS4HRoPAKx1IhpNAXq5MCMDr5CUZKqJUMdQlVfkmQLJy8a7dfgxG/T0xKaqwF
+1wFsRrYwwlvBQETxX4c4quAdDTx7k7V7rL0/vcRdCBGPxxcjv9xGIeb0YeYBmXVu
+VJIIeFnuGcP5cNHdgRQNvy+V8+MzldT970ngE8jTKuJj1g+cVLNLrVMznr5qJv/r
+zDvBxnnCr/HaXXDOORoHreaR/TsE9JxADrrFvL2GSpAlSjRQL38gjlc1RvNo0vFw
+EazBsxT3565GnWK3/7FeDkO4S3OGXTvN5F7mzqAiZsa8ae2fGml4zRKRltnWUKlP
+cOe0j/bDAgMBAAECggEAU0sRaLTXj4ufH4l9GRAwZ73R8q0QwLXC7u+23Siyyzfi
+3wqSNEJHxHV7AU16fDNUIbwIOdqaoRy7Rcywiyf9TyPdlhGidsEWOdQJN7wP/nB0
+3PYJTIYajKVYZT+t4A3vcWAoEjN2tLFnfE0TGhBnKi9sGcNfkdiCKKc+TgZCls/M
++ltrp3+QVH9UO6AMj74mNjNSN6EQOcsO8BUqNnzTsJ5mkTLfLyfoerWXtZlppXZM
+/0gyYshP+SN4d3Iuj1NUlM3LLTAx/hg08u3ioBURcRBF0wSIkywpgC9SdqAWKWsX
+V6BEIbNwRQk+0V782HTWaZ8H9aCRg6MOk5KO137r1QKBgQDkF5lApIoDAkVb0tFI
+wyRNnoNtv0HitbXGLGKS3KGyPPqCLgdnngeEgEqB8ejqjkMzdOmn0eaSmg/yml5O
+Vkkw1nSmYholzEbEzl7A34f3AOLMx5hegTjiJe3MrBjZN2qoyDJH8xikl+XFyV5J
+sNZe6uRyFozIRrzEPMxgW+R3hQKBgQDVtys66kqUz+5EGwY/n6kIV3ip8zp08KQj
+Q+a/h/2EZWvulKLv+Wcr8bwSqOs/ZSaKKgK6VOUK76CYQcHDIHuJEd6TEOC32wLM
+uhsjX+aVcTuWPHmGZdJxk5JCI1W0NIxdLVJKg5J1nAmsfRmhtk3yG+C+1i7PSQRT
+Y1m/92SzpwKBgQCpM3hUI7rdkImzHCh0OY5spfIJL5/IddNqNvLIzzKD7ghHGa4U
+h348JI8g5jtKBE6FlWzfOS46Al9iMHFU211gBTZzVsLe1zKIPC6+FRPff6C/GDFH
+qcRwvoIxGlk0iY9ttVTXWtYlAylIF6ECOVRNBSKCH4g/6XmOeSuDL6fDoQKBgQCk
+UWouqTdgxaKnwLOENakMXdzLptR6Vw+Mgcen2dJlemmLDcNdiT/3PKzjF/eQTaBd
+OMHSLDXSu72Zc22cLpxtHk0ofCCbnAvCBxGYmEK9AkvTTnoNiLpOUy1wJqTdok2N
+0qvj2NfCD5AsjB8qA/ZYQXECqcFh5P0rdEbsXzWRHwKBgQCM/GGUXWI0LrkcQpDY
+dpO1C161b+zNJHWwM+7cL2kM9azVwW3CNq1YV7c+GRuJG8YyToIYJJfIIUSiAFH0
+97J/JoQ2a/1baMXNaZf06WATtjsFywtG+O8FwZs9rAQ7oDeSe7l5jP5Mw/WjY/Kq
+BKoi+9Nz8JldcTIi1rj/YyuHag==
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/ausf.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDXDCCAkSgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjVaFw0zMjExMDgyMzM3MjVaMEsxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGTAX
+BgNVBAMMEGF1c2YubG9jYWxkb21haW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC4kKPcYH2eCayT80Ye9dBf6JmJGwfpkkHlwSlMNW8hh/aCEhDF8pj6
+8xU1Wqqptxs6hHHyLMdtqw9AlnOZlOZdTh8zwA5ExR+vf0IPK/bCDkRtUwBlyOUy
+LsEOoqMbdTEhGmriykQS0t7O63vsPeiX6oF31AgaNfI5glxZpjUI61rKcHTxCYAX
+XALSnIw13fnaQxz2ucmnioTToM28X0GA4ByGs8zgPkAf8F+tDYr+vfiYPZ0ELmLY
+AXJCdK4e/VzY1DsfkqnWCCbVZYg/sCjxFIa77PEQ8rUJ0VBdKE0n+O6hqR/7lL6g
+Idrk9Vh0LWueQI+cNy/IcVQbBOJaPVZXAgMBAAGjTTBLMAkGA1UdEwQCMAAwHQYD
+VR0OBBYEFBxp6AfQv4qeBrN5tM2WjNjC23pkMB8GA1UdIwQYMBaAFLFq+pyZvAQq
+Qohl136+YHCiDtpAMA0GCSqGSIb3DQEBCwUAA4IBAQBBnrBNSkmzMM5TTBrzCmgo
+GktZJy5iM5394OSNKwYdIAxFUotIP7PKwE4GGA9fMauYw+Q5AictubsZEW6Pc4SK
+wtvgDUkCmtOitdMxRGYa7lmVpLxsyCvyMVTH5eKvSWQeMBomOP6WR4Huzj+RGcTc
+dU3BbNByNMnGGoXO0WYoW6nal/cEIaogYtH2JM7v3otDztGN5ixmvkNxmd9ewLEu
+jYkcpqY6WPpK7TM55fBr4f7N5Tin7GM8lE/SQfnJzREsCDPrkLoEuB6DXG7dgjvA
+ZdrM3eD77xamzT3nA0/5Up2bDoQLtYMph0muVfDrOKL+pzrtSrR6CnkPVgX2aWrF
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/ausf.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/ausf.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC4kKPcYH2eCayT
+80Ye9dBf6JmJGwfpkkHlwSlMNW8hh/aCEhDF8pj68xU1Wqqptxs6hHHyLMdtqw9A
+lnOZlOZdTh8zwA5ExR+vf0IPK/bCDkRtUwBlyOUyLsEOoqMbdTEhGmriykQS0t7O
+63vsPeiX6oF31AgaNfI5glxZpjUI61rKcHTxCYAXXALSnIw13fnaQxz2ucmnioTT
+oM28X0GA4ByGs8zgPkAf8F+tDYr+vfiYPZ0ELmLYAXJCdK4e/VzY1DsfkqnWCCbV
+ZYg/sCjxFIa77PEQ8rUJ0VBdKE0n+O6hqR/7lL6gIdrk9Vh0LWueQI+cNy/IcVQb
+BOJaPVZXAgMBAAECggEAIqhShNb/r7YMWKn1kGnDa8cfUa4oQbWLt0ua6Cseh7Li
+2NDwomMoU/Nil6bDZmQycj4dsYa0GkVlc1DtOzlJOtspI8wcQdCsXwWsD3JHf3Az
+bD4KVJKxa0d5TDjBHS5X/+nYiWbG+qvrV/rDRfzoGOLZ1fkUXmuj5SW0FseNrPNH
+VaRrC+YdnFfOs1m+U7PZQmxSrp3C9FxQWCg1xTXT4vnOeoqsJLDQX6njCI6AONPD
+9vfeGLMD3D45Bk06xfv1zFz7oNgdu0TbOISiDKewUJX1MIpZbaDvx0LO7dBeJBWI
+x7yZymTy6B7cspyO9WuC7B3uvSZb4Dj0kmityXze0QKBgQDk/6QY2FMZbOpC0xuw
+8T67sxiF9omr23lxWZD+2PMe4IgcD3mijr50bg+pnoZ/R1cPs9IRT27gtuKdpQlS
+FOrV9kmJqXGGMO8R2edafzGRim3M+oKVOC8KuI0z/euGTKtKpozMKaoUF68nrMx4
+/7ybauLVYOuWDEqI+Fu6/yY+MQKBgQDOU8OOe5oW3BcNY3/yq+PWlaI9qEehsJTn
+kyMvzn5YbKg5yfF6rexm04pY9WCOZfOzvP5NdwwG/InR86YaVOxuuiDE/4WMip18
+rDLabGhlcxsja137c14h8hr936xcF2A4Nd5Q6GYOtCMYNAvCTSAgI98jyiwDGxsY
+vXl7WdQTBwKBgQCgZa8698q89FzhkZzDwzZ9omR68MRda80UZ/f3iV5BMmQjw3Mf
+OXyNcMnntPHgFMgWZ42sMkcnfvIcGYz9wUj7tRatJdIue/f4OPijmpPNrXhbKtxs
+SH4qtDmzQRfHacxQ7XeRSV2n1S8KSy6tUfN5qNRZQRnCb7mFVvBpem3/AQKBgEIs
+VUzuUXZBcldF8TRIctNQvG8f+JFgC/HVm/RqOtVrS+z02rDo9SfpcrajRCuHgUjF
+NZ5srvvSpPUkOsK5N/cvVPE5roBruKTSqaCqIjVfXHXYqpTJ5IfomUWRJjuG98Iv
+bLTwREM0/Qh3MMpJaCNGvftBjSoV2HPv2PV50u2jAoGBALbTtPaHLmSjTE6L675y
+Qb440nmgkI+5jl/KX21Gjnes5OqqVmmFzz/1fj1/ZwGpbzp10jdBG2zKChATMsjl
+xqPq6G0Gu5RKUeRbT64at3e1+aukU1W4L05GAS8FQru4qixKVK5be/24bmTLTpJ8
+tm0reJD9N9KJQouyqctAnf1O
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/bsf.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkOgAwIBAgIBAzANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjZaFw0zMjExMDgyMzM3MjZaMEoxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGDAW
+BgNVBAMMD2JzZi5sb2NhbGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKOY6GHHkFrexUafHFilmA+vsnx7tfbFS7Mkk41QmSXR2+xjG1MenpOQ
+kOJdDq5tFm8SsBIqaNmyTM1Tx2j6vT01KnludLJait4Q1F8o5npF5YFwMegVf06o
+ZcDrsFpdyIi1EjoFt1bhM02j1GkRVzfIycPi3xrJ1croWWtIj0J/CN4TkoAYaqUW
+8B2pccwVbb4jvUyGU61xIARkm/pHIYrCEjiuWP99imbROSUMBX9ne/krtgsJYylZ
+XPvZiZkrAXCFHx2KKrm9zOaXeYHSCEiHJQRAaSJICJA2COz3zzN8XpIJVP8paiXF
+B5oFoUwex/VdZ/a0m8jm05++jcHXVIECAwEAAaNNMEswCQYDVR0TBAIwADAdBgNV
+HQ4EFgQUgkNWEi5vGgi/rNh4n4WI3VkWdxQwHwYDVR0jBBgwFoAUsWr6nJm8BCpC
+iGXXfr5gcKIO2kAwDQYJKoZIhvcNAQELBQADggEBAE4+FPquzZPJfAg3namKryWe
+zJjibTvvZenRDoYhkJ9HWhi4tPvLAUqCHLe8sUfxcf5k17T+u7pYfK/+1IpGomWh
+Y6OxrxnNK4bnhxTFEch9j90x+cLyAAKVzDAotAgI/OoBQgqiSo0I3pe6MBVPZVIH
+Ga5aghA1u9QsLOr7XcuHLAXzMpYPq+6vjHTy1cSi3csQcVNLo67pB3l+b9o1lVGz
+6Y8V1L5n19OQ+gbCOSQrGXPAivWWJIDvKW6mtinFLNZ2f1/WDvkh9L/nSFNUsNOj
+uWqheRX7FegwvwpjhFfe7TdLQg4OZ5Q82JRFiVmcwx3cDRHPe8BlIdkkTmJvilo=
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/bsf.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/bsf.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCjmOhhx5Ba3sVG
+nxxYpZgPr7J8e7X2xUuzJJONUJkl0dvsYxtTHp6TkJDiXQ6ubRZvErASKmjZskzN
+U8do+r09NSp5bnSyWoreENRfKOZ6ReWBcDHoFX9OqGXA67BaXciItRI6BbdW4TNN
+o9RpEVc3yMnD4t8aydXK6FlrSI9CfwjeE5KAGGqlFvAdqXHMFW2+I71MhlOtcSAE
+ZJv6RyGKwhI4rlj/fYpm0TklDAV/Z3v5K7YLCWMpWVz72YmZKwFwhR8diiq5vczm
+l3mB0ghIhyUEQGkiSAiQNgjs988zfF6SCVT/KWolxQeaBaFMHsf1XWf2tJvI5tOf
+vo3B11SBAgMBAAECggEAAlCr87PItz99LlPauWatA2ZQrd4sj9ugh85IBAVAqJJK
+5OJNaQCHPRZ79WccmcNvkIZ0vUoSOifxuitiCFpZhpnnsiiZ8ErzmYNGlRrpoY/3
+CK0VOLgCqWLcz0VKlWnLuGMLGSz66GjnEmWD0FGTcNW3pLzzfDAgZVbiyo/QHrBS
+mhayw3ceTgggFDeqBXEpG3w1CeWIdOLafdQ7fCUkv34Qww9/kJ7gERbX4eoAHZMO
+fwkkOZ6xsKxH4tKOEAo4hkTnTo95P9n5UpvDGG/8fKV4vkto9KMWnCUSMUZz/t0Y
+G/Jv5aHOQJkfnzS1QtfgfZiHGbto5R5oOGZsy0NdkQKBgQDbJgQwVErskpYGNJwc
+tOcz3gooTEkE9tTsX6mT5cCtY2A59k/y6rXSv8X1es2CCkDFLqGHuOW/TBG6ZE9d
+8JrQVqQbjLe3kcdRdHlwdfzaj9HfQa/ZBZ2gGzhzqrB9Cry7v14F8vQ1M4qWtEXn
+XhWFbR3YP8qjFs3eKLS7DC3x0QKBgQC/G4DJPXvivz+M6iQOYWZH6aO+00Lrm0iv
+UsHPphP3LbIz3cDSAqXRTG18oOikmFCQkfNCRzB55JFwf6Udd/A3CdrIQ4rsqEWn
+kgtY2ZKkU2ZFtCs5wOiD9gk9CnsAb6D8rSaiKkp1X7VMssyoMrHkBFXvQKHtXuCk
+OkEqR56zsQKBgQC43sst0g4aoFY7CeqgNOPN14QOFryKmYdpmBHAGFOAcZLdkrJD
+JEkabnka6uuuxeN59CqECjCWPh++c5yYjL6s/koWi5D4JNxWFMHVY1NZNXZAtnMX
+yyr7w7rNqLKV6ZbpczhoIFpu/vnsxEssMSxKkJBauwXAqx4kSYadPFsN4QKBgQCT
+2SVDi0ui2q7ByArpDTViAUFrSmoFePc8nFvQ1/2uRy4MrkyUrPO3/tbdimcxn50E
+m8WEyyqXwts6G6aUK8wt6HPYZ1i9SlnJEFWzAXBPrS38Uyz122aHYPs4vDj412PG
+1/aBkxJTyB2tHs7yeXXin/ATzv73c2V76I2ttgbzoQKBgF3J7l1yUQ+4yxMUF9PI
+Ta1S87ShIM6B6XgzmdGYyn27lB9jAvmnwNe4pLd5GXZsvIZi8FuQQ9WNPEl78Nj1
+8kSBwSi/MZS1/fiLyP+IaGuaKrfYbEzIlT2rXSgO9IG1gdfO/MouuL4+brynXeDS
+BUuR/ojPd0aSsdGhNFvcwUYA
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/ca.crt Added

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDczCCAlugAwIBAgIUWqr1d8XhDsM5Gk5y7G9u6KeTF1wwDQYJKoZIhvcNAQEL
+BQAwSTEXMBUGA1UEAwwOY2EubG9jYWxkb21haW4xCzAJBgNVBAYTAktPMQ4wDAYD
+VQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUwHhcNMjIxMTExMjMzNzI1WhcN
+MzIxMTA4MjMzNzI1WjBJMRcwFQYDVQQDDA5jYS5sb2NhbGRvbWFpbjELMAkGA1UE
+BhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQKDAhOZW9QbGFuZTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAOfs1L9v9DIXY21LuT8+Gvkmie4Zc1fN
+OXP+rZAwZYiQpu9Awtk/L2YgAnJ9zXCNrL8DoGJGWGp9KyN3LJeFu6XUbyXgYDWu
+Beg6LN6OUPv30zdjm6iIwEmBtiBgL5HYJZunP3b/OdABIJu9foeWdKVuT+jFNlHK
+f6Arod4sVGp2kc6owkGgYE920m04a4UsYuDGhpGvIAv/r5/SBNdKuysF6gE5YHHv
+4Hk8RnrxrRwQIGasMAlguwhNfbNqupQ1cxcOtMTBZ8KMv+dji+2f5PI0tmmbSeJO
+nENk+A/i0JiuBH6szjZ3ylAuMiMZ42FqFLb9k3FHV/YosxZlzTyFldECAwEAAaNT
+MFEwHQYDVR0OBBYEFLFq+pyZvAQqQohl136+YHCiDtpAMB8GA1UdIwQYMBaAFLFq
++pyZvAQqQohl136+YHCiDtpAMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBAK01l12RIId/hjjaQy0pEbB8LU0DV9KYw3ibkFTrVnxXdAtOEvsAAGOX
+s5hwltZChJJyIVEh5uwAHUMrOs3MazAMhD/FiWBeqeHjh60BTR66tof2Gll1uPRR
+D7HHg8E2q01OQmZ1zhj25gd5FP7OSAgXh71TfB6CpRC/gPtYv4vrfe7ca7ZCXKM8
+h3sQxwAMajjHzIKn4ZbqzUfP+ALpOGokbCo+a83PlZgTrG0wHH5MheGQmGKUQaMP
+THXAPNaAaoKXbA8rup/fzdinBG0aj5op8bNS+iZUKOLws6M2Zrns2UQ+PxkhlSoa
+soOVoABREvi8iSj0hkEFrVdp8loESs0=
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/ca.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDn7NS/b/QyF2Nt
+S7k/Phr5JonuGXNXzTlz/q2QMGWIkKbvQMLZPy9mIAJyfc1wjay/A6BiRlhqfSsj
+dyyXhbul1G8l4GA1rgXoOizejlD799M3Y5uoiMBJgbYgYC+R2CWbpz92/znQASCb
+vX6HlnSlbk/oxTZRyn+gK6HeLFRqdpHOqMJBoGBPdtJtOGuFLGLgxoaRryAL/6+f
+0gTXSrsrBeoBOWBx7+B5PEZ68a0cECBmrDAJYLsITX2zarqUNXMXDrTEwWfCjL/n
+Y4vtn+TyNLZpm0niTpxDZPgP4tCYrgR+rM42d8pQLjIjGeNhahS2/ZNxR1f2KLMW
+Zc08hZXRAgMBAAECggEACK8vkDOK+00w5ejN+PZEYEv3IjlFvmXq3tMMgLevNZvl
+BFRyd1wMVFCihtL7HFnRvB1Qph1oNiSVtvBBdTMGwcDgoJR0Rc5MXlO/Vl4R3j17
+ZTmPnJHyUU5QGYpAfb+QOPHcSIJqEcXZCLvhvwX9PCyTRW4NCKcCfGbl2sHiL1JL
+BQ4++zPfjqoK7sJ+WC6bcEYQLpRHZSIZm+kzlBNUyWdtY9WzT8mTdfpzS4X8sZIH
+DrmUFufMkgyciN7qt/jBhps/4/S4yjrbRcOsltcg/1Oba7ayC+vGyzGeGPGA1ddS
++bprG7+nUGRvo/bTC5YxVpIXSlOXizpwpzufpyV+GQKBgQDrVVROaG4dcUKdg35y
+dLjhRcAAgR2gRJYxG2tYRGsDhBWAvVqJ5MwY919j4kdwQ6UBTnWgCFsByiv6OX6P
+kK5Em8ImLEOPHn0nIYNFst5S9GfeEPaCo2jtH1k8KJYbIsUWg8toONv54Ee1VxXV
+r6kS9H66zOC0GlayNazQV85JvwKBgQD8SuFHrKrGdo1Wa49LnWRQsTF0rkBXXUR8
+2NC3SiwyrCH8A+nGv4msbkKRcEOQjkbAthYjdhSXdYFtNLYsYa3VCsMDGV3YwA4w
+LhjHUsdt2W8Wl26Oo+WcDa22NjTyc5kk827EsgB52N8ug/ylVP01AVr5kEeQ/t+T
+yzQzeftkbwKBgAccINvtk8YX8edIXb2fgSZtMQvS2s5IxDDfnzKffowwpWWqUt3v
+p6rpblxaLcZahNWxRSR8nCNFtGZu7j/wIxO3kPoORExCo41XGdw1NzpSYAD5ijkQ
+Ls9bLxr+LurK9iFkAfU4Io0+FWyJIQO/tt/3uwxxvCg004G21W3F+VmJAoGBAPJZ
+U7IwERP3yakcRVgTZsuEisdUo4XImAN9mnCXFYHPjA20DJrYXv1+JP/kYWK46Qox
+X27M/NbJD3zBx8U2R2+AmPefJGETjA2IGlFOGThSR73h1Ve75NJU6WtBAvdrR88Q
+8HSNsJtbUngyXTzMOTbziFp21+hWjJpB9nEEWhKNAoGAVLy+5NBYg3XUSZRDhjgG
+D4LyKf7PjaleMceeZHlhOfG03pjnqZ6vEH6g86fUj4CT4m9JNJPtmhTu8vb96h9X
+EVuEkfctkYy8KPmmqqiasZb8viMA3yz4o0gY2Vh/ZgEuFTjLVANmrP4FnPPQSLPX
+OoF11bTHRPDa1vAN0sBCVoY=
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/hss.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkOgAwIBAgIBBDANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjZaFw0zMjExMDgyMzM3MjZaMEoxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGDAW
+BgNVBAMMD2hzcy5sb2NhbGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALljW/sKEWWc9NmMz8NpkskbjXtlhkduRWDapIKLTdUUjl+xP2Rbve0l
+ag7Gxw/bX3IkSKQcHwiT1+QMD+CgCcMMd9txI4nVkCP/7+YQVGfEe+2iclp1CrM8
+P7a2oaG3LzzS8Xz+iTWFW+eLE20B4QHygCyQwN14IPGYLkzQvGAe8MfiBfOCIJnm
+t4NKGyXGs31Tvbl5+Wzpm6hIXvlqPUEgjHXNtC6u6FQdCPPxcWwt2O8zT9aB5B4G
+n/914qWlzurUTlnhYg8HV9L+iyidD66v8JMiKQ9xuPNWMKdoxaw034qH3Dg9in9j
+Jqdk3AJdvuqjdmQvPBoOFBQKDcYW06kCAwEAAaNNMEswCQYDVR0TBAIwADAdBgNV
+HQ4EFgQU5GTunEyNMXr1ZZTh79w1hSC6wDYwHwYDVR0jBBgwFoAUsWr6nJm8BCpC
+iGXXfr5gcKIO2kAwDQYJKoZIhvcNAQELBQADggEBADYTkXOb9Kx31MN3LSLCz+ky
+KEi3Pio+eI65vTByclmfu/ej2AmGMmHylJQ2RpHzbWOe2MPmpFyI/yfqR7ZoIcfs
+soEnYk3vi4Ul7ooYqWTIvAl24/g5ujb9vZ2+7ZtiyFsTNG3kB/zdtS6X6CUk+e3H
+GbYTHjxvN+VmFJmCJjQpSMTQC9JGuqof3z+R7OODyJG24aw2g7rVtSDW3J0rvDgc
+1RylH/D2KJMBGjo/JlXB6y6wCTu9iLQ5prqk7YunFlpLxjsEdqrQ+yukLhwRH93x
+C0GQA6rMQEhC3paBukP2ePAJoGCqanipp/oJ6OJLnKqVDha69IXPSJLEhqAqtX4=
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/hss.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/hss.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC5Y1v7ChFlnPTZ
+jM/DaZLJG417ZYZHbkVg2qSCi03VFI5fsT9kW73tJWoOxscP219yJEikHB8Ik9fk
+DA/goAnDDHfbcSOJ1ZAj/+/mEFRnxHvtonJadQqzPD+2tqGhty880vF8/ok1hVvn
+ixNtAeEB8oAskMDdeCDxmC5M0LxgHvDH4gXzgiCZ5reDShslxrN9U725efls6Zuo
+SF75aj1BIIx1zbQuruhUHQjz8XFsLdjvM0/WgeQeBp//deKlpc7q1E5Z4WIPB1fS
+/osonQ+ur/CTIikPcbjzVjCnaMWsNN+Kh9w4PYp/YyanZNwCXb7qo3ZkLzwaDhQU
+Cg3GFtOpAgMBAAECggEAO2h5PdnMmGTzW9HRdHwc80BWlvACV1qhdfeq10Cf2QQk
+2cp5l4YEt32RXpnZiZ3RmMjC1IBEe6GxAd3RqrhuWGhi8lnvuwhKkBbAwFeETNp8
+ojq37X/rRWOtwTYGVsXWp+WrSFRjENkjCfCZ8Yk0G0UkSOO8QlxwJiuPzsLnUt+b
+wO/bahViAu7c+CyPouw0+MJmysZba1DSRoYSAYF6yzOolOOfk9HIEcfFyY+wCO6d
+hRVcGe5FgFS6hsBC2RLDrKc4sp1VoWOSkI8MfsTsnSvIdWHKLqvmdDlhoEgLJQ2C
+BuPX9J50oa9naLb0FszZNjsF1o1xNXvdzzCvWXIYXwKBgQDWCjlJDte/o48jFbvV
+aIa7jkChD6NWlMhGv6wRftblNU2WxzwQNiDxKo2OK3o2OZaOkXD7u/GrUzsOAnRs
+N+4I340UQz9C7tfzUmsFjS4ju+xxeaPQX1Wmnz5HSN5mxU34y3FvLdyeitUbadNL
+CbSeLXI+qzMoecrUp30qHsKarwKBgQDduzhI0xQS3BAWxVz63vMv/Pp7dCjgg/VC
+ULYv2d4z5twS9fRwCzyhtmOPRQzHOvgxPbU/MF9DW/uXzAGPFYZSzfWuJcv4u1mp
+Ha48GZcxA3C3HWpimsn9yZjcdWG7QV2BV6RgMwH0nUIxZHxQ7I6gplJasZN5dwlZ
+glPAAOetJwKBgF8cV+xQ/ioYQgizJa5lLkm1op5vVoOoxX46uflkRZXAo+O2UMhb
+ZTQFVrWwODRUTsS3eF9EWtVovLsy+A0GpW2n+QbiAwB5Jdjn7Mqgu7oBTcX26YY0
+dtj9tizzAnDkiAtgS929oWWKB7yQv+V+QJZxV2zlomwAAtOQQZwv4wXdAoGATReE
+8D0DY7NDnMcuFsNhhjPM2xN+CuGWamIpleWIDj+cELOXM0WU5RzG7M8zLCnilSxB
+UiD9XiwjA5oYiKkRNMULQGs/ydFJ0TTSmW7EVHQ/wkrl7DapOCXZkfz15+dIHWpd
+al0RtvzeQNIRLwmwZUaup33KKpcqlwZrG/y0kE0CgYEAtSp7JuJWnFCRBGYzITFG
+3gILjbzWxKquho7vOjlOZ9Jn0zHAMjMFaa5jO+jDVeFTo2ma6vJNjkrwwSt2ta5j
+RL3+dBFB8uFgihY68j2yP8OeTuMOUevinbKgySMcTP7mlLzya/SAk9bZFqTJEB6w
+CA6ghp5l+Pzf2ziJKd3nc0c=
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/meson.build Added

@@ -0,0 +1,63 @@
+# Copyright (C) 2022 by Sukchan Lee <acetcom@gmail.com>
+
+# This file is part of Open5GS.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+tls_sysconfdir = join_paths(open5gs_sysconfdir, 'tls')
+meson.add_install_script(python3_exe, '-c',
+        mkdir_p.format(tls_sysconfdir))
+
+tls_security = '''
+    ca.crt
+    amf.key
+    ausf.key
+    bsf.key
+    hss.key
+    mme.key
+    nrf.key
+    nssf.key
+    pcf.key
+    pcrf.key
+    scp.key
+    smf.key
+    udm.key
+    udr.key
+    amf.crt
+    ausf.crt
+    bsf.crt
+    hss.crt
+    mme.crt
+    nrf.crt
+    nssf.crt
+    pcf.crt
+    pcrf.crt
+    scp.crt
+    smf.crt
+    udm.crt
+    udr.crt
+    testserver.key
+    testserver.crt
+    testclient.key
+    testclient.crt
+'''.split()
+
+foreach file : tls_security
+    gen = configure_file(
+            input : file,
+            output : file,
+            configuration : conf_data)
+    meson.add_install_script(python3_exe, '-c',
+            install_conf.format(gen, tls_sysconfdir))
+endforeach

open5gs_2.6.0.tar.xz/configs/open5gs/tls/mme.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkOgAwIBAgIBBTANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjZaFw0zMjExMDgyMzM3MjZaMEoxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGDAW
+BgNVBAMMD21tZS5sb2NhbGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAOfRYYARkQf16dejrenOv9VbNAInKLH5BByRobC/FXYs/1ZEpE26QQpj
+ElSZfdc9ri6tlGm8JzsWdeospR10abH9wu/80lerrOJFsGAKC55tLbO0N71Odlk0
+UZms/Efets+4Y2N/ubgq1RStl6IhqkmUOgfbvX69h7+po4PILGMixbZiQTW9DwH+
+aZJ9Gb3YScewikE3J6E0RPf43ABX9roI1oU078n2nj7qZlCNd0zJ9vOXQiQOdcW3
+8PKHlrobulMYh5SmG5ASidZzexHy6csKiH/Rr2EC4mZTYBepb3QZy8+ad9b5Cl74
+yuCcKGf95xui1E+YqGBM9Gi5+HNdr3ECAwEAAaNNMEswCQYDVR0TBAIwADAdBgNV
+HQ4EFgQUVhByp4/5SHL0qj7sf6dXxrcO6L8wHwYDVR0jBBgwFoAUsWr6nJm8BCpC
+iGXXfr5gcKIO2kAwDQYJKoZIhvcNAQELBQADggEBAJTHO3re3/Tc9YeMs3Z+Kog6
+9z3Rb+OJ5nB56Y7nXVpJ70piUpTSVwPxK1r5a6QqHO9tTTgp5kp5i3u1H3cYnn3q
+r9if/lkNotdrOl1uwI9Kb3eb+4iwZe4VUnhDvWbC3oWVHcyZheS95qxuW/HfErxU
+eZakK1J5rynrd0R8fZiJBfpYeBfOczshDlLZ8G40gwmGcHBTJYQ6bYJjjA1jQXzF
+n1fE6WQBu7q79eX9w0U5Sf5Xo9Ale5Y7o6ud2aZT6F83Upt1G83BhEvQ8vrseTD6
+SHme/cpGXmSToBs9hJfrPuDzIkjGG/kjiVsFalHiaUtVbGvMqVa2iaHZ3HBzIro=
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/mme.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/mme.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDn0WGAEZEH9enX
+o63pzr/VWzQCJyix+QQckaGwvxV2LP9WRKRNukEKYxJUmX3XPa4urZRpvCc7FnXq
+LKUddGmx/cLv/NJXq6ziRbBgCguebS2ztDe9TnZZNFGZrPxH3rbPuGNjf7m4KtUU
+rZeiIapJlDoH271+vYe/qaODyCxjIsW2YkE1vQ8B/mmSfRm92EnHsIpBNyehNET3
++NwAV/a6CNaFNO/J9p4+6mZQjXdMyfbzl0IkDnXFt/Dyh5a6G7pTGIeUphuQEonW
+c3sR8unLCoh/0a9hAuJmU2AXqW90GcvPmnfW+Qpe+MrgnChn/ecbotRPmKhgTPRo
+ufhzXa9xAgMBAAECggEAHPsdqSueXzQ8pZ32XjkKiCtXP1T9mZur38B1yjQRWaKl
+fKJR4iUWACzuO+UBM6P9PyOp3rrMMsRg6G49aYcbYZ+mZmdL3/RRRZZ4cYE//kXg
+RUuTU6zX+dijF5xl4RGe9tgH64aqcAjsIPd/cfWrJXi3n9zg/f5xgUy9aaUK+4zp
+K77vv6ir3PjtHdQOqDTHblLdXJBDtNprF6Q3kvzWLdVptM2jhtsfhoZ5J4RnrkGm
+e9VwUksWnWK6NU3ezYndN2zDe8fkwRKWmLD/DLMrWxOd/E+1T2sUsiTYytxhCMpR
++x9hQZ8P1ogWivYZe0aEwzEcr9SR7sOafdnF+pFnswKBgQD/4fFSHI+c/nL0d0TR
+72BfNieuelnaxWzbsPDC8/7YzRd4g25uWCwoyMxzVntVSAdADmI2aD6REfIejLro
+m27AvEkMvXCBJIn6ZD6a/GVvLGAiJt060Y3znyRm2xCsynnfw+4RAK3Rs3Vqu4EC
+igHytUCKRsU1F3PeFYBABSKdswKBgQDn7JyG4uFl8YB3dm47SiaVxSNHVNnIKQJD
+kULqgxLV0jWbMyXx/brS+tp0ABwavRFYxhl3f1wm/ZBk7YnFCTxrpwG3E1MPu4bn
+fMJqVEbGFfJEkBePpB+3o2VFGYCrC8wsQx9+RsM98+f+jETqIn7J/j8W9Ht4Y1J/
+2mlWubqUSwKBgQDFugBSJQPMmsqVobwqRUFBEYXkS2M3rCsMMFQ7MXQSb5jdZSJm
+XffxpAhob8FqCvifRP4bcL44N5fSh4i+yazxfg0srQ5MnMGKHQBLnxF6sN2wRjvZ
+gaihQq5MVKcz/lni0XIa7V1jl7r5uN5d6erLc8flkf49olvElvS9g7pWBQKBgBNX
+3q45WgdAnzBXhlYXlyRCrvCSGR/im7e689PPXtDKmYH6QB3wxZY3KeUm5TEtt7ap
+vxICY1M1LsfcL/NpE8r+wNveFr1nLJc+BpELumNnDS++vNhUHfkY/adHuz2I3FyM
+tKG5kSsnnp/SXyUP/3clZ2motmuSDR1wv/xlvTQFAoGBAKDDpj2v3u6R5qWWWb4C
++kO41YOGAlx52pcukmPV682CQZyJHdWFG3YHNeJaSBMVayHN+roIbnZQHJGTbS0B
+jOMxgRyt6a86uGBHQ9PUDRrtOH8hcM4Wg5RnKip5GGHWnZYXH421p2ErpDE3ZAO2
+nt+0/3cXT4rENRXogOlzP3aG
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/nrf.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkOgAwIBAgIBBjANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjZaFw0zMjExMDgyMzM3MjZaMEoxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGDAW
+BgNVBAMMD25yZi5sb2NhbGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAJYwtO+kISwKZjSQlQ9eQNtF1/DpUFi8qrupceRuPtlAwsEFaly8BRiH
+bCuBcRdGjrIgHtoyFJDW3wi3veKn+xkUoSTcIdHahGwon6nryW049ef5tV2CtNqf
+RovgVACdKh7QIruIyqUhJUED+lm4s18aJjKb8QYne4jl18unM5xQkdHfL2bRh7Ce
+BZV9/GxjYyNGcLQUWf1Qme3dqLvq539XACxBr8NqmYSDJGlrSRG0i4z0Faa2Znnn
+epOTyRuttBrRgsebzszh1evg/zWgc5hsMDr4DoPVOfWfAihNkXmq2LF5kZsBqXdr
+kQS6rZsxV4KRF1ynafMNxp0E2I768ZECAwEAAaNNMEswCQYDVR0TBAIwADAdBgNV
+HQ4EFgQUofXRxrSK7mNyrNQCStGT0rE5vJAwHwYDVR0jBBgwFoAUsWr6nJm8BCpC
+iGXXfr5gcKIO2kAwDQYJKoZIhvcNAQELBQADggEBAHAaED78OABG0UPbkWUG1Bqd
+kWPiZVKySEj1zc8dOqCcgn79VGH8TruxK+/dHwQY/YClq/8o9tZzfFOwc/OdtdfO
+dk4AxHwyA+5zJMBWOaGOAIFzPkrRY7RIQnUlkL9FgRg/3hel70TyjBsRm5QEUCPF
+p100S0TS5AACJm5gcC7QPfx0Pz1EPsK0q8nm0V1zAus/mDY67jJcbkCGwH839J3s
+rVzMrnXEVeoubEr0u4fPB4ulsT1uufnmRPjO+Gw4ToqW+QB8aUX1y0PdxaV2K17g
+HD7N6TaLZzXLZDhXB183tMKgOMTzAN/+sDofLUgAT/npO35bAbMmbisCk8Alha0=
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/nrf.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/nrf.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCWMLTvpCEsCmY0
+kJUPXkDbRdfw6VBYvKq7qXHkbj7ZQMLBBWpcvAUYh2wrgXEXRo6yIB7aMhSQ1t8I
+t73ip/sZFKEk3CHR2oRsKJ+p68ltOPXn+bVdgrTan0aL4FQAnSoe0CK7iMqlISVB
+A/pZuLNfGiYym/EGJ3uI5dfLpzOcUJHR3y9m0YewngWVffxsY2MjRnC0FFn9UJnt
+3ai76ud/VwAsQa/DapmEgyRpa0kRtIuM9BWmtmZ553qTk8kbrbQa0YLHm87M4dXr
+4P81oHOYbDA6+A6D1Tn1nwIoTZF5qtixeZGbAal3a5EEuq2bMVeCkRdcp2nzDcad
+BNiO+vGRAgMBAAECggEADL0D06F5mMknAwVSRzPoz1A8sPew813JI1KLUOMS3I1U
+F1f0vfnKetqdj5ESfPVki/ISe9IskV5QG2auKceykd2Aj2ZGTgy5F41YgWp4spVW
+sf6pZc18tmA09Q8pQMYTuPpRP9Op0Fif1sRWGv8B46qNm9RDHJEDtsg7xc+gHn1L
+oeMNin1jZvypm/ZHv0gv2s+/ziOP9ZLcEsI/Zp8ljlGMJJ4Gv5bpZyZB6MCrC1xI
+2EOBIeQbO/DnvKw5tiflIiiE+UoTcLvRiX0yxS9IpcYTpV65uwsBsmj+yeg9eunh
+ZhoQNnEYeTwHpdzCX0ZO0IwTacb/gElutJ1n/FlMUwKBgQDKHh9UZYx1ejPrCzKT
+jyoiXClNEt14Ze3bh3hIgDLaENq24jadNYOfTyCwPd1CGYYkgnNlY8VWBtisafRW
+g7e28VGrzaEoYZ0S8p1vNsMabM1oWnq/P/oy0vY9YFvth7lZdlegDj8om+7tA0L/
+q0bDpcU0rQhLzxGExJaLJUjlIwKBgQC+OrTxkfrPvK/CIXole2Gu/Se/5smWNxGc
+LNuX39vgIzPvSf1I9rHCr4omqHoeFooujTckfNKR1yc6x/a0jPjDD35ztmPmSKs+
+8PCmhaq3yfjYnt2+0oZd3KVZ9acayNJ205/YVYxG27Gn8s2V2TnEHMXO18NZxPnL
+KHKDCGm7uwKBgDf7L+JIXicLueWYLGICfUEXFblrSDxYvxDW7NHn8C3GDU4qScYx
+VEuDtyIZgHcWarkiCKREhhvVuZ3Hmw17Xh8lp+FWCxUMNF1TJZfwKwneqOYGaYkf
+R0VceSd20P9xYD0PMiX6zDOLPRoYlS4LWoZGG+EDLBETQV7stGXF5fLRAoGAa4xN
+WHYr0t7ej2bV4/MJmyFNI9WbCu4/aoiB7i+F5AaDCjpOlL3EaklMVebSg8hCf2cf
+UeWwNvvpFfaPqCw7SCyuVUU83akgCAm4RK01g4sQwYev3n6vsMlaQq37t8zqEHw8
+1tYm5Li4jDddu+aAHjwWKYcaztnqT82iUCqlfJkCgYEAyK8xQfiWNPWADHILRDy0
+xtI415k+skYDx77dSmancF/10PGaZRO+UWI/EfweV8lR6ChSf9MuJxKZXOGupv/N
+2MY5qTAJ0WluunA/bGRS7VSzetq0ZC2LOLlARqvZQQSVINq406eUjhLzdwJZaR8z
+dtlKQ+91L56ELsd1XZ5DZfQ=
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/nssf.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDXDCCAkSgAwIBAgIBBzANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjZaFw0zMjExMDgyMzM3MjZaMEsxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGTAX
+BgNVBAMMEG5zc2YubG9jYWxkb21haW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDIrtclpBRox3SHlIWyxwKH/u77/UP+ML6C6AQOfsI6j7+G3o73cqIb
+zVlpFCfuy7Xh6+Y6uLqLQccNFlj0ckX/k+T3wR3Xpj6YAJ3W9ynPcgDWDK75Mlta
+YDR1r69mkZ+SvDAE2gjHgv9zb5Jujyd3s419wHv5qzJQmgEMmIfRhP3sBJNw5+GB
+D226dIR4QWmySrNku3BpTXrmKT8piStnnpWvEaoIBrYcAhUvFkETpWv2FIJyQJGH
+Ku5894DuK2kEdxhA2MTAeEOxRnq9Xfv4Qq9JpyYNRLSfpUeSeJW3ZjCYan+mpciA
+y7QPY2dG/RraGPvkGtTmlBEUMV2kThYjAgMBAAGjTTBLMAkGA1UdEwQCMAAwHQYD
+VR0OBBYEFKDi3dKxojvcTkXTSa6mQwULPtKBMB8GA1UdIwQYMBaAFLFq+pyZvAQq
+Qohl136+YHCiDtpAMA0GCSqGSIb3DQEBCwUAA4IBAQBJ5p0AF6bwFB2IaCdcpPix
+Ai8kh73og4G1fi6+5m0Es0Sj9atAS2jFerPw4w8qLlWQCQUu5c9TFRmC29PmYMKd
+1uPFfxOoaw6ohnfqbrmZyNOFpKLSYAi7VAcmVTt2ErolVAkWxknVTNFbC4QtgqOl
+vH7WF6UjRXpkGdEcDewBcNjo/GpMacTsMGpQrb09JH8Sfvi+O+RDJY3kYI8e8glx
+ejonu+gKXxCEZf0ALI/dIGyDIDTG30nShCMSBjOy+VjVFt2W9PFYykEc0yOpa+jX
+C0nbS8zvC0KnCFeIomYUTbkOj3mgEWKa+gewXkFA3+i8XxOPBbmsXU4cWyVJ3sBp
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/nssf.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/nssf.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDIrtclpBRox3SH
+lIWyxwKH/u77/UP+ML6C6AQOfsI6j7+G3o73cqIbzVlpFCfuy7Xh6+Y6uLqLQccN
+Flj0ckX/k+T3wR3Xpj6YAJ3W9ynPcgDWDK75MltaYDR1r69mkZ+SvDAE2gjHgv9z
+b5Jujyd3s419wHv5qzJQmgEMmIfRhP3sBJNw5+GBD226dIR4QWmySrNku3BpTXrm
+KT8piStnnpWvEaoIBrYcAhUvFkETpWv2FIJyQJGHKu5894DuK2kEdxhA2MTAeEOx
+Rnq9Xfv4Qq9JpyYNRLSfpUeSeJW3ZjCYan+mpciAy7QPY2dG/RraGPvkGtTmlBEU
+MV2kThYjAgMBAAECggEAHfOlE250cq781WogCkQUPKKanewkRGvsrd0IaKFtRmWY
+pah8mLH4lUMGH94Xl6xlGQhRnwdd0Cr2anL2E9slAgrbbEmGYAk6jl/ehEGfcTay
+qT/QsvYGbGwEvbaFlz66HPcOs6qsZMVIcGeBPhRfmkindX1Prj5pjrNtif5knFXZ
+YezQyv32wsXn0blE6Nfz7s6udA2JOhEj9hbl7VpK5Diq9X7zXD9eLlEB2vcF06xW
+u3mMZHCN0Bl9Ftq0KM3Mn56GjqIKMXZpQOZGL6hwKbQQRgLAwWqGGkQASsd+zpIJ
+i4NTibBDQarf6Wiob6SluEkpeaCim3cvf+lpHYCnAQKBgQDc/1StN7SB5Hpw6ApF
+RkWQb996UnmM7DUQp4G13iGww4iC9+pC/F6vb3WwcjITmxdLbSWPrMByTPzUIk+y
+kkBRD/TaAfPqSRsect9DjMhNyjxjSYL46jH7sR9VhebmuL4LhD2OpSPNGsnJwZ7O
+GcWWGRcEgQdMiXZTLpZhgJ+tXwKBgQDod9TRgADMMKFF55qCa5M+a/Jp2s6pgFBN
+BY8S0JApcOec0EyUZZ4fKX+vzP2PvQj4ITbEwsnnYDxGUIp76Wgo6ZvD50nSaxCC
+/liDY0pPEOFTIootByPVj56nrpBQ5Rcuon7DcIS2z7kCnoDZ3d52UTqXjuu1sQet
+8B7L8OVJvQKBgQDICwvgG+t2JJY8u54IZPq1Kr8035ENYgcKw0WjlaYTdnuMadMQ
+vZcL4K28gTIZEys76Fm2ux4cmNnHQCO6Na6ocfQmntvmuDQnFL5KTBZIbAbLrRA0
+NvH1rbf6V1HSiWnlzNdX1t4YW+ZKjcwtLaDwJFf0iMNNoaSM2T/glGh1qwKBgEB5
+5AQLTa1Um5Zo61ja/2bjx8OGVaV7mkoSjaE5SZLE5uh+eY77NEUOXITlBTrVwmQX
+yjn+kMNk1LLn6dD+Zs5aJMLMJpR+74B1jRU798NAOk61mL9uaIj2IZn+d7aII8ri
+dOg+EAEoUfchATnsKKSGWQrqMAQfyrJ6lAAam229AoGALHAQxLc2fXztnZ7g2ftw
+YsjutOSPPf+xBWZBVILYQMdY7Y3bEMIuz0oJqWSnvJ5ZMz09JQwoz9EzM1PL7GJ6
+PVlNNqqWdHtDlFamXS4rUXdsJLbKdoHy51bG1qIc5euYutpSUpKuc4n/g6erz7RD
+iJue+kVzeFjZeLSMFeoN5dQ=
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/pcf.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkOgAwIBAgIBCDANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjdaFw0zMjExMDgyMzM3MjdaMEoxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGDAW
+BgNVBAMMD3BjZi5sb2NhbGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANJDzsbZ910GqsJTS2Z+FKu3KnNHtPUvtJ4/pXdz6b2s9ECm0bPpTofQ
+7N17yvv1GmEoBiCEpoz13q6ZZ/CCW4PLXUTXQzKsB3HVbm7luJA9JziKbXnSrGnp
+SQk97HWN1RYdTKQKi46JaEg8MfyImeopyHQUmYbyg6oJSm/8JyXT9LAil8BJeLgS
+JpOGvhE+Pus1+7XS9hswr/zz/6jiy2i6Cc5AKxF1Qp1qp69/8EMBFPRtxiHkwnQR
+jMS3A7sk8N4z2P6JlRx3uBHvrActS7Q2IAUZHCqGPO+atdWjPpZmDJTTkiBcPBid
+xNBM1efy4xtCbJm3bXQStVgELdXxZwkCAwEAAaNNMEswCQYDVR0TBAIwADAdBgNV
+HQ4EFgQUAPQBjYhnG8101VwEMOb7qk7Lix4wHwYDVR0jBBgwFoAUsWr6nJm8BCpC
+iGXXfr5gcKIO2kAwDQYJKoZIhvcNAQELBQADggEBADjP6PVyrc5X0Av/FvkODQ0f
+9FcVH36olgqHMXH8HMtSaLhWB/NdOoeMfNnrZKlJJe12t05vd1b6c495Xg5bCpCn
+14wjUg/TM4FijXECGl0KT/VvPd+DI6sJiDgJB6wwVQoujY8c8k3inPoRBmPY56C6
+6UeD+NA3rUKnCas2yKq+eR2l+U48nfN9Sxdj5/LAQeY6CEaKKAdLZoN5YyxzZfTZ
+esG7mPpj5c7+oF2SBk7NEf+3yT8aZ2Uy20GXwLnQYk9d92AWUtBywe1LXgJxY3Yi
+snDuwEymRteXODzjMp6JXsCUwZ7e2e2QvTdDASx1QREidr9z/ddcpnXQWwQncHA=
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/pcf.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/pcf.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDSQ87G2fddBqrC
+U0tmfhSrtypzR7T1L7SeP6V3c+m9rPRAptGz6U6H0Ozde8r79RphKAYghKaM9d6u
+mWfwgluDy11E10MyrAdx1W5u5biQPSc4im150qxp6UkJPex1jdUWHUykCouOiWhI
+PDH8iJnqKch0FJmG8oOqCUpv/Ccl0/SwIpfASXi4EiaThr4RPj7rNfu10vYbMK/8
+8/+o4stougnOQCsRdUKdaqevf/BDART0bcYh5MJ0EYzEtwO7JPDeM9j+iZUcd7gR
+76wHLUu0NiAFGRwqhjzvmrXVoz6WZgyU05IgXDwYncTQTNXn8uMbQmyZt210ErVY
+BC3V8WcJAgMBAAECggEAEobL/ORuscEpIZcyQRUh4CFy+ZZbYPEzom/sNfK+KSrI
+mLu6JXaMp1Xm0Psb3whxKxdaNtpJTIlLdinpKR1rT9kG3k5zSs8ylrqeEOJn2Tmy
+L36u97ly3KAkAc71e0Qkft7VBm0xb702tYqsQtqMaUAGPAgmoOfUZxKLfwOCNYhn
+FvD76Qvv2jOwO0UvDzrlOdDsLiDPqYGR+4VhJOGEBVzZnQeQswbhTEj9JTBNc6Dn
+Gvh5ZxhaV82yxpB8J0JVWESb3w6KDnDpCskW8IVznjr4D2hxjQRjDXx4IMcWtCVg
+BnEknKR74uSaKZza5jwGf6XwoA1YlkCNbEmGeZn8yQKBgQDlFGx/KkSNIeDOUuFQ
+9la4jBjBf0RQkost9h10SVgk7UhnUOdhAzd8gygAdL8opesoVyY2lbIhv62iH+94
+5Eoh0mLT9siKjR/d56wyQRccrjoHLt91GnD6qKeGO0hbI5QeeKbdDrbCgzEpm385
+u0HYLhlkM+bpPnMDaai5wgnPpQKBgQDq+Vx2K9lNHN/Gdz7vq0xn/oGeiT0EWQAl
+nGD9E03f1QYsSA0DqX3MWJ+7rmXHxZcT4HC1DNcgpG27mEnIVxw3n3JoPWaY5DKd
+BXvQEA+SaNfXj+nEQft/mFgVGmadhnS8IgTk3obAQXVWXrgV/0xO4YaQH4D/08Zp
+eeWr7neclQKBgBceZoy24VA0+REZgC/BjKL3UJBGnchb4bvzuKlBtamUYNg8a/14
+a6MfQWw6XAhoJkFd+jdMCDwrsgRIoMxcjba4Gs01fKuu7mZguRohQ4nbc3PCIT8a
+Ogix+KYtWXIJNyuUFZL9pygeQVnnnYFgCpccn+di7Yzgho7znNmSYZcZAoGASOpi
+r+UBhLVuF5dPd24vwqGutXSe86durT0ut7ny03+2b61YJIfHGs9xmfsPaIO/UxK1
+xukaJO4Bg1JJqxqlDfmztfc/zDgcIK/f8Pva6TMRr7nf7+AN3FV5F+teZomf1fW0
+kRUgua5WbBvughz8IApKCJVOIZUlH/wMsmLIyVUCgYBL9vzRI1RliwBWZRRHGuuX
+Eg2x3GUvIAMbA7Yfpd08VCkxPGrNtPjb+nPbV5zHf0lSrKsBzCtgy6WAulhUGTBw
+tfcU//wg+1MDb7OY3ZBy0+8e0FDfS674DnD4YT7E+RoEqSrNPJ7v+Z1+LjkQPU/k
+58Nf0K4LaLiLah5T6dNIeA==
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/pcrf.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDXDCCAkSgAwIBAgIBCTANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjdaFw0zMjExMDgyMzM3MjdaMEsxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGTAX
+BgNVBAMMEHBjcmYubG9jYWxkb21haW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDMiA6Y/1qYyV3CMfVer498oPZNlnjciFECal71JbgigzvUUAIXT5tx
+KQUWKTjeyhbCGHMekwuyyUoljo6jMIoYFL5m1DKS6GV9mQgOhj2QpDEN44FFWm4B
+BRM+pHxXr71h51lXffH6l+wt1O7Y76ok2ZIxB8vzUUfKzmeg6wUQntS4oWuzZCHl
+5Ca/5FaDcty6H4ixE1O3+dRHPmbT+aWrZwekZyrOXYnOd4jNlJ9mz8STXLP+mEEH
+X3VbPkBOwFOHNq44WHYzZNj0CEjVghWWtse0T5V3QWluYxiBmJF3q9sWNe6bn9FI
+qOeJue5TzhqsldDZ75qhmvpRn7Kn+hz5AgMBAAGjTTBLMAkGA1UdEwQCMAAwHQYD
+VR0OBBYEFGyP1+kC3lw5HoXa6O9i41J/tZZqMB8GA1UdIwQYMBaAFLFq+pyZvAQq
+Qohl136+YHCiDtpAMA0GCSqGSIb3DQEBCwUAA4IBAQBkZI1BdcoRFyQGCb5AhiXc
+Su7MlrdPBACUvXqF4R1OeNUAa6dwlFVINxZmrFYrJ2MCo+4KBURXEBjugLloWGTP
+ChsM7eRoFniCQChWkEjoaTe8wDIWYSyZ6tBfiDgdM87uP4rbK9HO7C5lByj9QtAz
+OHYbkv5NEi5j+S0i9et9jjXoHjtqBRnlzF3lSWc461CkJA1Dgv6jldY+ozhxJlPq
+ZWvLc+8B44pgsQYkwpsg3CFESNAUa02h7qynswdmaB4AtPON13qjPzZxuawVco6K
+Fuy68CkHwwUTk3Qq2Nd5DLE5yOstiUOpJJ5qlQy0Fkp2SG+FEC9Rlfbl9Eh/Yxua
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/pcrf.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/pcrf.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDMiA6Y/1qYyV3C
+MfVer498oPZNlnjciFECal71JbgigzvUUAIXT5txKQUWKTjeyhbCGHMekwuyyUol
+jo6jMIoYFL5m1DKS6GV9mQgOhj2QpDEN44FFWm4BBRM+pHxXr71h51lXffH6l+wt
+1O7Y76ok2ZIxB8vzUUfKzmeg6wUQntS4oWuzZCHl5Ca/5FaDcty6H4ixE1O3+dRH
+PmbT+aWrZwekZyrOXYnOd4jNlJ9mz8STXLP+mEEHX3VbPkBOwFOHNq44WHYzZNj0
+CEjVghWWtse0T5V3QWluYxiBmJF3q9sWNe6bn9FIqOeJue5TzhqsldDZ75qhmvpR
+n7Kn+hz5AgMBAAECggEAAyK73I8fp7OAnztOWHkHEWFTXV2m9TSWz1troMUHBWpv
+JqJiYdKb3riDBjO0FkBRaIDg9PFKrt9Epn5AxBI4r8VTpPZwXw22jp4jwDtBIuBN
+izm3b+WCxbu6740shdihJeja1wtMhCvDmHFJByTnfiCiy+MjdpPCrsKK1q37uiU6
+NwQM96hwi6TYTX/i2FcTgB8TtPmy0hKiN5pUdWYGNq8xjNAKarNptELveOkTDmCc
+dlpqS+4ii5BrADrNDjuP7FS4KnBn45vEB+y13OAPrY2TvbfQDBI4i5HdCVw3zo0c
+NOf+TpJykg+Cxa/WqutX8im/3X8K8WymkcfdZ1I0QQKBgQDdadXvCrJNz8j5o2OU
+ClCvkFnPoCiySCT19/RN6C45C/LiWi67OxcD1kr3uWMjblPwXoyrfZnxjraOpeaM
+fVXnzNbqD+Rnre5/YskvU5hcgoKrAMSgcwa2wc/DKPrgj83PWaxrxLKCguPIh6zk
+DTvAFsx13SBQuRQwiAVyJY6KIQKBgQDsex/TndN4+kxdPhZMENExoqZ9wBvLFuvq
+q6ODTSDw/yahPlmAAuqyIYq3NY8Qdi4IEKnna6wVVBtZU313TADVntIKT+1xsdHp
+SLKChdFggqdUXIS1/FOCosoWCaFHe0jM/YVxn+QpooZLWtEjTofxGbfEiQf+sKPV
++KDED5wn2QKBgQCM/wazMLaXAojTIA8biO4UvvHSXAVOcs7Gq92xdvdocIl9RzyX
+Emv3j5Ex66aMO4fMfAlMc7GCuATdFhyYvn/kGveJGhGzTHmiOUAwmSVfU+TuDJEq
+M9XEr+skNoZ8VlcTgeFgx2N95Og1HOEmYJ76Fgqhy+z2OsX2mcgOBoicwQKBgEah
+R5I201CQwXof7xzs8O44PC3W0PZJdFD0zrOKt8oDCxChxK19MYfeiMXLk11BTuJN
+x9E80XrVUg3N5+1Xn/AtrWIzGSIaEC3y7o4ZVb3TiBKkR2brZC3iXSVT3v2wjr/b
+AJ49OTJOPnoHN+upquSR39ctblvdejGQPsQQPX2RAoGBAMPEbxnbW+4ueDqDLjZa
+Sycio+MO8wPtsBL6g0sg80zduoBLPb0djCSiqYCTEgwtkYG9oQtKYvEycvb8h1qB
+9TrLpwWTl/k1ERmjME94Kf0IJZU9KInq5zmIKAn0iIdoHjSWK78JiOMb9pw2A44V
+RmU/iXW95u9YMWPrtijdc/9y
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/scp.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkOgAwIBAgIBCjANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjdaFw0zMjExMDgyMzM3MjdaMEoxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGDAW
+BgNVBAMMD3NjcC5sb2NhbGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAJ34VbJi6C7XISkQdq0pKXcTITsG8w41IxlFm4nuglYyDWsdQJf4+sGO
+I+E6E8b0LVDkUljh4cRD3ZTZy/MlBC2EHIi1zP0ZRDzl6Av9qVUhCkQ5bviPmvUe
+fQp63Suo4MzdzhbAipzsEC/zFDdjtjHKziV16zxjzpWoR9Qhr8YzLWT4t2wxJVP8
+lOlgAdkWYPDW6/PAz9PNmJ0xuhtMC04Ia+RHxFi4xeH4umBcp2cHbdup8fW+sI4Q
+RSg6449FiL4XlElggMpNlixcvNE6umzCAS5rJj2FIODd1i4J7JJjbs2nxZWJQTj5
+B5mpvFr5UlkKAxNVDfEC1jNzkS7ttscCAwEAAaNNMEswCQYDVR0TBAIwADAdBgNV
+HQ4EFgQUGcbPg++D5U187URxcjqTsqmmAogwHwYDVR0jBBgwFoAUsWr6nJm8BCpC
+iGXXfr5gcKIO2kAwDQYJKoZIhvcNAQELBQADggEBAD3hPDcxv6j4n92UC/+XSsLQ
+cR0gZH454Y52Tocee1MgbQeDQauJAVtu4A79reBDmL8pVF14auBzLqLdyBTxAfOn
+4hcbw9OjxF/eKeNvYXL4tNu4KzZOoZuUiM78wnvJQObRp+30/dIUHt5B2nuKdStI
+kHgQrUXMuvJBCzmDKqiyDkkY8gN6/no6LzHQcpC7KiAhhQZ9s6IIgg8ulVqgeLXd
+Ia7Jit1Abm68+JDifwof3IGF6fzjxmWNzifxlVSgbMWMOnmgIVXojZrS2ofiJ2es
+VvLkGvyeCQtUV0NuGNS5QHyKN68mfDNRbk7A5gcr4ga9YzXHc9aQ5VJZyDvax3I=
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/scp.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/scp.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCd+FWyYugu1yEp
+EHatKSl3EyE7BvMONSMZRZuJ7oJWMg1rHUCX+PrBjiPhOhPG9C1Q5FJY4eHEQ92U
+2cvzJQQthByItcz9GUQ85egL/alVIQpEOW74j5r1Hn0Ket0rqODM3c4WwIqc7BAv
+8xQ3Y7Yxys4ldes8Y86VqEfUIa/GMy1k+LdsMSVT/JTpYAHZFmDw1uvzwM/TzZid
+MbobTAtOCGvkR8RYuMXh+LpgXKdnB23bqfH1vrCOEEUoOuOPRYi+F5RJYIDKTZYs
+XLzROrpswgEuayY9hSDg3dYuCeySY27Np8WViUE4+QeZqbxa+VJZCgMTVQ3xAtYz
+c5Eu7bbHAgMBAAECggEAFJLs2lxeYAddxsLhqgDT6THBILZxfna2OQrjTI4XRJGl
+RL+dE432XrIcAy/0tnND2aa7AN9+b3jlSYcqNGMsTZ9IthdzeL1LMWFCHRmu7art
+cuBGDzJo3KbZYz2IQ7DtglEbD8SI6RIns48FoYcnigmfWqqmdgmLtNsja8HtajM4
+nF9CZQvGkpM5DxXm5K6OigkZ9JKHkvw3a3uglH5uNTmf5UqMSktQQUks996lNlcF
+ncjJeagOazWk5suG/fR8y7jrf2JrhcKwuYSg8jEFwf/ykAKuy0SNHU1TfF0ply9w
+84HvMScv2nRsdB3cT0J2yfGhV1+y6S1tCkA1EhOWCQKBgQDY7V65kKaFJhyZDIrT
+vZoJMCWfYAYe9It64LLuGl+K2b7HQWMa8AONy8PV1NPIoMzX+AKmfvo7Yt6WL4tW
+lNdmQIcVPYnoPfGW+9si6ajByQuaLMYzFKXYsMmazNuIxgx/+4x7U4NJmtHxKhyW
+izy8M0D2GY5wPQqKDYD5Ew2MDwKBgQC6bGsTVoUp3RyQfuH8zCCavOjJCk36pyYX
+U7NToCNaDzA4j69NiDY3AQi4qjLN+qIuNh7WLi9VUubwaqiwVvzBiKe4AfVPlh2R
+cOtXJZxCmZ0pcsSsMvv5JbQVLbmOTU5OVUBx1IosakXFyPbX0+HlRTCXQWV9/WGU
+Rk1PvmZRyQKBgBApp3wmBfI3w7u3joR2RQrYNoVobyxRRi8ynMJW3rWGwcsw2QSB
+y5H+E6pUAC+bo4eX6AKlxVk1ZaZFBpm930q0FhyECElwjBaWz14LkNJXe3DSUzYt
+HKpHic3p45WORBIpGO97anXKfkf8vkKNP0o6e2Waw90i/y0IEor8W28LAoGBALQZ
+nfBWu9tP5BKsogKp6i3Tp0jiDafD54bNtAdsQ/rzhXB/T6qll0rYUuakduSL6Dag
+znW4tL3Hk5hcUo/Z2eHW9cFNEwNKUVJ7NsFAco/c+/pZCCwcLVXr2OhE/mi9wpLm
+xZWy8bIrETEdD2w/JJNsnp7h7P0k1yp6KKKLnSoRAoGAEZOB+A1EGllcsEMX23jZ
+SfECJntHZomP1GvstLvaQNlSC5lDmT6KO7Rw2RNEDJPyfelO/A17CICpDGU2NndC
+hI4zzywqqsLfCaYpPz1CD/BzP4ugyXM8W/kP4w8hSlHdqgyNi+iWqeBzsrZXtHLT
+4XJt75eQQ48u+NWkaQ4kLY4=
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/smf.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkOgAwIBAgIBCzANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjdaFw0zMjExMDgyMzM3MjdaMEoxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGDAW
+BgNVBAMMD3NtZi5sb2NhbGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMrZsOPjIlGG8FptBo7fdxaEKusuBoQEfSV/8KoQovMca1yn3SEiFNdv
+dDG2RusBCzZ6K/bjTieYpkUuTH5nTPQiz0MRM0ErlxUXKrosZ8aalRNajveq3fgR
+K7pa1tnS4iEArMwtr1Fgj4jA5B48pOQrS5vmx8w5JCaPXJ9HPjTwdFubXSfMT9fT
+qcP/E9Z13zfhDZ1TStz0hYIanQZlp2BTJJgZQJ5kJsdEsp5Ect+t3ZVwDxT90iFo
+1X96dR/xf0DEKHxmybrahhmePvzEETgz03McVEUVBdQMMvDnqyXicLNzLJICY0Yw
+KzGeAg9Lh3PVjUnx/ctGdp8BCJRRkS0CAwEAAaNNMEswCQYDVR0TBAIwADAdBgNV
+HQ4EFgQU6p4PokOU3iROPZzUmvS88xnI/QcwHwYDVR0jBBgwFoAUsWr6nJm8BCpC
+iGXXfr5gcKIO2kAwDQYJKoZIhvcNAQELBQADggEBACpTSu1iB2ZWmTrR6zvnn57p
+xuE7udN7M52yG58N5k+f9cwXwmvvo//VK5AkJLqc/qBERwOC1yUQPTotBq8K0dF7
+Gx+zyG7o24GjZYgJvqIADEE0pWLTN6GkkYTzYXQwfv9kPDpAWbXl2bsYoY8610ce
+rRCQE7FkGuITR5mqKbJbvMSAwiH7gZ5yjjWXaUB1b6zzXiPOvME23IewgnddB3Ab
+zkGqgYO2qCcelkE5ciFl75d+DovfMXQDU1qGV6s0NTEqIWy5BnYj2jKoJJp2zKfE
+nOhyty5eh08CrH3PbYjmU5pNP7/ibG0oVJR5xLx5SWlPCbkEImcOwUH1cCoxEbU=
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/smf.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/smf.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDK2bDj4yJRhvBa
+bQaO33cWhCrrLgaEBH0lf/CqEKLzHGtcp90hIhTXb3QxtkbrAQs2eiv2404nmKZF
+Lkx+Z0z0Is9DETNBK5cVFyq6LGfGmpUTWo73qt34ESu6WtbZ0uIhAKzMLa9RYI+I
+wOQePKTkK0ub5sfMOSQmj1yfRz408HRbm10nzE/X06nD/xPWdd834Q2dU0rc9IWC
+Gp0GZadgUySYGUCeZCbHRLKeRHLfrd2VcA8U/dIhaNV/enUf8X9AxCh8Zsm62oYZ
+nj78xBE4M9NzHFRFFQXUDDLw56sl4nCzcyySAmNGMCsxngIPS4dz1Y1J8f3LRnaf
+AQiUUZEtAgMBAAECggEADlqgK0gPziAT0vpDDAohFa1Nki3EFURyDJzEjWw286gP
+qtNQEP+l5ObEnJ3u38NHpVe407Qa/C9PmLahgBJUPjRWYUMO0u5ANyRYCCuLPmEC
+6ocudbUYFu00IHA8ItbK3JX9JEeZT9Na5Mztd3xIGMM9iu8mNTvX5Iihf73dV4aK
+AtD1L5fCGckEJ0Va/xLta0sjdxLSYMIzacIpn9gdK7DXf9DL/eTACrf1U2ZAMQRr
+plKeri4OFBjMBy68kdpPF5ZyQwj1Plx6E2Dm0eNzsdF1zSkP75BYbi3OaIJR77Xk
+jp9lQvkP74e2ItzYJn9sGWhwAW2AiQt1zn+7v5eGEQKBgQDSajh8jMvFt93GgCqR
+OTGR2s4k4jp2XvcEWnJJax3ksqiGHMhlvCQDV/39saTcLUvc+bymtMc5Tws2ewaS
+LstUeBh/GrEMn8tQH7TXns+rq62I+CwSYzYqu2/uHBHkk1nXrTBxQ4LE/l4a6ZyT
+eVHr/x4iy9KMF3WhTBJytQJfFQKBgQD2y+7s1Hh7r+THSgo1CBZRtlw0CuA5EOgM
+iuglkU2cbx8q/XdXb9u6sLfldHGu3E18TYUJqPTrc3PVSEEA948qJ527PZh3VxRg
+L64M7gt+g1MqyZvuRYzTZOMBcJNJpfJSnP4mPY+o2L7mNpAS2Twe2K9/zuIWyChy
+g6xbVw4vuQKBgQCOGWQKYP9giHqCip20s35RdQYQjKNUu29whjB2epuWjj0XTSrc
+4cEkbPE/ug+PDhwUoKeRobaFcmctJMpcQLPaWLyaYgk9cFDazH7RuxOeaPNp88e3
+pz62fxzpHhXLWuOqrvBvHVub8/jTjf7K7XywtvrAHwwSxekPxBMVWj6+vQKBgHWS
+H4d5jNA3skByeDxdVuykeHZefAUTlchr4D4NY7DTi0CasWDZLA9bIrBP8dyAnPVL
+pMY+VDdar+L6YeVJCk3lw5GwvVKVDGLqM/t658TkYRlwJDW1smn+lNpZvAEI6lEK
+81RaXXbtkrvvYGFqVebICYtUjoaV4hbzvYdiCKMZAoGBAIFv6AMnXaWHoO4Qpnch
+FCSBNckhzajPmmZ1fskWR95d9ArmrJUaA0KKMqno767zVkrDzm2fw4+q12Ba1xRe
+J2KW1M12IPfZtNwSfQPYs4wej0VGScbOWve9qpA3WrLv08W63MXz7XRpeg5ZnzG/
+3bZZLfqZIBdQR9/f9ibP1h98
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/testclient.crt Added

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDYjCCAkqgAwIBAgIBDzANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjhaFw0zMjExMDgyMzM3MjhaMFExCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxHzAd
+BgNVBAMMFnRlc3RjbGllbnQubG9jYWxkb21haW4wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC/2SPBDa9KE9rRuKHp2ZNNm8X+Jgl34tocbcYiWm3I7+je
+NPOiUIB6TpuP0gkwbzfhqbRdO59EmAsGjtjonwC2mTxDLWflfAUVUEGUml3b9ESf
+ZUtMWh1qBBme99DL9kqqNWaXVL9xAX/yLWbdXxfc/+Zuc3j/uRVOzqGLROqfw/k7
+iKmfZvBjVrtxR/xyRa3LfjuTPnM30UA7sk0jrZH9feOCEbNeYGa12TloDh05RzU9
+RgkBL1AH7Zvha3iNlXwQLkgEpnJEeegQ/iS9pPEwgqsquBRoQTClzVGzbs5Ttpzi
+ZL5q/Hf7sGE2x00v3XKNDvUPg9k7RvVZoG/fUy+VAgMBAAGjTTBLMAkGA1UdEwQC
+MAAwHQYDVR0OBBYEFEegxvp7oDrpJfd4LDD4LSGouPVnMB8GA1UdIwQYMBaAFLFq
++pyZvAQqQohl136+YHCiDtpAMA0GCSqGSIb3DQEBCwUAA4IBAQAPDVSwdX8u25Pd
+a7UNANFAf87AurQKsaeLpKu1AfZZakgu+XQ9W/5fJXCSvuVc3g+JAwxVKZfO3yae
+C7vcLSughlUGbjJyVV4wn9xzbKISWwAXmBEt+pP+vJAcyCyRD2uXZjO89sCFxHmD
+/Oh84m/ygiUAx+u2to55HPjNTZs9wphdyDws1lPUwxj01B84r6QPgTKBpnhOAr96
+xUYNZKAt1ycRXcoi7RNieEZP/r0j92RVA57twMGSDHpCgb7YnCXAS9ptlpHySbOK
+akfqFx04eVilqKGee4NeM4rt7363Fr61H+bjkYjvS//ZS/L5ZrbNAMWmkr94Xkcj
+m1BG0Bwg
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/testclient.csr Added

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICljCCAX4CAQAwUTEfMB0GA1UEAwwWdGVzdGNsaWVudC5sb2NhbGRvbWFpbjEL
+MAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQKDAhOZW9QbGFuZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/ZI8ENr0oT2tG4oenZk02b
+xf4mCXfi2hxtxiJabcjv6N4086JQgHpOm4/SCTBvN+GptF07n0SYCwaO2OifALaZ
+PEMtZ+V8BRVQQZSaXdv0RJ9lS0xaHWoEGZ730Mv2Sqo1ZpdUv3EBf/ItZt1fF9z/
+5m5zeP+5FU7OoYtE6p/D+TuIqZ9m8GNWu3FH/HJFrct+O5M+czfRQDuyTSOtkf19
+44IRs15gZrXZOWgOHTlHNT1GCQEvUAftm+FreI2VfBAuSASmckR56BD+JL2k8TCC
+qyq4FGhBMKXNUbNuzlO2nOJkvmr8d/uwYTbHTS/dco0O9Q+D2TtG9Vmgb99TL5UC
+AwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQAdqoupSBRB+iFdX3ULgt1sTfqxio9d
+X2avV8mhQt8Ivrgw3/+iggz0y54JS+yL+tfzFu2upxmeemnImkKremt/zwQDhKJC
+2yLtDBDCWIwrdQyoC8V5irUEZNwFjZn/VrZty7lFsAA46HOXPysPJuYEXMQ1JYoV
+VB7N7JdfaFDGDLe7lKsOA/zK3QF1yRvFqdaNyeVP7SZ68K6JzzuP1eakp6BO0pBF
+X8xQc3LlMcMSP+G+IjN5LFp+gRMpxv6BkLHFn3ahN9aUPOJb4np/uEg5Mo6fT+gc
+qNW1NZ9ZkYPWfTV7SmgWfar+tKXjG7TQyLQfTDqMD+VbSZtWQFGLp5T5
+-----END CERTIFICATE REQUEST-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/testclient.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC/2SPBDa9KE9rR
+uKHp2ZNNm8X+Jgl34tocbcYiWm3I7+jeNPOiUIB6TpuP0gkwbzfhqbRdO59EmAsG
+jtjonwC2mTxDLWflfAUVUEGUml3b9ESfZUtMWh1qBBme99DL9kqqNWaXVL9xAX/y
+LWbdXxfc/+Zuc3j/uRVOzqGLROqfw/k7iKmfZvBjVrtxR/xyRa3LfjuTPnM30UA7
+sk0jrZH9feOCEbNeYGa12TloDh05RzU9RgkBL1AH7Zvha3iNlXwQLkgEpnJEeegQ
+/iS9pPEwgqsquBRoQTClzVGzbs5TtpziZL5q/Hf7sGE2x00v3XKNDvUPg9k7RvVZ
+oG/fUy+VAgMBAAECggEABEzMuJsYKp/4d7AR+aYYX1+xB8yDSfuHbyYwZUeOGOLJ
+tHtO2lHqw0hc7mkN2YGl/hSZ7Ty0yeqM1WGLxTuqc4Kf6hM2i4X6A4Yy5hlcpl1a
+prue56/zDf6CstWz9B0J2OKisUcjawLBLaTXXqRZlP5BBF4/CspI9Y/Q6Uh1ks2d
+dkGob3+leeDCLtggVbIE7FqdjmLI4gD9cVYvH39cTvFd3uXYRyjDtGUdbAH5MYsy
+/ji8Y7ZkR+Phas0xYiJBRSKIxsdZzDDRbVDaQJM8DgUOQawtE7aQs+s8+rddR0xH
+WFdQIM51vTNYENVA0BzNY3Es7roBDaeaZbD53y30kQKBgQDLDq2c5OuxS66NaHGH
+UShytecC9ugeKYVALzDen/CM7Wvf/3hJw/bXrzEm+FO0h/Xz7rHBtSfOzwHbQmM/
+FZ4TxGohDhPgqR0bP0vqR9sKE9Kc4K2eRjjncd7wiVBstHMKZysyD3IQtNDJqzqw
+umVFyVy1lWBGLXM+l0IuTjNwRQKBgQDx3kse4lkIxYCFW+ZjJtUs2DzyOy0Ga7BD
+UkRw/tbyzD7kzj3xp9MJAeUz8vaZ+zcqQgjsfhmLMbflCuuNdREWLA17Cpejekmf
+nTu8hxpEEvtESkj0aq55iessUpfLxdPZepKfz/UkDNa+mJus4QILDp/tUnGSvGIA
+v0DV8AT/EQKBgCSR6SyXgec1ZSNsiv2+3RUDs64x/43nFmt/1EJT9cO7wrDd1rEa
+TOt9TtHg6VpbHi2ncHYdhSTW3VO6uhsTbpvKxP5dBbFxY5+Tn7164XUIKuc8A6i8
+puTv+iHB6S0atplKCVqDs5xUpEGdx/0qJLET2dGOLH+XEelU3oNubA8tAoGAbqs7
+Diede5D7LIoPUcD7+6f5wxBmmrB9l2A2JsnESpZAFOt1lnQm8NEoMevzACPdav2K
+HcPZJkKalTe47iHpro57oJgJKGkU9O653Zqn3wwcYnPnC8cgjEYaEE6+XCPpunIG
+Uw+RaGxjehRT7veJust3S9zUUMLXyOW54eoQLzECgYBBTcFVoDIqJY5MSOuQTYri
+lro7YcXk0kvahCSgXzdecU+ajG6+ppHvIje/h7nBZizFfsGsZQj3j9hrmxXxJn4H
+4gSLHSycFGY65G6tBC4eNKi6umBi8rgw+kQ0PtY23ZDoRTdePXYT4OzQaGiGzZhO
+4su2WwkXmgev/Rcan3hj1w==
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/testserver.crt Added

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDYjCCAkqgAwIBAgIBDjANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjhaFw0zMjExMDgyMzM3MjhaMFExCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxHzAd
+BgNVBAMMFnRlc3RzZXJ2ZXIubG9jYWxkb21haW4wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDK/mRxA7vFDetSR7J58pT+deCpXdjH6rFyebKsPRklq6aq
+P8eLMj3CYG641BHNFoMygnK1SEuPXxoLqVYFOf1aZh+9OdvLPjKB37ZfikzXR5az
+PRvGKOO9bM+lgviZvmgnE2sEVYtoBJAeK+ZXQkPUQ+Q3QBsdyZXFKu4uQZukW7UO
+sp+IGQ5guCi+MAkppB/T6WbuTl7Hr7wjLd/eFK5rHik57D0N1f1fX7G5+K1jfFu9
+OsVYDsp3f7LB1QjZntAfE7dnddmAXdDz3FCPm7keLSrdsYSY9Q5tVqBl5yRzMcq2
+C4DQX7JcqWCfpGjm8Gnc4gmDyKV4zZPaQXiXr6TzAgMBAAGjTTBLMAkGA1UdEwQC
+MAAwHQYDVR0OBBYEFNNWx1Ixb8nBttAAziCdNf5iUfGCMB8GA1UdIwQYMBaAFLFq
++pyZvAQqQohl136+YHCiDtpAMA0GCSqGSIb3DQEBCwUAA4IBAQDeFTLtNW8hPvUB
+QOBVZU4kyzOw3v7Y74lug88I92XMagWVV71lLGCzHcQodI7p0ih/3uK9CO+yuhU9
+Wkmimb3oh44wao6+R9qtYF/OdbKLvRZ9y3Fd5y5RiYJNFCuBPLGf/0UwIifP0tcI
+bivpNkB5WByebbhzo7zZXz+pgMMDkLtBfvwNF9JYM6WAdEw/3cYaN6jwtwvA9/2O
+wQ08z1BtuA0Cxjy+7DgFl9b7EQE4q85+TNCyl59x0vO2M9lo01C/APQ8HmCRc8Ax
+YCY7zYz5AqnO3HPnQ6plYbIw1xaLEwNYDZ6sxIpCRP+g+ZDG6A3YW76n019lEm75
+02901MR9
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/testserver.csr Added

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICljCCAX4CAQAwUTEfMB0GA1UEAwwWdGVzdHNlcnZlci5sb2NhbGRvbWFpbjEL
+MAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQKDAhOZW9QbGFuZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMr+ZHEDu8UN61JHsnnylP51
+4Kld2MfqsXJ5sqw9GSWrpqo/x4syPcJgbrjUEc0WgzKCcrVIS49fGgupVgU5/Vpm
+H70528s+MoHftl+KTNdHlrM9G8Yo471sz6WC+Jm+aCcTawRVi2gEkB4r5ldCQ9RD
+5DdAGx3JlcUq7i5Bm6RbtQ6yn4gZDmC4KL4wCSmkH9PpZu5OXsevvCMt394Urmse
+KTnsPQ3V/V9fsbn4rWN8W706xVgOynd/ssHVCNme0B8Tt2d12YBd0PPcUI+buR4t
+Kt2xhJj1Dm1WoGXnJHMxyrYLgNBfslypYJ+kaObwadziCYPIpXjNk9pBeJevpPMC
+AwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQACkHItCrvQWANviVk27ntZE/Ze1/NF
+W8jPeJG3V9Zemwp2QWE530gdhNy717kGJzW0Udvx57By4tS1bORlKDL7ikpPaIm3
+q2YLXzusJ3JXyD2aYoaY+uP6+gt1541aLep8eSQPgG0jJlo8VbbsrPrXj9T15Nsb
+MhDlKDLZhW+JCwp53/IB8Az3s6oCUelwENOTDkmuaksTbo9NX9TJ68ByAtSqroT3
+/jHqvSpD+VVnQcWn6XE6lLNyXcFcQ/jQLKLVbdV+CLPrUORNCyB5Vy7Qxm49g4lB
+H9Cx2fPDBpYw7BlFIrNU9bxLAem2lE2x+H5NbbFoMfi8Bq3q+2MWZg+a
+-----END CERTIFICATE REQUEST-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/testserver.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDK/mRxA7vFDetS
+R7J58pT+deCpXdjH6rFyebKsPRklq6aqP8eLMj3CYG641BHNFoMygnK1SEuPXxoL
+qVYFOf1aZh+9OdvLPjKB37ZfikzXR5azPRvGKOO9bM+lgviZvmgnE2sEVYtoBJAe
+K+ZXQkPUQ+Q3QBsdyZXFKu4uQZukW7UOsp+IGQ5guCi+MAkppB/T6WbuTl7Hr7wj
+Ld/eFK5rHik57D0N1f1fX7G5+K1jfFu9OsVYDsp3f7LB1QjZntAfE7dnddmAXdDz
+3FCPm7keLSrdsYSY9Q5tVqBl5yRzMcq2C4DQX7JcqWCfpGjm8Gnc4gmDyKV4zZPa
+QXiXr6TzAgMBAAECggEAGwG1EkDJaAJIkcCpMvE+YmEDcUpjj4F0Ie36rVCkT683
+yW8ag189TpGELuyZVlxNkILrc56OiEts9yqMdRM4gkuToxoXWcHIzXTv2g6Cgk0W
+HyWc/tms0aRa4e3RWP8MnfpG4s47cazTEbiMeNp/lLYtntjVYrqm8D2cb6SvP4fu
+kvi7bKLhcd4l9v42oZKF5wZjynUEh+424TNxqI8OTcnT15xoOjauM9aQnbFYB0ON
+tOJ5cO8Pmjbo1wfFsSntC7NrIspaTrlseOl/bK3LadLlb9UHW3GRVwIcIzEYPabU
+PZcTKjzk1nAu1fpHgoCuMequxDaXSSWyDLMqwLfqoQKBgQDtcOHFJHO63SIOrwlG
+OjZiMxKekjVqtbdiN+7h3FBR0+M7EZnyFO7zsfmDaN3k4m3a6idlnn9HvsEilf+K
+Cc+8I0dCeBbZOs/TqVN8ZHB6MqUmtMdGIc1Fau1HYis+d4g1pbQ9tpG0OVa806rR
+AkBwD+/Vm6+8uZKilq+oijSpEwKBgQDa3Dt9LFYOG6gnWHlq7uLIWnA4wHKmgEGL
+AykaZgW2bxIhQa1C+460OQaCwBbBG2NlN7Lt8MXsr48epnSKROfCYIBuqlH3i2CN
+ka+W7pEtnkeEnZSUMb/IF5T868xbYkzXFqJkr17o2MBMbLiM2G79dT/j83MJVc1A
+FecQByNwoQKBgArrdBai9IeVf+l49045gyLFAog0ZSyBKuvjcqMEhNUej4a56oCN
+oeenObhnbD0IhNDaj/FGdsgP58X1bAknJlyaqr5N048t+zzavrIr1FhqV9oN2lRJ
+Xa1hm4P66c43pRYChuWHre/B61FH0sVF+zysHvWN8WkWh73efDmeEYntAoGAMcq1
+Bg9WLLOCGCF6zic3FRnuOhseel7ninbXnRfk6NJwL3y/rGOK3dmzb3/ALYLLpDV9
+0cBbZzOxvelkzihLCd/mmEbLiyP8fXjNl+sCwHwoDTXEncqLtTwYO0pyHcBJdw3B
+OGLlltfpN/nsKq764VMRjAzQ+Si6H4BcJztYhsECgYEAnql7JlJlg/jUOS3hU/sM
+iZ1EY7K8DFjaIOitcPcjbZqH4Ha9922MSGW4hCKMo3ncDdaDKDvrfYd9pgtrSvHd
+vH1vXcVrdzuLPVzvCxlRxQbSZpK6RZT+OF1OTvg9zMu2hemMwyKNxrRmjADwuU/E
+f7etkEMnboFO//fGoMXU5cc=
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/udm.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkOgAwIBAgIBDDANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjdaFw0zMjExMDgyMzM3MjdaMEoxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGDAW
+BgNVBAMMD3VkbS5sb2NhbGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMnNHwgMDlTfi2x5QMvhdhGzOxCZvboqcrkHrTGkRJtUrxNjddjhSkm3
+KeRKEdcDq/t126t2CAxiYiRprKr9II1o6rq2JUZz7VU0aC9wWnZyWhIf4VIzyhz5
+G5s5cWT7IoJZ/cjmoS89e5cPv34G0jLaqz2m/Kl2zqmVozQRdDuO7Hreh9KgPs92
+kqA6XYy1z+hxUILAjpdVoTwgJm0UchF9Ibgc5+ab1XuaaYzxlYAzwcWcCibFzgGO
+I6+MdTpJISJBHRzkLOsmFyJ2XpH53aRPN51yQDRnPTDfJj4og6FyFWjtIfCeBHBf
+3taz6SPFPHIZhR8OIMt25T4r2bXmS68CAwEAAaNNMEswCQYDVR0TBAIwADAdBgNV
+HQ4EFgQUfzKzBycjEgN97TEqC+0iKaWBdVIwHwYDVR0jBBgwFoAUsWr6nJm8BCpC
+iGXXfr5gcKIO2kAwDQYJKoZIhvcNAQELBQADggEBACQXPgeUMGyWGbGPwr/cg0lC
+SPiIL1s7oZQoNisbTtTqnBHo36xLTGb051o9ZTwd2xTRNJ4ue9/rDnMTK//9+6V5
+FKDOYFqikSmCtzuJFB5Q24KxdUM679feAy7v7BWTGd7LoN0dOgPCHqPT7/daxgYW
+Xaip1lslx5TYNTnhrJAoVfj0VGrSrTqQqCNf3ifQDI0HRuheKC2WM6Ep7E8MyjiT
+kzfsznaWul06geQn7vT4MMTHUNUI49Y2uCCgosD8Xi23Oi8qSiguCeSLcg2ns0p6
+eELtPm1xcTWoJHomDNf150ZW5swFDfE9asAWGeYqONShUp5Zim1agcuGTpp9uaQ=
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/udm.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/udm.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDJzR8IDA5U34ts
+eUDL4XYRszsQmb26KnK5B60xpESbVK8TY3XY4UpJtynkShHXA6v7ddurdggMYmIk
+aayq/SCNaOq6tiVGc+1VNGgvcFp2cloSH+FSM8oc+RubOXFk+yKCWf3I5qEvPXuX
+D79+BtIy2qs9pvypds6plaM0EXQ7jux63ofSoD7PdpKgOl2Mtc/ocVCCwI6XVaE8
+ICZtFHIRfSG4HOfmm9V7mmmM8ZWAM8HFnAomxc4BjiOvjHU6SSEiQR0c5CzrJhci
+dl6R+d2kTzedckA0Zz0w3yY+KIOhchVo7SHwngRwX97Ws+kjxTxyGYUfDiDLduU+
+K9m15kuvAgMBAAECggEAGPA7bIAo6T4y+bXGVyvGrotKulN1ieMjCFC1i5P0UonV
+lPzOnH3C83cqOycYK00t3MaE3hyZBAbIgB17FCpx8mfL0kUeOCWtZ8ExOuOUmlyp
+WuILs1/pE0mJqtYfeE48xoUegsxVkQP1GQb+MDHhmh1B2j2frcWb5oMyhwW9KnrX
+8yoMUq0J41keGbM4nd6hYY/0mqQL4BffJd/UdLOGL5SupAYTzyELuycktMBbt8EG
+CIlIOsd5ZfD5aLHiM0ZUGnK7URQBIpf//tBw6SBeYmc02CmfaLvqRLvnH9oE47/9
+0vFLDGifUY9vRuX4rBlghmy+/jzCBMRW6Rlbj8LyGQKBgQDb2UXmQ7NiMAuNTb2+
+4498QIi1ReQyyg1ONtMoZ9vXc9CwtFVdLk6JTru2VRvXIwpCWHZGsS9vWtuIk+1p
+QqZYT8lRqX4TEDIjC4MG2XdGCnox4FuKPqyjESwd0O45xqfv45Nbx2NAsNOgm/xg
+oJULFMuVVHMztOcH+6fQamRJxQKBgQDq/B++VMDoXnYyNmhxfSR0NPfeQuCkHlXo
+kfX2cve27yI9mLKXKtNKtwlAAdhSGZ9Hbe2B1mINLpqajKUuoyD0eyNPzZGWiINH
+7BM+oxIMbzRo+o2a7Eyaa12RLJ1b2O2wOPriddwa0ycx3BqTy2mzgRvSzoA9fAPY
+6mHAXp164wKBgE6YJSIFj+qJLIgOg8frSE9uLrFHVCZID2uns+NdBb3HXJLfVSkj
+tdXmfLrZQEOv9inzwAzTqRaRD6yK3bPkrN0jYOA9zKF6B8J5ihT3x2kVs8uC3pbU
+gxkkuXXLTG8BMuZSoEqORFBLJszjFt1gawf0Hje7YhfZE0LKV5rtff7VAoGAMIMg
+opCoytBFopQs99EYJ42P5qjz663/mmYX22tczL2N2h2eMSs8N96V4EsBN+HmSj7d
+m8KAt6v5axLCP2CaOx746U7NUcCZKc4JIxNTdJG4xjuD5IoIPpEP3hrR2dZtK8Z3
+tS0T5c3V96szKXQDPHXZIqpTO15RBQVObQKbjHUCgYEAo6smzS8yppgd4zQaPkIK
+7gRdfvIxXwcmWeVG5GeFIHmSpBsdPVgcwhbsdHoFWLBu1kU4pXsi6Mm8RQqW8GQv
+TqLtQg+8UZwOUcZpwK3ubEJpPst8meVfi5KPQYgeqNHcBjOhllQWobdI1Zh6i76r
+BDBpY0brm19iZHspDFURjjY=
+-----END PRIVATE KEY-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/udr.crt Added

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkOgAwIBAgIBDTANBgkqhkiG9w0BAQsFADBJMRcwFQYDVQQDDA5jYS5s
+b2NhbGRvbWFpbjELMAkGA1UEBhMCS08xDjAMBgNVBAgMBVNlb3VsMREwDwYDVQQK
+DAhOZW9QbGFuZTAeFw0yMjExMTEyMzM3MjhaFw0zMjExMDgyMzM3MjhaMEoxCzAJ
+BgNVBAYTAktPMQ4wDAYDVQQIDAVTZW91bDERMA8GA1UECgwITmVvUGxhbmUxGDAW
+BgNVBAMMD3Vkci5sb2NhbGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALS3q+2uJj5htQxIoV5PjCbuUbETFbWunNBpU3n/bs5wtcl1jf/Ez8f+
+4nhN+liNHvInFyxflA9Qu2eL9/+HbZxMXlyFwcHZo82SMa+CQEoFcZQUxtPa7Zo0
+WovYJJH+XMqdFFPMQgq3VRsRkbSJJIRID0Lx1jx3RSIMMCcWTOyrGgIDOySSkNGo
+8CuJ3VzsH5Httj1crrZhypGrY4rgoYO2gsc9KtI4r3hS7hHTjD1C3lDLKJj035Xu
+t8g0rDe4S5DqKJ7WF+z7nIplVuVmj6HWFhW8H16fxNMohmjkHMLL7QIkyCZOYkWY
+rbymCPQGYuBRKajTAoI80yj237vxiFkCAwEAAaNNMEswCQYDVR0TBAIwADAdBgNV
+HQ4EFgQUoc0vMqJQ773qf3xn5qGb3YTTtDUwHwYDVR0jBBgwFoAUsWr6nJm8BCpC
+iGXXfr5gcKIO2kAwDQYJKoZIhvcNAQELBQADggEBAFbO+6lgHIhX9tcNDspiO/2d
+BwBVruQuslYNVmKN53IS+Dr1fku49/WDo5WVd59JVV5OStLdXMZoj6103ie12GQ0
+2fTelMDLk/GRBv80OpD8vPnUKRI/uNDjGjAgle6ruMX7LZHmPfoIM4s1yIfYMEOt
+R9F6BmZbRAPQX6OgHsTp6+uaCRIk6nBVJP+eIdVU+IAON7gzJIsiJesm78u+Jmvm
+SdOkSsoW/mHgoDtC5EgwMHYOfuHZPPBZOa5HOFvQPhi7lgFNUVUim2iNBxYoDecF
+J2i3J07fE7mvETfmfiTUfWPqGHSJG9C8zuKvHRWW0rky9Vjjcux69QyUANnyYZU=
+-----END CERTIFICATE-----

open5gs_2.6.0.tar.xz/configs/open5gs/tls/udr.csr Added

open5gs_2.6.0.tar.xz/configs/open5gs/tls/udr.key Added

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC0t6vtriY+YbUM
+SKFeT4wm7lGxExW1rpzQaVN5/27OcLXJdY3/xM/H/uJ4TfpYjR7yJxcsX5QPULtn
+i/f/h22cTF5chcHB2aPNkjGvgkBKBXGUFMbT2u2aNFqL2CSR/lzKnRRTzEIKt1Ub
+EZG0iSSESA9C8dY8d0UiDDAnFkzsqxoCAzskkpDRqPArid1c7B+R7bY9XK62YcqR
+q2OK4KGDtoLHPSrSOK94Uu4R04w9Qt5QyyiY9N+V7rfINKw3uEuQ6iie1hfs+5yK
+ZVblZo+h1hYVvB9en8TTKIZo5BzCy+0CJMgmTmJFmK28pgj0BmLgUSmo0wKCPNMo
+9t+78YhZAgMBAAECggEADdVR7jKSl5uZ1OAB5zLaYPgE7ZOvCZ5dP1hSpR/sAtYu
+miZbGWkeuRnOCuS4LTtXMzTSEanazu3QfJmCoS8kES7o2bb86QpwfxnJ3xwOsQPX
+6PyKqDilz7QierovuXOxtWo+/jegVgro0za98yZ80rnj3i1eJ3h/RJ8PeAx9VK/W
+nsE/aoR/AiNmdwyZRStVdsvW98GNdONc8la2Cs9fC71tbeKnL/QFSmgZpVGz606u
+Y3ykNxPgcePFscS+6UR+ML5L34HtZfQV4KCAnEWUO1tXYoLDKM+h7sp03rNoGdQK
+/L3xNd1jI0gcm/t0LFhBuKGrKo1pKwrONwm6LMbRkQKBgQDAep8a46jKwQbbVNnp
+qSxy9l3it/TjbYuLSAuRlz8YXaJSvF/EMmTYtYQ1G4T2exkBN11UeP/tdywD+J/p
+4jEI9UZz9QCjXFyleDZZfScs7SuRfKlZ6ygY+cbKb8T75rO/J/StU4VgNPtKjxzv
+OZEpJwCLsZLkOj7mmqlfwSwaiQKBgQDwW2P9XF2XkcoGyEffQDX0qylekUZ8Zqq9
+UnuWmjLJxD+rbJcQiyMIKxzY5gKw1FtquBMKryfuKHiDRCTO/Sr5V4VjRG13etAN
+WqPWUrjmvlutMZhvwS876wS15hyHkL9Jjbj6F0TvYRIMXTa6yLFMLVNBZFSJzfRH
+aRxnfb9LUQKBgF2S/4i+BxBTGTdGIA6lrTNSrMAM+KQcXIvhAabNJeJ9mu2oINKs
+QTTNwjFjaJe/rp9VwCzSCnHyztY7Z9r3mSkmvRKgmKfSvkO/loSZAJOp1dWMCnTp
+ivvhapB+GADy3o3fKeedxCjKeSR9QO7YSMb97Bj9wlDsNCo+JHul2QApAoGAb5/B
+3BRdUtreHDA/UKsdY7dpywVk2rlDahE4XETYeWOuvgn8Ti6P4mdDSmfnr/+vROyf
+y0J1JOGetjebcJWas5m11NgejnJ21PzXQd3BCUg2g0SZKq1pJkaLNX7cmQjcDWjI
+Ez1jQliubReNJ0m1LU+PbrsNl8ISRGfITTfU80ECgYEAjzlKdEB0GUyDev9yuJWb
+xLPgbtQmIFJ0wcr55R1BrLlOw5nhJvHYUuAqNVwbZyDOcZT6RdC2k1uyybAupPFF
+ZRFFBnGQGGXj2fiPvFyJCVcbT6QhtkvXqBRwbRakJY1FMWCw079VzcoRtt+mcgFu
+u179+NNjjTx63C4ZElNl654=
+-----END PRIVATE KEY-----

open5gs_2.5.8.tar.xz/configs/open5gs/udm.yaml.in -> open5gs_2.6.0.tar.xz/configs/open5gs/udm.yaml.in Changed

@@ -22,6 +22,99 @@
     file: @localstatedir@/log/open5gs/udm.log
 
 #
+# tls:
+#    enabled: auto|yes|no
+#    - auto: Default. Use TLS only if key/cert is available
+#    - yes:  Use TLS always;
+#            reject if no key/cert available
+#    - no:   Don't use TLS if there is an key/cert available
+#
+#    o Server-side Key and Certficiate
+#    server:
+#      key: /etc/open5gs/tls/udm.key
+#      cert: /etc/open5gs/tls/udm.crt
+#
+#    o Client-side does not use TLS
+#    client:
+#      enabled: no
+#      key: /etc/open5gs/tls/udm.key
+#      cert: /etc/open5gs/tls/udm.crt
+#
+#    o Use the specified certificate to verify client
+#    server
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+#    o Use the specified certificate to verify server
+#    client
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+tls:
+    enabled: no
+    server:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/udm.key
+      cert: @sysconfdir@/open5gs/tls/udm.crt
+    client:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/udm.key
+      cert: @sysconfdir@/open5gs/tls/udm.crt
+
+#
+# o Generate the private key as below.
+#   $ openssl genpkey -algorithm X25519 -out /etc/open5gs/hnet/curve25519-1.key
+#   $ openssl ecparam -name prime256v1 -genkey -conv_form compressed -out /etc/open5gs/hnet/secp256r1-2.key
+#
+# o The private and public keys can be viewed with the command.
+#   The public key is used when creating the SIM.
+#   $ openssl pkey -in /etc/open5gs/hnet/curve25519-1.key -text
+#   $ openssl ec -in /etc/open5gs/hnet/secp256r1-2.key -conv_form compressed -text
+#
+# hnet:
+#    o Home network public key identifier(PKI) value : 1
+#      Protection scheme identifier : ECIES scheme profile A
+#    - id: 1
+#      scheme: 1
+#      key: /etc/open5gs/hnet/curve25519-1.key
+#
+#    o Home network public key identifier(PKI) value : 2
+#      Protection scheme identifier : ECIES scheme profile B
+#    - id: 2
+#      scheme: 2
+#      key: /etc/open5gs/hnet/secp256r1-2.key
+#
+#    o Home network public key identifier(PKI) value : 3
+#      Protection scheme identifier : ECIES scheme profile A
+#    - id: 3
+#      scheme: 1
+#      key: /etc/open5gs/hnet/curve25519-1.key
+#
+#    o Home network public key identifier(PKI) value : 4
+#      Protection scheme identifier : ECIES scheme profile B
+#    - id: 4
+#      scheme: 2
+#      key: /etc/open5gs/hnet/secp256r1-2.key
+#
+hnet:
+  - id: 1
+    scheme: 1
+    key: @sysconfdir@/open5gs/hnet/curve25519-1.key
+  - id: 2
+    scheme: 2
+    key: @sysconfdir@/open5gs/hnet/secp256r1-2.key
+  - id: 3
+    scheme: 1
+    key: @sysconfdir@/open5gs/hnet/curve25519-3.key
+  - id: 4
+    scheme: 2
+    key: @sysconfdir@/open5gs/hnet/secp256r1-4.key
+  - id: 5
+    scheme: 1
+    key: @sysconfdir@/open5gs/hnet/curve25519-5.key
+  - id: 6
+    scheme: 2
+    key: @sysconfdir@/open5gs/hnet/secp256r1-6.key
+
+#
 # udm:
 #
 #  <SBI Server>
@@ -29,7 +122,7 @@
 #  o SBI Server(http://<all address available>:80)
 #    sbi:
 #
-#  o SBI Server(http://<any address>:80)
+#  o SBI Server(http://<any address>:7777)
 #    sbi:
 #      - addr:
 #          - 0.0.0.0
@@ -37,20 +130,31 @@
 #        port: 7777
 #
 #  o SBI Server(https://<all address available>:443)
+#  tls:
+#    server:
+#      key: /etc/open5gs/tls/udm.key
+#      cert: /etc/open5gs/tls/udm.crt
+#  udm:
+#    sbi:
+#
+#  o SBI Server(http://127.0.0.5:80, http://::1:80)
+#  tls:
+#    enabled: no
+#    server:
+#      key: /etc/open5gs/tls/udm.key
+#      cert: /etc/open5gs/tls/udm.crt
+#  udm:
 #    sbi:
-#      - tls:
-#          key: udm.key
-#          pem: udm.pem
-#
-#  o SBI Server(https://127.0.0.12:443, http://::1:80)
-#    sbi:
-#      - addr: 127.0.0.12
-#        tls:
-#          key: udm.key
-#          pem: udm.pem
+#      - addr: 127.0.0.5
 #      - addr: ::1
 #
-#  o SBI Server(http://udm.open5gs.org:80)
+#  o SBI Server(https://udm.open5gs.org:443)
+#    Use the specified certificate to verify client
+#
+#  tls:
+#    server:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  udm:
 #    sbi:
 #      - name: udm.open5gs.org
 #
@@ -163,10 +267,18 @@
 #    sbi:
 #      - addr: 127.0.1.10
 #        tls:
-#          key: scp.key
-#          pem: scp.pem
+#          key: /etc/open5gs/tls/udm.key
+#          cert: /etc/open5gs/tls/udm.crt
 #      - name: scp.open5gs.org
 #
+#  o SBI Client(https://scp.open5gs.org:443)
+#    Use the specified certificate to verify peer
+#
+#    sbi:
+#      - name: scp.open5gs.org
+#        tls:
+#          cacert: /etc/open5gs/tls/ca.crt
+#
 #  o SBI Client(http://fd69:f21d:873c:fb::1:80)
 #    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
 #
@@ -203,12 +315,24 @@
 #      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/udm.key
+#      cert: /etc/open5gs/tls/udm.crt
+#  nrf:
 #    sbi:
 #      - addr: 127.0.0.10
-#        tls:
-#          key: nrf.key
-#          pem: nrf.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://nrf.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  nrf:
+#    sbi:
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fa::1:80)

open5gs_2.5.8.tar.xz/configs/open5gs/udr.yaml.in -> open5gs_2.6.0.tar.xz/configs/open5gs/udr.yaml.in Changed

@@ -24,6 +24,44 @@
     file: @localstatedir@/log/open5gs/udr.log
 
 #
+# tls:
+#    enabled: auto|yes|no
+#    - auto: Default. Use TLS only if key/cert is available
+#    - yes:  Use TLS always;
+#            reject if no key/cert available
+#    - no:   Don't use TLS if there is an key/cert available
+#
+#    o Server-side Key and Certficiate
+#    server:
+#      key: /etc/open5gs/tls/udr.key
+#      cert: /etc/open5gs/tls/udr.crt
+#
+#    o Client-side does not use TLS
+#    client:
+#      enabled: no
+#      key: /etc/open5gs/tls/udr.key
+#      cert: /etc/open5gs/tls/udr.crt
+#
+#    o Use the specified certificate to verify client
+#    server
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+#    o Use the specified certificate to verify server
+#    client
+#      cacert: /etc/open5gs/tls/ca.crt
+#
+tls:
+    enabled: no
+    server:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/udr.key
+      cert: @sysconfdir@/open5gs/tls/udr.crt
+    client:
+      cacert: @sysconfdir@/open5gs/tls/ca.crt
+      key: @sysconfdir@/open5gs/tls/udr.key
+      cert: @sysconfdir@/open5gs/tls/udr.crt
+
+#
 # udr:
 #
 #  <SBI Server>
@@ -31,7 +69,7 @@
 #  o SBI Server(http://<all address available>:80)
 #    sbi:
 #
-#  o SBI Server(http://<any address>:80)
+#  o SBI Server(http://<any address>:7777)
 #    sbi:
 #      - addr:
 #          - 0.0.0.0
@@ -39,20 +77,31 @@
 #        port: 7777
 #
 #  o SBI Server(https://<all address available>:443)
+#  tls:
+#    server:
+#      key: /etc/open5gs/tls/udr.key
+#      cert: /etc/open5gs/tls/udr.crt
+#  udr:
+#    sbi:
+#
+#  o SBI Server(http://127.0.0.5:80, http://::1:80)
+#  tls:
+#    enabled: no
+#    server:
+#      key: /etc/open5gs/tls/udr.key
+#      cert: /etc/open5gs/tls/udr.crt
+#  udr:
 #    sbi:
-#      - tls:
-#          key: udr.key
-#          pem: udr.pem
-#
-#  o SBI Server(https://127.0.0.20:443, http://::1:80)
-#    sbi:
-#      - addr: 127.0.0.20
-#        tls:
-#          key: udr.key
-#          pem: udr.pem
+#      - addr: 127.0.0.5
 #      - addr: ::1
 #
-#  o SBI Server(http://udr.open5gs.org:80)
+#  o SBI Server(https://udr.open5gs.org:443)
+#    Use the specified certificate to verify client
+#
+#  tls:
+#    server:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  udr:
 #    sbi:
 #      - name: udr.open5gs.org
 #
@@ -163,10 +212,18 @@
 #    sbi:
 #      - addr: 127.0.1.10
 #        tls:
-#          key: scp.key
-#          pem: scp.pem
+#          key: /etc/open5gs/tls/udr.key
+#          cert: /etc/open5gs/tls/udr.crt
 #      - name: scp.open5gs.org
 #
+#  o SBI Client(https://scp.open5gs.org:443)
+#    Use the specified certificate to verify peer
+#
+#    sbi:
+#      - name: scp.open5gs.org
+#        tls:
+#          cacert: /etc/open5gs/tls/ca.crt
+#
 #  o SBI Client(http://fd69:f21d:873c:fb::1:80)
 #    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
 #
@@ -203,12 +260,24 @@
 #      addr: 127.0.0.10
 #      port: 7777
 #
-#  o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
+#  o SBI Client(https://127.0.0.10:443, https://::1:443)
+#  tls:
+#    client:
+#      key: /etc/open5gs/tls/udr.key
+#      cert: /etc/open5gs/tls/udr.crt
+#  nrf:
 #    sbi:
 #      - addr: 127.0.0.10
-#        tls:
-#          key: nrf.key
-#          pem: nrf.pem
+#      - addr: ::1
+#
+#  o SBI Client(https://nrf.open5gs.org:443)
+#    Use the specified certificate to verify server
+#
+#  tls:
+#    client:
+#      cacert: /etc/open5gs/tls/ca.crt
+#  nrf:
+#    sbi:
 #      - name: nrf.open5gs.org
 #
 #  o SBI Client(http://fd69:f21d:873c:fa::1:80)

open5gs_2.5.8.tar.xz/configs/open5gs/upf.yaml.in -> open5gs_2.6.0.tar.xz/configs/open5gs/upf.yaml.in Changed

open5gs_2.5.8.tar.xz/configs/sample.yaml.in -> open5gs_2.6.0.tar.xz/configs/sample.yaml.in Changed

@@ -2,6 +2,25 @@
 
 logger:
 
+tls:
+    enabled: no
+    server:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testserver.key
+      cert: @build_configs_dir@/open5gs/tls/testserver.crt
+    client:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testclient.key
+      cert: @build_configs_dir@/open5gs/tls/testclient.crt
+
+hnet:
+  - id: 1
+    scheme: 1
+    key: @build_configs_dir@/open5gs/hnet/curve25519-1.key
+  - id: 2
+    scheme: 2
+    key: @build_configs_dir@/open5gs/hnet/secp256r1-2.key
+
 parameter:
 #    no_nrf: true
 #    no_scp: true
@@ -28,14 +47,14 @@
       listen_on: 127.0.0.2
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -44,6 +63,9 @@
       - addr: 127.0.0.2
     gtpc:
       - addr: 127.0.0.2
+    metrics:
+      addr: 127.0.0.2
+      port: 9090
     gummei:
       plmn_id:
         mcc: 999
@@ -80,6 +102,9 @@
     gtpu:
       - addr: 127.0.0.4
       - addr: ::1
+    metrics:
+      addr: 127.0.0.4
+      port: 9090
     subnet:
       - addr: 10.45.0.1/16
       - addr: 2001:db8:cafe::1/48
@@ -95,14 +120,14 @@
       listen_on: 127.0.0.4
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -137,6 +162,9 @@
         port: 7777
     ngap:
       - addr: 127.0.0.5
+    metrics:
+      addr: 127.0.0.5
+      port: 9090
     guami:
       - plmn_id:
           mcc: 999
@@ -176,6 +204,9 @@
     subnet:
       - addr: 10.45.0.1/16
       - addr: 2001:db8:cafe::1/48
+    metrics:
+      - addr: 127.0.0.7
+        port: 9090
 
 hss:
     freeDiameter:
@@ -184,14 +215,14 @@
       listen_on: 127.0.0.8
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -202,14 +233,14 @@
       listen_on: 127.0.0.9
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -221,45 +252,6 @@
         - ::1
         port: 7777
 
-#
-# scp:
-#
-#  <SBI Client>>
-#
-#  o SBI Client(http://127.0.1.10:7777)
-#    sbi:
-#      addr: 127.0.1.10
-#      port: 7777
-#
-#  o SBI Client(https://127.0.1.10:443, http://scp.open5gs.org:80)
-#    sbi:
-#      - addr: 127.0.1.10
-#        tls:
-#          key: scp.key
-#          pem: scp.pem
-#      - name: scp.open5gs.org
-#
-#  o SBI Client(http://fd69:f21d:873c:fb::1:80)
-#    If prefer_ipv4 is true, http://127.0.1.10:80 is selected.
-#
-#    sbi:
-#      addr:
-#        - 127.0.1.10
-#        - fd69:f21d:873c:fb::1
-#
-#  o SBI Option (Default)
-#    - tcp_nodelay : true
-#    - so_linger.l_onoff : false
-#
-#    sbi:
-#      addr: 127.0.1.10
-#      option:
-#        tcp_nodelay: false
-#        so_linger:
-#          l_onoff: true
-#          l_linger: 10
-#
-#
 scp:
     sbi:
       - addr: 127.0.1.10
@@ -279,6 +271,9 @@
     sbi:
       - addr: 127.0.0.13
         port: 7777
+    metrics:
+      - addr: 127.0.0.13
+        port: 9090
 
 nssf:
     sbi:
@@ -298,3 +293,7 @@
     sbi:
       - addr: 127.0.0.20
         port: 7777
+
+time:
+  t3512:
+    value: 540     # 9 mintues * 60 = 540 seconds

open5gs_2.5.8.tar.xz/configs/slice.yaml.in -> open5gs_2.6.0.tar.xz/configs/slice.yaml.in Changed

@@ -2,6 +2,17 @@
 
 logger:
 
+tls:
+    enabled: no
+    server:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testserver.key
+      cert: @build_configs_dir@/open5gs/tls/testserver.crt
+    client:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testclient.key
+      cert: @build_configs_dir@/open5gs/tls/testclient.crt
+
 parameter:
 #    no_nrf: true
     no_scp: true
@@ -28,14 +39,14 @@
       listen_on: 127.0.0.2
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -95,14 +106,14 @@
       listen_on: 127.0.0.4
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -155,6 +166,9 @@
     subnet:
       - addr: 10.45.0.1/16
       - addr: 2001:db8:cafe::1/48
+    metrics:
+      - addr: 127.0.0.7
+        port: 9090
 
 hss:
     freeDiameter:
@@ -163,14 +177,14 @@
       listen_on: 127.0.0.8
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -181,14 +195,14 @@
       listen_on: 127.0.0.9
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -214,6 +228,9 @@
     sbi:
       - addr: 127.0.0.13
         port: 7777
+    metrics:
+      - addr: 127.0.0.13
+        port: 9090
 
 nssf:
     sbi:
@@ -244,3 +261,7 @@
     sbi:
       - addr: 127.0.0.20
         port: 7777
+
+time:
+  t3512:
+    value: 540     # 9 mintues * 60 = 540 seconds

open5gs_2.6.0.tar.xz/configs/srsenb.yaml.in Added

@@ -0,0 +1,253 @@
+db_uri: mongodb://localhost/open5gs
+
+logger:
+
+tls:
+    enabled: no
+    server:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testserver.key
+      cert: @build_configs_dir@/open5gs/tls/testserver.crt
+    client:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testclient.key
+      cert: @build_configs_dir@/open5gs/tls/testclient.crt
+
+parameter:
+#    no_nrf: true
+#    no_scp: true
+#    no_amf: true
+#    no_smf: true
+#    no_upf: true
+#    no_ausf: true
+#    no_udm: true
+#    no_pcf: true
+#    no_nssf: true
+#    no_bsf: true
+#    no_udr: true
+#    no_mme: true
+#    no_sgwc: true
+#    no_sgwu: true
+#    no_pcrf: true
+#    no_hss: true
+#    use_mongodb_change_stream: true
+
+mme:
+    freeDiameter:
+      identity: mme.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.2
+      no_fwd: true
+      load_extension:
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+      connect:
+        - identity: hss.localdomain
+          addr: 127.0.0.8
+
+    s1ap:
+      - addr: 127.0.1.100
+    gtpc:
+      - addr: 127.0.0.2
+    gummei:
+      plmn_id:
+        mcc: 901
+        mnc: 70
+      mme_gid: 2
+      mme_code: 1
+    tai:
+      plmn_id:
+        mcc: 901
+        mnc: 70
+      tac: 7
+    security:
+        integrity_order :  EIA2, EIA1, EIA0 
+        ciphering_order :  EEA0, EEA1, EEA2 
+
+    network_name:
+        full: Open5GS
+
+sgwc:
+    gtpc:
+      - addr: 127.0.0.3
+    pfcp:
+      - addr: 127.0.0.3
+
+smf:
+#    sbi:
+#      - addr: 127.0.0.4
+#        port: 7777
+    pfcp:
+      - addr: 127.0.0.4
+    gtpc:
+      - addr: 127.0.0.4
+      - addr: ::1
+    gtpu:
+      - addr: 127.0.0.4
+      - addr: ::1
+    subnet:
+      - addr: 10.45.0.1/16
+      - addr: 2001:db8:cafe::1/48
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+      - 2001:4860:4860::8888
+      - 2001:4860:4860::8844
+    mtu: 1400
+    freeDiameter:
+      identity: smf.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.4
+      no_fwd: true
+      load_extension:
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+      connect:
+        - identity: pcrf.localdomain
+          addr: 127.0.0.9
+amf:
+    sbi:
+      - addr: 127.0.0.5
+        port: 7777
+    ngap:
+      - addr: 127.0.0.5
+    guami:
+      - plmn_id:
+          mcc: 901
+          mnc: 70
+        amf_id:
+          region: 2
+          set: 1
+    tai:
+      - plmn_id:
+          mcc: 901
+          mnc: 70
+        tac: 1
+    plmn_support:
+      - plmn_id:
+          mcc: 901
+          mnc: 70
+        s_nssai:
+          - sst: 1
+    security:
+        integrity_order :  NIA2, NIA1, NIA0 
+        ciphering_order :  NEA0, NEA1, NEA2 
+    network_name:
+        full: Open5GS
+    amf_name: open5gs-amf0
+
+sgwu:
+    pfcp:
+      - addr: 127.0.0.6
+    gtpu:
+      - addr: 127.0.0.6
+
+upf:
+    pfcp:
+      - addr: 127.0.0.7
+    gtpu:
+      - addr: 127.0.0.7
+    subnet:
+      - addr: 10.45.0.1/16
+      - addr: 2001:db8:cafe::1/48
+    metrics:
+      - addr: 127.0.0.7
+        port: 9090
+
+hss:
+    freeDiameter:
+      identity: hss.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.8
+      no_fwd: true
+      load_extension:
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+      connect:
+        - identity: mme.localdomain
+          addr: 127.0.0.2
+pcrf:
+    freeDiameter:
+      identity: pcrf.localdomain
+      realm: localdomain
+      listen_on: 127.0.0.9
+      no_fwd: true
+      load_extension:
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
+          conf: 0x8888
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+      connect:
+        - identity: smf.localdomain
+          addr: 127.0.0.4
+
+#nrf:
+#    sbi:
+#      - addr:
+#        - 127.0.0.10
+#        - ::1
+#        port: 7777
+
+ausf:
+    sbi:
+      - addr: 127.0.0.11
+        port: 7777
+
+udm:
+    sbi:
+      - addr: 127.0.0.12
+        port: 7777
+
+pcf:
+    sbi:
+      - addr: 127.0.0.13
+        port: 7777
+    metrics:
+      - addr: 127.0.0.13
+        port: 9090
+
+nssf:
+    sbi:
+      - addr: 127.0.0.14
+        port: 7777
+    nsi:
+      - addr: 127.0.0.10
+        port: 7777
+        s_nssai:
+          sst: 1
+
+bsf:
+    sbi:
+      - addr: 127.0.0.15
+        port: 7777
+
+udr:
+    sbi:
+      - addr: 127.0.0.20
+        port: 7777
+
+time:
+  t3512:
+    value: 540     # 9 mintues * 60 = 540 seconds

open5gs_2.5.8.tar.xz/configs/volte.yaml.in -> open5gs_2.6.0.tar.xz/configs/volte.yaml.in Changed

@@ -2,6 +2,17 @@
 
 logger:
 
+tls:
+    enabled: no
+    server:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testserver.key
+      cert: @build_configs_dir@/open5gs/tls/testserver.crt
+    client:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testclient.key
+      cert: @build_configs_dir@/open5gs/tls/testclient.crt
+
 parameter:
 #    no_nrf: true
 #    no_scp: true
@@ -28,14 +39,14 @@
       listen_on: 127.0.0.2
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -98,14 +109,14 @@
       listen_on: 127.0.0.4
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -154,6 +165,9 @@
     subnet:
       - addr: 10.45.0.1/16
       - addr: 2001:db8:cafe::1/48
+    metrics:
+      - addr: 127.0.0.7
+        port: 9090
 
 hss:
     freeDiameter:
@@ -162,14 +176,14 @@
       listen_on: 127.0.0.8
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -182,14 +196,14 @@
       listen_on: 127.0.0.9
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -217,6 +231,9 @@
     sbi:
       - addr: 127.0.0.13
         port: 7777
+    metrics:
+      - addr: 127.0.0.13
+        port: 9090
 
 nssf:
     sbi:
@@ -237,3 +254,7 @@
     sbi:
       - addr: 127.0.0.20
         port: 7777
+
+time:
+  t3512:
+    value: 540     # 9 mintues * 60 = 540 seconds

open5gs_2.5.8.tar.xz/configs/vonr.yaml.in -> open5gs_2.6.0.tar.xz/configs/vonr.yaml.in Changed

@@ -2,6 +2,17 @@
 
 logger:
 
+tls:
+    enabled: no
+    server:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testserver.key
+      cert: @build_configs_dir@/open5gs/tls/testserver.crt
+    client:
+      cacert: @build_configs_dir@/open5gs/tls/ca.crt
+      key: @build_configs_dir@/open5gs/tls/testclient.key
+      cert: @build_configs_dir@/open5gs/tls/testclient.crt
+
 parameter:
 #    no_nrf: true
 #    no_scp: true
@@ -28,14 +39,14 @@
       listen_on: 127.0.0.2
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: hss.localdomain
           addr: 127.0.0.8
@@ -98,14 +109,14 @@
       listen_on: 127.0.0.4
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: pcrf.localdomain
           addr: 127.0.0.9
@@ -154,6 +165,9 @@
     subnet:
       - addr: 10.45.0.1/16
       - addr: 2001:db8:cafe::1/48
+    metrics:
+      - addr: 127.0.0.7
+        port: 9090
 
 hss:
     freeDiameter:
@@ -162,14 +176,14 @@
       listen_on: 127.0.0.8
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: mme.localdomain
           addr: 127.0.0.2
@@ -180,14 +194,14 @@
       listen_on: 127.0.0.9
       no_fwd: true
       load_extension:
-        - module: @freediameter_extensions_builddir@/dbg_msg_dumps.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dbg_msg_dumps.fdx
           conf: 0x8888
-        - module: @freediameter_extensions_builddir@/dict_rfc5777.fdx
-        - module: @freediameter_extensions_builddir@/dict_mip6i.fdx
-        - module: @freediameter_extensions_builddir@/dict_nasreq.fdx
-        - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca.fdx
-        - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_rfc5777.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_mip6i.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nasreq.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_nas_mipv6.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca.fdx
+        - module: @build_subprojects_freeDiameter_extensions_dir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx
       connect:
         - identity: smf.localdomain
           addr: 127.0.0.4
@@ -220,6 +234,9 @@
     sbi:
       - addr: 127.0.0.13
         port: 7777
+    metrics:
+      - addr: 127.0.0.13
+        port: 9090
 
 nssf:
     sbi:
@@ -245,3 +262,7 @@
     sbi:
       - addr: 127.0.0.20
         port: 7777
+
+time:
+  t3512:
+    value: 540     # 9 mintues * 60 = 540 seconds

open5gs_2.5.8.tar.xz/debian/changelog -> open5gs_2.6.0.tar.xz/debian/changelog Changed

@@ -1,62 +1,8 @@
-open5gs (2.5.8) unstable; urgency=medium
+open5gs (2.6.0) unstable; urgency=medium
 
-  * Bug Fixed
+  * Automatically generated changelog entry for building the Osmocom latest feed
 
- -- Sukchan Lee <acetcom@gmail.com>  Mon, 23 Jan 2023 10:58:46 +0900
-
-open5gs (2.5.8~kinetic) kinetic; urgency=medium
-
-  * Bug Fixed
-
- -- Sukchan Lee <acetcom@gmail.com>  Mon, 23 Jan 2023 10:57:23 +0900
-
-open5gs (2.5.8~jammy) jammy; urgency=medium
-
-  * Bug Fixed
-
- -- Sukchan Lee <acetcom@gmail.com>  Mon, 23 Jan 2023 10:55:19 +0900
-
-open5gs (2.5.8~bionic) bionic; urgency=medium
-
-  * Bug Fixed
-
- -- Sukchan Lee <acetcom@gmail.com>  Mon, 23 Jan 2023 10:53:56 +0900
-
-open5gs (2.5.8~focal) focal; urgency=medium
-
-  * Bug Fixed
-
- -- Sukchan Lee <acetcom@gmail.com>  Mon, 23 Jan 2023 10:52:22 +0900
-
-open5gs (2.5.7) unstable; urgency=medium
-
-  * Bug Fixed
-
- -- Sukchan Lee <acetcom@gmail.com>  Sat, 14 Jan 2023 11:18:40 +0900
-
-open5gs (2.5.7~kinetic) kinetic; urgency=medium
-
-  * Bug Fixed
-
- -- Sukchan Lee <acetcom@gmail.com>  Sat, 14 Jan 2023 11:17:17 +0900
-
-open5gs (2.5.7~jammy) jammy; urgency=medium
-
-  * Bug Fixed
-
- -- Sukchan Lee <acetcom@gmail.com>  Sat, 14 Jan 2023 11:15:53 +0900
-
-open5gs (2.5.7~bionic) bionic; urgency=medium
-
-  * Bug Fixed
-
- -- Sukchan Lee <acetcom@gmail.com>  Sat, 14 Jan 2023 11:14:32 +0900
-
-open5gs (2.5.7~focal) focal; urgency=medium
-
-  * Bug Fixed
-
- -- Sukchan Lee <acetcom@gmail.com>  Sat, 14 Jan 2023 11:12:57 +0900
+ -- Osmocom OBS scripts <info@osmocom.org>  Sat, 28 Jan 2023 00:28:25 +0000
 
 open5gs (2.5.6) unstable; urgency=medium

open5gs_2.5.8.tar.xz/debian/control -> open5gs_2.6.0.tar.xz/debian/control Changed

open5gs_2.5.8.tar.xz/debian/open5gs-amf.install -> open5gs_2.6.0.tar.xz/debian/open5gs-amf.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-ausf.install -> open5gs_2.6.0.tar.xz/debian/open5gs-ausf.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-bsf.install -> open5gs_2.6.0.tar.xz/debian/open5gs-bsf.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-common.install -> open5gs_2.6.0.tar.xz/debian/open5gs-common.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-hss.install -> open5gs_2.6.0.tar.xz/debian/open5gs-hss.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-mme.install -> open5gs_2.6.0.tar.xz/debian/open5gs-mme.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-nrf.install -> open5gs_2.6.0.tar.xz/debian/open5gs-nrf.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-nssf.install -> open5gs_2.6.0.tar.xz/debian/open5gs-nssf.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-pcf.install -> open5gs_2.6.0.tar.xz/debian/open5gs-pcf.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-pcrf.install -> open5gs_2.6.0.tar.xz/debian/open5gs-pcrf.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-scp.install -> open5gs_2.6.0.tar.xz/debian/open5gs-scp.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-smf.install -> open5gs_2.6.0.tar.xz/debian/open5gs-smf.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-udm.install -> open5gs_2.6.0.tar.xz/debian/open5gs-udm.install Changed

open5gs_2.5.8.tar.xz/debian/open5gs-udr.install -> open5gs_2.6.0.tar.xz/debian/open5gs-udr.install Changed

open5gs_2.5.8.tar.xz/docker/README.md -> open5gs_2.6.0.tar.xz/docker/README.md Changed

open5gs_2.5.8.tar.xz/docker/alpine/latest/base/Dockerfile -> open5gs_2.6.0.tar.xz/docker/alpine/latest/base/Dockerfile Changed

open5gs_2.5.8.tar.xz/docker/debian/latest/base/Dockerfile -> open5gs_2.6.0.tar.xz/docker/debian/latest/base/Dockerfile Changed

open5gs_2.5.8.tar.xz/docker/fedora/latest/base/Dockerfile -> open5gs_2.6.0.tar.xz/docker/fedora/latest/base/Dockerfile Changed

open5gs_2.6.0.tar.xz/docker/ubuntu/jammy Added

open5gs_2.6.0.tar.xz/docker/ubuntu/kinetic Added

open5gs_2.5.8.tar.xz/docker/ubuntu/latest/base/Dockerfile -> open5gs_2.6.0.tar.xz/docker/ubuntu/latest/base/Dockerfile Changed

open5gs_2.5.8.tar.xz/docs/_config.yml -> open5gs_2.6.0.tar.xz/docs/_config.yml Changed

open5gs_2.5.8.tar.xz/docs/_docs/guide/01-quickstart.md -> open5gs_2.6.0.tar.xz/docs/_docs/guide/01-quickstart.md Changed

@@ -91,7 +91,7 @@
 Install the MongoDB packages.
 ```bash
 $ sudo apt update
-$ sudo apt-get install -y mongodb-org
+$ sudo apt install -y mongodb-org
 $ sudo systemctl start mongod (if '/usr/bin/mongod' is not running)
 $ sudo systemctl enable mongod (ensure to automatically start it on system boot)
 ```
@@ -123,9 +123,11 @@
 
 ```
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Debian_10/
+https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Debian_11/
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Debian_Testing/
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Debian_Unstable/
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Raspbian_10/
+https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/Raspbian_11/
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_18.04/
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_20.04/
 https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_20.10/
@@ -136,13 +138,13 @@
 
 #### Nightly Builds
 
-Nightly bulit package are provided by Osmocom(https://osmocom.org) on OBS(https://build.opensuse.org/package/show/network:osmocom:nightly/open5gs). On *Ubuntu 20.04* you can install it like this:
+Nightly bulit package are provided by Osmocom(https://osmocom.org) on OBS(https://obs.osmocom.org/package/show/osmocom:nightly/open5gs). On *Ubuntu 20.04* you can install it like this:
 
 ```bash
 $ sudo apt update
 $ sudo apt install wget gnupg
-$ wget -qO - https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_20.04/Release.key | sudo apt-key add -
-$ sudo sh -c "echo 'deb http://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_20.04/ ./' > /etc/apt/sources.list.d/open5gs.list"
+$ wget -qO - https://downloads.osmocom.org/packages/osmocom:/nightly/xUbuntu_20.04/Release.key | sudo apt-key add -
+$ sudo sh -c "echo 'deb https://downloads.osmocom.org/packages/osmocom:/nightly/xUbuntu_20.04/ ./' > /etc/apt/sources.list.d/open5gs.list"
 $ sudo apt update
 $ sudo apt install open5gs
 ```
@@ -150,16 +152,18 @@
 Other distributions can be installed by changing the path.
 
 ```
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_10/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_Testing/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_Unstable/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/Raspbian_10/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_18.04/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_20.04/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_20.10/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_21.04/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_21.10/
-https://download.opensuse.org/repositories/network:/osmocom:/nightly/xUbuntu_22.04/
+https://downloads.osmocom.org/packages/osmocom:/nightly/Debian_10/
+https://downloads.osmocom.org/packages/osmocom:/nightly/Debian_11/
+https://downloads.osmocom.org/packages/osmocom:/nightly/Debian_Testing/
+https://downloads.osmocom.org/packages/osmocom:/nightly/Debian_Unstable/
+https://downloads.osmocom.org/packages/osmocom:/nightly/Raspbian_10/
+https://downloads.osmocom.org/packages/osmocom:/nightly/Raspbian_11/
+https://downloads.osmocom.org/packages/osmocom:/nightly/xUbuntu_18.04/
+https://downloads.osmocom.org/packages/osmocom:/nightly/xUbuntu_20.04/
+https://downloads.osmocom.org/packages/osmocom:/nightly/xUbuntu_20.10/
+https://downloads.osmocom.org/packages/osmocom:/nightly/xUbuntu_21.04/
+https://downloads.osmocom.org/packages/osmocom:/nightly/xUbuntu_21.10/
+https://downloads.osmocom.org/packages/osmocom:/nightly/xUbuntu_22.04/
 ```
 
 #### openSUSE
@@ -290,17 +294,19 @@
 
 Modify /etc/open5gs/sgwu.yaml(https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/sgwu.yaml.in) to set the GTP-U IP address.
 ```diff
-$ diff -u /etc/open5gs/sgwu.yaml.old /etc/open5gs/sgwu.yaml
---- sgwu.yaml    2020-09-05 20:50:39.393022566 -0400
-+++ sgwu.yaml.new    2020-09-05 20:51:06.667838823 -0400
-@@ -98,7 +98,7 @@ logger:
- #
- sgwu:
+$ diff --git a/configs/open5gs/sgwu.yaml.in b/configs/open5gs/sgwu.yaml.in
+index 8ccf94378..25b6884a3 100644
+--- a/configs/open5gs/sgwu.yaml.in
++++ b/configs/open5gs/sgwu.yaml.in
+@@ -100,7 +100,7 @@ sgwu:
      pfcp:
+       - addr: 127.0.0.6
+     gtpu:
 -      - addr: 127.0.0.6
 +      - addr: 10.11.0.6
-     gtpu:
-       - addr: 127.0.0.6
+
+ #
+ # sgwc:
 ```
 
 After changing config files, please restart Open5GS daemons.
@@ -410,38 +416,7 @@
 #### Adding a route for the UE to have WAN connectivity {#UEInternet}
 ---
 
-In order to bridge between the PGWU/UPF and WAN (Internet), you must enable IP forwarding and add a NAT rule to your IP Tables.  
-
-**Note:** For the first run, it makes things simpler if you do not have any rules in the IP/NAT tables. If a program such as docker has already set up a rule, you will need to add rules differently.
-{: .notice--danger}
-
-You can check your current IP Table rules with the following commands (these tables are empty):
-```bash
-### Check IP Tables
-$ sudo iptables -L
-Chain INPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain FORWARD (policy ACCEPT)
-target     prot opt source               destination
-
-Chain OUTPUT (policy ACCEPT)
-target     prot opt source               destination
-
-### Check NAT Tables
-$ sudo iptables -L -t nat
-Chain PREROUTING (policy ACCEPT)
-target     prot opt source               destination
-
-Chain INPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain OUTPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain POSTROUTING (policy ACCEPT)
-target     prot opt source               destination
-```
+In order to bridge between the PGWU/UPF and WAN (Internet), you must enable IP forwarding and add a NAT rule to your IP Tables.
 
 To enable forwarding and add the NAT rule, enter
 ```bash
@@ -454,9 +429,22 @@
 $ sudo ip6tables -t nat -A POSTROUTING -s 2001:db8:cafe::/48 ! -o ogstun -j MASQUERADE
 ```
 
+Configure the firewall correctly. Some operating systems (Ubuntu) by default enable firewall rules to block traffic.
+```bash
+$ sudo ufw status
+Status: active
+$ sudo ufw disable
+Firewall stopped and disabled on system startup
+$ sudo ufw status
+Status: inactive
+```
+
 Optionally, you may consider the settings below for security purposes.
 
 ```bash
+### Ensure that the packets in the `INPUT` chain to the `ogstun` interface are accepted
+$ sudo iptables -I INPUT -i ogstun -j ACCEPT
+
 ### Prevent UE's from connecting to the host on which UPF is running
 $ sudo iptables -I INPUT -s 10.45.0.0/16 -j DROP
 $ sudo ip6tables -I INPUT -s 2001:db8:cafe::/48 -j DROP
@@ -467,9 +455,6 @@
 $ sudo iptables -I FORWARD -s 10.45.0.0/16 -d x.x.x.x/y -j DROP
 ```
 
-**Note:** The above assumes you do not have any existing rules in the filter and nat tables. If a program such as docker has already set up rules, you may need to add the Open5GS related rules differently.
-{: .notice--danger}
-
 ## 5. Turn on your eNB/gNB and UE
 ---

open5gs_2.5.8.tar.xz/docs/_docs/guide/02-building-open5gs-from-sources.md -> open5gs_2.6.0.tar.xz/docs/_docs/guide/02-building-open5gs-from-sources.md Changed

@@ -16,6 +16,8 @@
 Import the public key used by the package management system.
 
 ```bash
+$ sudo apt update
+$ sudo apt install wget gnupg
 $ wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | sudo apt-key add -
 ```
 
@@ -28,7 +30,7 @@
 Install the MongoDB packages.
 ```bash
 $ sudo apt update
-$ sudo apt-get install -y mongodb-org
+$ sudo apt install -y mongodb-org
 $ sudo systemctl start mongod (if '/usr/bin/mongod' is not running)
 $ sudo systemctl enable mongod (ensure to automatically start it on system boot)
 ```
@@ -58,7 +60,7 @@
 Install the dependencies for building the source code.
 
 ```bash
-$ sudo apt install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev libidn11-dev libmongoc-dev libbson-dev libyaml-dev libnghttp2-dev libmicrohttpd-dev libcurl4-gnutls-dev libnghttp2-dev libtins-dev libtalloc-dev meson
+$ sudo apt install python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git cmake libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev libidn11-dev libmongoc-dev libbson-dev libyaml-dev libnghttp2-dev libmicrohttpd-dev libcurl4-gnutls-dev libnghttp2-dev libtins-dev libtalloc-dev meson
 ```
 
 Git clone.
@@ -202,17 +204,19 @@
 
 Modify install/etc/open5gs/sgwu.yaml(https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/sgwu.yaml.in) to set the GTP-U IP address.
 ```diff
-$ diff -u /etc/open5gs/sgwu.yaml.old /etc/open5gs/sgwu.yaml
---- sgwu.yaml    2020-09-05 20:50:39.393022566 -0400
-+++ sgwu.yaml.new    2020-09-05 20:51:06.667838823 -0400
-@@ -98,7 +98,7 @@ logger:
- #
- sgwu:
+$ diff --git a/configs/open5gs/sgwu.yaml.in b/configs/open5gs/sgwu.yaml.in
+index 8ccf94378..25b6884a3 100644
+--- a/configs/open5gs/sgwu.yaml.in
++++ b/configs/open5gs/sgwu.yaml.in
+@@ -100,7 +100,7 @@ sgwu:
      pfcp:
+       - addr: 127.0.0.6
+     gtpu:
 -      - addr: 127.0.0.6
 +      - addr: 10.11.0.6
-     gtpu:
-       - addr: 127.0.0.6
+
+ #
+ # sgwc:
 ```
 
 If you modify the config files while Open5GS daemons are running, please restart them
@@ -464,37 +468,13 @@
 **Note:** Subscribers added with this tool immediately register in the Open5GS HSS/UDR without the need to restart any daemon. However, if you use the WebUI to change subscriber profile, you must restart the Open5GS AMF/MME daemon for the changes to take effect.
 {: .notice--warning}
 
-### IP routing + NAT for UE internet connectivity
+#### Adding a route for the UE to have WAN connectivity {#UEInternet}
 ---
 
-To allow your phones to connect to the internet, you must run the following command on the host running Open5GS-PGW:
+In order to bridge between the PGWU/UPF and WAN (Internet), you must enable IP forwarding and add a NAT rule to your IP Tables.
 
+To enable forwarding and add the NAT rule, enter
 ```bash
-### Check IP Table 'forward'
-$ sudo iptables -L
-Chain INPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain FORWARD (policy ACCEPT)
-target     prot opt source               destination
-
-Chain OUTPUT (policy ACCEPT)
-target     prot opt source               destination
-
-### Check IP Table 'nat'
-$ sudo iptables -L -t nat
-Chain PREROUTING (policy ACCEPT)
-target     prot opt source               destination
-
-Chain INPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain OUTPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain POSTROUTING (policy ACCEPT)
-target     prot opt source               destination
-
 ### Enable IPv4/IPv6 Forwarding
 $ sudo sysctl -w net.ipv4.ip_forward=1
 $ sudo sysctl -w net.ipv6.conf.all.forwarding=1
@@ -504,9 +484,22 @@
 $ sudo ip6tables -t nat -A POSTROUTING -s 2001:db8:cafe::/48 ! -o ogstun -j MASQUERADE
 ```
 
+Configure the firewall correctly. Some operating systems (Ubuntu) by default enable firewall rules to block traffic.
+```bash
+$ sudo ufw status
+Status: active
+$ sudo ufw disable
+Firewall stopped and disabled on system startup
+$ sudo ufw status
+Status: inactive
+```
+
 Optionally, you may consider the settings below for security purposes.
 
 ```bash
+### Ensure that the packets in the `INPUT` chain to the `ogstun` interface are accepted
+$ sudo iptables -I INPUT -i ogstun -j ACCEPT
+
 ### Prevent UE's from connecting to the host on which UPF is running
 $ sudo iptables -I INPUT -s 10.45.0.0/16 -j DROP
 $ sudo ip6tables -I INPUT -s 2001:db8:cafe::/48 -j DROP
@@ -517,10 +510,7 @@
 $ sudo iptables -I FORWARD -s 10.45.0.0/16 -d x.x.x.x/y -j DROP
 ```
 
-**Note:** The above assumes you do not have any existing rules in the filter and nat tables. If a program such as docker has already set up rules, you may need to add the Open5GS related rules differently.
-{: .notice--danger}
-
-### Turn on your eNodeB and Phone
+## 5. Turn on your eNB/gNB and UE
 ---
 
 - You can see actual traffic through wireshark -- srsenb.pcapng({{ site.url }}{{ site.baseurl }}/assets/pcapng/srsenb.pcapng).

open5gs_2.5.8.tar.xz/docs/_docs/platform/02-centos.md -> open5gs_2.6.0.tar.xz/docs/_docs/platform/02-centos.md Changed

@@ -86,13 +86,13 @@
 Create a repository file to install the MongoDB packages:
 
 ```bash
-$ sudo sh -c 'cat << EOF > /etc/yum.repos.d/mongodb-org-3.6.repo
-mongodb-org-3.6
+$ sudo sh -c 'cat << EOF > /etc/yum.repos.d/mongodb-org-6.0.repo
+mongodb-org-6.0
 name=MongoDB Repository
-baseurl=https://repo.mongodb.org/yum/redhat/\$releasever/mongodb-org/3.6/x86_64/
+baseurl=https://repo.mongodb.org/yum/redhat/\$releasever/mongodb-org/6.0/x86_64/
 gpgcheck=1
 enabled=1
-gpgkey=https://www.mongodb.org/static/pgp/server-3.6.asc
+gpgkey=https://www.mongodb.org/static/pgp/server-6.0.asc
 EOF'
 ```
 
@@ -109,7 +109,7 @@
 
 
 ```bash
-$ sudo dnf install python3 meson ninja-build gcc gcc-c++ flex bison git lksctp-tools-devel libidn-devel gnutls-devel libgcrypt-devel openssl-devel cyrus-sasl-devel libyaml-devel mongo-c-driver-devel libmicrohttpd-devel libcurl-devel libnghttp2-devel libtalloc-devel
+$ sudo dnf install python3 meson cmake ninja-build gcc gcc-c++ flex bison git cmake lksctp-tools-devel libidn-devel gnutls-devel libgcrypt-devel openssl-devel cyrus-sasl-devel libyaml-devel mongo-c-driver-devel libmicrohttpd-devel libcurl-devel libnghttp2-devel libtalloc-devel
 ```
 
 ### Install iproute IP interface tools.
@@ -341,6 +341,7 @@
 
 Install Node.js:
 ```bash
+$ curl -sL https://rpm.nodesource.com/setup_18.x | sudo -E bash -
 $ sudo dnf install nodejs
 ```
 
@@ -354,5 +355,5 @@
 The WebUI runs as an npm(https://www.npmjs.com/) script.
 
 ```bash
-$ npm run dev
+$ DB_URI=mongodb://127.0.0.1/open5gs HOSTNAME=0.0.0.0 npm run dev
 ```

open5gs_2.5.8.tar.xz/docs/_docs/platform/03-fedora.md -> open5gs_2.6.0.tar.xz/docs/_docs/platform/03-fedora.md Changed

open5gs_2.5.8.tar.xz/docs/_docs/platform/05-macosx-apple-silicon.md -> open5gs_2.6.0.tar.xz/docs/_docs/platform/05-macosx-apple-silicon.md Changed

open5gs_2.5.8.tar.xz/docs/_docs/platform/06-macosx-intel.md -> open5gs_2.6.0.tar.xz/docs/_docs/platform/06-macosx-intel.md Changed

open5gs_2.5.8.tar.xz/docs/_docs/platform/07-freebsd.md -> open5gs_2.6.0.tar.xz/docs/_docs/platform/07-freebsd.md Changed

@@ -3,10 +3,10 @@
 head_inline: "<style> .blue { color: blue; } </style>"
 ---
 
-This guide is based on **FreeBSD-11.4-STABLE**.
+This guide is based on **FreeBSD-13.1-STABLE**.
 {: .blue}
 
-## Install **FreeBSD-11.4-STABLE** from Vagrant box (optional)
+## Install **FreeBSD-13.1-STABLE** from Vagrant box (optional)
 ---
 Vagrant provides a simple way to create and deploy Virtual Machines from
 pre-built images using VirtualBox, libvirt, or VMWare as a hypervisor engine.
@@ -20,13 +20,13 @@
 vagrantup.com(https://www.vagrantup.com/).
 
 
-### Create a FreeBSD-11.4-STABLE Virtual Machine using Vagrant
+### Create a FreeBSD-13.1-STABLE Virtual Machine using Vagrant
 ---
 
 Use the supplied `Vagrantfile` in the `vagrant` directory to create the
 virtual machine.
 
-Note that this Vagrantfile is identical to the base FreeBSD 11 box, with
+Note that this Vagrantfile is identical to the base FreeBSD 13 box, with
 the exception that the amount of virtual memory has been increased to 1GB:
 
 ```bash
@@ -37,7 +37,7 @@
 ### Log into the newly created FreeBSD VM
 ---
 
-Use SSH to log into the FreeBSD 11 VM:
+Use SSH to log into the FreeBSD 13 VM:
 
 ```bash
 vagrant ssh
@@ -45,17 +45,17 @@
 
 Note that the Open5GS source is *not* copied into the VM.  The instructions
 below provide the step by step instructions for setting up Open5GS for
-either a bare metal or virtual FreeBSD 11 system.
+either a bare metal or virtual FreeBSD 13 system.
 
 The rest of the commands below are performed inside the FreeBSD VM as the
-user 'vagrant', or on your bare metal FreeBSD 11 system as any normal user.
+user 'vagrant', or on your bare metal FreeBSD 13 system as any normal user.
 
 ### Getting MongoDB
 ---
 
 Install MongoDB with package manager.
 ```bash
-$ sudo pkg install mongodb44
+$ sudo pkg install mongodb50
 ```
 
 Run MongoDB server.
@@ -102,12 +102,37 @@
 `$ sudo ./misc/netconf.sh`
 {: .notice--info}
 
+### Load the SCTP kernel module
+---
+
+Update `/etc/rc.conf` to load the SCTP kernel module.
+
+```diff
+$ diff -u /etc/rc.conf.old /etc/rc.conf.new
+--- /etc/rc.conf.old	2022-11-19 12:35:07.718151000 +0000
++++ /etc/rc.conf.new	2022-11-19 12:34:59.160560000 +0000
+@@ -11,3 +11,4 @@
+ sendmail_submit_enable="NO"
+ sendmail_outbound_enable="NO"
+ sendmail_msp_queue_enable="NO"
++kld_list="sctp"
+```
+
+This is important that you must reboot as shown below.
+
+```bash
+host $ vagrant halt
+host $ vagrant up --provider virtualbox
+host $ # ssh back into the VM after it reboots...
+host $ vagrant ssh
+```
+
 ### Building Open5GS
 ---
 
 Install the depedencies for building the source code.
 ```bash
-$ sudo pkg install meson ninja gcc bison gsed pkgconf git mongo-c-driver gnutls libgcrypt libidn libyaml libmicrohttpd nghttp2 talloc
+$ sudo pkg install meson cmake ninja gcc bison gsed pkgconf git cmake mongo-c-driver gnutls libgcrypt libidn libyaml libmicrohttpd nghttp2 talloc
 ```
 
 Configure gcc PATH
@@ -136,7 +161,7 @@
 $ ninja -C build
 ```
 
-**Note:** No source code changes are required for FreeBSD 11.x version. However, in FreeBSD 12.x version, we'll getting a crash with segmentation fault when calling basename(3). To avoid this, you need to change the freeDiameter source code as below.
+**Note:** No source code changes are required for FreeBSD 11.x version. However, in FreeBSD 12.x/13.x version, we'll getting a crash with segmentation fault when calling basename(3). To avoid this, you need to change the freeDiameter source code as below.
 {: .blue}
 
 ```diff
@@ -200,7 +225,7 @@
 Node.js(https://nodejs.org/) is required to build WebUI of Open5GS
 
 ```bash
-$ sudo pkg install node
+$ sudo pkg install npm
 ```
 
 Install the dependencies to run WebUI

open5gs_2.5.8.tar.xz/docs/_docs/platform/08-alpine.md -> open5gs_2.6.0.tar.xz/docs/_docs/platform/08-alpine.md Changed

open5gs_2.5.8.tar.xz/docs/_docs/troubleshoot/01-simple-issues.md -> open5gs_2.6.0.tar.xz/docs/_docs/troubleshoot/01-simple-issues.md Changed

@@ -151,21 +151,6 @@
 Ensure the DNNs/APNs requested by the UE are present in the UDM/HSS.
 
 
-#### UE shows "5G" or "LTE" Connection but has no IP Connectivity to the outside World
-If your device shows as connected (Includes 5G/LTE symbol) there are a few simple things to check to diagnose connectivity issues:
-* The UPF can contact the outside world (Can resolve DNS, browse, etc)
-* Check if the interface connected to the internet is correctly `NAT` with the `ogstun` interface.
-   - Ensure that the packets in the `INPUT` chain to the `ogstun` interface are accepted 
-   ```
-   $ sudo iptables -I INPUT -i ogstun -j ACCEPT
-   ```
-* Check if the UE's IP can be pinged successfully by performing `ping <IP of UE>` -- e.g. `ping 10.45.0.2`
-* Configure the firewall correctly. Some operating systems (Ubuntu) by default enable firewall rules to block traffic
-   - Explicitly disable it to see if it resolves the problem of granting data access to the UE by doing
-   ```
-   $ sudo ufw disable
-   ```
-
 ## Further Debugging
 ---

open5gs_2.5.8.tar.xz/docs/_docs/tutorial/01-your-first-lte.md -> open5gs_2.6.0.tar.xz/docs/_docs/tutorial/01-your-first-lte.md Changed

@@ -13,7 +13,7 @@
 For USRP B200/B210, you can use a GPS antenna for clock synchronization. Of course, it can work without a GPS antenna, but if you have that antenna, it's a good to have a window near your desk where you can put the small GPS patch antenna. In my case, a 1 to 2 meters antenna cable is used between desk/computer and the window.
 
 This document will be described with the following equipment.
- - i5-8500 PC with Ubuntu 20.04(focal)
+ - i5-8500 PC with Ubuntu 22.04(jammy)
  - USRP B200/B210 with USB 3.0
  - iPhone XS
  - sysmoUSIM-SJS1
@@ -46,7 +46,7 @@
 
 ###### Install dependencies:
 ```
-$ sudo apt-get install pcscd pcsc-tools libccid libpcsclite-dev python-pyscard
+$ sudo apt-get install pcscd pcsc-tools libccid libpcsclite-dev python3-pyscard
 ```
  - Connect SIM card reader to your computer and insert programmable SIM card to the reader. 
 
@@ -70,8 +70,13 @@
 ###### Get the code of PySIM with installing dependency:
 
 ```
-$ sudo apt-get install python-pyscard python-serial python-pip
-$ pip install pytlv
+$ sudo apt-get install --no-install-recommends \
+	pcscd libpcsclite-dev \
+	python3 \
+	python3-setuptools \
+	python3-pyscard \
+	python3-pip
+ pip3 install --user -r requirements.txt
 $ git clone git://git.osmocom.org/pysim
 ```
 
@@ -122,7 +127,7 @@
 ```bash
 $ sudo add-apt-repository ppa:ettusresearch/uhd
 $ sudo apt update
-$ sudo apt install libuhd-dev libuhd003 uhd-host
+$ sudo apt install libuhd-dev uhd-host
 ```
 
 After installing, you need to download the FPGA images packages by running _uhd images downloader_ on the command line (the actual path may differ based on your installation):
@@ -133,7 +138,7 @@
 
 #### 2. srsRAN
 
-On *Ubuntu 20.04(focal)*, one can install the required libraries with:
+On *Ubuntu 22.04(jammy)*, one can install the required libraries with:
 
 ```bash
 $ sudo apt install cmake libfftw3-dev libmbedtls-dev libboost-program-options-dev libconfig++-dev libsctp-dev
@@ -144,9 +149,9 @@
 ```bash
 $ git clone https://github.com/srsRAN/srsRAN.git
 $ cd srsRAN
-$ git checkout release_21_10
+$ git checkout release_22_10
 $ git rev-parse HEAD
-5275f33360f1b3f1ee8d1c4d9ae951ac7c4ecd4e
+254cc719a9a31f64ce0262f4ca6ab72b1803477d
 $ mkdir build
 $ cd build
 $ cmake ../
@@ -156,13 +161,8 @@
 
 #### 3. Open5GS
 
-Install the MongoDB packages.
-
-```bash
-```
 
 The Open5GS package is available on the recent versions of *Ubuntu*.
-
 ```bash
 # Install the MongoDB Packages
 $ wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | sudo apt-key add -
@@ -170,13 +170,8 @@
 $ sudo apt update
 $ sudo apt install mongodb-org
 
-# Getting the authentication key
-$ sudo apt install wget
-$ wget https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_20.04/Release.key
-$ sudo apt-key add Release.key
-
 # Installing Open5GS
-$ sudo sh -c "echo 'deb https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/xUbuntu_20.04/ ./' > /etc/apt/sources.list.d/open5gs.list"
+$ sudo add-apt-repository ppa:open5gs/latest
 $ sudo apt update
 $ sudo apt install open5gs
 ```
@@ -239,18 +234,21 @@
 Modify install/etc/open5gs/mme.yaml(https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/mme.yaml.in) to set the S1AP IP address, PLMN ID, and TAC.
 
 ```diff
-$ diff -u /etc/open5gs/mme.yaml.old /etc/open5gs/mme.yaml
---- mme.yaml    2020-09-05 20:52:28.648235143 -0400
-+++ mme.yaml.new    2020-09-05 20:56:05.434484208 -0400
-@@ -253,20 +253,20 @@ mme:
+$ diff --git a/configs/open5gs/mme.yaml.in b/configs/open5gs/mme.yaml.in
+index 722648dd6..c998a1e47 100644
+--- a/configs/open5gs/mme.yaml.in
++++ b/configs/open5gs/mme.yaml.in
+@@ -251,7 +251,7 @@ logger:
+ mme:
+     freeDiameter: @sysconfdir@/freeDiameter/mme.conf
      s1ap:
 -      - addr: 127.0.0.2
-+      - addr: 10.10.0.2
++      - addr: 127.0.1.2
      gtpc:
        - addr: 127.0.0.2
      metrics:
-       addr: 127.0.0.2
-       port: 9090
+@@ -259,15 +259,15 @@ mme:
+         port: 9090
      gummei:
        plmn_id:
 -        mcc: 999
@@ -263,64 +261,25 @@
        plmn_id:
 -        mcc: 999
 -        mnc: 70
+-      tac: 1
 +        mcc: 310
 +        mnc: 789
-       tac: 1
++      tac: 5
      security:
          integrity_order :  EIA2, EIA1, EIA0 
+         ciphering_order :  EEA0, EEA1, EEA2 
 ```
 
-Modify install/etc/open5gs/sgwu.yaml(https://github.com/{{ site.github_username }}/open5gs/blob/main/configs/open5gs/sgwu.yaml.in) to set the GTP-U IP address.
-```diff
-$ diff -u /etc/open5gs/sgwu.yaml.old /etc/open5gs/sgwu.yaml
---- sgwu.yaml    2020-09-05 20:50:39.393022566 -0400
-+++ sgwu.yaml.new    2020-09-05 20:51:06.667838823 -0400
-@@ -98,7 +98,7 @@ logger:
- #
- sgwu:
-     pfcp:
--      - addr: 10.11.0.6
-+      - addr: 127.0.0.6
-     gtpu:
-       - addr: 127.0.0.6
-```
-
-
 After changing conf files, please restart Open5GS daemons.
 
 ```bash
 $ sudo systemctl restart open5gs-mmed.service
-$ sudo systemctl restart open5gs-sgwud.service
 ```
 
-If your phone can connect to internet, you must run the following command in Open5GS-PGW installed host. 
+In order to bridge between the PGWU/UPF and WAN (Internet), you must enable IP forwarding and add a NAT rule to your IP Tables.
 
+To enable forwarding and add the NAT rule, enter
 ```bash
-### Check IP Tables
-$ sudo iptables -L
-Chain INPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain FORWARD (policy ACCEPT)
-target     prot opt source               destination
-
-Chain OUTPUT (policy ACCEPT)
-target     prot opt source               destination
-
-### Check NAT Tables
-$ sudo iptables -L -t nat
-Chain PREROUTING (policy ACCEPT)
-target     prot opt source               destination
-
-Chain INPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain OUTPUT (policy ACCEPT)
-target     prot opt source               destination
-
-Chain POSTROUTING (policy ACCEPT)
-target     prot opt source               destination
-
 ### Enable IPv4/IPv6 Forwarding
 $ sudo sysctl -w net.ipv4.ip_forward=1
 $ sudo sysctl -w net.ipv6.conf.all.forwarding=1
@@ -330,8 +289,31 @@
 $ sudo ip6tables -t nat -A POSTROUTING -s 2001:db8:cafe::/48 ! -o ogstun -j MASQUERADE
 ```
 
-**Note:** For the first time, it is a good condition if you do not have any rules in the IP/NAT tables. If a program such as docker has already set up a rule, you will need to add a rule differently.
-{: .notice--danger}
+Configure the firewall correctly. Some operating systems (Ubuntu) by default enable firewall rules to block traffic.
+```bash
+$ sudo ufw status
+Status: active
+$ sudo ufw disable
+Firewall stopped and disabled on system startup
+$ sudo ufw status
+Status: inactive
+```
+
+Optionally, you may consider the settings below for security purposes.
+
+```bash
+### Ensure that the packets in the `INPUT` chain to the `ogstun` interface are accepted
+$ sudo iptables -I INPUT -i ogstun -j ACCEPT
+
+### Prevent UE's from connecting to the host on which UPF is running
+$ sudo iptables -I INPUT -s 10.45.0.0/16 -j DROP
+$ sudo ip6tables -I INPUT -s 2001:db8:cafe::/48 -j DROP
+
+### If your core network runs over multiple hosts, you probably want to block
+### UE originating traffic from accessing other network functions.
+### Replace x.x.x.x/y with the VNFs IP/subnet
+$ sudo iptables -I FORWARD -s 10.45.0.0/16 -d x.x.x.x/y -j DROP
+```
 
 #### 2. srsRAN
 Change back to the srsRAN source directory and copy the main config example as well as all additional config files for RR, SIB and DRB.
@@ -341,15 +323,14 @@
 $ cp srsenb/rr.conf.example srsenb/rr.conf
 $ cp srsenb/drb.conf.example srsenb/drb.conf
 $ cp srsenb/sib.conf.example srsenb/sib.conf
-$ cp srsenb/sib.conf.mbsfn.example srsenb/sib.conf.mbsfn
 ```
 
 You should check your phone frequency. If your phone does not support Band-3, you should use a different DL EARFCN value.
 
 ```diff
 $ diff -u enb.conf.example enb.conf
--- enb.conf.example    2022-01-19 20:30:13.612993155 +0900
-+++ enb.conf    2022-01-19 21:04:15.674419300 +0900
+--- enb.conf.example	2022-12-11 10:04:37.519188021 +0900
++++ enb.conf	2022-12-11 10:45:13.746995146 +0900
 @@ -20,9 +20,9 @@
  #####################################################################
  enb
@@ -363,36 +344,18 @@
  gtp_bind_addr = 127.0.1.1
  s1c_bind_addr = 127.0.1.1
  s1c_bind_port = 0
-@@ -67,7 +67,7 @@
- tx_gain = 80
- rx_gain = 40
-
--#device_name = auto
-+device_name = auto
-
- # For best performance in 2x2 MIMO and >= 15 MHz use the following device_args settings:
- #     USRP B210: num_recv_frames=64,num_send_frames=64
-@@ -81,7 +81,7 @@
-
- # Example for ZMQ-based operation with TCP transport for I/Q samples
- #device_name = zmq
--#device_args = fail_on_disconnect=true,tx_port=tcp://*:2000,rx_port=tcp://localhost:2001,id=enb,base_srate=23.04e6
-+device_args = clock=external
-
- #####################################################################
- # Packet capture configuration
 ```
 
 ```diff
 $ diff -u rr.conf.example rr.conf
--- rr.conf.example    2022-01-19 20:30:13.620992794 +0900
-+++ rr.conf    2022-01-19 21:05:21.959044145 +0900
+--- rr.conf.example	2022-12-11 10:04:37.523187831 +0900
++++ rr.conf	2022-12-11 10:42:23.590401941 +0900
 @@ -55,10 +55,10 @@
    {
      // rf_port = 0;
      cell_id = 0x01;
 -    tac = 0x0007;
-+    tac = 0x0002;
++    tac = 0x0005;
      pci = 1;
      // root_seq_idx = 204;
 -    dl_earfcn = 3350;
@@ -404,29 +367,44 @@
  nr_cell_list =
  (
    // no NR cells
+-);
+\ No newline at end of file
++);
 ```
 
 MME Address, TAC, PLMN ID, DL EARFCN, and Device Argument are updated as belows.
 
 ```
 MME Address : 127.0.1.2
-TAC : 2
+TAC : 5
 PLMN ID : MNC(310), MCC(789) programmed USIM with a card reader
 DL EARFCN : Band-3 - from your Phone
 Device Argument : Clock source from external GPS-DO
 ```
 
-If you are not using GPS-DO, you can just comment out `device_args` as shown below.
+If you are using GPS-DO, you need to add `device_args` as shown below.
 ```diff
-$ diff -u enb.conf enb.conf.no_gps_do
---- enb.conf    2022-01-19 21:08:32.941527373 +0900
-+++ enb.conf.no_gps_do    2022-01-19 21:10:18.612581261 +0900
-@@ -81,7 +81,7 @@
-
+$ diff -u enb.conf.example enb.conf
+--- enb.conf.example	2022-12-11 10:04:37.519188021 +0900
++++ enb.conf	2022-12-11 10:44:25.565094551 +0900
+@@ -20,9 +20,9 @@
+ #####################################################################
+ enb
+ enb_id = 0x19B
+-mcc = 001
+-mnc = 01
+-mme_addr = 127.0.1.100
++mcc = 310
++mnc = 789
++mme_addr = 127.0.1.2
+ gtp_bind_addr = 127.0.1.1
+ s1c_bind_addr = 127.0.1.1
+ s1c_bind_port = 0
+@@ -82,6 +82,7 @@
  # Example for ZMQ-based operation with TCP transport for I/Q samples
  #device_name = zmq
--device_args = clock=external
-+#device_args = fail_on_disconnect=true,tx_port=tcp://*:2000,rx_port=tcp://localhost:2001,id=enb,base_srate=23.04e6
+ #device_args = fail_on_disconnect=true,tx_port=tcp://*:2000,rx_port=tcp://localhost:2001,id=enb,base_srate=23.04e6
++device_args = clock=external
 
  #####################################################################
  # Packet capture configuration
@@ -436,25 +414,30 @@
 
 ```bash
 $ cd srsenb/
-$ sudo UHD_IMAGES_DIR=/usr/share/uhd/images ../build/srsenb/src/srsenb ./enb.conf
+$ sudo ../build/srsenb/src/srsenb ./enb.conf
+sudo password for acetcom:
+Active RF plugins: libsrsran_rf_uhd.so
+Inactive RF plugins:
 ---  Software Radio Systems LTE eNodeB  ---
 
 Reading configuration file ./enb.conf...
 WARNING: cpu0 scaling governor is not set to performance mode. Realtime processing could be compromised. Consider setting it to performance mode before running the application.
 
-Built in Release mode using commit 5275f3336 on branch HEAD.
+Built in Release mode using commit 254cc719a on branch HEAD.
 
-connect(): Connection refused
-Failed to initiate S1 connection. Attempting reconnection in 10 seconds
 Opening 1 channels in RF device=default with args=default
-Available RF device list: UHD
+Supported RF device list: UHD file
 Trying to open RF device 'UHD'
-INFO UHD linux; GNU C++ version 9.3.0; Boost_107100; UHD_4.1.0.4-release
+INFO UHD linux; GNU C++ version 11.2.0; Boost_107400; UHD_4.3.0.0-0ubuntu1~jammy1
 INFO LOGGING Fastpath logging disabled at runtime.
+INFO B200 Loading firmware image: /usr/share/uhd/images/usrp_b200_fw.hex...
 Opening USRP channels=1, args: type=b200,master_clock_rate=23.04e6
 INFO UHD RF RF UHD Generic instance constructed
 INFO B200 Detected Device: B200
+INFO B200 Loading FPGA image: /usr/share/uhd/images/usrp_b200_fpga.bin...
 INFO B200 Operating over USB 3.
+INFO B200 Detecting internal GPSDO....
+INFO GPS No GPSDO found
 INFO B200 Initialize CODEC control...
 INFO B200 Initialize Radio control...
 INFO B200 Performing register loopback test...
@@ -465,6 +448,7 @@
 
 ==== eNodeB started ===
 Type <t> to view trace
+Setting frequency: DL=1845.0 Mhz, UL=1750.0 MHz for cc_idx=0 nof_prb=50
 ```
 
 ### Turn on your eNodeB and Phone

open5gs_2.5.8.tar.xz/docs/_docs/tutorial/02-VoLTE-setup.md -> open5gs_2.6.0.tar.xz/docs/_docs/tutorial/02-VoLTE-setup.md Changed

open5gs_2.5.8.tar.xz/docs/_docs/tutorial/04-metrics-prometheus.md -> open5gs_2.6.0.tar.xz/docs/_docs/tutorial/04-metrics-prometheus.md Changed

@@ -12,25 +12,14 @@
 Prometheus server, which is basically an HTTP server serving Prometheus data to
 the Prometheus scrapper.
 
-Note: Only open5gs-smfd supports exporting metrics so far, though other may
+Note: AMF, MME and SMF support exporting metrics so far, though other may
 hopefully follow soon.
 
 #### 1. Enable Prometheus support during build
 
 Open5GS programs use a generic internal API available in libogsmetrics. This
 library implements the API based on configuration passed during open5gs build
-time. By default, the library will be built using the `void` implementation,
-which is basically a NO-OP implementation.
-
-In order to use the Prometheus, the `prometheus` metrics implementation needs to
-be selected at build time:
-
-```
-meson configure -Dmetrics_impl=prometheus build
-```
-
-This will enable building the implementation under lib/metrics/prometheus/,
-which uses:
+time. By default, the library will be built under lib/metrics/prometheus/, which uses:
 
 * prometheus-client-c project (libprom): To generate the Prometheus expected
   output format of the metrics
@@ -45,9 +34,8 @@
 
 #### 2. Configuring for runtime
 
-By default the created Prometheus HTTP server will be listening on `0.0.0.0`
-port `9090`.
-This can be configured under the following config file options:
+A Prometheus HTTP server can be created from the following config file options.
+A HTTP server is not created if 'metrics' is not defined.
 
 ```
 #
@@ -57,12 +45,18 @@
 #
 #  o Metrics Server(http://<any address>:9090)
 #    metrics:
-#      addr: 0.0.0.0
-#      port: 9090
+#      - addr: 0.0.0.0
+#        port: 9090
+#
+#  o Metrics Server(127.0.0.5:9090, ::1:9090)
+#    metrics:
+#      - addr: 127.0.0.5
+#      - addr: ::1
 #
-metrics:
-    addr: 0.0.0.0
-    port: 9090
+amf:
+  metrics:
+    - addr: 127.0.0.5
+      port: 9090
 ```
 
 Note: You may want to change the default IP address or port if you are running

open5gs_2.5.8.tar.xz/docs/_layouts/page.html -> open5gs_2.6.0.tar.xz/docs/_layouts/page.html Changed

open5gs_2.5.8.tar.xz/docs/_pages/cla.md -> open5gs_2.6.0.tar.xz/docs/_pages/cla.md Changed

open5gs_2.5.8.tar.xz/docs/_pages/docs.md -> open5gs_2.6.0.tar.xz/docs/_pages/docs.md Changed

open5gs_2.6.0.tar.xz/docs/_pages/features.md Added

open5gs_2.6.0.tar.xz/docs/_pages/oss-notice.md Added

@@ -0,0 +1,112 @@
+---
+layout: page
+title: OSS Notice
+subject: OSS Notice
+permalink: /oss-notice/
+---
+
+The following sets forth attribution notices for third party software that may be contained in this repository.
+
+If you have any questions or concerns, please contact us at <a href="mailto:acetcom@gmail.com">acetcom@gmail.com</a>
+
+---
+
+##### Apache Protable Runtime(ARP)
+- https://apr.apache.org/(https://apr.apache.org/)
+- Copyright (C) The Apache Software Foundation
+- LICENSE: Apache-2.0(https://www.apache.org/licenses/LICENSE-2.0)
+
+##### OpenSSL
+- https://www.openssl.org/(https://www.openssl.org/)
+- Copyright (C) The OpenSSL Project Authors
+- LICENSE: Apache-2.0(https://www.apache.org/licenses/LICENSE-2.0)
+
+##### GnuTLS
+- https://www.gnutls.org/(https://www.gnutls.org/)
+- Copyright (C) Free Software Foundation, Inc.
+- LICENSE: LGPL-2.1-or-later(https://www.gnu.org/licenses/lgpl-3.0.html)
+
+##### LIBGCRYPT
+- https://gnupg.org/software/libgcrypt/(https://gnupg.org/software/libgcrypt/)
+- Copyright (C) The GnuPG Project
+- LICENSE: LGPL-2.1-or-later(https://www.gnu.org/licenses/lgpl-3.0.html)
+
+##### GNU IDN Library
+- https://www.gnu.org/software/libidn/(https://www.gnu.org/software/libidn/)
+- Copyright (C) Free Software Foundation, Inc.
+- LICENSE: LGPL-2.1-or-later(https://www.gnu.org/licenses/lgpl-3.0.html)
+
+##### FreeBSD-ipfw
+- https://github.com/freebsd/freebsd-src/tree/main/sbin/ipfw(https://github.com/freebsd/freebsd-src/tree/main/sbin/ipfw)
+- Copyright 1992-2022 The FreeBSD Project
+- License: BSD-2-Clause(https://opensource.org/licenses/BSD-2-Clause)
+
+##### LibYAML
+- https://pyyaml.org/wiki/LibYAML(https://pyyaml.org/wiki/LibYAML)
+- Copyright (c) 2017-2020 Ingy döt Net Copyright (c) 2006-2016 Kirill Simonov
+- License: MIT(https://opensource.org/licenses/mit-license.php)
+
+##### prometheus-client-c
+- https://github.com/digitalocean/prometheus-client-c(https://github.com/digitalocean/prometheus-client-c)
+- Copyright (C) 2022 DigitalOcean, LLC. 
+- LICENSE: Apache-2.0(https://www.apache.org/licenses/LICENSE-2.0)
+
+##### Linux Kernel Stream Control Transmission Protocol Tools
+- https://lksctp.sourceforge.net/(https://lksctp.sourceforge.net/)
+- Copyright 2002 La Monte H.P. Yarroll; Copyright 2002, 2004 IBM Corp.; Copyright 2010, 2013 Red Hat
+- LICENSE: LGPL-2.1-or-later(https://www.gnu.org/licenses/lgpl-3.0.html)
+
+##### libmongoc
+- https://mongoc.org/libmongoc/current/(https://mongoc.org/libmongoc/current/)
+- Copyright 2017-present MongoDB, Inc.
+- LICENSE: Apache-2.0(https://www.apache.org/licenses/LICENSE-2.0)
+
+##### libbson
+- http://mongoc.org/libbson/current/(http://mongoc.org/libbson/current/)
+- Copyright 2017-present MongoDB, Inc.
+- LICENSE: Apache-2.0(https://www.apache.org/licenses/LICENSE-2.0)
+
+##### freeDiameter
+- http://www.freediameter.net(http://www.freediameter.net)
+- Copyright (c) 2008-2019, WIDE Project and NICT
+- License: BSD-2-Clause(https://opensource.org/licenses/BSD-2-Clause)
+
+##### asn1c
+- https://github.com/vlm/asn1c(https://github.com/vlm/asn1c)
+- Copyright (c) Lev Walkin <vlm@lionet.info> and contributors.
+- License: BSD-2-Clause(https://opensource.org/licenses/BSD-2-Clause)
+
+##### Nghttp2
+- https://nghttp2.org/(https://nghttp2.org/)
+- Copyright (C) 2022 - Tatsuhiro Tsujikawa
+- License: MIT(https://opensource.org/licenses/mit-license.php)
+
+##### libcurl
+- https://curl.se/libcurl/(https://curl.se/libcurl/)
+- Copyright (C) 2019 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
+- License: MIT(https://opensource.org/licenses/mit-license.php)
+
+##### GNU Libmicrohttpd
+- https://www.gnu.org/software/libmicrohttpd/(https://www.gnu.org/software/libmicrohttpd/)
+- Copyright (C) Free Software Foundation, Inc.
+- LICENSE: LGPL-2.1-or-later(https://www.gnu.org/licenses/lgpl-3.0.html)
+
+##### OpenAPI Generator
+- https://openapi-generator.tech/(https://openapi-generator.tech/)
+- Copyright OpenAPI-Generator Contributors
+- LICENSE: Apache-2.0(https://www.apache.org/licenses/LICENSE-2.0)
+
+##### libtins
+- http://libtins.github.io/(http://libtins.github.io/)
+- Copyright (c) 2012-2017, Matias Fontanini
+- License: BSD-2-Clause(https://opensource.org/licenses/BSD-2-Clause)
+
+##### libtalloc
+- https://talloc.samba.org/talloc/doc/html/(https://talloc.samba.org/talloc/doc/html/)
+- Copyright (C) Andrew Tridgell 2004-2005, Stefan Metzmacher 2006
+- LICENSE: LGPL-2.1-or-later(https://www.gnu.org/licenses/lgpl-3.0.html)
+
+##### usrsctp
+- https://github.com/sctplab/usrsctp(https://github.com/sctplab/usrsctp)
+- Copyright (c) 2015, Randall Stewart and Michael Tuexen
+- License: BSD-3-Clause(https://opensource.org/licenses/BSD-3-Clause)

open5gs_2.5.8.tar.xz/docs/_pages/support.md -> open5gs_2.6.0.tar.xz/docs/_pages/support.md Changed

open5gs_2.6.0.tar.xz/docs/_posts/2023-01-23-release-v2.4.14-v2.5.8.md Added

@@ -0,0 +1,32 @@
+---
+title: "v2.4.14 and v2.5.8 - Bug Fixes"
+date: 2023-01-23 11:04:00 +0900
+categories:
+  - Release
+tags:
+  - News
+  - Release
+head_inline: "<style> ul { padding-bottom: 1em; } .blue { color: blue; }</style>"
+---
+
+#### Security Issues
+- UPF Fixed an infinite loop when ext_len is 0 -- 2319375(https://github.com/open5gs/open5gs/commit/2319375ea7084e6e9f5db6f16853f7f8c146aa86)
+
+#### Bug Fixes
+- PROTO Increased SDU buffer from 8k to 16k (#2008(https://github.com/open5gs/open5gs/issues/2008)) -- Sabreu(https://github.com/Sabreu)
+- AMF Fixed a memory leak (#1925(https://github.com/open5gs/open5gs/issues/1925)) -- irazairspan(https://github.com/irazairspan)
+- UPF Fixed a bug when 2 PDRs with same TEID (#2003(https://github.com/open5gs/open5gs/issues/2003)) -- shizw2(https://github.com/shizw2)
+- PCRF Fixed a crash when switching between video and audio.  (#1981(https://github.com/open5gs/open5gs/issues/1981)) -- lglhust(https://github.com/lglhust)
+- MME Sending UEContextReleaseCommand after Attach-Reject to clear UE Context (#1848(https://github.com/open5gs/open5gs/issues/1848)) -- jmasterfunk84(https://github.com/jmasterfunk84)
+- SBI Case-Insensitive inside MIME message (#1939(https://github.com/open5gs/open5gs/issues/1939)) -- congzee(https://github.com/congzee)
+- AMF Fixed a problem of SMF selection -- (#1929(https://github.com/open5gs/open5gs/pull/1929)) -- miguelbf-alb(https://github.com/miguelbf-alb)
+- AMF Fixed a crash while NG_Reset in response for UE_Context_Release_Command (#1928(https://github.com/open5gs/open5gs/issues/1928)) -- mateuszmichalskiacc(https://github.com/mateuszmichalskiacc)
+- AMF Wrongly sending NG-AP "PDU Session Release" to gNodeB when gNodeB does not have a PDU Session (#1925(https://github.com/open5gs/open5gs/issues/1925)) -- irazairspan(https://github.com/irazairspan)
+- AMF/MME Forgetting the UE Radio Capabilities when UE is sending NAS "De-Registration Request" with "type = Switch-Off" (#1917(https://github.com/open5gs/open5gs/issues/1917)) -- irazairspan(https://github.com/irazairspan)
+- SMF/UPF Fixed stack overflow on small memory like Alpine. (#1911(https://github.com/open5gs/open5gs/issues/1911)) -- maikovisky(https://github.com/maikovisky)
+- AMF/MME Refactoring common_register_state() to prevent a crash (#1912(https://github.com/open5gs/open5gs/issues/1912)) -- lemon1009(https://github.com/lemon1009)
+- UPF Packet buffer must be freed after sending replay message -- (#1936(https://github.com/open5gs/open5gs/pull/1936)) -- lester-001(https://github.com/lester-001)
+- AMF Added safety code to prevent crash while getting amf_ue from sess -- (#1913(https://github.com/open5gs/open5gs/pull/1913)) -- lester-001(https://github.com/lester-001)
+
+Download -- v2.5.7.tar.gz(https://github.com/open5gs/open5gs/archive/v2.5.7.tar.gz)
+{: .notice--info}

open5gs_2.5.8.tar.xz/docs/assets/pcapng/srsenb.pcapng -> open5gs_2.6.0.tar.xz/docs/assets/pcapng/srsenb.pcapng Changed

open5gs_2.5.8.tar.xz/docs/assets/webui/install -> open5gs_2.6.0.tar.xz/docs/assets/webui/install Changed

@@ -91,6 +91,16 @@
 
 preinstall() {
 
+if  ! -x /usr/bin/mongod ; then
+    print_status "First you need to install MongoDB packages."
+    exit 1
+fi
+
+if  ! -x /usr/bin/npm ; then
+    print_status "First you need to install NPM packages."
+    exit 1
+fi
+
 PRE_INSTALL_PKGS=""
 
 # Check that HTTPS transport is available to APT
@@ -222,35 +232,6 @@
     print_status "Found \"${DISTRO}\" in /etc/debian_version..."
   fi
 fi
-
-print_status 'Removing Launchpad PPA Repository for MongoDB...'
-for i in /etc/apt/sources.list.d/mongodb-org*; do
-    exec_cmd "rm -f $i"
-done
-
-print_status 'Adding the MongoDB signing key to your keyring...'
-
-if  -x /usr/bin/curl ; then
-    exec_cmd_nobail "curl -sLf 'https://www.mongodb.org/static/pgp/server-6.0.asc' | apt-key add -"
-else
-    exec_cmd_nobail "wget -qO - 'https://www.mongodb.org/static/pgp/server-6.0.asc' | apt-key add -"
-fi
-
-print_status "Creating apt sources list file for the MongoDB repo..."
-
-exec_cmd "echo 'deb  arch=amd64,arm64  https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/6.0 multiverse' > /etc/apt/sources.list.d/mongodb-org-6.0.list"
-
-if  ! -x /usr/bin/mongod ; then
-    MONGODB_INSTALL_PKGS="${MONGODB_INSTALL_PKGS} mongodb-org"
-fi
-
-if  "X${MONGODB_INSTALL_PKGS}" != "X" ; then
-    print_status "Populating apt-get cache..."
-    exec_cmd 'apt-get update'
-
-    print_status "Installing packages required for setup:${MONGODB_INSTALL_PKGS}..."
-    exec_cmd "apt-get install -y${MONGODB_INSTALL_PKGS} > /dev/null 2>&1"
-fi
 }
 
 install() {
@@ -294,14 +275,22 @@
 EOF"
 
 exec_cmd_nobail "systemctl daemon-reload"
-exec_cmd "systemctl enable open5gs-webui"
-exec_cmd "deb-systemd-invoke start open5gs-webui"
+exec_cmd_nobail "systemctl enable open5gs-webui"
+exec_cmd_nobail "deb-systemd-invoke start open5gs-webui"
 }
 
 postinstall() {
 
 print_status "Default Administrator Account Username:admin, Password:1423..."
-exec_cmd "mongosh open5gs ./${PACKAGE}-${VERSION}/docs/assets/webui/mongo-init.js"
+if  -x /usr/bin/mongo ;
+then
+    exec_cmd "mongo open5gs ./${PACKAGE}-${VERSION}/docs/assets/webui/mongo-init.js"
+elif  -x /usr/bin/mongosh ;
+then
+    exec_cmd "mongosh open5gs ./${PACKAGE}-${VERSION}/docs/assets/webui/mongo-init.js"
+else
+    echo "Failed to execute mongo-init.js"
+fi
 
 exec_cmd "rm -rf ./${PACKAGE}-${VERSION}"
 }

open5gs_2.5.8.tar.xz/lib/app/ogs-app.h -> open5gs_2.6.0.tar.xz/lib/app/ogs-app.h Changed

open5gs_2.5.8.tar.xz/lib/app/ogs-context.c -> open5gs_2.6.0.tar.xz/lib/app/ogs-context.c Changed

@@ -425,10 +425,14 @@
                     const char *v = ogs_yaml_iter_value(&pool_iter);
                     if (v)
                         self.pool.defconfig.cluster_2048_pool = atoi(v);
-                } else if (!strcmp(pool_key, "16384")) {
+                } else if (!strcmp(pool_key, "8192")) {
                     const char *v = ogs_yaml_iter_value(&pool_iter);
                     if (v)
-                        self.pool.defconfig.cluster_16384_pool = atoi(v);
+                        self.pool.defconfig.cluster_8192_pool = atoi(v);
+                } else if (!strcmp(pool_key, "32768")) {
+                    const char *v = ogs_yaml_iter_value(&pool_iter);
+                    if (v)
+                        self.pool.defconfig.cluster_32768_pool = atoi(v);
                 } else if (!strcmp(pool_key, "big")) {
                     const char *v = ogs_yaml_iter_value(&pool_iter);
                     if (v)
@@ -515,6 +519,16 @@
                         } else
                             ogs_warn("unknown key `%s`", msg_key);
                     }
+                } else if (!strcmp(time_key, "t3502")) {
+                    /* handle config in amf */
+                } else if (!strcmp(time_key, "t3512")) {
+                    /* handle config in amf */
+                } else if (!strcmp(time_key, "t3402")) {
+                    /* handle config in mme */
+                } else if (!strcmp(time_key, "t3412")) {
+                    /* handle config in mme */
+                } else if (!strcmp(time_key, "t3423")) {
+                    /* handle config in mme */
                 } else
                     ogs_warn("unknown key `%s`", time_key);
             }

open5gs_2.5.8.tar.xz/lib/app/ogs-context.h -> open5gs_2.6.0.tar.xz/lib/app/ogs-context.h Changed

open5gs_2.5.8.tar.xz/lib/asn1c/util/conv.c -> open5gs_2.6.0.tar.xz/lib/asn1c/util/conv.c Changed

open5gs_2.5.8.tar.xz/lib/asn1c/util/message.c -> open5gs_2.6.0.tar.xz/lib/asn1c/util/message.c Changed

open5gs_2.5.8.tar.xz/lib/core/meson.build -> open5gs_2.6.0.tar.xz/lib/core/meson.build Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-conv.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-conv.c Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-conv.h -> open5gs_2.6.0.tar.xz/lib/core/ogs-conv.h Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-core.h -> open5gs_2.6.0.tar.xz/lib/core/ogs-core.h Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-epoll.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-epoll.c Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-errno.h -> open5gs_2.6.0.tar.xz/lib/core/ogs-errno.h Changed

open5gs_2.6.0.tar.xz/lib/core/ogs-file.c Added

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "ogs-core.h"
+
+int ogs_file_read_full(
+        const char *filename, void *buf, size_t nbytes, size_t *bytes_read)
+{
+    FILE *fp = NULL;
+    size_t total_read = 0, amt;
+
+    ogs_assert(filename);
+    ogs_assert(buf);
+    ogs_assert(nbytes);
+
+    fp = fopen(filename, "rb");
+    if (!fp) {
+        ogs_error("Cannot find file %s", filename);
+        return OGS_ERROR;
+    }
+
+    amt = fread(buf, 1, nbytes, fp);
+
+    if (bytes_read != NULL)
+        *bytes_read = amt;
+
+    fclose(fp);
+
+    if (amt > 0)
+        return OGS_OK;
+
+    ogs_error("Cannot read file name:%s,amt:%d,total_read:%d",
+            filename, (int)amt, (int)total_read);
+    return OGS_ERROR;
+}

open5gs_2.6.0.tar.xz/lib/core/ogs-file.h Added

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#if !defined(OGS_CORE_INSIDE) && !defined(OGS_CORE_COMPILATION)
+#error "This header cannot be included directly."
+#endif
+
+#ifndef OGS_FILE_H
+#define OGS_FILE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int ogs_file_read_full(
+        const char *filename, void *buf, size_t nbytes, size_t *bytes_read);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OGS_FILE_H */

open5gs_2.5.8.tar.xz/lib/core/ogs-hash.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-hash.c Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-log.h -> open5gs_2.6.0.tar.xz/lib/core/ogs-log.h Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-macros.h -> open5gs_2.6.0.tar.xz/lib/core/ogs-macros.h Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-memory.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-memory.c Changed

@@ -124,7 +124,11 @@
 
     headroom = sizeof(ogs_pkbuf_t *);
     pkbuf = ogs_pkbuf_alloc_debug(NULL, headroom + size, file_line);
-    ogs_expect_or_return_val(pkbuf, NULL);
+    if (!pkbuf) {
+        ogs_error("ogs_pkbuf_alloc_debugheadroom:%d, size:%d failed",
+                (int)headroom, (int)size);
+        return NULL;
+    }
 
     ogs_pkbuf_reserve(pkbuf, headroom);
     memcpy(pkbuf->head, &pkbuf, headroom);
@@ -155,7 +159,11 @@
     void *ptr = NULL;
 
     ptr = ogs_malloc_debug(nmemb * size, file_line);
-    ogs_expect_or_return_val(ptr, NULL);
+    if (!ptr) {
+        ogs_error("ogs_malloc_debugnmemb:%d, size:%d failed",
+                (int)nmemb, (int)size);
+        return NULL;
+    }
 
     memset(ptr, 0, nmemb * size);
     return ptr;
@@ -174,10 +182,17 @@
 
     memcpy(&pkbuf, (unsigned char*)ptr - headroom, headroom);
 
-    ogs_expect_or_return_val(pkbuf, NULL);
+    if (!pkbuf) {
+        ogs_error("Cannot get pkbuf from ptr%p, headroom%d",
+                ptr, (int)headroom);
+        return NULL;
+    }
 
     cluster = pkbuf->cluster;
-    ogs_expect_or_return_val(cluster, NULL);
+    if (!cluster) {
+        ogs_error("No cluster");
+        return NULL;
+    }
 
     if (!size) {
         ogs_pkbuf_free(pkbuf);
@@ -188,7 +203,10 @@
         void *new = NULL;
 
         new = ogs_malloc_debug(size, file_line);
-        ogs_expect_or_return_val(new, NULL);
+        if (!new) {
+            ogs_error("ogs_malloc_debug%d failed", (int)size);
+            return NULL;
+        }
 
         memcpy(new, ptr, pkbuf->len);

open5gs_2.5.8.tar.xz/lib/core/ogs-pkbuf.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-pkbuf.c Changed

@@ -28,7 +28,8 @@
 #define OGS_CLUSTER_512_SIZE    512
 #define OGS_CLUSTER_1024_SIZE   1024
 #define OGS_CLUSTER_2048_SIZE   2048
-#define OGS_CLUSTER_16384_SIZE  16384
+#define OGS_CLUSTER_8192_SIZE   8192
+#define OGS_CLUSTER_32768_SIZE  32768
 
 /*
  *
@@ -48,7 +49,8 @@
 typedef uint8_t ogs_cluster_512_tOGS_CLUSTER_512_SIZE;
 typedef uint8_t ogs_cluster_1024_tOGS_CLUSTER_1024_SIZE;
 typedef uint8_t ogs_cluster_2048_tOGS_CLUSTER_2048_SIZE;
-typedef uint8_t ogs_cluster_16384_tOGS_CLUSTER_16384_SIZE;
+typedef uint8_t ogs_cluster_8192_tOGS_CLUSTER_8192_SIZE;
+typedef uint8_t ogs_cluster_32768_tOGS_CLUSTER_32768_SIZE;
 typedef uint8_t ogs_cluster_big_tOGS_CLUSTER_BIG_SIZE;
 
 OGS_STATIC_ASSERT(sizeof(ogs_cluster_128_t) % sizeof(void *) == 0);
@@ -56,7 +58,8 @@
 OGS_STATIC_ASSERT(sizeof(ogs_cluster_512_t) % sizeof(void *) == 0);
 OGS_STATIC_ASSERT(sizeof(ogs_cluster_1024_t) % sizeof(void *) == 0);
 OGS_STATIC_ASSERT(sizeof(ogs_cluster_2048_t) % sizeof(void *) == 0);
-OGS_STATIC_ASSERT(sizeof(ogs_cluster_16384_t) % sizeof(void *) == 0);
+OGS_STATIC_ASSERT(sizeof(ogs_cluster_8192_t) % sizeof(void *) == 0);
+OGS_STATIC_ASSERT(sizeof(ogs_cluster_32768_t) % sizeof(void *) == 0);
 OGS_STATIC_ASSERT(sizeof(ogs_cluster_big_t) % sizeof(void *) == 0);
 
 typedef struct ogs_pkbuf_pool_s {
@@ -68,7 +71,8 @@
     OGS_POOL(cluster_512, ogs_cluster_512_t);
     OGS_POOL(cluster_1024, ogs_cluster_1024_t);
     OGS_POOL(cluster_2048, ogs_cluster_2048_t);
-    OGS_POOL(cluster_16384, ogs_cluster_16384_t);
+    OGS_POOL(cluster_8192, ogs_cluster_8192_t);
+    OGS_POOL(cluster_32768, ogs_cluster_32768_t);
     OGS_POOL(cluster_big, ogs_cluster_big_t);
 
     ogs_thread_mutex_t mutex;
@@ -116,7 +120,8 @@
     config->cluster_512_pool = 4096;
     config->cluster_1024_pool = 2048;
     config->cluster_2048_pool = 1024;
-    config->cluster_16384_pool = 512;
+    config->cluster_8192_pool = 256;
+    config->cluster_32768_pool = 64;
     config->cluster_big_pool = 8;
 #endif
 }
@@ -151,8 +156,8 @@
 
     tmp = config->cluster_128_pool + config->cluster_256_pool +
         config->cluster_512_pool + config->cluster_1024_pool +
-        config->cluster_2048_pool + config->cluster_16384_pool +
-        config->cluster_big_pool;
+        config->cluster_2048_pool + config->cluster_8192_pool +
+        config->cluster_32768_pool + config->cluster_big_pool;
 
     ogs_pool_init(&pool->pkbuf, tmp);
     ogs_pool_init(&pool->cluster, tmp);
@@ -162,7 +167,8 @@
     ogs_pool_init(&pool->cluster_512, config->cluster_512_pool);
     ogs_pool_init(&pool->cluster_1024, config->cluster_1024_pool);
     ogs_pool_init(&pool->cluster_2048, config->cluster_2048_pool);
-    ogs_pool_init(&pool->cluster_16384, config->cluster_16384_pool);
+    ogs_pool_init(&pool->cluster_8192, config->cluster_8192_pool);
+    ogs_pool_init(&pool->cluster_32768, config->cluster_32768_pool);
     ogs_pool_init(&pool->cluster_big, config->cluster_big_pool);
 #endif
 
@@ -200,7 +206,8 @@
     ogs_pool_final(&pool->cluster_512);
     ogs_pool_final(&pool->cluster_1024);
     ogs_pool_final(&pool->cluster_2048);
-    ogs_pool_final(&pool->cluster_16384);
+    ogs_pool_final(&pool->cluster_8192);
+    ogs_pool_final(&pool->cluster_32768);
     ogs_pool_final(&pool->cluster_big);
 
     ogs_thread_mutex_destroy(&pool->mutex);
@@ -372,31 +379,59 @@
 
     if (size <= OGS_CLUSTER_128_SIZE) {
         ogs_pool_alloc(&pool->cluster_128, (ogs_cluster_128_t**)&buffer);
-        ogs_expect_or_return_val(buffer, NULL);
+        if (!buffer) {
+            ogs_error("ogs_pool_alloc() failed");
+            return NULL;
+        }
         cluster->size = OGS_CLUSTER_128_SIZE;
     } else if (size <= OGS_CLUSTER_256_SIZE) {
         ogs_pool_alloc(&pool->cluster_256, (ogs_cluster_256_t**)&buffer);
-        ogs_expect_or_return_val(buffer, NULL);
+        if (!buffer) {
+            ogs_error("ogs_pool_alloc() failed");
+            return NULL;
+        }
         cluster->size = OGS_CLUSTER_256_SIZE;
     } else if (size <= OGS_CLUSTER_512_SIZE) {
         ogs_pool_alloc(&pool->cluster_512, (ogs_cluster_512_t**)&buffer);
-        ogs_expect_or_return_val(buffer, NULL);
+        if (!buffer) {
+            ogs_error("ogs_pool_alloc() failed");
+            return NULL;
+        }
         cluster->size = OGS_CLUSTER_512_SIZE;
     } else if (size <= OGS_CLUSTER_1024_SIZE) {
         ogs_pool_alloc(&pool->cluster_1024, (ogs_cluster_1024_t**)&buffer);
-        ogs_expect_or_return_val(buffer, NULL);
+        if (!buffer) {
+            ogs_error("ogs_pool_alloc() failed");
+            return NULL;
+        }
         cluster->size = OGS_CLUSTER_1024_SIZE;
     } else if (size <= OGS_CLUSTER_2048_SIZE) {
         ogs_pool_alloc(&pool->cluster_2048, (ogs_cluster_2048_t**)&buffer);
-        ogs_expect_or_return_val(buffer, NULL);
+        if (!buffer) {
+            ogs_error("ogs_pool_alloc() failed");
+            return NULL;
+        }
         cluster->size = OGS_CLUSTER_2048_SIZE;
-    } else if (size <= OGS_CLUSTER_16384_SIZE) {
-        ogs_pool_alloc(&pool->cluster_16384, (ogs_cluster_16384_t**)&buffer);
-        ogs_expect_or_return_val(buffer, NULL);
-        cluster->size = OGS_CLUSTER_16384_SIZE;
+    } else if (size <= OGS_CLUSTER_8192_SIZE) {
+        ogs_pool_alloc(&pool->cluster_8192, (ogs_cluster_8192_t**)&buffer);
+        if (!buffer) {
+            ogs_error("ogs_pool_alloc() failed");
+            return NULL;
+        }
+        cluster->size = OGS_CLUSTER_8192_SIZE;
+    } else if (size <= OGS_CLUSTER_32768_SIZE) {
+        ogs_pool_alloc(&pool->cluster_32768, (ogs_cluster_32768_t**)&buffer);
+        if (!buffer) {
+            ogs_error("ogs_pool_alloc() failed");
+            return NULL;
+        }
+        cluster->size = OGS_CLUSTER_32768_SIZE;
     } else if (size <= OGS_CLUSTER_BIG_SIZE) {
         ogs_pool_alloc(&pool->cluster_big, (ogs_cluster_big_t**)&buffer);
-        ogs_expect_or_return_val(buffer, NULL);
+        if (!buffer) {
+            ogs_error("ogs_pool_alloc() failed");
+            return NULL;
+        }
         cluster->size = OGS_CLUSTER_BIG_SIZE;
     } else {
         ogs_fatal("invalid size = %d", size);
@@ -431,9 +466,13 @@
         ogs_pool_free(
                 &pool->cluster_2048, (ogs_cluster_2048_t*)cluster->buffer);
         break;
-    case OGS_CLUSTER_16384_SIZE:
+    case OGS_CLUSTER_8192_SIZE:
         ogs_pool_free(
-                &pool->cluster_16384, (ogs_cluster_16384_t*)cluster->buffer);
+                &pool->cluster_8192, (ogs_cluster_8192_t*)cluster->buffer);
+        break;
+    case OGS_CLUSTER_32768_SIZE:
+        ogs_pool_free(
+                &pool->cluster_32768, (ogs_cluster_32768_t*)cluster->buffer);
         break;
     case OGS_CLUSTER_BIG_SIZE:
         ogs_pool_free(&pool->cluster_big, (ogs_cluster_big_t*)cluster->buffer);

open5gs_2.5.8.tar.xz/lib/core/ogs-pkbuf.h -> open5gs_2.6.0.tar.xz/lib/core/ogs-pkbuf.h Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-poll.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-poll.c Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-queue.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-queue.c Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-sockaddr.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-sockaddr.c Changed

@@ -130,7 +130,10 @@
             continue;
 
         new = ogs_calloc(1, sizeof(ogs_sockaddr_t));
-        ogs_expect_or_return_val(new, OGS_ERROR);
+        if (!new) {
+            ogs_error("ogs_calloc() failed");
+            return OGS_ERROR;
+        }
         memcpy(&new->sa, ai->ai_addr, ai->ai_addrlen);
         new->ogs_sin_port = htobe16(port);
 
@@ -204,15 +207,24 @@
     for (*dst = d = NULL, s = src; s; s = s->next) {
         if (!d) {
             *dst = d = ogs_memdup(s, sizeof *s);
-            ogs_expect_or_return_val(*dst, OGS_ERROR);
+            if (!(*dst)) {
+                ogs_error("ogs_memdup() failed");
+                return OGS_ERROR;
+            }
         } else {
             d = d->next = ogs_memdup(s, sizeof *s);
-            ogs_expect_or_return_val(d, OGS_ERROR);
+            if (!d) {
+                ogs_error("ogs_memdup() failed");
+                return OGS_ERROR;
+            }
         }
         if (s->hostname) {
             if (s == src || s->hostname != src->hostname) {
                 d->hostname = ogs_strdup(s->hostname);
-                ogs_expect_or_return_val(d->hostname, OGS_ERROR);
+                if (!d->hostname) {
+                    ogs_error("ogs_memdup() failed");
+                    return OGS_ERROR;
+                }
             } else {
                 d->hostname = (*dst)->hostname;
             }
@@ -287,7 +299,10 @@
             continue;
 
         addr = ogs_calloc(1, sizeof(ogs_sockaddr_t));
-        ogs_expect_or_return_val(addr, NULL);
+        if (!addr) {
+            ogs_error("ogs_calloc() failed");
+            return NULL;
+        }
         ogs_assert(addr);
         memcpy(&addr->sa, cur->ifa_addr, ogs_sockaddr_len(cur->ifa_addr));

open5gs_2.5.8.tar.xz/lib/core/ogs-socket.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-socket.c Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-socknode.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-socknode.c Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-strings.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-strings.c Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-strings.h -> open5gs_2.6.0.tar.xz/lib/core/ogs-strings.h Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-thread.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-thread.c Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-timer.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-timer.c Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-timer.h -> open5gs_2.6.0.tar.xz/lib/core/ogs-timer.h Changed

open5gs_2.5.8.tar.xz/lib/core/ogs-tlv-msg.c -> open5gs_2.6.0.tar.xz/lib/core/ogs-tlv-msg.c Changed

@@ -107,12 +107,21 @@
     case OGS_TV_INT8:
     {
         ogs_tlv_uint8_t *v = (ogs_tlv_uint8_t *)msg;
-        if (parent_tlv)
+        if (parent_tlv) {
             tlv = ogs_tlv_embed(parent_tlv, tlv_mode,
                     desc->type, 1, desc->instance, &v->u8);
-        else
-            tlv = ogs_tlv_add(tlv, tlv_mode, desc->type, 1, desc->instance, &v->u8);
-        ogs_expect_or_return_val(tlv, NULL);
+            if (!tlv) {
+                ogs_error("ogs_tlv_embed()");
+                return NULL;
+            }
+        } else {
+            tlv = ogs_tlv_add(tlv, tlv_mode,
+                    desc->type, 1, desc->instance, &v->u8);
+            if (!tlv) {
+                ogs_error("ogs_tlv_add()");
+                return NULL;
+            }
+        }
         break;
     }
     case OGS_TLV_UINT16:
@@ -124,12 +133,21 @@
 
         v->u16 = htobe16(v->u16);
 
-        if (parent_tlv)
+        if (parent_tlv) {
             tlv = ogs_tlv_embed(parent_tlv, tlv_mode,
                     desc->type, 2, desc->instance, &v->u16);
-        else
-            tlv = ogs_tlv_add(tlv, tlv_mode, desc->type, 2, desc->instance, &v->u16);
-        ogs_expect_or_return_val(tlv, NULL);
+            if (!tlv) {
+                ogs_error("ogs_tlv_embed()");
+                return NULL;
+            }
+        } else {
+            tlv = ogs_tlv_add(tlv, tlv_mode,
+                    desc->type, 2, desc->instance, &v->u16);
+            if (!tlv) {
+                ogs_error("ogs_tlv_add()");
+                return NULL;
+            }
+        }
         break;
     }
     case OGS_TLV_UINT24:
@@ -142,12 +160,21 @@
         v->u24 = v->u24 << 8;
         v->u24 = htobe32(v->u24);
 
-        if (parent_tlv)
+        if (parent_tlv) {
             tlv = ogs_tlv_embed(parent_tlv, tlv_mode,
                     desc->type, 3, desc->instance, &v->u24);
-        else
-            tlv = ogs_tlv_add(tlv, tlv_mode, desc->type, 3, desc->instance, &v->u24);
-        ogs_expect_or_return_val(tlv, NULL);
+            if (!tlv) {
+                ogs_error("ogs_tlv_embed()");
+                return NULL;
+            }
+        } else {
+            tlv = ogs_tlv_add(tlv, tlv_mode,
+                    desc->type, 3, desc->instance, &v->u24);
+            if (!tlv) {
+                ogs_error("ogs_tlv_add()");
+                return NULL;
+            }
+        }
         break;
     }
     case OGS_TLV_UINT32:
@@ -159,13 +186,21 @@
 
         v->u32 = htobe32(v->u32);
 
-        if (parent_tlv)
+        if (parent_tlv) {
             tlv = ogs_tlv_embed(parent_tlv, tlv_mode,
                     desc->type, 4, desc->instance, &v->u32);
-        else
+            if (!tlv) {
+                ogs_error("ogs_tlv_embed()");
+                return NULL;
+            }
+        } else {
             tlv = ogs_tlv_add(tlv, tlv_mode,
                     desc->type, 4, desc->instance, &v->u32);
-        ogs_expect_or_return_val(tlv, NULL);
+            if (!tlv) {
+                ogs_error("ogs_tlv_add()");
+                return NULL;
+            }
+        }
         break;
     }
     case OGS_TLV_FIXED_STR:
@@ -173,13 +208,21 @@
     {
         ogs_tlv_octet_t *v = (ogs_tlv_octet_t *)msg;
 
-        if (parent_tlv)
+        if (parent_tlv) {
             tlv = ogs_tlv_embed(parent_tlv, tlv_mode,
                     desc->type, desc->length, desc->instance, v->data);
-        else
+            if (!tlv) {
+                ogs_error("ogs_tlv_embed()");
+                return NULL;
+            }
+        } else {
             tlv = ogs_tlv_add(tlv, tlv_mode,
                     desc->type, desc->length, desc->instance, v->data);
-        ogs_expect_or_return_val(tlv, NULL);
+            if (!tlv) {
+                ogs_error("ogs_tlv_add()");
+                return NULL;
+            }
+        }
         break;
     }
     case OGS_TLV_VAR_STR:
@@ -189,33 +232,49 @@
         if (v->len == 0) {
             ogs_error("No TLV length - %s T:%d I:%d (vsz=%d)",
                     desc->name, desc->type, desc->instance, desc->vsize);
-            ogs_expect_or_return_val(0, NULL);
+            return NULL;
         }
 
-        if (parent_tlv)
+        if (parent_tlv) {
             tlv = ogs_tlv_embed(parent_tlv, tlv_mode,
                     desc->type, v->len, desc->instance, v->data);
-        else
+            if (!tlv) {
+                ogs_error("ogs_tlv_embed()");
+                return NULL;
+            }
+        } else {
             tlv = ogs_tlv_add(tlv, tlv_mode,
                     desc->type, v->len, desc->instance, v->data);
-        ogs_expect_or_return_val(tlv, NULL);
+            if (!tlv) {
+                ogs_error("ogs_tlv_add()");
+                return NULL;
+            }
+        }
         break;
     }
     case OGS_TLV_NULL:
     case OGS_TV_NULL:
     {
-        if (parent_tlv)
+        if (parent_tlv) {
             tlv = ogs_tlv_embed(parent_tlv, tlv_mode,
                     desc->type, 0, desc->instance, NULL);
-        else
+            if (!tlv) {
+                ogs_error("ogs_tlv_embed()");
+                return NULL;
+            }
+        } else {
             tlv = ogs_tlv_add(tlv, tlv_mode,
                     desc->type, 0, desc->instance, NULL);
-        ogs_expect_or_return_val(tlv, NULL);
+            if (!tlv) {
+                ogs_error("ogs_tlv_add()");
+                return NULL;
+            }
+        }
         break;
     }
     default:
-        ogs_expect_or_return_val(0, NULL);
-        break;
+        ogs_error("Unknown type %d", desc->ctype);
+        return NULL;
     }
 
     return tlv;
@@ -258,16 +317,21 @@
                             desc->vsize, p + offset2);
 
                     if (parent_tlv)
-                        tlv = ogs_tlv_embed(parent_tlv, tlv_ctype2mode(desc->ctype, mode),
+                        tlv = ogs_tlv_embed(parent_tlv,
+                                tlv_ctype2mode(desc->ctype, mode),
                                 desc->type, 0, desc->instance, NULL);
                     else
-                        tlv = ogs_tlv_add(tlv, tlv_ctype2mode(desc->ctype, mode),
+                        tlv = ogs_tlv_add(tlv,
+                                tlv_ctype2mode(desc->ctype, mode),
                                 desc->type, 0, desc->instance, NULL);
 
                     r = tlv_add_compound(&emb_tlv, tlv, desc,
                             p + offset2 + sizeof(ogs_tlv_presence_t),
                             depth + 1, mode);
-                    ogs_expect_or_return_val(r > 0 && emb_tlv, 0);
+                    if (r <= 0 || !emb_tlv) {
+                        ogs_error("tlv_add_compound() failed");
+                        return 0;
+                    }
                     count += 1 + r;
                 } else {
                     ogs_trace("BUILD %sL#%d %s T:%d L:%d I:%d "
@@ -276,8 +340,12 @@
                             desc->instance, desc->ctype, desc->vsize,
                             p + offset2);
 
-                    tlv = tlv_add_leaf(parent_tlv, tlv, desc, p + offset2, mode);
-                    ogs_expect_or_return_val(tlv, 0);
+                    tlv = tlv_add_leaf(parent_tlv, tlv, desc,
+                            p + offset2, mode);
+                    if (!tlv) {
+                        ogs_error("tlv_add_leaf() failed");
+                        return 0;
+                    }
                     count++;
                 }
 
@@ -298,16 +366,21 @@
                             desc->vsize, p + offset);
 
                     if (parent_tlv)
-                        tlv = ogs_tlv_embed(parent_tlv, tlv_ctype2mode(desc->ctype, mode),
+                        tlv = ogs_tlv_embed(parent_tlv,
+                                tlv_ctype2mode(desc->ctype, mode),
                                 desc->type, 0, desc->instance, NULL);
                     else
-                        tlv = ogs_tlv_add(tlv, tlv_ctype2mode(desc->ctype, mode),
+                        tlv = ogs_tlv_add(tlv,
+                                tlv_ctype2mode(desc->ctype, mode),
                                 desc->type, 0, desc->instance, NULL);
 
                     r = tlv_add_compound(&emb_tlv, tlv, desc,
                             p + offset + sizeof(ogs_tlv_presence_t),
                             depth + 1, mode);
-                    ogs_expect_or_return_val(r > 0 && emb_tlv, 0);
+                    if (r <= 0 || !emb_tlv) {
+                        ogs_error("tlv_add_compound() failed");
+                        return 0;
+                    }
                     count += 1 + r;
                 } else {
                     ogs_trace("BUILD %sL#%d %s T:%d L:%d I:%d "
@@ -317,7 +390,10 @@
                             p + offset);
 
                     tlv = tlv_add_leaf(parent_tlv, tlv, desc, p + offset, mode);
-                    ogs_expect_or_return_val(tlv, 0);
+                    if (!tlv) {
+                        ogs_error("tlv_add_leaf() failed");
+                        return 0;
+                    }
                     count++;
                 }
 
@@ -344,20 +420,30 @@
 
     if (desc->child_descs0) {
         r = tlv_add_compound(&root, NULL, desc, msg, 0, mode);
-        ogs_expect_or_return_val(r > 0 && root, NULL);
+        if (r <= 0 || !root) {
+            ogs_error("tlv_add_compound() failed");
+            return NULL;
+        }
 
         length = ogs_tlv_calc_length(root);
     } else {
         length = 0;
     }
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_TLV_MAX_HEADROOM+length);
-    ogs_expect_or_return_val(pkbuf, NULL);
+    if (!pkbuf) {
+        ogs_error("ogs_pkbuf_alloc() failed");
+        return NULL;
+    }
     ogs_pkbuf_reserve(pkbuf, OGS_TLV_MAX_HEADROOM);
     ogs_pkbuf_put(pkbuf, length);
 
     if (desc->child_descs0) {
         rendlen = ogs_tlv_render(root, pkbuf->data, length);
-        ogs_expect_or_return_val(rendlen == length, NULL);
+        if (rendlen != length) {
+            ogs_error("ogs_tlv_renderrendlen:%d != length:%d failed",
+                    rendlen, length);
+            return NULL;
+        }
 
         ogs_tlv_free_all(root);
     }

open5gs_2.6.0.tar.xz/lib/crypt/curve25519-donna.c Added

@@ -0,0 +1,864 @@
+/* Copyright 2008, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * curve25519-donna: Curve25519 elliptic curve, public key function
+ *
+ * http://code.google.com/p/curve25519-donna/
+ *
+ * Adam Langley <agl@imperialviolet.org>
+ *
+ * Derived from public domain C code by Daniel J. Bernstein <djb@cr.yp.to>
+ *
+ * More information about curve25519 can be found here
+ *   http://cr.yp.to/ecdh.html
+ *
+ * djb's sample implementation of curve25519 is written in a special assembly
+ * language called qhasm and uses the floating point registers.
+ *
+ * This is, almost, a clean room reimplementation from the curve25519 paper. It
+ * uses many of the tricks described therein. Only the crecip function is taken
+ * from the sample implementation. */
+
+#if 0 /* modified by acetcom */
+#include <string.h>
+#include <stdint.h>
+
+#ifdef _MSC_VER
+#define inline __inline
+#endif
+#else
+#include "ogs-crypt.h"
+#endif
+
+typedef uint8_t u8;
+typedef int32_t s32;
+typedef int64_t limb;
+
+/* Field element representation:
+ *
+ * Field elements are written as an array of signed, 64-bit limbs, least
+ * significant first. The value of the field element is:
+ *   x0 + 2^26·x1 + x^51·x2 + 2^102·x3 + ...
+ *
+ * i.e. the limbs are 26, 25, 26, 25, ... bits wide. */
+
+/* Sum two numbers: output += in */
+static void fsum(limb *output, const limb *in) {
+  unsigned i;
+  for (i = 0; i < 10; i += 2) {
+    output0+i = output0+i + in0+i;
+    output1+i = output1+i + in1+i;
+  }
+}
+
+/* Find the difference of two numbers: output = in - output
+ * (note the order of the arguments!). */
+static void fdifference(limb *output, const limb *in) {
+  unsigned i;
+  for (i = 0; i < 10; ++i) {
+    outputi = ini - outputi;
+  }
+}
+
+/* Multiply a number by a scalar: output = in * scalar */
+static void fscalar_product(limb *output, const limb *in, const limb scalar) {
+  unsigned i;
+  for (i = 0; i < 10; ++i) {
+    outputi = ini * scalar;
+  }
+}
+
+/* Multiply two numbers: output = in2 * in
+ *
+ * output must be distinct to both inputs. The inputs are reduced coefficient
+ * form, the output is not.
+ *
+ * outputx <= 14 * the largest product of the input limbs. */
+static void fproduct(limb *output, const limb *in2, const limb *in) {
+  output0 =       ((limb) ((s32) in20)) * ((s32) in0);
+  output1 =       ((limb) ((s32) in20)) * ((s32) in1) +
+                    ((limb) ((s32) in21)) * ((s32) in0);
+  output2 =  2 *  ((limb) ((s32) in21)) * ((s32) in1) +
+                    ((limb) ((s32) in20)) * ((s32) in2) +
+                    ((limb) ((s32) in22)) * ((s32) in0);
+  output3 =       ((limb) ((s32) in21)) * ((s32) in2) +
+                    ((limb) ((s32) in22)) * ((s32) in1) +
+                    ((limb) ((s32) in20)) * ((s32) in3) +
+                    ((limb) ((s32) in23)) * ((s32) in0);
+  output4 =       ((limb) ((s32) in22)) * ((s32) in2) +
+               2 * (((limb) ((s32) in21)) * ((s32) in3) +
+                    ((limb) ((s32) in23)) * ((s32) in1)) +
+                    ((limb) ((s32) in20)) * ((s32) in4) +
+                    ((limb) ((s32) in24)) * ((s32) in0);
+  output5 =       ((limb) ((s32) in22)) * ((s32) in3) +
+                    ((limb) ((s32) in23)) * ((s32) in2) +
+                    ((limb) ((s32) in21)) * ((s32) in4) +
+                    ((limb) ((s32) in24)) * ((s32) in1) +
+                    ((limb) ((s32) in20)) * ((s32) in5) +
+                    ((limb) ((s32) in25)) * ((s32) in0);
+  output6 =  2 * (((limb) ((s32) in23)) * ((s32) in3) +
+                    ((limb) ((s32) in21)) * ((s32) in5) +
+                    ((limb) ((s32) in25)) * ((s32) in1)) +
+                    ((limb) ((s32) in22)) * ((s32) in4) +
+                    ((limb) ((s32) in24)) * ((s32) in2) +
+                    ((limb) ((s32) in20)) * ((s32) in6) +
+                    ((limb) ((s32) in26)) * ((s32) in0);
+  output7 =       ((limb) ((s32) in23)) * ((s32) in4) +
+                    ((limb) ((s32) in24)) * ((s32) in3) +
+                    ((limb) ((s32) in22)) * ((s32) in5) +
+                    ((limb) ((s32) in25)) * ((s32) in2) +
+                    ((limb) ((s32) in21)) * ((s32) in6) +
+                    ((limb) ((s32) in26)) * ((s32) in1) +
+                    ((limb) ((s32) in20)) * ((s32) in7) +
+                    ((limb) ((s32) in27)) * ((s32) in0);
+  output8 =       ((limb) ((s32) in24)) * ((s32) in4) +
+               2 * (((limb) ((s32) in23)) * ((s32) in5) +
+                    ((limb) ((s32) in25)) * ((s32) in3) +
+                    ((limb) ((s32) in21)) * ((s32) in7) +
+                    ((limb) ((s32) in27)) * ((s32) in1)) +
+                    ((limb) ((s32) in22)) * ((s32) in6) +
+                    ((limb) ((s32) in26)) * ((s32) in2) +
+                    ((limb) ((s32) in20)) * ((s32) in8) +
+                    ((limb) ((s32) in28)) * ((s32) in0);
+  output9 =       ((limb) ((s32) in24)) * ((s32) in5) +
+                    ((limb) ((s32) in25)) * ((s32) in4) +
+                    ((limb) ((s32) in23)) * ((s32) in6) +
+                    ((limb) ((s32) in26)) * ((s32) in3) +
+                    ((limb) ((s32) in22)) * ((s32) in7) +
+                    ((limb) ((s32) in27)) * ((s32) in2) +
+                    ((limb) ((s32) in21)) * ((s32) in8) +
+                    ((limb) ((s32) in28)) * ((s32) in1) +
+                    ((limb) ((s32) in20)) * ((s32) in9) +
+                    ((limb) ((s32) in29)) * ((s32) in0);
+  output10 = 2 * (((limb) ((s32) in25)) * ((s32) in5) +
+                    ((limb) ((s32) in23)) * ((s32) in7) +
+                    ((limb) ((s32) in27)) * ((s32) in3) +
+                    ((limb) ((s32) in21)) * ((s32) in9) +
+                    ((limb) ((s32) in29)) * ((s32) in1)) +
+                    ((limb) ((s32) in24)) * ((s32) in6) +
+                    ((limb) ((s32) in26)) * ((s32) in4) +
+                    ((limb) ((s32) in22)) * ((s32) in8) +
+                    ((limb) ((s32) in28)) * ((s32) in2);
+  output11 =      ((limb) ((s32) in25)) * ((s32) in6) +
+                    ((limb) ((s32) in26)) * ((s32) in5) +
+                    ((limb) ((s32) in24)) * ((s32) in7) +
+                    ((limb) ((s32) in27)) * ((s32) in4) +
+                    ((limb) ((s32) in23)) * ((s32) in8) +
+                    ((limb) ((s32) in28)) * ((s32) in3) +
+                    ((limb) ((s32) in22)) * ((s32) in9) +
+                    ((limb) ((s32) in29)) * ((s32) in2);
+  output12 =      ((limb) ((s32) in26)) * ((s32) in6) +
+               2 * (((limb) ((s32) in25)) * ((s32) in7) +
+                    ((limb) ((s32) in27)) * ((s32) in5) +
+                    ((limb) ((s32) in23)) * ((s32) in9) +
+                    ((limb) ((s32) in29)) * ((s32) in3)) +
+                    ((limb) ((s32) in24)) * ((s32) in8) +
+                    ((limb) ((s32) in28)) * ((s32) in4);
+  output13 =      ((limb) ((s32) in26)) * ((s32) in7) +
+                    ((limb) ((s32) in27)) * ((s32) in6) +
+                    ((limb) ((s32) in25)) * ((s32) in8) +
+                    ((limb) ((s32) in28)) * ((s32) in5) +
+                    ((limb) ((s32) in24)) * ((s32) in9) +
+                    ((limb) ((s32) in29)) * ((s32) in4);
+  output14 = 2 * (((limb) ((s32) in27)) * ((s32) in7) +
+                    ((limb) ((s32) in25)) * ((s32) in9) +
+                    ((limb) ((s32) in29)) * ((s32) in5)) +
+                    ((limb) ((s32) in26)) * ((s32) in8) +
+                    ((limb) ((s32) in28)) * ((s32) in6);
+  output15 =      ((limb) ((s32) in27)) * ((s32) in8) +
+                    ((limb) ((s32) in28)) * ((s32) in7) +
+                    ((limb) ((s32) in26)) * ((s32) in9) +
+                    ((limb) ((s32) in29)) * ((s32) in6);
+  output16 =      ((limb) ((s32) in28)) * ((s32) in8) +
+               2 * (((limb) ((s32) in27)) * ((s32) in9) +
+                    ((limb) ((s32) in29)) * ((s32) in7));
+  output17 =      ((limb) ((s32) in28)) * ((s32) in9) +
+                    ((limb) ((s32) in29)) * ((s32) in8);
+  output18 = 2 *  ((limb) ((s32) in29)) * ((s32) in9);
+}
+
+/* Reduce a long form to a short form by taking the input mod 2^255 - 19.
+ *
+ * On entry: |outputi| < 14*2^54
+ * On exit: |output0..8| < 280*2^54 */
+static void freduce_degree(limb *output) {
+  /* Each of these shifts and adds ends up multiplying the value by 19.
+   *
+   * For output0..8, the absolute entry value is < 14*2^54 and we add, at
+   * most, 19*14*2^54 thus, on exit, |output0..8| < 280*2^54. */
+  output8 += output18 << 4;
+  output8 += output18 << 1;
+  output8 += output18;
+  output7 += output17 << 4;
+  output7 += output17 << 1;
+  output7 += output17;
+  output6 += output16 << 4;
+  output6 += output16 << 1;
+  output6 += output16;
+  output5 += output15 << 4;
+  output5 += output15 << 1;
+  output5 += output15;
+  output4 += output14 << 4;
+  output4 += output14 << 1;
+  output4 += output14;
+  output3 += output13 << 4;
+  output3 += output13 << 1;
+  output3 += output13;
+  output2 += output12 << 4;
+  output2 += output12 << 1;
+  output2 += output12;
+  output1 += output11 << 4;
+  output1 += output11 << 1;
+  output1 += output11;
+  output0 += output10 << 4;
+  output0 += output10 << 1;
+  output0 += output10;
+}
+
+#if (-1 & 3) != 3
+#error "This code only works on a two's complement system"
+#endif
+
+/* return v / 2^26, using only shifts and adds.
+ *
+ * On entry: v can take any value. */
+static inline limb
+div_by_2_26(const limb v)
+{
+  /* High word of v; no shift needed. */
+  const uint32_t highword = (uint32_t) (((uint64_t) v) >> 32);
+  /* Set to all 1s if v was negative; else set to 0s. */
+  const int32_t sign = ((int32_t) highword) >> 31;
+  /* Set to 0x3ffffff if v was negative; else set to 0. */
+  const int32_t roundoff = ((uint32_t) sign) >> 6;
+  /* Should return v / (1<<26) */
+  return (v + roundoff) >> 26;
+}
+
+/* return v / (2^25), using only shifts and adds.
+ *
+ * On entry: v can take any value. */
+static inline limb
+div_by_2_25(const limb v)
+{
+  /* High word of v; no shift needed*/
+  const uint32_t highword = (uint32_t) (((uint64_t) v) >> 32);
+  /* Set to all 1s if v was negative; else set to 0s. */
+  const int32_t sign = ((int32_t) highword) >> 31;
+  /* Set to 0x1ffffff if v was negative; else set to 0. */
+  const int32_t roundoff = ((uint32_t) sign) >> 7;
+  /* Should return v / (1<<25) */
+  return (v + roundoff) >> 25;
+}
+
+/* Reduce all coefficients of the short form input so that |x| < 2^26.
+ *
+ * On entry: |outputi| < 280*2^54 */
+static void freduce_coefficients(limb *output) {
+  unsigned i;
+
+  output10 = 0;
+
+  for (i = 0; i < 10; i += 2) {
+    limb over = div_by_2_26(outputi);
+    /* The entry condition (that |outputi| < 280*2^54) means that over is, at
+     * most, 280*2^28 in the first iteration of this loop. This is added to the
+     * next limb and we can approximate the resulting bound of that limb by
+     * 281*2^54. */
+    outputi -= over << 26;
+    outputi+1 += over;
+
+    /* For the first iteration, |outputi+1| < 281*2^54, thus |over| <
+     * 281*2^29. When this is added to the next limb, the resulting bound can
+     * be approximated as 281*2^54.
+     *
+     * For subsequent iterations of the loop, 281*2^54 remains a conservative
+     * bound and no overflow occurs. */
+    over = div_by_2_25(outputi+1);
+    outputi+1 -= over << 25;
+    outputi+2 += over;
+  }
+  /* Now |output10| < 281*2^29 and all other coefficients are reduced. */
+  output0 += output10 << 4;
+  output0 += output10 << 1;
+  output0 += output10;
+
+  output10 = 0;
+
+  /* Now output1..9 are reduced, and |output0| < 2^26 + 19*281*2^29
+   * So |over| will be no more than 2^16. */
+  {
+    limb over = div_by_2_26(output0);
+    output0 -= over << 26;
+    output1 += over;
+  }
+
+  /* Now output0,2..9 are reduced, and |output1| < 2^25 + 2^16 < 2^26. The
+   * bound on |output1| is sufficient to meet our needs. */
+}
+
+/* A helpful wrapper around fproduct: output = in * in2.
+ *
+ * On entry: |ini| < 2^27 and |in2i| < 2^27.
+ *
+ * output must be distinct to both inputs. The output is reduced degree
+ * (indeed, one need only provide storage for 10 limbs) and |outputi| < 2^26. */
+static void
+fmul(limb *output, const limb *in, const limb *in2) {
+  limb t19;
+  fproduct(t, in, in2);
+  /* |ti| < 14*2^54 */
+  freduce_degree(t);
+  freduce_coefficients(t);
+  /* |ti| < 2^26 */
+  memcpy(output, t, sizeof(limb) * 10);
+}
+
+/* Square a number: output = in**2
+ *
+ * output must be distinct from the input. The inputs are reduced coefficient
+ * form, the output is not.
+ *
+ * outputx <= 14 * the largest product of the input limbs. */
+static void fsquare_inner(limb *output, const limb *in) {
+  output0 =       ((limb) ((s32) in0)) * ((s32) in0);
+  output1 =  2 *  ((limb) ((s32) in0)) * ((s32) in1);
+  output2 =  2 * (((limb) ((s32) in1)) * ((s32) in1) +
+                    ((limb) ((s32) in0)) * ((s32) in2));
+  output3 =  2 * (((limb) ((s32) in1)) * ((s32) in2) +
+                    ((limb) ((s32) in0)) * ((s32) in3));
+  output4 =       ((limb) ((s32) in2)) * ((s32) in2) +
+               4 *  ((limb) ((s32) in1)) * ((s32) in3) +
+               2 *  ((limb) ((s32) in0)) * ((s32) in4);
+  output5 =  2 * (((limb) ((s32) in2)) * ((s32) in3) +
+                    ((limb) ((s32) in1)) * ((s32) in4) +
+                    ((limb) ((s32) in0)) * ((s32) in5));
+  output6 =  2 * (((limb) ((s32) in3)) * ((s32) in3) +
+                    ((limb) ((s32) in2)) * ((s32) in4) +
+                    ((limb) ((s32) in0)) * ((s32) in6) +
+               2 *  ((limb) ((s32) in1)) * ((s32) in5));
+  output7 =  2 * (((limb) ((s32) in3)) * ((s32) in4) +
+                    ((limb) ((s32) in2)) * ((s32) in5) +
+                    ((limb) ((s32) in1)) * ((s32) in6) +
+                    ((limb) ((s32) in0)) * ((s32) in7));
+  output8 =       ((limb) ((s32) in4)) * ((s32) in4) +
+               2 * (((limb) ((s32) in2)) * ((s32) in6) +
+                    ((limb) ((s32) in0)) * ((s32) in8) +
+               2 * (((limb) ((s32) in1)) * ((s32) in7) +
+                    ((limb) ((s32) in3)) * ((s32) in5)));
+  output9 =  2 * (((limb) ((s32) in4)) * ((s32) in5) +
+                    ((limb) ((s32) in3)) * ((s32) in6) +
+                    ((limb) ((s32) in2)) * ((s32) in7) +
+                    ((limb) ((s32) in1)) * ((s32) in8) +
+                    ((limb) ((s32) in0)) * ((s32) in9));
+  output10 = 2 * (((limb) ((s32) in5)) * ((s32) in5) +
+                    ((limb) ((s32) in4)) * ((s32) in6) +
+                    ((limb) ((s32) in2)) * ((s32) in8) +
+               2 * (((limb) ((s32) in3)) * ((s32) in7) +
+                    ((limb) ((s32) in1)) * ((s32) in9)));
+  output11 = 2 * (((limb) ((s32) in5)) * ((s32) in6) +
+                    ((limb) ((s32) in4)) * ((s32) in7) +
+                    ((limb) ((s32) in3)) * ((s32) in8) +
+                    ((limb) ((s32) in2)) * ((s32) in9));
+  output12 =      ((limb) ((s32) in6)) * ((s32) in6) +
+               2 * (((limb) ((s32) in4)) * ((s32) in8) +
+               2 * (((limb) ((s32) in5)) * ((s32) in7) +
+                    ((limb) ((s32) in3)) * ((s32) in9)));
+  output13 = 2 * (((limb) ((s32) in6)) * ((s32) in7) +
+                    ((limb) ((s32) in5)) * ((s32) in8) +
+                    ((limb) ((s32) in4)) * ((s32) in9));
+  output14 = 2 * (((limb) ((s32) in7)) * ((s32) in7) +
+                    ((limb) ((s32) in6)) * ((s32) in8) +
+               2 *  ((limb) ((s32) in5)) * ((s32) in9));
+  output15 = 2 * (((limb) ((s32) in7)) * ((s32) in8) +
+                    ((limb) ((s32) in6)) * ((s32) in9));
+  output16 =      ((limb) ((s32) in8)) * ((s32) in8) +
+               4 *  ((limb) ((s32) in7)) * ((s32) in9);
+  output17 = 2 *  ((limb) ((s32) in8)) * ((s32) in9);
+  output18 = 2 *  ((limb) ((s32) in9)) * ((s32) in9);
+}
+
+/* fsquare sets output = in^2.
+ *
+ * On entry: The |in| argument is in reduced coefficients form and |ini| <
+ * 2^27.
+ *
+ * On exit: The |output| argument is in reduced coefficients form (indeed, one
+ * need only provide storage for 10 limbs) and |outi| < 2^26. */
+static void
+fsquare(limb *output, const limb *in) {
+  limb t19;
+  fsquare_inner(t, in);
+  /* |ti| < 14*2^54 because the largest product of two limbs will be <
+   * 2^(27+27) and fsquare_inner adds together, at most, 14 of those
+   * products. */
+  freduce_degree(t);
+  freduce_coefficients(t);
+  /* |ti| < 2^26 */
+  memcpy(output, t, sizeof(limb) * 10);
+}
+
+/* Take a little-endian, 32-byte number and expand it into polynomial form */
+static void
+fexpand(limb *output, const u8 *input) {
+#define F(n,start,shift,mask) \
+  outputn = ((((limb) inputstart + 0) | \
+                ((limb) inputstart + 1) << 8 | \
+                ((limb) inputstart + 2) << 16 | \
+                ((limb) inputstart + 3) << 24) >> shift) & mask;
+  F(0, 0, 0, 0x3ffffff);
+  F(1, 3, 2, 0x1ffffff);
+  F(2, 6, 3, 0x3ffffff);
+  F(3, 9, 5, 0x1ffffff);
+  F(4, 12, 6, 0x3ffffff);
+  F(5, 16, 0, 0x1ffffff);
+  F(6, 19, 1, 0x3ffffff);
+  F(7, 22, 3, 0x1ffffff);
+  F(8, 25, 4, 0x3ffffff);
+  F(9, 28, 6, 0x1ffffff);
+#undef F
+}
+
+#if (-32 >> 1) != -16
+#error "This code only works when >> does sign-extension on negative numbers"
+#endif
+
+/* s32_eq returns 0xffffffff iff a == b and zero otherwise. */
+static s32 s32_eq(s32 a, s32 b) {
+  a = ~(a ^ b);
+  a &= a << 16;
+  a &= a << 8;
+  a &= a << 4;
+  a &= a << 2;
+  a &= a << 1;
+  return a >> 31;
+}
+
+/* s32_gte returns 0xffffffff if a >= b and zero otherwise, where a and b are
+ * both non-negative. */
+static s32 s32_gte(s32 a, s32 b) {
+  a -= b;
+  /* a >= 0 iff a >= b. */
+  return ~(a >> 31);
+}
+
+/* Take a fully reduced polynomial form number and contract it into a
+ * little-endian, 32-byte array.
+ *
+ * On entry: |input_limbsi| < 2^26 */
+static void
+fcontract(u8 *output, limb *input_limbs) {
+  int i;
+  int j;
+  s32 input10;
+  s32 mask;
+
+  /* |input_limbsi| < 2^26, so it's valid to convert to an s32. */
+  for (i = 0; i < 10; i++) {
+    inputi = input_limbsi;
+  }
+
+  for (j = 0; j < 2; ++j) {
+    for (i = 0; i < 9; ++i) {
+      if ((i & 1) == 1) {
+        /* This calculation is a time-invariant way to make inputi
+         * non-negative by borrowing from the next-larger limb. */
+        const s32 mask = inputi >> 31;
+        const s32 carry = -((inputi & mask) >> 25);
+        inputi = inputi + (carry << 25);
+        inputi+1 = inputi+1 - carry;
+      } else {
+        const s32 mask = inputi >> 31;
+        const s32 carry = -((inputi & mask) >> 26);
+        inputi = inputi + (carry << 26);
+        inputi+1 = inputi+1 - carry;
+      }
+    }
+
+    /* There's no greater limb for input9 to borrow from, but we can multiply
+     * by 19 and borrow from input0, which is valid mod 2^255-19. */
+    {
+      const s32 mask = input9 >> 31;
+      const s32 carry = -((input9 & mask) >> 25);
+      input9 = input9 + (carry << 25);
+      input0 = input0 - (carry * 19);
+    }
+
+    /* After the first iteration, input1..9 are non-negative and fit within
+     * 25 or 26 bits, depending on position. However, input0 may be
+     * negative. */
+  }
+
+  /* The first borrow-propagation pass above ended with every limb
+     except (possibly) input0 non-negative.
+
+     If input0 was negative after the first pass, then it was because of a
+     carry from input9. On entry, input9 < 2^26 so the carry was, at most,
+     one, since (2**26-1) >> 25 = 1. Thus input0 >= -19.
+
+     In the second pass, each limb is decreased by at most one. Thus the second
+     borrow-propagation pass could only have wrapped around to decrease
+     input0 again if the first pass left input0 negative *and* input1
+     through input9 were all zero.  In that case, input1 is now 2^25 - 1,
+     and this last borrow-propagation step will leave input1 non-negative. */
+  {
+    const s32 mask = input0 >> 31;
+    const s32 carry = -((input0 & mask) >> 26);
+    input0 = input0 + (carry << 26);
+    input1 = input1 - carry;
+  }
+
+  /* All inputi are now non-negative. However, there might be values between
+   * 2^25 and 2^26 in a limb which is, nominally, 25 bits wide. */
+  for (j = 0; j < 2; j++) {
+    for (i = 0; i < 9; i++) {
+      if ((i & 1) == 1) {
+        const s32 carry = inputi >> 25;
+        inputi &= 0x1ffffff;
+        inputi+1 += carry;
+      } else {
+        const s32 carry = inputi >> 26;
+        inputi &= 0x3ffffff;
+        inputi+1 += carry;
+      }
+    }
+
+    {
+      const s32 carry = input9 >> 25;
+      input9 &= 0x1ffffff;
+      input0 += 19*carry;
+    }
+  }
+
+  /* If the first carry-chain pass, just above, ended up with a carry from
+   * input9, and that caused input0 to be out-of-bounds, then input0 was
+   * < 2^26 + 2*19, because the carry was, at most, two.
+   *
+   * If the second pass carried from input9 again then input0 is < 2*19 and
+   * the input9 -> input0 carry didn't push input0 out of bounds. */
+
+  /* It still remains the case that input might be between 2^255-19 and 2^255.
+   * In this case, input1..9 must take their maximum value and input0 must
+   * be >= (2^255-19) & 0x3ffffff, which is 0x3ffffed. */
+  mask = s32_gte(input0, 0x3ffffed);
+  for (i = 1; i < 10; i++) {
+    if ((i & 1) == 1) {
+      mask &= s32_eq(inputi, 0x1ffffff);
+    } else {
+      mask &= s32_eq(inputi, 0x3ffffff);
+    }
+  }
+
+  /* mask is either 0xffffffff (if input >= 2^255-19) and zero otherwise. Thus
+   * this conditionally subtracts 2^255-19. */
+  input0 -= mask & 0x3ffffed;
+
+  for (i = 1; i < 10; i++) {
+    if ((i & 1) == 1) {
+      inputi -= mask & 0x1ffffff;
+    } else {
+      inputi -= mask & 0x3ffffff;
+    }
+  }
+
+  input1 <<= 2;
+  input2 <<= 3;
+  input3 <<= 5;
+  input4 <<= 6;
+  input6 <<= 1;
+  input7 <<= 3;
+  input8 <<= 4;
+  input9 <<= 6;
+#define F(i, s) \
+  outputs+0 |=  inputi & 0xff; \
+  outputs+1  = (inputi >> 8) & 0xff; \
+  outputs+2  = (inputi >> 16) & 0xff; \
+  outputs+3  = (inputi >> 24) & 0xff;
+  output0 = 0;
+  output16 = 0;
+  F(0,0);
+  F(1,3);
+  F(2,6);
+  F(3,9);
+  F(4,12);
+  F(5,16);
+  F(6,19);
+  F(7,22);
+  F(8,25);
+  F(9,28);
+#undef F
+}
+
+/* Input: Q, Q', Q-Q'
+ * Output: 2Q, Q+Q'
+ *
+ *   x2 z3: long form
+ *   x3 z3: long form
+ *   x z: short form, destroyed
+ *   xprime zprime: short form, destroyed
+ *   qmqp: short form, preserved
+ *
+ * On entry and exit, the absolute value of the limbs of all inputs and outputs
+ * are < 2^26. */
+static void fmonty(limb *x2, limb *z2,  /* output 2Q */
+                   limb *x3, limb *z3,  /* output Q + Q' */
+                   limb *x, limb *z,    /* input Q */
+                   limb *xprime, limb *zprime,  /* input Q' */
+                   const limb *qmqp /* input Q - Q' */) {
+  limb origx10, origxprime10, zzz19, xx19, zz19, xxprime19,
+        zzprime19, zzzprime19, xxxprime19;
+
+  memcpy(origx, x, 10 * sizeof(limb));
+  fsum(x, z);
+  /* |xi| < 2^27 */
+  fdifference(z, origx);  /* does x - z */
+  /* |zi| < 2^27 */
+
+  memcpy(origxprime, xprime, sizeof(limb) * 10);
+  fsum(xprime, zprime);
+  /* |xprimei| < 2^27 */
+  fdifference(zprime, origxprime);
+  /* |zprimei| < 2^27 */
+  fproduct(xxprime, xprime, z);
+  /* |xxprimei| < 14*2^54: the largest product of two limbs will be <
+   * 2^(27+27) and fproduct adds together, at most, 14 of those products.
+   * (Approximating that to 2^58 doesn't work out.) */
+  fproduct(zzprime, x, zprime);
+  /* |zzprimei| < 14*2^54 */
+  freduce_degree(xxprime);
+  freduce_coefficients(xxprime);
+  /* |xxprimei| < 2^26 */
+  freduce_degree(zzprime);
+  freduce_coefficients(zzprime);
+  /* |zzprimei| < 2^26 */
+  memcpy(origxprime, xxprime, sizeof(limb) * 10);
+  fsum(xxprime, zzprime);
+  /* |xxprimei| < 2^27 */
+  fdifference(zzprime, origxprime);
+  /* |zzprimei| < 2^27 */
+  fsquare(xxxprime, xxprime);
+  /* |xxxprimei| < 2^26 */
+  fsquare(zzzprime, zzprime);
+  /* |zzzprimei| < 2^26 */
+  fproduct(zzprime, zzzprime, qmqp);
+  /* |zzprimei| < 14*2^52 */
+  freduce_degree(zzprime);
+  freduce_coefficients(zzprime);
+  /* |zzprimei| < 2^26 */
+  memcpy(x3, xxxprime, sizeof(limb) * 10);
+  memcpy(z3, zzprime, sizeof(limb) * 10);
+
+  fsquare(xx, x);
+  /* |xxi| < 2^26 */
+  fsquare(zz, z);
+  /* |zzi| < 2^26 */
+  fproduct(x2, xx, zz);
+  /* |x2i| < 14*2^52 */
+  freduce_degree(x2);
+  freduce_coefficients(x2);
+  /* |x2i| < 2^26 */
+  fdifference(zz, xx);  // does zz = xx - zz
+  /* |zzi| < 2^27 */
+  memset(zzz + 10, 0, sizeof(limb) * 9);
+  fscalar_product(zzz, zz, 121665);
+  /* |zzzi| < 2^(27+17) */
+  /* No need to call freduce_degree here:
+     fscalar_product doesn't increase the degree of its input. */
+  freduce_coefficients(zzz);
+  /* |zzzi| < 2^26 */
+  fsum(zzz, xx);
+  /* |zzzi| < 2^27 */
+  fproduct(z2, zz, zzz);
+  /* |z2i| < 14*2^(26+27) */
+  freduce_degree(z2);
+  freduce_coefficients(z2);
+  /* |z2|i| < 2^26 */
+}
+
+/* Conditionally swap two reduced-form limb arrays if 'iswap' is 1, but leave
+ * them unchanged if 'iswap' is 0.  Runs in data-invariant time to avoid
+ * side-channel attacks.
+ *
+ * NOTE that this function requires that 'iswap' be 1 or 0; other values give
+ * wrong results.  Also, the two limb arrays must be in reduced-coefficient,
+ * reduced-degree form: the values in a10..19 or b10..19 aren't swapped,
+ * and all all values in a0..9,b0..9 must have magnitude less than
+ * INT32_MAX. */
+static void
+swap_conditional(limb a19, limb b19, limb iswap) {
+  unsigned i;
+  const s32 swap = (s32) -iswap;
+
+  for (i = 0; i < 10; ++i) {
+    const s32 x = swap & ( ((s32)ai) ^ ((s32)bi) );
+    ai = ((s32)ai) ^ x;
+    bi = ((s32)bi) ^ x;
+  }
+}
+
+/* Calculates nQ where Q is the x-coordinate of a point on the curve
+ *
+ *   resultx/resultz: the x coordinate of the resulting curve point (short form)
+ *   n: a little endian, 32-byte number
+ *   q: a point of the curve (short form) */
+static void
+cmult(limb *resultx, limb *resultz, const u8 *n, const limb *q) {
+  limb a19 = {0}, b19 = {1}, c19 = {1}, d19 = {0};
+  limb *nqpqx = a, *nqpqz = b, *nqx = c, *nqz = d, *t;
+  limb e19 = {0}, f19 = {1}, g19 = {0}, h19 = {1};
+  limb *nqpqx2 = e, *nqpqz2 = f, *nqx2 = g, *nqz2 = h;
+
+  unsigned i, j;
+
+  memcpy(nqpqx, q, sizeof(limb) * 10);
+
+  for (i = 0; i < 32; ++i) {
+    u8 byte = n31 - i;
+    for (j = 0; j < 8; ++j) {
+      const limb bit = byte >> 7;
+
+      swap_conditional(nqx, nqpqx, bit);
+      swap_conditional(nqz, nqpqz, bit);
+      fmonty(nqx2, nqz2,
+             nqpqx2, nqpqz2,
+             nqx, nqz,
+             nqpqx, nqpqz,
+             q);
+      swap_conditional(nqx2, nqpqx2, bit);
+      swap_conditional(nqz2, nqpqz2, bit);
+
+      t = nqx;
+      nqx = nqx2;
+      nqx2 = t;
+      t = nqz;
+      nqz = nqz2;
+      nqz2 = t;
+      t = nqpqx;
+      nqpqx = nqpqx2;
+      nqpqx2 = t;
+      t = nqpqz;
+      nqpqz = nqpqz2;
+      nqpqz2 = t;
+
+      byte <<= 1;
+    }
+  }
+
+  memcpy(resultx, nqx, sizeof(limb) * 10);
+  memcpy(resultz, nqz, sizeof(limb) * 10);
+}
+
+// -----------------------------------------------------------------------------
+// Shamelessly copied from djb's code
+// -----------------------------------------------------------------------------
+static void
+crecip(limb *out, const limb *z) {
+  limb z210;
+  limb z910;
+  limb z1110;
+  limb z2_5_010;
+  limb z2_10_010;
+  limb z2_20_010;
+  limb z2_50_010;
+  limb z2_100_010;
+  limb t010;
+  limb t110;
+  int i;
+
+  /* 2 */ fsquare(z2,z);
+  /* 4 */ fsquare(t1,z2);
+  /* 8 */ fsquare(t0,t1);
+  /* 9 */ fmul(z9,t0,z);
+  /* 11 */ fmul(z11,z9,z2);
+  /* 22 */ fsquare(t0,z11);
+  /* 2^5 - 2^0 = 31 */ fmul(z2_5_0,t0,z9);
+
+  /* 2^6 - 2^1 */ fsquare(t0,z2_5_0);
+  /* 2^7 - 2^2 */ fsquare(t1,t0);
+  /* 2^8 - 2^3 */ fsquare(t0,t1);
+  /* 2^9 - 2^4 */ fsquare(t1,t0);
+  /* 2^10 - 2^5 */ fsquare(t0,t1);
+  /* 2^10 - 2^0 */ fmul(z2_10_0,t0,z2_5_0);
+
+  /* 2^11 - 2^1 */ fsquare(t0,z2_10_0);
+  /* 2^12 - 2^2 */ fsquare(t1,t0);
+  /* 2^20 - 2^10 */ for (i = 2;i < 10;i += 2) { fsquare(t0,t1); fsquare(t1,t0); }
+  /* 2^20 - 2^0 */ fmul(z2_20_0,t1,z2_10_0);
+
+  /* 2^21 - 2^1 */ fsquare(t0,z2_20_0);
+  /* 2^22 - 2^2 */ fsquare(t1,t0);
+  /* 2^40 - 2^20 */ for (i = 2;i < 20;i += 2) { fsquare(t0,t1); fsquare(t1,t0); }
+  /* 2^40 - 2^0 */ fmul(t0,t1,z2_20_0);
+
+  /* 2^41 - 2^1 */ fsquare(t1,t0);
+  /* 2^42 - 2^2 */ fsquare(t0,t1);
+  /* 2^50 - 2^10 */ for (i = 2;i < 10;i += 2) { fsquare(t1,t0); fsquare(t0,t1); }
+  /* 2^50 - 2^0 */ fmul(z2_50_0,t0,z2_10_0);
+
+  /* 2^51 - 2^1 */ fsquare(t0,z2_50_0);
+  /* 2^52 - 2^2 */ fsquare(t1,t0);
+  /* 2^100 - 2^50 */ for (i = 2;i < 50;i += 2) { fsquare(t0,t1); fsquare(t1,t0); }
+  /* 2^100 - 2^0 */ fmul(z2_100_0,t1,z2_50_0);
+
+  /* 2^101 - 2^1 */ fsquare(t1,z2_100_0);
+  /* 2^102 - 2^2 */ fsquare(t0,t1);
+  /* 2^200 - 2^100 */ for (i = 2;i < 100;i += 2) { fsquare(t1,t0); fsquare(t0,t1); }
+  /* 2^200 - 2^0 */ fmul(t1,t0,z2_100_0);
+
+  /* 2^201 - 2^1 */ fsquare(t0,t1);
+  /* 2^202 - 2^2 */ fsquare(t1,t0);
+  /* 2^250 - 2^50 */ for (i = 2;i < 50;i += 2) { fsquare(t0,t1); fsquare(t1,t0); }
+  /* 2^250 - 2^0 */ fmul(t0,t1,z2_50_0);
+
+  /* 2^251 - 2^1 */ fsquare(t1,t0);
+  /* 2^252 - 2^2 */ fsquare(t0,t1);
+  /* 2^253 - 2^3 */ fsquare(t1,t0);
+  /* 2^254 - 2^4 */ fsquare(t0,t1);
+  /* 2^255 - 2^5 */ fsquare(t1,t0);
+  /* 2^255 - 21 */ fmul(out,t1,z11);
+}
+
+int
+curve25519_donna(u8 *mypublic, const u8 *secret, const u8 *basepoint) {
+  limb bp10, x10, z11, zmone10;
+  uint8_t e32;
+  int i;
+
+  for (i = 0; i < 32; ++i) ei = secreti;
+  e0 &= 248;
+  e31 &= 127;
+  e31 |= 64;
+
+  fexpand(bp, basepoint);
+  cmult(x, z, e, bp);
+  crecip(zmone, z);
+  fmul(z, x, zmone);
+  fcontract(mypublic, z);
+  return 0;
+}

open5gs_2.6.0.tar.xz/lib/crypt/ecc.c Added

@@ -0,0 +1,1322 @@
+/* From https://github.com/jestan/easy-ecc */
+
+#include "ecc.h"
+
+#include <string.h>
+
+#define NUM_ECC_DIGITS (ECC_BYTES/8)
+#define MAX_TRIES 16
+
+typedef unsigned int uint;
+
+#if defined(__SIZEOF_INT128__) || ((__clang_major__ * 100 + __clang_minor__) >= 302)
+    #define SUPPORTS_INT128 1
+#else
+    #define SUPPORTS_INT128 0
+#endif
+
+#if SUPPORTS_INT128
+typedef unsigned __int128 uint128_t;
+#else
+typedef struct
+{
+    uint64_t m_low;
+    uint64_t m_high;
+} uint128_t;
+#endif
+
+typedef struct EccPoint
+{
+    uint64_t xNUM_ECC_DIGITS;
+    uint64_t yNUM_ECC_DIGITS;
+} EccPoint;
+
+#define CONCAT1(a, b) a##b
+#define CONCAT(a, b) CONCAT1(a, b)
+
+#define Curve_P_16 {0xFFFFFFFFFFFFFFFF, 0xFFFFFFFDFFFFFFFF}
+#define Curve_P_24 {0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFEull, 0xFFFFFFFFFFFFFFFFull}
+#define Curve_P_32 {0xFFFFFFFFFFFFFFFFull, 0x00000000FFFFFFFFull, 0x0000000000000000ull, 0xFFFFFFFF00000001ull}
+#define Curve_P_48 {0x00000000FFFFFFFF, 0xFFFFFFFF00000000, 0xFFFFFFFFFFFFFFFE, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF}
+
+#define Curve_B_16 {0xD824993C2CEE5ED3, 0xE87579C11079F43D}
+#define Curve_B_24 {0xFEB8DEECC146B9B1ull, 0x0FA7E9AB72243049ull, 0x64210519E59C80E7ull}
+#define Curve_B_32 {0x3BCE3C3E27D2604Bull, 0x651D06B0CC53B0F6ull, 0xB3EBBD55769886BCull, 0x5AC635D8AA3A93E7ull}
+#define Curve_B_48 {0x2A85C8EDD3EC2AEF, 0xC656398D8A2ED19D, 0x0314088F5013875A, 0x181D9C6EFE814112, 0x988E056BE3F82D19, 0xB3312FA7E23EE7E4}
+
+#define Curve_G_16 { \
+    {0x0C28607CA52C5B86, 0x161FF7528B899B2D}, \
+    {0xC02DA292DDED7A83, 0xCF5AC8395BAFEB13}}
+
+#define Curve_G_24 { \
+    {0xF4FF0AFD82FF1012ull, 0x7CBF20EB43A18800ull, 0x188DA80EB03090F6ull}, \
+    {0x73F977A11E794811ull, 0x631011ED6B24CDD5ull, 0x07192B95FFC8DA78ull}}
+    
+#define Curve_G_32 { \
+    {0xF4A13945D898C296ull, 0x77037D812DEB33A0ull, 0xF8BCE6E563A440F2ull, 0x6B17D1F2E12C4247ull}, \
+    {0xCBB6406837BF51F5ull, 0x2BCE33576B315ECEull, 0x8EE7EB4A7C0F9E16ull, 0x4FE342E2FE1A7F9Bull}}
+
+#define Curve_G_48 { \
+    {0x3A545E3872760AB7, 0x5502F25DBF55296C, 0x59F741E082542A38, 0x6E1D3B628BA79B98, 0x8EB1C71EF320AD74, 0xAA87CA22BE8B0537}, \
+    {0x7A431D7C90EA0E5F, 0x0A60B1CE1D7E819D, 0xE9DA3113B5F0B8C0, 0xF8F41DBD289A147C, 0x5D9E98BF9292DC29, 0x3617DE4A96262C6F}}
+
+#define Curve_N_16 {0x75A30D1B9038A115, 0xFFFFFFFE00000000}
+#define Curve_N_24 {0x146BC9B1B4D22831ull, 0xFFFFFFFF99DEF836ull, 0xFFFFFFFFFFFFFFFFull}
+#define Curve_N_32 {0xF3B9CAC2FC632551ull, 0xBCE6FAADA7179E84ull, 0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFF00000000ull}
+#define Curve_N_48 {0xECEC196ACCC52973, 0x581A0DB248B0A77A, 0xC7634D81F4372DDF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF}
+
+static uint64_t curve_pNUM_ECC_DIGITS = CONCAT(Curve_P_, ECC_CURVE);
+static uint64_t curve_bNUM_ECC_DIGITS = CONCAT(Curve_B_, ECC_CURVE);
+static EccPoint curve_G = CONCAT(Curve_G_, ECC_CURVE);
+static uint64_t curve_nNUM_ECC_DIGITS = CONCAT(Curve_N_, ECC_CURVE);
+
+#if (defined(_WIN32) || defined(_WIN64))
+/* Windows */
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <wincrypt.h>
+
+static int getRandomNumber(uint64_t *p_vli)
+{
+    HCRYPTPROV l_prov;
+    if(!CryptAcquireContext(&l_prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
+    {
+        return 0;
+    }
+
+    CryptGenRandom(l_prov, ECC_BYTES, (BYTE *)p_vli);
+    CryptReleaseContext(l_prov, 0);
+    
+    return 1;
+}
+
+#else /* _WIN32 */
+
+/* Assume that we are using a POSIX-like system with /dev/urandom or /dev/random. */
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#ifndef O_CLOEXEC
+    #define O_CLOEXEC 0
+#endif
+
+static int getRandomNumber(uint64_t *p_vli)
+{
+    int l_fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC);
+    if(l_fd == -1)
+    {
+        l_fd = open("/dev/random", O_RDONLY | O_CLOEXEC);
+        if(l_fd == -1)
+        {
+            return 0;
+        }
+    }
+    
+    char *l_ptr = (char *)p_vli;
+    size_t l_left = ECC_BYTES;
+    while(l_left > 0)
+    {
+        int l_read = read(l_fd, l_ptr, l_left);
+        if(l_read <= 0)
+        { // read failed
+            close(l_fd);
+            return 0;
+        }
+        l_left -= l_read;
+        l_ptr += l_read;
+    }
+    
+    close(l_fd);
+    return 1;
+}
+
+#endif /* _WIN32 */
+
+static void vli_clear(uint64_t *p_vli)
+{
+    uint i;
+    for(i=0; i<NUM_ECC_DIGITS; ++i)
+    {
+        p_vlii = 0;
+    }
+}
+
+/* Returns 1 if p_vli == 0, 0 otherwise. */
+static int vli_isZero(uint64_t *p_vli)
+{
+    uint i;
+    for(i = 0; i < NUM_ECC_DIGITS; ++i)
+    {
+        if(p_vlii)
+        {
+            return 0;
+        }
+    }
+    return 1;
+}
+
+/* Returns nonzero if bit p_bit of p_vli is set. */
+static uint64_t vli_testBit(uint64_t *p_vli, uint p_bit)
+{
+    return (p_vlip_bit/64 & ((uint64_t)1 << (p_bit % 64)));
+}
+
+/* Counts the number of 64-bit "digits" in p_vli. */
+static uint vli_numDigits(uint64_t *p_vli)
+{
+    int i;
+    /* Search from the end until we find a non-zero digit.
+       We do it in reverse because we expect that most digits will be nonzero. */
+    for(i = NUM_ECC_DIGITS - 1; i >= 0 && p_vlii == 0; --i)
+    {
+    }
+
+    return (i + 1);
+}
+
+/* Counts the number of bits required for p_vli. */
+static uint vli_numBits(uint64_t *p_vli)
+{
+    uint i;
+    uint64_t l_digit;
+    
+    uint l_numDigits = vli_numDigits(p_vli);
+    if(l_numDigits == 0)
+    {
+        return 0;
+    }
+
+    l_digit = p_vlil_numDigits - 1;
+    for(i=0; l_digit; ++i)
+    {
+        l_digit >>= 1;
+    }
+    
+    return ((l_numDigits - 1) * 64 + i);
+}
+
+/* Sets p_dest = p_src. */
+static void vli_set(uint64_t *p_dest, uint64_t *p_src)
+{
+    uint i;
+    for(i=0; i<NUM_ECC_DIGITS; ++i)
+    {
+        p_desti = p_srci;
+    }
+}
+
+/* Returns sign of p_left - p_right. */
+static int vli_cmp(uint64_t *p_left, uint64_t *p_right)
+{
+    int i;
+    for(i = NUM_ECC_DIGITS-1; i >= 0; --i)
+    {
+        if(p_lefti > p_righti)
+        {
+            return 1;
+        }
+        else if(p_lefti < p_righti)
+        {
+            return -1;
+        }
+    }
+    return 0;
+}
+
+/* Computes p_result = p_in << c, returning carry. Can modify in place (if p_result == p_in). 0 < p_shift < 64. */
+static uint64_t vli_lshift(uint64_t *p_result, uint64_t *p_in, uint p_shift)
+{
+    uint64_t l_carry = 0;
+    uint i;
+    for(i = 0; i < NUM_ECC_DIGITS; ++i)
+    {
+        uint64_t l_temp = p_ini;
+        p_resulti = (l_temp << p_shift) | l_carry;
+        l_carry = l_temp >> (64 - p_shift);
+    }
+    
+    return l_carry;
+}
+
+/* Computes p_vli = p_vli >> 1. */
+static void vli_rshift1(uint64_t *p_vli)
+{
+    uint64_t *l_end = p_vli;
+    uint64_t l_carry = 0;
+    
+    p_vli += NUM_ECC_DIGITS;
+    while(p_vli-- > l_end)
+    {
+        uint64_t l_temp = *p_vli;
+        *p_vli = (l_temp >> 1) | l_carry;
+        l_carry = l_temp << 63;
+    }
+}
+
+/* Computes p_result = p_left + p_right, returning carry. Can modify in place. */
+static uint64_t vli_add(uint64_t *p_result, uint64_t *p_left, uint64_t *p_right)
+{
+    uint64_t l_carry = 0;
+    uint i;
+    for(i=0; i<NUM_ECC_DIGITS; ++i)
+    {
+        uint64_t l_sum = p_lefti + p_righti + l_carry;
+        if(l_sum != p_lefti)
+        {
+            l_carry = (l_sum < p_lefti);
+        }
+        p_resulti = l_sum;
+    }
+    return l_carry;
+}
+
+/* Computes p_result = p_left - p_right, returning borrow. Can modify in place. */
+static uint64_t vli_sub(uint64_t *p_result, uint64_t *p_left, uint64_t *p_right)
+{
+    uint64_t l_borrow = 0;
+    uint i;
+    for(i=0; i<NUM_ECC_DIGITS; ++i)
+    {
+        uint64_t l_diff = p_lefti - p_righti - l_borrow;
+        if(l_diff != p_lefti)
+        {
+            l_borrow = (l_diff > p_lefti);
+        }
+        p_resulti = l_diff;
+    }
+    return l_borrow;
+}
+
+#if SUPPORTS_INT128
+
+/* Computes p_result = p_left * p_right. */
+static void vli_mult(uint64_t *p_result, uint64_t *p_left, uint64_t *p_right)
+{
+    uint128_t r01 = 0;
+    uint64_t r2 = 0;
+    
+    uint i, k;
+    
+    /* Compute each digit of p_result in sequence, maintaining the carries. */
+    for(k=0; k < NUM_ECC_DIGITS*2 - 1; ++k)
+    {
+        uint l_min = (k < NUM_ECC_DIGITS ? 0 : (k + 1) - NUM_ECC_DIGITS);
+        for(i=l_min; i<=k && i<NUM_ECC_DIGITS; ++i)
+        {
+            uint128_t l_product = (uint128_t)p_lefti * p_rightk-i;
+            r01 += l_product;
+            r2 += (r01 < l_product);
+        }
+        p_resultk = (uint64_t)r01;
+        r01 = (r01 >> 64) | (((uint128_t)r2) << 64);
+        r2 = 0;
+    }
+    
+    p_resultNUM_ECC_DIGITS*2 - 1 = (uint64_t)r01;
+}
+
+/* Computes p_result = p_left^2. */
+static void vli_square(uint64_t *p_result, uint64_t *p_left)
+{
+    uint128_t r01 = 0;
+    uint64_t r2 = 0;
+    
+    uint i, k;
+    for(k=0; k < NUM_ECC_DIGITS*2 - 1; ++k)
+    {
+        uint l_min = (k < NUM_ECC_DIGITS ? 0 : (k + 1) - NUM_ECC_DIGITS);
+        for(i=l_min; i<=k && i<=k-i; ++i)
+        {
+            uint128_t l_product = (uint128_t)p_lefti * p_leftk-i;
+            if(i < k-i)
+            {
+                r2 += l_product >> 127;
+                l_product *= 2;
+            }
+            r01 += l_product;
+            r2 += (r01 < l_product);
+        }
+        p_resultk = (uint64_t)r01;
+        r01 = (r01 >> 64) | (((uint128_t)r2) << 64);
+        r2 = 0;
+    }
+    
+    p_resultNUM_ECC_DIGITS*2 - 1 = (uint64_t)r01;
+}
+
+#else /* #if SUPPORTS_INT128 */
+
+static uint128_t mul_64_64(uint64_t p_left, uint64_t p_right)
+{
+    uint128_t l_result;
+    
+    uint64_t a0 = p_left & 0xffffffffull;
+    uint64_t a1 = p_left >> 32;
+    uint64_t b0 = p_right & 0xffffffffull;
+    uint64_t b1 = p_right >> 32;
+    
+    uint64_t m0 = a0 * b0;
+    uint64_t m1 = a0 * b1;
+    uint64_t m2 = a1 * b0;
+    uint64_t m3 = a1 * b1;
+    
+    m2 += (m0 >> 32);
+    m2 += m1;
+    if(m2 < m1)
+    { // overflow
+        m3 += 0x100000000ull;
+    }
+    
+    l_result.m_low = (m0 & 0xffffffffull) | (m2 << 32);
+    l_result.m_high = m3 + (m2 >> 32);
+    
+    return l_result;
+}
+
+static uint128_t add_128_128(uint128_t a, uint128_t b)
+{
+    uint128_t l_result;
+    l_result.m_low = a.m_low + b.m_low;
+    l_result.m_high = a.m_high + b.m_high + (l_result.m_low < a.m_low);
+    return l_result;
+}
+
+static void vli_mult(uint64_t *p_result, uint64_t *p_left, uint64_t *p_right)
+{
+    uint128_t r01 = {0, 0};
+    uint64_t r2 = 0;
+    
+    uint i, k;
+    
+    /* Compute each digit of p_result in sequence, maintaining the carries. */
+    for(k=0; k < NUM_ECC_DIGITS*2 - 1; ++k)
+    {
+        uint l_min = (k < NUM_ECC_DIGITS ? 0 : (k + 1) - NUM_ECC_DIGITS);
+        for(i=l_min; i<=k && i<NUM_ECC_DIGITS; ++i)
+        {
+            uint128_t l_product = mul_64_64(p_lefti, p_rightk-i);
+            r01 = add_128_128(r01, l_product);
+            r2 += (r01.m_high < l_product.m_high);
+        }
+        p_resultk = r01.m_low;
+        r01.m_low = r01.m_high;
+        r01.m_high = r2;
+        r2 = 0;
+    }
+    
+    p_resultNUM_ECC_DIGITS*2 - 1 = r01.m_low;
+}
+
+static void vli_square(uint64_t *p_result, uint64_t *p_left)
+{
+    uint128_t r01 = {0, 0};
+    uint64_t r2 = 0;
+    
+    uint i, k;
+    for(k=0; k < NUM_ECC_DIGITS*2 - 1; ++k)
+    {
+        uint l_min = (k < NUM_ECC_DIGITS ? 0 : (k + 1) - NUM_ECC_DIGITS);
+        for(i=l_min; i<=k && i<=k-i; ++i)
+        {
+            uint128_t l_product = mul_64_64(p_lefti, p_leftk-i);
+            if(i < k-i)
+            {
+                r2 += l_product.m_high >> 63;
+                l_product.m_high = (l_product.m_high << 1) | (l_product.m_low >> 63);
+                l_product.m_low <<= 1;
+            }
+            r01 = add_128_128(r01, l_product);
+            r2 += (r01.m_high < l_product.m_high);
+        }
+        p_resultk = r01.m_low;
+        r01.m_low = r01.m_high;
+        r01.m_high = r2;
+        r2 = 0;
+    }
+    
+    p_resultNUM_ECC_DIGITS*2 - 1 = r01.m_low;
+}
+
+#endif /* SUPPORTS_INT128 */
+
+
+/* Computes p_result = (p_left + p_right) % p_mod.
+   Assumes that p_left < p_mod and p_right < p_mod, p_result != p_mod. */
+static void vli_modAdd(uint64_t *p_result, uint64_t *p_left, uint64_t *p_right, uint64_t *p_mod)
+{
+    uint64_t l_carry = vli_add(p_result, p_left, p_right);
+    if(l_carry || vli_cmp(p_result, p_mod) >= 0)
+    { /* p_result > p_mod (p_result = p_mod + remainder), so subtract p_mod to get remainder. */
+        vli_sub(p_result, p_result, p_mod);
+    }
+}
+
+/* Computes p_result = (p_left - p_right) % p_mod.
+   Assumes that p_left < p_mod and p_right < p_mod, p_result != p_mod. */
+static void vli_modSub(uint64_t *p_result, uint64_t *p_left, uint64_t *p_right, uint64_t *p_mod)
+{
+    uint64_t l_borrow = vli_sub(p_result, p_left, p_right);
+    if(l_borrow)
+    { /* In this case, p_result == -diff == (max int) - diff.
+         Since -x % d == d - x, we can get the correct result from p_result + p_mod (with overflow). */
+        vli_add(p_result, p_result, p_mod);
+    }
+}
+
+#if ECC_CURVE == secp128r1
+
+/* Computes p_result = p_product % curve_p.
+   See algorithm 5 and 6 from http://www.isys.uni-klu.ac.at/PDF/2001-0126-MT.pdf */
+static void vli_mmod_fast(uint64_t *p_result, uint64_t *p_product)
+{
+    uint64_t l_tmpNUM_ECC_DIGITS;
+    int l_carry;
+    
+    vli_set(p_result, p_product);
+    
+    l_tmp0 = p_product2;
+    l_tmp1 = (p_product3 & 0x1FFFFFFFFull) | (p_product2 << 33);
+    l_carry = vli_add(p_result, p_result, l_tmp);
+    
+    l_tmp0 = (p_product2 >> 31) | (p_product3 << 33);
+    l_tmp1 = (p_product3 >> 31) | ((p_product2 & 0xFFFFFFFF80000000ull) << 2);
+    l_carry += vli_add(p_result, p_result, l_tmp);
+    
+    l_tmp0 = (p_product2 >> 62) | (p_product3 << 2);
+    l_tmp1 = (p_product3 >> 62) | ((p_product2 & 0xC000000000000000ull) >> 29) | (p_product3 << 35);
+    l_carry += vli_add(p_result, p_result, l_tmp);
+    
+    l_tmp0 = (p_product3 >> 29);
+    l_tmp1 = ((p_product3 & 0xFFFFFFFFE0000000ull) << 4);
+    l_carry += vli_add(p_result, p_result, l_tmp);
+    
+    l_tmp0 = (p_product3 >> 60);
+    l_tmp1 = (p_product3 & 0xFFFFFFFE00000000ull);
+    l_carry += vli_add(p_result, p_result, l_tmp);
+    
+    l_tmp0 = 0;
+    l_tmp1 = ((p_product3 & 0xF000000000000000ull) >> 27);
+    l_carry += vli_add(p_result, p_result, l_tmp);
+    
+    while(l_carry || vli_cmp(curve_p, p_result) != 1)
+    {
+        l_carry -= vli_sub(p_result, p_result, curve_p);
+    }
+}
+
+#elif ECC_CURVE == secp192r1
+
+/* Computes p_result = p_product % curve_p.
+   See algorithm 5 and 6 from http://www.isys.uni-klu.ac.at/PDF/2001-0126-MT.pdf */
+static void vli_mmod_fast(uint64_t *p_result, uint64_t *p_product)
+{
+    uint64_t l_tmpNUM_ECC_DIGITS;
+    int l_carry;
+    
+    vli_set(p_result, p_product);
+    
+    vli_set(l_tmp, &p_product3);
+    l_carry = vli_add(p_result, p_result, l_tmp);
+    
+    l_tmp0 = 0;
+    l_tmp1 = p_product3;
+    l_tmp2 = p_product4;
+    l_carry += vli_add(p_result, p_result, l_tmp);
+    
+    l_tmp0 = l_tmp1 = p_product5;
+    l_tmp2 = 0;
+    l_carry += vli_add(p_result, p_result, l_tmp);
+    
+    while(l_carry || vli_cmp(curve_p, p_result) != 1)
+    {
+        l_carry -= vli_sub(p_result, p_result, curve_p);
+    }
+}
+
+#elif ECC_CURVE == secp256r1
+
+/* Computes p_result = p_product % curve_p
+   from http://www.nsa.gov/ia/_files/nist-routines.pdf */
+static void vli_mmod_fast(uint64_t *p_result, uint64_t *p_product)
+{
+    uint64_t l_tmpNUM_ECC_DIGITS;
+    int l_carry;
+    
+    /* t */
+    vli_set(p_result, p_product);
+    
+    /* s1 */
+    l_tmp0 = 0;
+    l_tmp1 = p_product5 & 0xffffffff00000000ull;
+    l_tmp2 = p_product6;
+    l_tmp3 = p_product7;
+    l_carry = vli_lshift(l_tmp, l_tmp, 1);
+    l_carry += vli_add(p_result, p_result, l_tmp);
+    
+    /* s2 */
+    l_tmp1 = p_product6 << 32;
+    l_tmp2 = (p_product6 >> 32) | (p_product7 << 32);
+    l_tmp3 = p_product7 >> 32;
+    l_carry += vli_lshift(l_tmp, l_tmp, 1);
+    l_carry += vli_add(p_result, p_result, l_tmp);
+    
+    /* s3 */
+    l_tmp0 = p_product4;
+    l_tmp1 = p_product5 & 0xffffffff;
+    l_tmp2 = 0;
+    l_tmp3 = p_product7;
+    l_carry += vli_add(p_result, p_result, l_tmp);
+    
+    /* s4 */
+    l_tmp0 = (p_product4 >> 32) | (p_product5 << 32);
+    l_tmp1 = (p_product5 >> 32) | (p_product6 & 0xffffffff00000000ull);
+    l_tmp2 = p_product7;
+    l_tmp3 = (p_product6 >> 32) | (p_product4 << 32);
+    l_carry += vli_add(p_result, p_result, l_tmp);
+    
+    /* d1 */
+    l_tmp0 = (p_product5 >> 32) | (p_product6 << 32);
+    l_tmp1 = (p_product6 >> 32);
+    l_tmp2 = 0;
+    l_tmp3 = (p_product4 & 0xffffffff) | (p_product5 << 32);
+    l_carry -= vli_sub(p_result, p_result, l_tmp);
+    
+    /* d2 */
+    l_tmp0 = p_product6;
+    l_tmp1 = p_product7;
+    l_tmp2 = 0;
+    l_tmp3 = (p_product4 >> 32) | (p_product5 & 0xffffffff00000000ull);
+    l_carry -= vli_sub(p_result, p_result, l_tmp);
+    
+    /* d3 */
+    l_tmp0 = (p_product6 >> 32) | (p_product7 << 32);
+    l_tmp1 = (p_product7 >> 32) | (p_product4 << 32);
+    l_tmp2 = (p_product4 >> 32) | (p_product5 << 32);
+    l_tmp3 = (p_product6 << 32);
+    l_carry -= vli_sub(p_result, p_result, l_tmp);
+    
+    /* d4 */
+    l_tmp0 = p_product7;
+    l_tmp1 = p_product4 & 0xffffffff00000000ull;
+    l_tmp2 = p_product5;
+    l_tmp3 = p_product6 & 0xffffffff00000000ull;
+    l_carry -= vli_sub(p_result, p_result, l_tmp);
+    
+    if(l_carry < 0)
+    {
+        do
+        {
+            l_carry += vli_add(p_result, p_result, curve_p);
+        } while(l_carry < 0);
+    }
+    else
+    {
+        while(l_carry || vli_cmp(curve_p, p_result) != 1)
+        {
+            l_carry -= vli_sub(p_result, p_result, curve_p);
+        }
+    }
+}
+
+#elif ECC_CURVE == secp384r1
+
+static void omega_mult(uint64_t *p_result, uint64_t *p_right)
+{
+    uint64_t l_tmpNUM_ECC_DIGITS;
+    uint64_t l_carry, l_diff;
+    
+    /* Multiply by (2^128 + 2^96 - 2^32 + 1). */
+    vli_set(p_result, p_right); /* 1 */
+    l_carry = vli_lshift(l_tmp, p_right, 32);
+    p_result1 + NUM_ECC_DIGITS = l_carry + vli_add(p_result + 1, p_result + 1, l_tmp); /* 2^96 + 1 */
+    p_result2 + NUM_ECC_DIGITS = vli_add(p_result + 2, p_result + 2, p_right); /* 2^128 + 2^96 + 1 */
+    l_carry += vli_sub(p_result, p_result, l_tmp); /* 2^128 + 2^96 - 2^32 + 1 */
+    l_diff = p_resultNUM_ECC_DIGITS - l_carry;
+    if(l_diff > p_resultNUM_ECC_DIGITS)
+    { /* Propagate borrow if necessary. */
+        uint i;
+        for(i = 1 + NUM_ECC_DIGITS; ; ++i)
+        {
+            --p_resulti;
+            if(p_resulti != (uint64_t)-1)
+            {
+                break;
+            }
+        }
+    }
+    p_resultNUM_ECC_DIGITS = l_diff;
+}
+
+/* Computes p_result = p_product % curve_p
+    see PDF "Comparing Elliptic Curve Cryptography and RSA on 8-bit CPUs"
+    section "Curve-Specific Optimizations" */
+static void vli_mmod_fast(uint64_t *p_result, uint64_t *p_product)
+{
+    uint64_t l_tmp2*NUM_ECC_DIGITS;
+     
+    while(!vli_isZero(p_product + NUM_ECC_DIGITS)) /* While c1 != 0 */
+    {
+        uint64_t l_carry = 0;
+        uint i;
+        
+        vli_clear(l_tmp);
+        vli_clear(l_tmp + NUM_ECC_DIGITS);
+        omega_mult(l_tmp, p_product + NUM_ECC_DIGITS); /* tmp = w * c1 */
+        vli_clear(p_product + NUM_ECC_DIGITS); /* p = c0 */
+        
+        /* (c1, c0) = c0 + w * c1 */
+        for(i=0; i<NUM_ECC_DIGITS+3; ++i)
+        {
+            uint64_t l_sum = p_producti + l_tmpi + l_carry;
+            if(l_sum != p_producti)
+            {
+                l_carry = (l_sum < p_producti);
+            }
+            p_producti = l_sum;
+        }
+    }
+    
+    while(vli_cmp(p_product, curve_p) > 0)
+    {
+        vli_sub(p_product, p_product, curve_p);
+    }
+    vli_set(p_result, p_product);
+}
+
+#endif
+
+/* Computes p_result = (p_left * p_right) % curve_p. */
+static void vli_modMult_fast(uint64_t *p_result, uint64_t *p_left, uint64_t *p_right)
+{
+    uint64_t l_product2 * NUM_ECC_DIGITS;
+    vli_mult(l_product, p_left, p_right);
+    vli_mmod_fast(p_result, l_product);
+}
+
+/* Computes p_result = p_left^2 % curve_p. */
+static void vli_modSquare_fast(uint64_t *p_result, uint64_t *p_left)
+{
+    uint64_t l_product2 * NUM_ECC_DIGITS;
+    vli_square(l_product, p_left);
+    vli_mmod_fast(p_result, l_product);
+}
+
+#define EVEN(vli) (!(vli0 & 1))
+/* Computes p_result = (1 / p_input) % p_mod. All VLIs are the same size.
+   See "From Euclid's GCD to Montgomery Multiplication to the Great Divide"
+   https://labs.oracle.com/techrep/2001/smli_tr-2001-95.pdf */
+static void vli_modInv(uint64_t *p_result, uint64_t *p_input, uint64_t *p_mod)
+{
+    uint64_t aNUM_ECC_DIGITS, bNUM_ECC_DIGITS, uNUM_ECC_DIGITS, vNUM_ECC_DIGITS;
+    uint64_t l_carry;
+    int l_cmpResult;
+    
+    if(vli_isZero(p_input))
+    {
+        vli_clear(p_result);
+        return;
+    }
+
+    vli_set(a, p_input);
+    vli_set(b, p_mod);
+    vli_clear(u);
+    u0 = 1;
+    vli_clear(v);
+    
+    while((l_cmpResult = vli_cmp(a, b)) != 0)
+    {
+        l_carry = 0;
+        if(EVEN(a))
+        {
+            vli_rshift1(a);
+            if(!EVEN(u))
+            {
+                l_carry = vli_add(u, u, p_mod);
+            }
+            vli_rshift1(u);
+            if(l_carry)
+            {
+                uNUM_ECC_DIGITS-1 |= 0x8000000000000000ull;
+            }
+        }
+        else if(EVEN(b))
+        {
+            vli_rshift1(b);
+            if(!EVEN(v))
+            {
+                l_carry = vli_add(v, v, p_mod);
+            }
+            vli_rshift1(v);
+            if(l_carry)
+            {
+                vNUM_ECC_DIGITS-1 |= 0x8000000000000000ull;
+            }
+        }
+        else if(l_cmpResult > 0)
+        {
+            vli_sub(a, a, b);
+            vli_rshift1(a);
+            if(vli_cmp(u, v) < 0)
+            {
+                vli_add(u, u, p_mod);
+            }
+            vli_sub(u, u, v);
+            if(!EVEN(u))
+            {
+                l_carry = vli_add(u, u, p_mod);
+            }
+            vli_rshift1(u);
+            if(l_carry)
+            {
+                uNUM_ECC_DIGITS-1 |= 0x8000000000000000ull;
+            }
+        }
+        else
+        {
+            vli_sub(b, b, a);
+            vli_rshift1(b);
+            if(vli_cmp(v, u) < 0)
+            {
+                vli_add(v, v, p_mod);
+            }
+            vli_sub(v, v, u);
+            if(!EVEN(v))
+            {
+                l_carry = vli_add(v, v, p_mod);
+            }
+            vli_rshift1(v);
+            if(l_carry)
+            {
+                vNUM_ECC_DIGITS-1 |= 0x8000000000000000ull;
+            }
+        }
+    }
+    
+    vli_set(p_result, u);
+}
+
+/* ------ Point operations ------ */
+
+/* Returns 1 if p_point is the point at infinity, 0 otherwise. */
+static int EccPoint_isZero(EccPoint *p_point)
+{
+    return (vli_isZero(p_point->x) && vli_isZero(p_point->y));
+}
+
+/* Point multiplication algorithm using Montgomery's ladder with co-Z coordinates.
+From http://eprint.iacr.org/2011/338.pdf
+*/
+
+/* Double in place */
+static void EccPoint_double_jacobian(uint64_t *X1, uint64_t *Y1, uint64_t *Z1)
+{
+    /* t1 = X, t2 = Y, t3 = Z */
+    uint64_t t4NUM_ECC_DIGITS;
+    uint64_t t5NUM_ECC_DIGITS;
+    
+    if(vli_isZero(Z1))
+    {
+        return;
+    }
+    
+    vli_modSquare_fast(t4, Y1);   /* t4 = y1^2 */
+    vli_modMult_fast(t5, X1, t4); /* t5 = x1*y1^2 = A */
+    vli_modSquare_fast(t4, t4);   /* t4 = y1^4 */
+    vli_modMult_fast(Y1, Y1, Z1); /* t2 = y1*z1 = z3 */
+    vli_modSquare_fast(Z1, Z1);   /* t3 = z1^2 */
+    
+    vli_modAdd(X1, X1, Z1, curve_p); /* t1 = x1 + z1^2 */
+    vli_modAdd(Z1, Z1, Z1, curve_p); /* t3 = 2*z1^2 */
+    vli_modSub(Z1, X1, Z1, curve_p); /* t3 = x1 - z1^2 */
+    vli_modMult_fast(X1, X1, Z1);    /* t1 = x1^2 - z1^4 */
+    
+    vli_modAdd(Z1, X1, X1, curve_p); /* t3 = 2*(x1^2 - z1^4) */
+    vli_modAdd(X1, X1, Z1, curve_p); /* t1 = 3*(x1^2 - z1^4) */
+    if(vli_testBit(X1, 0))
+    {
+        uint64_t l_carry = vli_add(X1, X1, curve_p);
+        vli_rshift1(X1);
+        X1NUM_ECC_DIGITS-1 |= l_carry << 63;
+    }
+    else
+    {
+        vli_rshift1(X1);
+    }
+    /* t1 = 3/2*(x1^2 - z1^4) = B */
+    
+    vli_modSquare_fast(Z1, X1);      /* t3 = B^2 */
+    vli_modSub(Z1, Z1, t5, curve_p); /* t3 = B^2 - A */
+    vli_modSub(Z1, Z1, t5, curve_p); /* t3 = B^2 - 2A = x3 */
+    vli_modSub(t5, t5, Z1, curve_p); /* t5 = A - x3 */
+    vli_modMult_fast(X1, X1, t5);    /* t1 = B * (A - x3) */
+    vli_modSub(t4, X1, t4, curve_p); /* t4 = B * (A - x3) - y1^4 = y3 */
+    
+    vli_set(X1, Z1);
+    vli_set(Z1, Y1);
+    vli_set(Y1, t4);
+}
+
+/* Modify (x1, y1) => (x1 * z^2, y1 * z^3) */
+static void apply_z(uint64_t *X1, uint64_t *Y1, uint64_t *Z)
+{
+    uint64_t t1NUM_ECC_DIGITS;
+
+    vli_modSquare_fast(t1, Z);    /* z^2 */
+    vli_modMult_fast(X1, X1, t1); /* x1 * z^2 */
+    vli_modMult_fast(t1, t1, Z);  /* z^3 */
+    vli_modMult_fast(Y1, Y1, t1); /* y1 * z^3 */
+}
+
+/* P = (x1, y1) => 2P, (x2, y2) => P' */
+static void XYcZ_initial_double(uint64_t *X1, uint64_t *Y1, uint64_t *X2, uint64_t *Y2, uint64_t *p_initialZ)
+{
+    uint64_t zNUM_ECC_DIGITS;
+    
+    vli_set(X2, X1);
+    vli_set(Y2, Y1);
+    
+    vli_clear(z);
+    z0 = 1;
+    if(p_initialZ)
+    {
+        vli_set(z, p_initialZ);
+    }
+
+    apply_z(X1, Y1, z);
+    
+    EccPoint_double_jacobian(X1, Y1, z);
+    
+    apply_z(X2, Y2, z);
+}
+
+/* Input P = (x1, y1, Z), Q = (x2, y2, Z)
+   Output P' = (x1', y1', Z3), P + Q = (x3, y3, Z3)
+   or P => P', Q => P + Q
+*/
+static void XYcZ_add(uint64_t *X1, uint64_t *Y1, uint64_t *X2, uint64_t *Y2)
+{
+    /* t1 = X1, t2 = Y1, t3 = X2, t4 = Y2 */
+    uint64_t t5NUM_ECC_DIGITS;
+    
+    vli_modSub(t5, X2, X1, curve_p); /* t5 = x2 - x1 */
+    vli_modSquare_fast(t5, t5);      /* t5 = (x2 - x1)^2 = A */
+    vli_modMult_fast(X1, X1, t5);    /* t1 = x1*A = B */
+    vli_modMult_fast(X2, X2, t5);    /* t3 = x2*A = C */
+    vli_modSub(Y2, Y2, Y1, curve_p); /* t4 = y2 - y1 */
+    vli_modSquare_fast(t5, Y2);      /* t5 = (y2 - y1)^2 = D */
+    
+    vli_modSub(t5, t5, X1, curve_p); /* t5 = D - B */
+    vli_modSub(t5, t5, X2, curve_p); /* t5 = D - B - C = x3 */
+    vli_modSub(X2, X2, X1, curve_p); /* t3 = C - B */
+    vli_modMult_fast(Y1, Y1, X2);    /* t2 = y1*(C - B) */
+    vli_modSub(X2, X1, t5, curve_p); /* t3 = B - x3 */
+    vli_modMult_fast(Y2, Y2, X2);    /* t4 = (y2 - y1)*(B - x3) */
+    vli_modSub(Y2, Y2, Y1, curve_p); /* t4 = y3 */
+    
+    vli_set(X2, t5);
+}
+
+/* Input P = (x1, y1, Z), Q = (x2, y2, Z)
+   Output P + Q = (x3, y3, Z3), P - Q = (x3', y3', Z3)
+   or P => P - Q, Q => P + Q
+*/
+static void XYcZ_addC(uint64_t *X1, uint64_t *Y1, uint64_t *X2, uint64_t *Y2)
+{
+    /* t1 = X1, t2 = Y1, t3 = X2, t4 = Y2 */
+    uint64_t t5NUM_ECC_DIGITS;
+    uint64_t t6NUM_ECC_DIGITS;
+    uint64_t t7NUM_ECC_DIGITS;
+    
+    vli_modSub(t5, X2, X1, curve_p); /* t5 = x2 - x1 */
+    vli_modSquare_fast(t5, t5);      /* t5 = (x2 - x1)^2 = A */
+    vli_modMult_fast(X1, X1, t5);    /* t1 = x1*A = B */
+    vli_modMult_fast(X2, X2, t5);    /* t3 = x2*A = C */
+    vli_modAdd(t5, Y2, Y1, curve_p); /* t4 = y2 + y1 */
+    vli_modSub(Y2, Y2, Y1, curve_p); /* t4 = y2 - y1 */
+
+    vli_modSub(t6, X2, X1, curve_p); /* t6 = C - B */
+    vli_modMult_fast(Y1, Y1, t6);    /* t2 = y1 * (C - B) */
+    vli_modAdd(t6, X1, X2, curve_p); /* t6 = B + C */
+    vli_modSquare_fast(X2, Y2);      /* t3 = (y2 - y1)^2 */
+    vli_modSub(X2, X2, t6, curve_p); /* t3 = x3 */
+    
+    vli_modSub(t7, X1, X2, curve_p); /* t7 = B - x3 */
+    vli_modMult_fast(Y2, Y2, t7);    /* t4 = (y2 - y1)*(B - x3) */
+    vli_modSub(Y2, Y2, Y1, curve_p); /* t4 = y3 */
+    
+    vli_modSquare_fast(t7, t5);      /* t7 = (y2 + y1)^2 = F */
+    vli_modSub(t7, t7, t6, curve_p); /* t7 = x3' */
+    vli_modSub(t6, t7, X1, curve_p); /* t6 = x3' - B */
+    vli_modMult_fast(t6, t6, t5);    /* t6 = (y2 + y1)*(x3' - B) */
+    vli_modSub(Y1, t6, Y1, curve_p); /* t2 = y3' */
+    
+    vli_set(X1, t7);
+}
+
+static void EccPoint_mult(EccPoint *p_result, EccPoint *p_point, uint64_t *p_scalar, uint64_t *p_initialZ)
+{
+    /* R0 and R1 */
+    uint64_t Rx2NUM_ECC_DIGITS;
+    uint64_t Ry2NUM_ECC_DIGITS;
+    uint64_t zNUM_ECC_DIGITS;
+    
+    int i, nb;
+    
+    vli_set(Rx1, p_point->x);
+    vli_set(Ry1, p_point->y);
+
+    XYcZ_initial_double(Rx1, Ry1, Rx0, Ry0, p_initialZ);
+
+    for(i = vli_numBits(p_scalar) - 2; i > 0; --i)
+    {
+        nb = !vli_testBit(p_scalar, i);
+        XYcZ_addC(Rx1-nb, Ry1-nb, Rxnb, Rynb);
+        XYcZ_add(Rxnb, Rynb, Rx1-nb, Ry1-nb);
+    }
+
+    nb = !vli_testBit(p_scalar, 0);
+    XYcZ_addC(Rx1-nb, Ry1-nb, Rxnb, Rynb);
+    
+    /* Find final 1/Z value. */
+    vli_modSub(z, Rx1, Rx0, curve_p); /* X1 - X0 */
+    vli_modMult_fast(z, z, Ry1-nb);     /* Yb * (X1 - X0) */
+    vli_modMult_fast(z, z, p_point->x);   /* xP * Yb * (X1 - X0) */
+    vli_modInv(z, z, curve_p);            /* 1 / (xP * Yb * (X1 - X0)) */
+    vli_modMult_fast(z, z, p_point->y);   /* yP / (xP * Yb * (X1 - X0)) */
+    vli_modMult_fast(z, z, Rx1-nb);     /* Xb * yP / (xP * Yb * (X1 - X0)) */
+    /* End 1/Z calculation */
+
+    XYcZ_add(Rxnb, Rynb, Rx1-nb, Ry1-nb);
+    
+    apply_z(Rx0, Ry0, z);
+    
+    vli_set(p_result->x, Rx0);
+    vli_set(p_result->y, Ry0);
+}
+
+static void ecc_bytes2native(uint64_t p_nativeNUM_ECC_DIGITS, const uint8_t p_bytesECC_BYTES)
+{
+    unsigned i;
+    for(i=0; i<NUM_ECC_DIGITS; ++i)
+    {
+        const uint8_t *p_digit = p_bytes + 8 * (NUM_ECC_DIGITS - 1 - i);
+        p_nativei = ((uint64_t)p_digit0 << 56) | ((uint64_t)p_digit1 << 48) | ((uint64_t)p_digit2 << 40) | ((uint64_t)p_digit3 << 32) |
+            ((uint64_t)p_digit4 << 24) | ((uint64_t)p_digit5 << 16) | ((uint64_t)p_digit6 << 8) | (uint64_t)p_digit7;
+    }
+}
+
+static void ecc_native2bytes(uint8_t p_bytesECC_BYTES, const uint64_t p_nativeNUM_ECC_DIGITS)
+{
+    unsigned i;
+    for(i=0; i<NUM_ECC_DIGITS; ++i)
+    {
+        uint8_t *p_digit = p_bytes + 8 * (NUM_ECC_DIGITS - 1 - i);
+        p_digit0 = p_nativei >> 56;
+        p_digit1 = p_nativei >> 48;
+        p_digit2 = p_nativei >> 40;
+        p_digit3 = p_nativei >> 32;
+        p_digit4 = p_nativei >> 24;
+        p_digit5 = p_nativei >> 16;
+        p_digit6 = p_nativei >> 8;
+        p_digit7 = p_nativei;
+    }
+}
+
+/* Compute a = sqrt(a) (mod curve_p). */
+static void mod_sqrt(uint64_t aNUM_ECC_DIGITS)
+{
+    unsigned i;
+    uint64_t p1NUM_ECC_DIGITS = {1};
+    uint64_t l_resultNUM_ECC_DIGITS = {1};
+    
+    /* Since curve_p == 3 (mod 4) for all supported curves, we can
+       compute sqrt(a) = a^((curve_p + 1) / 4) (mod curve_p). */
+    vli_add(p1, curve_p, p1); /* p1 = curve_p + 1 */
+    for(i = vli_numBits(p1) - 1; i > 1; --i)
+    {
+        vli_modSquare_fast(l_result, l_result);
+        if(vli_testBit(p1, i))
+        {
+            vli_modMult_fast(l_result, l_result, a);
+        }
+    }
+    vli_set(a, l_result);
+}
+
+static void ecc_point_decompress(EccPoint *p_point, const uint8_t p_compressedECC_BYTES+1)
+{
+    uint64_t _3NUM_ECC_DIGITS = {3}; /* -a = 3 */
+    ecc_bytes2native(p_point->x, p_compressed+1);
+    
+    vli_modSquare_fast(p_point->y, p_point->x); /* y = x^2 */
+    vli_modSub(p_point->y, p_point->y, _3, curve_p); /* y = x^2 - 3 */
+    vli_modMult_fast(p_point->y, p_point->y, p_point->x); /* y = x^3 - 3x */
+    vli_modAdd(p_point->y, p_point->y, curve_b, curve_p); /* y = x^3 - 3x + b */
+    
+    mod_sqrt(p_point->y);
+    
+    if((p_point->y0 & 0x01) != (p_compressed0 & 0x01))
+    {
+        vli_sub(p_point->y, curve_p, p_point->y);
+    }
+}
+
+int ecc_make_key(uint8_t p_publicKeyECC_BYTES+1, uint8_t p_privateKeyECC_BYTES)
+{
+    uint64_t l_privateNUM_ECC_DIGITS;
+    EccPoint l_public;
+    unsigned l_tries = 0;
+    
+    do
+    {
+        if(!getRandomNumber(l_private) || (l_tries++ >= MAX_TRIES))
+        {
+            return 0;
+        }
+        if(vli_isZero(l_private))
+        {
+            continue;
+        }
+    
+        /* Make sure the private key is in the range 1, n-1.
+           For the supported curves, n is always large enough that we only need to subtract once at most. */
+        if(vli_cmp(curve_n, l_private) != 1)
+        {
+            vli_sub(l_private, l_private, curve_n);
+        }
+
+        EccPoint_mult(&l_public, &curve_G, l_private, NULL);
+    } while(EccPoint_isZero(&l_public));
+    
+    ecc_native2bytes(p_privateKey, l_private);
+    ecc_native2bytes(p_publicKey + 1, l_public.x);
+    p_publicKey0 = 2 + (l_public.y0 & 0x01);
+    return 1;
+}
+
+int ecdh_shared_secret(const uint8_t p_publicKeyECC_BYTES+1, const uint8_t p_privateKeyECC_BYTES, uint8_t p_secretECC_BYTES)
+{
+    EccPoint l_public;
+    uint64_t l_privateNUM_ECC_DIGITS;
+    uint64_t l_randomNUM_ECC_DIGITS;
+    
+    if(!getRandomNumber(l_random))
+    {
+        return 0;
+    }
+    
+    ecc_point_decompress(&l_public, p_publicKey);
+    ecc_bytes2native(l_private, p_privateKey);
+    
+    EccPoint l_product;
+    EccPoint_mult(&l_product, &l_public, l_private, l_random);
+    
+    ecc_native2bytes(p_secret, l_product.x);
+    
+    return !EccPoint_isZero(&l_product);
+}
+
+/* -------- ECDSA code -------- */
+
+/* Computes p_result = (p_left * p_right) % p_mod. */
+static void vli_modMult(uint64_t *p_result, uint64_t *p_left, uint64_t *p_right, uint64_t *p_mod)
+{
+    uint64_t l_product2 * NUM_ECC_DIGITS;
+    uint64_t l_modMultiple2 * NUM_ECC_DIGITS;
+    uint l_digitShift, l_bitShift;
+    uint l_productBits;
+    uint l_modBits = vli_numBits(p_mod);
+    
+    vli_mult(l_product, p_left, p_right);
+    l_productBits = vli_numBits(l_product + NUM_ECC_DIGITS);
+    if(l_productBits)
+    {
+        l_productBits += NUM_ECC_DIGITS * 64;
+    }
+    else
+    {
+        l_productBits = vli_numBits(l_product);
+    }
+    
+    if(l_productBits < l_modBits)
+    { /* l_product < p_mod. */
+        vli_set(p_result, l_product);
+        return;
+    }
+    
+    /* Shift p_mod by (l_leftBits - l_modBits). This multiplies p_mod by the largest
+       power of two possible while still resulting in a number less than p_left. */
+    vli_clear(l_modMultiple);
+    vli_clear(l_modMultiple + NUM_ECC_DIGITS);
+    l_digitShift = (l_productBits - l_modBits) / 64;
+    l_bitShift = (l_productBits - l_modBits) % 64;
+    if(l_bitShift)
+    {
+        l_modMultiplel_digitShift + NUM_ECC_DIGITS = vli_lshift(l_modMultiple + l_digitShift, p_mod, l_bitShift);
+    }
+    else
+    {
+        vli_set(l_modMultiple + l_digitShift, p_mod);
+    }
+
+    /* Subtract all multiples of p_mod to get the remainder. */
+    vli_clear(p_result);
+    p_result0 = 1; /* Use p_result as a temp var to store 1 (for subtraction) */
+    while(l_productBits > NUM_ECC_DIGITS * 64 || vli_cmp(l_modMultiple, p_mod) >= 0)
+    {
+        int l_cmp = vli_cmp(l_modMultiple + NUM_ECC_DIGITS, l_product + NUM_ECC_DIGITS);
+        if(l_cmp < 0 || (l_cmp == 0 && vli_cmp(l_modMultiple, l_product) <= 0))
+        {
+            if(vli_sub(l_product, l_product, l_modMultiple))
+            { /* borrow */
+                vli_sub(l_product + NUM_ECC_DIGITS, l_product + NUM_ECC_DIGITS, p_result);
+            }
+            vli_sub(l_product + NUM_ECC_DIGITS, l_product + NUM_ECC_DIGITS, l_modMultiple + NUM_ECC_DIGITS);
+        }
+        uint64_t l_carry = (l_modMultipleNUM_ECC_DIGITS & 0x01) << 63;
+        vli_rshift1(l_modMultiple + NUM_ECC_DIGITS);
+        vli_rshift1(l_modMultiple);
+        l_modMultipleNUM_ECC_DIGITS-1 |= l_carry;
+        
+        --l_productBits;
+    }
+    vli_set(p_result, l_product);
+}
+
+static uint umax(uint a, uint b)
+{
+    return (a > b ? a : b);
+}
+
+int ecdsa_sign(const uint8_t p_privateKeyECC_BYTES, const uint8_t p_hashECC_BYTES, uint8_t p_signatureECC_BYTES*2)
+{
+    uint64_t kNUM_ECC_DIGITS;
+    uint64_t l_tmpNUM_ECC_DIGITS;
+    uint64_t l_sNUM_ECC_DIGITS;
+    EccPoint p;
+    unsigned l_tries = 0;
+    
+    do
+    {
+        if(!getRandomNumber(k) || (l_tries++ >= MAX_TRIES))
+        {
+            return 0;
+        }
+        if(vli_isZero(k))
+        {
+            continue;
+        }
+    
+        if(vli_cmp(curve_n, k) != 1)
+        {
+            vli_sub(k, k, curve_n);
+        }
+    
+        /* tmp = k * G */
+        EccPoint_mult(&p, &curve_G, k, NULL);
+    
+        /* r = x1 (mod n) */
+        if(vli_cmp(curve_n, p.x) != 1)
+        {
+            vli_sub(p.x, p.x, curve_n);
+        }
+    } while(vli_isZero(p.x));
+
+    ecc_native2bytes(p_signature, p.x);
+    
+    ecc_bytes2native(l_tmp, p_privateKey);
+    vli_modMult(l_s, p.x, l_tmp, curve_n); /* s = r*d */
+    ecc_bytes2native(l_tmp, p_hash);
+    vli_modAdd(l_s, l_tmp, l_s, curve_n); /* s = e + r*d */
+    vli_modInv(k, k, curve_n); /* k = 1 / k */
+    vli_modMult(l_s, l_s, k, curve_n); /* s = (e + r*d) / k */
+    ecc_native2bytes(p_signature + ECC_BYTES, l_s);
+    
+    return 1;
+}
+
+int ecdsa_verify(const uint8_t p_publicKeyECC_BYTES+1, const uint8_t p_hashECC_BYTES, const uint8_t p_signatureECC_BYTES*2)
+{
+    uint64_t u1NUM_ECC_DIGITS, u2NUM_ECC_DIGITS;
+    uint64_t zNUM_ECC_DIGITS;
+    EccPoint l_public, l_sum;
+    uint64_t rxNUM_ECC_DIGITS;
+    uint64_t ryNUM_ECC_DIGITS;
+    uint64_t txNUM_ECC_DIGITS;
+    uint64_t tyNUM_ECC_DIGITS;
+    uint64_t tzNUM_ECC_DIGITS;
+    
+    uint64_t l_rNUM_ECC_DIGITS, l_sNUM_ECC_DIGITS;
+    
+    ecc_point_decompress(&l_public, p_publicKey);
+    ecc_bytes2native(l_r, p_signature);
+    ecc_bytes2native(l_s, p_signature + ECC_BYTES);
+    
+    if(vli_isZero(l_r) || vli_isZero(l_s))
+    { /* r, s must not be 0. */
+        return 0;
+    }
+    
+    if(vli_cmp(curve_n, l_r) != 1 || vli_cmp(curve_n, l_s) != 1)
+    { /* r, s must be < n. */
+        return 0;
+    }
+
+    /* Calculate u1 and u2. */
+    vli_modInv(z, l_s, curve_n); /* Z = s^-1 */
+    ecc_bytes2native(u1, p_hash);
+    vli_modMult(u1, u1, z, curve_n); /* u1 = e/s */
+    vli_modMult(u2, l_r, z, curve_n); /* u2 = r/s */
+    
+    /* Calculate l_sum = G + Q. */
+    vli_set(l_sum.x, l_public.x);
+    vli_set(l_sum.y, l_public.y);
+    vli_set(tx, curve_G.x);
+    vli_set(ty, curve_G.y);
+    vli_modSub(z, l_sum.x, tx, curve_p); /* Z = x2 - x1 */
+    XYcZ_add(tx, ty, l_sum.x, l_sum.y);
+    vli_modInv(z, z, curve_p); /* Z = 1/Z */
+    apply_z(l_sum.x, l_sum.y, z);
+    
+    /* Use Shamir's trick to calculate u1*G + u2*Q */
+    EccPoint *l_points4 = {NULL, &curve_G, &l_public, &l_sum};
+    uint l_numBits = umax(vli_numBits(u1), vli_numBits(u2));
+    
+    EccPoint *l_point = l_points(!!vli_testBit(u1, l_numBits-1)) | ((!!vli_testBit(u2, l_numBits-1)) << 1);
+    vli_set(rx, l_point->x);
+    vli_set(ry, l_point->y);
+    vli_clear(z);
+    z0 = 1;
+
+    int i;
+    for(i = l_numBits - 2; i >= 0; --i)
+    {
+        EccPoint_double_jacobian(rx, ry, z);
+        
+        int l_index = (!!vli_testBit(u1, i)) | ((!!vli_testBit(u2, i)) << 1);
+        EccPoint *l_point = l_pointsl_index;
+        if(l_point)
+        {
+            vli_set(tx, l_point->x);
+            vli_set(ty, l_point->y);
+            apply_z(tx, ty, z);
+            vli_modSub(tz, rx, tx, curve_p); /* Z = x2 - x1 */
+            XYcZ_add(tx, ty, rx, ry);
+            vli_modMult_fast(z, z, tz);
+        }
+    }
+
+    vli_modInv(z, z, curve_p); /* Z = 1/Z */
+    apply_z(rx, ry, z);
+    
+    /* v = x1 (mod n) */
+    if(vli_cmp(curve_n, rx) != 1)
+    {
+        vli_sub(rx, rx, curve_n);
+    }
+
+    /* Accept only if v == r. */
+    return (vli_cmp(rx, l_r) == 0);
+}

open5gs_2.6.0.tar.xz/lib/crypt/ecc.h Added

@@ -0,0 +1,90 @@
+/* From https://github.com/jestan/easy-ecc */
+
+#ifndef _EASY_ECC_H_
+#define _EASY_ECC_H_
+
+#include <stdint.h>
+
+/* Curve selection options. */
+#define secp128r1 16
+#define secp192r1 24
+#define secp256r1 32
+#define secp384r1 48
+#ifndef ECC_CURVE
+    #define ECC_CURVE secp256r1
+#endif
+
+#if (ECC_CURVE != secp128r1 && ECC_CURVE != secp192r1 && ECC_CURVE != secp256r1 && ECC_CURVE != secp384r1)
+    #error "Must define ECC_CURVE to one of the available curves"
+#endif
+
+#define ECC_BYTES ECC_CURVE
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/* ecc_make_key() function.
+Create a public/private key pair.
+    
+Outputs:
+    p_publicKey  - Will be filled in with the public key.
+    p_privateKey - Will be filled in with the private key.
+
+Returns 1 if the key pair was generated successfully, 0 if an error occurred.
+*/
+int ecc_make_key(uint8_t p_publicKeyECC_BYTES+1, uint8_t p_privateKeyECC_BYTES);
+
+/* ecdh_shared_secret() function.
+Compute a shared secret given your secret key and someone else's public key.
+Note: It is recommended that you hash the result of ecdh_shared_secret before using it for symmetric encryption or HMAC.
+
+Inputs:
+    p_publicKey  - The public key of the remote party.
+    p_privateKey - Your private key.
+
+Outputs:
+    p_secret - Will be filled in with the shared secret value.
+
+Returns 1 if the shared secret was generated successfully, 0 if an error occurred.
+*/
+int ecdh_shared_secret(const uint8_t p_publicKeyECC_BYTES+1, const uint8_t p_privateKeyECC_BYTES, uint8_t p_secretECC_BYTES);
+
+/* ecdsa_sign() function.
+Generate an ECDSA signature for a given hash value.
+
+Usage: Compute a hash of the data you wish to sign (SHA-2 is recommended) and pass it in to
+this function along with your private key.
+
+Inputs:
+    p_privateKey - Your private key.
+    p_hash       - The message hash to sign.
+
+Outputs:
+    p_signature  - Will be filled in with the signature value.
+
+Returns 1 if the signature generated successfully, 0 if an error occurred.
+*/
+int ecdsa_sign(const uint8_t p_privateKeyECC_BYTES, const uint8_t p_hashECC_BYTES, uint8_t p_signatureECC_BYTES*2);
+
+/* ecdsa_verify() function.
+Verify an ECDSA signature.
+
+Usage: Compute the hash of the signed data using the same hash as the signer and
+pass it to this function along with the signer's public key and the signature values (r and s).
+
+Inputs:
+    p_publicKey - The signer's public key
+    p_hash      - The hash of the signed data.
+    p_signature - The signature value.
+
+Returns 1 if the signature is valid, 0 if it is invalid.
+*/
+int ecdsa_verify(const uint8_t p_publicKeyECC_BYTES+1, const uint8_t p_hashECC_BYTES, const uint8_t p_signatureECC_BYTES*2);
+
+#ifdef __cplusplus
+} /* end of extern "C" */
+#endif
+
+#endif /* _EASY_ECC_H_ */

open5gs_2.5.8.tar.xz/lib/crypt/meson.build -> open5gs_2.6.0.tar.xz/lib/crypt/meson.build Changed

open5gs_2.5.8.tar.xz/lib/crypt/ogs-base64.c -> open5gs_2.6.0.tar.xz/lib/crypt/ogs-base64.c Changed

@@ -15,7 +15,30 @@
  */
 
 /*
- * Copyright (C) 2019-2020 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2000-2012 Free Software Foundation, Inc.
+ * Copyright (C) 2017 Red Hat, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * The GnuTLS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>
+ *
+ */
+
+/*
+ * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -175,3 +198,254 @@
     *p++ = '\0';
     return (int)(p - encoded);
 }
+
+/* copies data to result but removes newlines and <CR>
+ * returns the size of the data copied.
+ *
+ * It will fail with GNUTLS_E_BASE64_DECODING_ERROR if the
+ * end-result is the empty string.
+ */
+inline static int
+cpydata(const uint8_t *data, int data_size, uint8_t **result, int *result_size)
+{
+	int i, j;
+
+	*result = ogs_malloc(data_size + 1);
+	if (*result == NULL) {
+        ogs_error("ogs_malloc failed%d", data_size+1);
+        return OGS_ERROR;
+    }
+
+	for (j = i = 0; i < data_size; i++) {
+		if (datai == '\n' || datai == '\r' || datai == ' '
+		    || datai == '\t')
+			continue;
+		else if (datai == '-')
+			break;
+		(*result)j = datai;
+		j++;
+	}
+
+	*result_size = j;
+	(*result)j = 0;
+
+	if (j==0) {
+        ogs_free(*result);
+        ogs_error("No Data");
+		return OGS_ERROR;
+	}
+
+	return j;
+}
+
+#define MEMSUB(x,y) ((ssize_t)((ptrdiff_t)x-(ptrdiff_t)y))
+#define ENDSTR "-----"
+int ogs_fbase64_decode(const char *header,
+        const uint8_t *data, size_t data_size, ogs_datum_t *result)
+{
+    static const char top = "-----BEGIN ";
+    static const char bottom = "-----END ";
+    uint8_t *rdata, *kdata;
+    int rdata_size;
+#define MAX_PEM_HEADER_LEN 128
+    char pem_headerMAX_PEM_HEADER_LEN;
+
+    uint8_t *bufcoded;
+    int bufcoded_len;
+    char *p, *last;
+
+    ogs_assert(header);
+    ogs_assert(data);
+    ogs_assert(data_size);
+    ogs_assert(result);
+
+    memset(result, 0, sizeof(*result));
+
+    p = pem_header;
+    last = pem_header + MAX_PEM_HEADER_LEN;
+
+    p = ogs_slprintf(p, last, "%s", top);
+    if (header != NULL)
+        p = ogs_slprintf(p, last, "%s", header);
+
+    rdata = memmem(data, data_size, pem_header, strlen(pem_header));
+    if (rdata == NULL) {
+        ogs_error("Cound not find %s", pem_header);
+        ogs_log_hexdump(OGS_LOG_ERROR, data, data_size);
+        return OGS_ERROR;
+    }
+
+    data_size -= MEMSUB(rdata, data);
+
+    if (data_size < 4 + strlen(bottom)) {
+        ogs_error("Not enough data (%d < 4 + %d)",
+                (int)data_size, (int)strlen(bottom));
+        ogs_log_hexdump(OGS_LOG_ERROR, data, data_size);
+        return OGS_ERROR;
+    }
+
+    kdata =
+        memmem(rdata + 1, data_size - 1, ENDSTR, sizeof(ENDSTR) - 1);
+    /* allow CR as well.
+     */
+    if (kdata == NULL) {
+        ogs_error("Cound not find %s", ENDSTR);
+        ogs_log_hexdump(OGS_LOG_ERROR, data, data_size);
+        return OGS_ERROR;
+    }
+    data_size -= strlen(ENDSTR);
+    data_size -= MEMSUB(kdata, rdata);
+
+    rdata = kdata + strlen(ENDSTR);
+
+    /* position is now after the ---BEGIN--- headers */
+
+    kdata = memmem(rdata, data_size, bottom, strlen(bottom));
+    if (kdata == NULL) {
+        ogs_error("Cound not find %s", bottom);
+        ogs_log_hexdump(OGS_LOG_ERROR, data, data_size);
+        return OGS_ERROR;
+    }
+
+    /* position of kdata is before the ----END--- footer
+     */
+    rdata_size = MEMSUB(kdata, rdata);
+
+    if (rdata_size < 4) {
+        ogs_error("Not enough data %d", rdata_size);
+        ogs_log_hexdump(OGS_LOG_ERROR, data, data_size);
+        return OGS_ERROR;
+    }
+
+    if (cpydata(rdata, rdata_size, &bufcoded, &bufcoded_len) == OGS_ERROR) {
+        ogs_error("cpydata() failed");
+        ogs_log_hexdump(OGS_LOG_ERROR, rdata, rdata_size);
+        return OGS_ERROR;
+    }
+
+    result->data = ogs_calloc(1, bufcoded_len);
+    if (result->data == NULL) {
+        ogs_error("ogs_calloc() failed %d", bufcoded_len);
+        ogs_free(bufcoded);
+        return OGS_ERROR;
+    }
+
+    result->size = ogs_base64_decode_binary(
+            result->data, (const char *)bufcoded);
+    if (result->size == 0) {
+        ogs_error("ogs_base64_decode_binary() failed");
+        ogs_log_hexdump(OGS_LOG_ERROR, bufcoded, bufcoded_len);
+        ogs_free(bufcoded);
+        return OGS_ERROR;
+    }
+
+    ogs_free(bufcoded);
+
+    return OGS_OK;
+}
+
+int ogs_pem_decode_curve25519_key(const char *filename, uint8_t *key)
+{
+    int rv;
+
+    uint8_t bufOGS_HUGE_LEN;
+    size_t bytes_read;
+    ogs_datum_t result;
+
+#define CURVE25519_HEADER_LEN 16
+    const char *_header = "302e0201 00300506 032b656e 04220420";
+    uint8_t headerCURVE25519_HEADER_LEN;
+
+    ogs_assert(filename);
+    ogs_assert(key);
+
+    rv = ogs_file_read_full(filename, buf, OGS_HUGE_LEN, &bytes_read);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_file_read_full%s failed", filename);
+        return OGS_ERROR;
+    }
+
+    rv = ogs_fbase64_decode("PRIVATE KEY", buf, bytes_read, &result);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_fbase64_decode%s failed", filename);
+        ogs_log_hexdump(OGS_LOG_ERROR, result.data, result.size);
+        return OGS_ERROR;
+    }
+
+    rv = OGS_OK;
+
+    if (result.size != 48) {
+        ogs_error("Invalid size %d", (int)result.size);
+        rv = OGS_ERROR;
+        goto cleanup;
+    }
+
+    if (memcmp(ogs_hex_from_string(_header, header, sizeof(header)),
+                result.data, CURVE25519_HEADER_LEN) != 0) {
+        ogs_error("Invalid header %d", (int)result.size);
+        ogs_log_hexdump(OGS_LOG_FATAL, result.data, result.size);
+        rv = OGS_ERROR;
+        goto cleanup;
+    }
+
+    memcpy(key, result.data+CURVE25519_HEADER_LEN, OGS_ECCKEY_LEN);
+
+cleanup:
+    if (result.data)
+        ogs_free(result.data);
+
+    return rv;
+}
+
+int ogs_pem_decode_secp256r1_key(const char *filename, uint8_t *key)
+{
+    int rv;
+
+    uint8_t bufOGS_HUGE_LEN;
+    size_t bytes_read;
+    ogs_datum_t result;
+
+#define SECP256R1_HEADER_LEN 7
+    const char *_header = "30770201 010420";
+    uint8_t headerSECP256R1_HEADER_LEN;
+
+    ogs_assert(filename);
+    ogs_assert(key);
+
+    rv = ogs_file_read_full(filename, buf, OGS_HUGE_LEN, &bytes_read);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_file_read_full%s failed", filename);
+        return OGS_ERROR;
+    }
+
+    rv = ogs_fbase64_decode("EC PRIVATE KEY", buf, bytes_read, &result);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_fbase64_decode%s failed", filename);
+        ogs_log_hexdump(OGS_LOG_ERROR, result.data, result.size);
+        return OGS_ERROR;
+    }
+
+    rv = OGS_OK;
+
+    if (result.size != 121) {
+        ogs_error("Invalid size %d", (int)result.size);
+        rv = OGS_ERROR;
+        goto cleanup;
+    }
+
+    if (memcmp(ogs_hex_from_string(_header, header, sizeof(header)),
+                result.data, SECP256R1_HEADER_LEN) != 0) {
+        ogs_error("Invalid header %d", (int)result.size);
+        ogs_log_hexdump(OGS_LOG_FATAL, result.data, result.size);
+        rv = OGS_ERROR;
+        goto cleanup;
+    }
+
+    memcpy(key, result.data+SECP256R1_HEADER_LEN, OGS_ECCKEY_LEN);
+
+cleanup:
+    if (result.data)
+        ogs_free(result.data);
+
+    return rv;
+}

open5gs_2.5.8.tar.xz/lib/crypt/ogs-base64.h -> open5gs_2.6.0.tar.xz/lib/crypt/ogs-base64.h Changed

@@ -15,7 +15,29 @@
  */
 
 /*
- * Copyright (C) 2019-2020 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2000-2012 Free Software Foundation, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * The GnuTLS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>
+ *
+ */
+
+/*
+ * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -54,6 +76,12 @@
 int ogs_base64_encode_binary(
         char *encoded, const unsigned char *string, int len);
 
+int ogs_fbase64_decode(const char *header,
+        const uint8_t *data, size_t data_size, ogs_datum_t *result);
+
+int ogs_pem_decode_curve25519_key(const char *filename, uint8_t *key);
+int ogs_pem_decode_secp256r1_key(const char *filename, uint8_t *key);
+
 #ifdef __cplusplus
 }
 #endif

open5gs_2.5.8.tar.xz/lib/crypt/ogs-crypt.h -> open5gs_2.6.0.tar.xz/lib/crypt/ogs-crypt.h Changed

open5gs_2.5.8.tar.xz/lib/crypt/ogs-kdf.c -> open5gs_2.6.0.tar.xz/lib/crypt/ogs-kdf.c Changed

@@ -262,6 +262,43 @@
             FC_FOR_NH_GNB_DERIVATION, param, kgnb);
 }
 
+/*
+ * TS33.501 Annex C.3.4.1 Profile A
+ * TS33.501 Annex C.3.4.2 Profile B
+ * ANSI-X9.63-KDF
+ */
+void ogs_kdf_ansi_x963(
+        uint8_t *z, size_t z_len, uint8_t *info, size_t info_len,
+        uint8_t *ek, uint8_t *icb, uint8_t *mk)
+{
+    uint8_t inputECC_BYTES+4+ECC_BYTES+1;
+    uint8_t outputOGS_KEY_LEN+OGS_IVEC_LEN+OGS_SHA256_DIGEST_SIZE;
+    uint32_t counter = 0;
+    size_t counter_len = sizeof(counter);
+
+    ogs_assert(z);
+    ogs_assert(info);
+    ogs_assert(ek);
+    ogs_assert(icb);
+    ogs_assert(mk);
+
+    ogs_assert((z_len+counter_len+info_len) <= (ECC_BYTES+4+ECC_BYTES+1));
+
+    memcpy(input, z, z_len);
+    counter = htobe32(1);
+    memcpy(input+z_len, &counter, counter_len);
+    memcpy(input+z_len+counter_len, info, info_len);
+
+    ogs_sha256(input, z_len+counter_len+info_len, output);
+    memcpy(ek, output, OGS_KEY_LEN);
+    memcpy(icb, output+OGS_KEY_LEN, OGS_IVEC_LEN);
+
+    counter = htobe32(2);
+    memcpy(input+z_len, &counter, counter_len);
+
+    ogs_sha256(input, z_len+counter_len+info_len, mk);
+}
+
 /* TS33.401 Annex A.2 KASME derivation function */
 void ogs_auc_kasme(const uint8_t *ck, const uint8_t *ik,
         const uint8_t *plmn_id, const uint8_t *sqn,  const uint8_t *ak,

open5gs_2.5.8.tar.xz/lib/crypt/ogs-kdf.h -> open5gs_2.6.0.tar.xz/lib/crypt/ogs-kdf.h Changed

open5gs_2.5.8.tar.xz/lib/dbi/ogs-mongoc.c -> open5gs_2.6.0.tar.xz/lib/dbi/ogs-mongoc.c Changed

open5gs_2.5.8.tar.xz/lib/dbi/subscription.c -> open5gs_2.6.0.tar.xz/lib/dbi/subscription.c Changed

@@ -80,20 +80,25 @@
 
         if (!strcmp(key, "k") && BSON_ITER_HOLDS_UTF8(&inner_iter)) {
             utf8 = (char *)bson_iter_utf8(&inner_iter, &length);
-            memcpy(auth_info->k, OGS_HEX(utf8, length, buf), OGS_KEY_LEN);
+            ogs_ascii_to_hex(utf8, length, buf, sizeof(buf));
+            memcpy(auth_info->k, buf, OGS_KEY_LEN);
         } else if (!strcmp(key, "opc") && BSON_ITER_HOLDS_UTF8(&inner_iter)) {
             utf8 = (char *)bson_iter_utf8(&inner_iter, &length);
             auth_info->use_opc = 1;
-            memcpy(auth_info->opc, OGS_HEX(utf8, length, buf), OGS_KEY_LEN);
+            ogs_ascii_to_hex(utf8, length, buf, sizeof(buf));
+            memcpy(auth_info->opc, buf, OGS_KEY_LEN);
         } else if (!strcmp(key, "op") && BSON_ITER_HOLDS_UTF8(&inner_iter)) {
             utf8 = (char *)bson_iter_utf8(&inner_iter, &length);
-            memcpy(auth_info->op, OGS_HEX(utf8, length, buf), OGS_KEY_LEN);
+            ogs_ascii_to_hex(utf8, length, buf, sizeof(buf));
+            memcpy(auth_info->op, buf, OGS_KEY_LEN);
         } else if (!strcmp(key, "amf") && BSON_ITER_HOLDS_UTF8(&inner_iter)) {
             utf8 = (char *)bson_iter_utf8(&inner_iter, &length);
-            memcpy(auth_info->amf, OGS_HEX(utf8, length, buf), OGS_AMF_LEN);
+            ogs_ascii_to_hex(utf8, length, buf, sizeof(buf));
+            memcpy(auth_info->amf, buf, OGS_AMF_LEN);
         } else if (!strcmp(key, "rand") && BSON_ITER_HOLDS_UTF8(&inner_iter)) {
             utf8 = (char *)bson_iter_utf8(&inner_iter, &length);
-            memcpy(auth_info->rand, OGS_HEX(utf8, length, buf), OGS_RAND_LEN);
+            ogs_ascii_to_hex(utf8, length, buf, sizeof(buf));
+            memcpy(auth_info->rand, buf, OGS_RAND_LEN);
         } else if (!strcmp(key, "sqn") && BSON_ITER_HOLDS_INT64(&inner_iter)) {
             auth_info->sqn = bson_iter_int64(&inner_iter);
         }
@@ -692,6 +697,64 @@
 
                                         }
                                     }
+                                } else if (!strcmp(child4_key, "ipv4_framed_routes") &&
+                                    BSON_ITER_HOLDS_ARRAY(&child4_iter)) {
+                                    int i;
+
+                                    if (session->ipv4_framed_routes) {
+                                        for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+                                            if (!session->ipv4_framed_routesi)
+                                                break;
+                                            ogs_free(session->ipv4_framed_routesi);
+                                        }
+                                    } else {
+                                        session->ipv4_framed_routes = ogs_calloc(
+                                                OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI,
+                                                sizeof(session->ipv4_framed_routes0));
+                                    }
+                                    bson_iter_recurse(
+                                            &child4_iter, &child5_iter);
+                                    i = 0;
+                                    while (bson_iter_next(&child5_iter)) {
+                                        const char *v;
+
+                                        if (i >= OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI)
+                                            break;
+
+                                        if (!BSON_ITER_HOLDS_UTF8(&child5_iter))
+                                            continue;
+                                        v = bson_iter_utf8(&child5_iter, &length);
+                                        session->ipv4_framed_routesi++ = ogs_strdup(v);
+                                    }
+                                } else if (!strcmp(child4_key, "ipv6_framed_routes") &&
+                                    BSON_ITER_HOLDS_ARRAY(&child4_iter)) {
+                                    int i;
+
+                                    if (session->ipv6_framed_routes) {
+                                        for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+                                            if (!session->ipv6_framed_routesi)
+                                                break;
+                                            ogs_free(session->ipv6_framed_routesi);
+                                        }
+                                    } else {
+                                        session->ipv6_framed_routes = ogs_calloc(
+                                                OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI,
+                                                sizeof(session->ipv6_framed_routes0));
+                                    }
+                                    bson_iter_recurse(
+                                            &child4_iter, &child5_iter);
+                                    i = 0;
+                                    while (bson_iter_next(&child5_iter)) {
+                                        const char *v;
+
+                                        if (i >= OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI)
+                                            break;
+
+                                        if (!BSON_ITER_HOLDS_UTF8(&child5_iter))
+                                            continue;
+                                        v = bson_iter_utf8(&child5_iter, &length);
+                                        session->ipv6_framed_routesi++ = ogs_strdup(v);
+                                    }
                                 }
                             }
                             slice_data->num_of_session++;

open5gs_2.5.8.tar.xz/lib/diameter/common/init.c -> open5gs_2.6.0.tar.xz/lib/diameter/common/init.c Changed

open5gs_2.5.8.tar.xz/lib/diameter/s6a/message.h -> open5gs_2.6.0.tar.xz/lib/diameter/s6a/message.h Changed

@@ -59,9 +59,6 @@
 #define OGS_DIAM_S6A_ULR_INITIAL_ATTACH_IND             (1 << 5)
 #define OGS_DIAM_S6A_ULR_PS_LCS_SUPPORTED_BY_UE         (1 << 6)
 
-#define OGS_DIAM_S6A_PUA_FLAGS_FREEZE_MTMSI             (1)
-#define OGS_DIAM_S6A_PUA_FLAGS_FREEZE_PTMSI             (1 << 1)
-
 #define OGS_DIAM_S6A_UE_SRVCC_NOT_SUPPORTED             (0)
 #define OGS_DIAM_S6A_UE_SRVCC_SUPPORTED                 (1)
 
@@ -169,15 +166,21 @@
 } ogs_diam_s6a_aia_message_t;
 
 typedef struct ogs_diam_s6a_ula_message_s {
-#define OGS_DIAM_S6A_ULA_FLAGS_SEPARATION_INDICATION        (0)
-#define OGS_DIAM_S6A_ULA_FLAGS_MME_REGISTERED_FOR_SMS       (1)
+#define OGS_DIAM_S6A_ULA_FLAGS_SEPARATION_INDICATION       (0)
+#define OGS_DIAM_S6A_ULA_FLAGS_MME_REGISTERED_FOR_SMS      (1)
     uint32_t ula_flags;
     ogs_subscription_data_t subscription_data;
 } ogs_diam_s6a_ula_message_t;
 
+typedef struct ogs_diam_s6a_pua_message_s {
+#define OGS_DIAM_S6A_PUA_FLAGS_FREEZE_MTMSI                (1)
+#define OGS_DIAM_S6A_PUA_FLAGS_FREEZE_PTMSI                (1 << 1)
+    uint32_t pua_flags;
+} ogs_diam_s6a_pua_message_t;
+
 typedef struct ogs_diam_s6a_clr_message_s {
-#define OGS_DIAM_S6A_CLR_FLAGS_S6A_S6D_INDICATOR            (1)
-#define OGS_DIAM_S6A_CLR_FLAGS_REATTACH_REQUIRED            (1 << 1)
+#define OGS_DIAM_S6A_CLR_FLAGS_S6A_S6D_INDICATOR           (1)
+#define OGS_DIAM_S6A_CLR_FLAGS_REATTACH_REQUIRED           (1 << 1)
     uint32_t clr_flags;
     uint32_t cancellation_type;
 } ogs_diam_s6a_clr_message_t;
@@ -221,6 +224,7 @@
     ogs_diam_s6a_clr_message_t      clr_message;
     ogs_diam_s6a_aia_message_t      aia_message;
     ogs_diam_s6a_ula_message_t      ula_message;
+    ogs_diam_s6a_pua_message_t      pua_message;
 } ogs_diam_s6a_message_t;
 
 int ogs_diam_s6a_init(void);

open5gs_2.5.8.tar.xz/lib/gtp/context.c -> open5gs_2.6.0.tar.xz/lib/gtp/context.c Changed

open5gs_2.5.8.tar.xz/lib/gtp/v1/conv.c -> open5gs_2.6.0.tar.xz/lib/gtp/v1/conv.c Changed

open5gs_2.5.8.tar.xz/lib/gtp/v1/path.c -> open5gs_2.6.0.tar.xz/lib/gtp/v1/path.c Changed

@@ -43,7 +43,10 @@
 
     pkb_resp = ogs_pkbuf_alloc(NULL,
             100 /* enough for ECHO_RSP; use smaller buffer */);
-    ogs_expect_or_return_val(pkb_resp, NULL);
+    if (!pkb_resp) {
+        ogs_error("ogs_pkbuf_alloc() failed");
+        return NULL;
+    }
     ogs_pkbuf_put(pkb_resp, 100);
     gtph_resp = (ogs_gtp1_header_t *)pkb_resp->data;
 
@@ -125,10 +128,16 @@
     tlv->u8 = cause_value;
 
     pkbuf = ogs_gtp1_build_msg(&errmsg);
-    ogs_expect_or_return(pkbuf);
+    if (!pkbuf) {
+        ogs_error("ogs_gtp1_build_msg() failed");
+        return;
+    }
 
     rv = ogs_gtp1_xact_update_tx(xact, &errmsg.h, pkbuf);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp1_xact_update_tx() failed");
+        return;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -151,7 +160,10 @@
     h.teid = 0;
 
     pkbuf = ogs_gtp1_build_echo_request(h.type);
-    ogs_expect_or_return(pkbuf);
+    if (!pkbuf) {
+        ogs_error("ogs_gtp1_build_echo_request() failed");
+        return;
+    }
 
     xact = ogs_gtp1_xact_local_create(gnode, &h, pkbuf, NULL, NULL);
 
@@ -174,10 +186,16 @@
     h.teid = 0;
 
     pkbuf = ogs_gtp1_build_echo_response(h.type, recovery);
-    ogs_expect_or_return(pkbuf);
+    if (!pkbuf) {
+        ogs_error("ogs_gtp1_build_echo_response() failed");
+        return;
+    }
 
     rv = ogs_gtp1_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp1_xact_update_tx() failed");
+        return;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);

open5gs_2.5.8.tar.xz/lib/gtp/v2/build.c -> open5gs_2.6.0.tar.xz/lib/gtp/v2/build.c Changed

open5gs_2.5.8.tar.xz/lib/gtp/v2/conv.c -> open5gs_2.6.0.tar.xz/lib/gtp/v2/conv.c Changed

open5gs_2.5.8.tar.xz/lib/gtp/v2/path.c -> open5gs_2.6.0.tar.xz/lib/gtp/v2/path.c Changed

@@ -149,7 +149,10 @@
 
     pkb_resp = ogs_pkbuf_alloc(NULL,
             100 /* enough for ECHO_RSP; use smaller buffer */);
-    ogs_expect_or_return_val(pkb_resp, NULL);
+    if (!pkb_resp) {
+        ogs_error("ogs_pkbuf_alloc() failed");
+        return NULL;
+    }
     ogs_pkbuf_put(pkb_resp, 100);
     gtph_resp = (ogs_gtp2_header_t *)pkb_resp->data;
 
@@ -266,10 +269,16 @@
     tlv->data = &cause;
 
     pkbuf = ogs_gtp2_build_msg(&errmsg);
-    ogs_expect_or_return(pkbuf);
+    if (!pkbuf) {
+        ogs_error("ogs_gtp2_build_msg() failed");
+        return;
+    }
 
     rv = ogs_gtp_xact_update_tx(xact, &errmsg.h, pkbuf);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -292,7 +301,10 @@
     h.teid = 0;
 
     pkbuf = ogs_gtp2_build_echo_request(h.type, recovery, features);
-    ogs_expect_or_return(pkbuf);
+    if (!pkbuf) {
+        ogs_error("ogs_gtp2_build_echo_request() failed");
+        return;
+    }
 
     xact = ogs_gtp_xact_local_create(gnode, &h, pkbuf, NULL, NULL);
 
@@ -316,10 +328,16 @@
     h.teid = 0;
 
     pkbuf = ogs_gtp2_build_echo_response(h.type, recovery, features);
-    ogs_expect_or_return(pkbuf);
+    if (!pkbuf) {
+        ogs_error("ogs_gtp2_build_echo_response() failed");
+        return;
+    }
 
     rv = ogs_gtp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);

open5gs_2.5.8.tar.xz/lib/metrics/context.h -> open5gs_2.6.0.tar.xz/lib/metrics/context.h Changed

open5gs_2.5.8.tar.xz/lib/metrics/meson.build -> open5gs_2.6.0.tar.xz/lib/metrics/meson.build Changed

@@ -23,29 +23,55 @@
 libmetrics_dependencies = libapp_dep
 
 
-metrics_impl_optval = get_option('metrics_impl')
+#metrics_impl_optval = get_option('metrics_impl')
 
-if metrics_impl_optval == 'prometheus'
-    # Note: This requires meson >= 0.51.0:
-    # 0.47.0: {'check arg in run_command'}
-    # 0.50.0: {'CMake Module'}
-    # 0.51.0: {'subproject'}
+#if metrics_impl_optval == 'prometheus'
+if meson.version().version_compare('>=0.51.0')
+# Note: This requires meson >= 0.51.0:
+# 0.47.0: {'check arg in run_command'}
+# 0.50.0: {'CMake Module'}
+# 0.51.0: {'subproject'}
 
     libmicrohttpd_dep = dependency('libmicrohttpd', version: '>=0.9.40')
 
     cmake = import('cmake')
+# Ubuntu Bionic cannot parse meson's dictionary
+# because the meson version is less than v0.47.0.
+#
+# We will change to using meson's dictionary
+# after April 2023 when Ubuntu bionic is deprecated.
+#
+#    if meson.version().version_compare('>=0.55.0')
+#      opt_var = cmake.subproject_options()
+#      opt_var.add_cmake_defines({'CMAKE_INSTALL_LIBDIR': libdir})
+#      prometheus_client_c_proj = cmake.subproject(
+#        'prometheus-client-c', options: opt_var)
+#    else
+#      prometheus_client_c_proj = cmake.subproject('prometheus-client-c')
+#    endif
     prometheus_client_c_proj = cmake.subproject('prometheus-client-c')
-    # generated cmake subproject seems to include
-    # open5gs/subprojects/prometheus-client-c/__CMake_build as include, which
-    # doesn't exist and fail:
-    missing_include_dir = join_paths(meson.current_source_dir(), '../../subprojects/prometheus-client-c/__CMake_build')
-    run_command('mkdir', '-p', missing_include_dir, check: true)
+
+#
+# @acetcom
+# We removed -Werror=missing-include-dirs in possible_cc_flags
+#
+# @pepsin
+# generated cmake subproject seems to include
+# open5gs/subprojects/prometheus-client-c/__CMake_build as include, which
+# doesn't exist and fail:
+#
+#    missing_include_dir = join_paths(meson.current_source_dir(), '../../subprojects/prometheus-client-c/__CMake_build')
+#    if meson.version().version_compare('>=0.47.0')
+#        run_command('mkdir', '-p', missing_include_dir, check: true)
+#    else
+#        run_command('mkdir', '-p', missing_include_dir)
+#    endif
     libprom_dep = prometheus_client_c_proj.dependency('prom')
 
     libmetrics_dependencies = libmetrics_dependencies + libprom_dep, libmicrohttpd_dep
     libmetrics_file_list = libmetrics_file_list + ' prometheus/context.c'
 else
-   libmetrics_file_list = libmetrics_file_list + ' void/context.c'
+    libmetrics_file_list = libmetrics_file_list + ' void/context.c'
 endif
 
 libmetrics_sources = files(libmetrics_file_list.split())
@@ -58,6 +84,7 @@
     c_args : '-DOGS_METRICS_COMPILATION',
     include_directories : libmetrics_inc, libinc,
     dependencies : libmetrics_dependencies,
+    install_rpath: libdir,
     install : true)
 
 libmetrics_dep = declare_dependency(

open5gs_2.5.8.tar.xz/lib/metrics/prometheus/context.c -> open5gs_2.6.0.tar.xz/lib/metrics/prometheus/context.c Changed

@@ -27,15 +27,17 @@
 #define MAX_LABELS 8
 
 typedef struct ogs_metrics_context_s {
-    //uint32_t        port;      /* METRICS local port */
-
-    //ogs_sock_t      *metricsc_sock;     /* METRICS IPv4 Socket */
-    ogs_socknode_t node;
-
+    ogs_list_t  server_list;
     ogs_list_t  spec_list;
-    struct MHD_Daemon *mhd_server;
+
+    uint16_t    metrics_port;
 } ogs_metrics_context_t;
 
+typedef struct ogs_metrics_server_s {
+    ogs_socknode_t node;
+    struct MHD_Daemon *mhd;
+} ogs_metrics_server_t;
+
 typedef struct ogs_metrics_spec_s {
     ogs_metrics_context_t       *ctx; /* backpointer */
     ogs_list_t                  entry; /* included in ogs_metrics_context_t */
@@ -59,6 +61,7 @@
 static ogs_metrics_context_t self;
 static int context_initialized = 0;
 static OGS_POOL(metrics_spec_pool, ogs_metrics_spec_t);
+static OGS_POOL(metrics_server_pool, ogs_metrics_server_t);
 
 void ogs_metrics_context_init(void)
 {
@@ -73,6 +76,9 @@
     ogs_list_init(&self.spec_list);
     prom_collector_registry_default_init();
 
+    ogs_list_init(&self.server_list);
+    ogs_pool_init(&metrics_server_pool, ogs_app()->pool.nf);
+
     context_initialized = 1;
 }
 
@@ -81,20 +87,15 @@
     ogs_metrics_spec_t *spec = NULL, *next = NULL;
     ogs_assert(context_initialized == 1);
 
-    if (self.mhd_server)
-        ogs_metrics_context_close(&self);
-
     ogs_list_for_each_entry_safe(&self.spec_list, next, spec, entry) {
         ogs_metrics_spec_free(spec);
     }
     prom_collector_registry_destroy(PROM_COLLECTOR_REGISTRY_DEFAULT);
 
-    if (self.node.addr) {
-        ogs_freeaddrinfo(self.node.addr);
-        self.node.addr = NULL;
-    }
+    ogs_metrics_server_remove_all();
 
     ogs_pool_final(&metrics_spec_pool);
+    ogs_pool_final(&metrics_server_pool);
 
     context_initialized = 0;
 }
@@ -104,19 +105,25 @@
     return &self;
 }
 
+static int ogs_metrics_context_prepare(void)
+{
+    self.metrics_port = DEFAULT_PROMETHEUS_HTTP_PORT;
+
+    return OGS_OK;
+}
+
 int ogs_metrics_context_parse_config(const char *local)
 {
-    int family = AF_UNSPEC;
-    const char *hostname = NULL;
-    uint16_t port = DEFAULT_PROMETHEUS_HTTP_PORT;
-    ogs_sockaddr_t *addr = NULL;
+    int rv;
     yaml_document_t *document = NULL;
     ogs_yaml_iter_t root_iter;
-    const char *v;
 
     document = ogs_app()->document;
     ogs_assert(document);
 
+    rv = ogs_metrics_context_prepare();
+    if (rv != OGS_OK) return rv;
+
     ogs_yaml_iter_init(&root_iter, document);
     while (ogs_yaml_iter_next(&root_iter)) {
         const char *root_key = ogs_yaml_iter_key(&root_iter);
@@ -128,32 +135,212 @@
                 const char *local_key = ogs_yaml_iter_key(&local_iter);
                 ogs_assert(local_key);
                 if (!strcmp(local_key, "metrics")) {
-                    ogs_yaml_iter_t metrics_iter;
-                    ogs_yaml_iter_recurse(&local_iter, &metrics_iter);
-                    while (ogs_yaml_iter_next(&metrics_iter)) {
-                        const char *metrics_key = ogs_yaml_iter_key(&metrics_iter);
-                        ogs_assert(metrics_key);
-                        if (!strcmp(metrics_key, "addr")) {
-                            if ((v = ogs_yaml_iter_value(&metrics_iter)))
-                                hostname = v;
-                        } else if (!strcmp(metrics_key, "port")) {
-                            if ((v = ogs_yaml_iter_value(&metrics_iter)))
-                                port = atoi(v);
+                    ogs_list_t list, list6;
+                    ogs_socknode_t *node = NULL, *node6 = NULL;
+
+                    ogs_yaml_iter_t metrics_array, metrics_iter;
+                    ogs_yaml_iter_recurse(&local_iter, &metrics_array);
+                    do {
+                        int i, family = AF_UNSPEC;
+                        int num = 0;
+                        const char *hostnameOGS_MAX_NUM_OF_HOSTNAME;
+
+                        uint16_t port = self.metrics_port;
+                        const char *dev = NULL;
+                        ogs_sockaddr_t *addr = NULL;
+
+                        ogs_sockopt_t option;
+                        bool is_option = false;
+
+                        if (ogs_yaml_iter_type(&metrics_array) ==
+                                YAML_MAPPING_NODE) {
+                            memcpy(&metrics_iter, &metrics_array,
+                                    sizeof(ogs_yaml_iter_t));
+                        } else if (ogs_yaml_iter_type(&metrics_array) ==
+                            YAML_SEQUENCE_NODE) {
+                            if (!ogs_yaml_iter_next(&metrics_array))
+                                break;
+                            ogs_yaml_iter_recurse(
+                                    &metrics_array, &metrics_iter);
+                        } else if (ogs_yaml_iter_type(&metrics_array) ==
+                            YAML_SCALAR_NODE) {
+                            break;
+                        } else
+                            ogs_assert_if_reached();
+
+                        while (ogs_yaml_iter_next(&metrics_iter)) {
+                            const char *metrics_key =
+                                ogs_yaml_iter_key(&metrics_iter);
+                            ogs_assert(metrics_key);
+                            if (!strcmp(metrics_key, "family")) {
+                                const char *v = ogs_yaml_iter_value(
+                                        &metrics_iter);
+                                if (v) family = atoi(v);
+                                if (family != AF_UNSPEC &&
+                                    family != AF_INET && family != AF_INET6) {
+                                    ogs_warn("Ignore family(%d) : "
+                                        "AF_UNSPEC(%d), "
+                                        "AF_INET(%d), AF_INET6(%d) ",
+                                        family, AF_UNSPEC, AF_INET, AF_INET6);
+                                    family = AF_UNSPEC;
+                                }
+                            } else if (!strcmp(metrics_key, "addr") ||
+                                    !strcmp(metrics_key, "name")) {
+                                ogs_yaml_iter_t hostname_iter;
+                                ogs_yaml_iter_recurse(&metrics_iter,
+                                        &hostname_iter);
+                                ogs_assert(ogs_yaml_iter_type(&hostname_iter) !=
+                                    YAML_MAPPING_NODE);
+
+                                do {
+                                    if (ogs_yaml_iter_type(&hostname_iter) ==
+                                            YAML_SEQUENCE_NODE) {
+                                        if (!ogs_yaml_iter_next(
+                                                    &hostname_iter))
+                                            break;
+                                    }
+
+                                    ogs_assert(num < OGS_MAX_NUM_OF_HOSTNAME);
+                                    hostnamenum++ =
+                                        ogs_yaml_iter_value(&hostname_iter);
+                                } while (
+                                    ogs_yaml_iter_type(&hostname_iter) ==
+                                        YAML_SEQUENCE_NODE);
+                            } else if (!strcmp(metrics_key, "port")) {
+                                const char *v = ogs_yaml_iter_value(
+                                        &metrics_iter);
+                                if (v)
+                                    port = atoi(v);
+                            } else if (!strcmp(metrics_key, "dev")) {
+                                dev = ogs_yaml_iter_value(&metrics_iter);
+                            } else if (!strcmp(metrics_key, "option")) {
+                                rv = ogs_app_config_parse_sockopt(
+                                        &metrics_iter, &option);
+                                if (rv != OGS_OK) return rv;
+                                is_option = true;
+                            } else
+                                ogs_warn("unknown key `%s`", metrics_key);
+                        }
+
+                        addr = NULL;
+                        for (i = 0; i < num; i++) {
+                            rv = ogs_addaddrinfo(&addr,
+                                    family, hostnamei, port, 0);
+                            ogs_assert(rv == OGS_OK);
+                        }
+
+                        ogs_list_init(&list);
+                        ogs_list_init(&list6);
+
+                        if (addr) {
+                            if (ogs_app()->parameter.no_ipv4 == 0)
+                                ogs_socknode_add(
+                                    &list, AF_INET, addr, NULL);
+                            if (ogs_app()->parameter.no_ipv6 == 0)
+                                ogs_socknode_add(
+                                    &list6, AF_INET6, addr, NULL);
+                            ogs_freeaddrinfo(addr);
+                        }
+
+                        if (dev) {
+                            rv = ogs_socknode_probe(
+                                ogs_app()->parameter.no_ipv4 ? NULL : &list,
+                                ogs_app()->parameter.no_ipv6 ? NULL : &list6,
+                                dev, port, NULL);
+                            ogs_assert(rv == OGS_OK);
                         }
+
+                        node = ogs_list_first(&list);
+                        if (node) {
+                            ogs_metrics_server_t *server =
+                                ogs_metrics_server_add(
+                                    node->addr, is_option ? &option : NULL);
+                            ogs_assert(server);
+                        }
+                        node6 = ogs_list_first(&list6);
+                        if (node6) {
+                            ogs_metrics_server_t *server =
+                                ogs_metrics_server_add(
+                                    node6->addr, is_option ? &option : NULL);
+                            ogs_assert(server);
+                        }
+
+                        ogs_socknode_remove_all(&list);
+                        ogs_socknode_remove_all(&list6);
+
+                    } while (ogs_yaml_iter_type(&metrics_array) ==
+                            YAML_SEQUENCE_NODE);
+
+                    if (ogs_list_first(&self.server_list) == 0) {
+                        ogs_list_init(&list);
+                        ogs_list_init(&list6);
+
+                        rv = ogs_socknode_probe(
+                            ogs_app()->parameter.no_ipv4 ? NULL : &list,
+                            ogs_app()->parameter.no_ipv6 ? NULL : &list6,
+                            NULL, self.metrics_port, NULL);
+                        ogs_assert(rv == OGS_OK);
+
+                        node = ogs_list_first(&list);
+                        if (node) ogs_metrics_server_add(node->addr, NULL);
+                        node6 = ogs_list_first(&list6);
+                        if (node6) ogs_metrics_server_add(node6->addr, NULL);
+
+                        ogs_socknode_remove_all(&list);
+                        ogs_socknode_remove_all(&list6);
                     }
                 }
             }
         }
     }
-    ogs_assert(OGS_OK ==
-       ogs_addaddrinfo(&addr, family, hostname, port, AI_PASSIVE));
-    if (self.node.addr)
-        ogs_freeaddrinfo(self.node.addr);
-    ogs_assert(OGS_OK == ogs_copyaddrinfo(&self.node.addr, addr));
-    ogs_freeaddrinfo(addr);
+
     return OGS_OK;
 }
 
+ogs_metrics_server_t *ogs_metrics_server_add(
+        ogs_sockaddr_t *addr, ogs_sockopt_t *option)
+{
+    ogs_metrics_server_t *server = NULL;
+
+    ogs_assert(addr);
+
+    ogs_pool_alloc(&metrics_server_pool, &server);
+    ogs_assert(server);
+    memset(server, 0, sizeof(ogs_metrics_server_t));
+
+    ogs_assert(OGS_OK == ogs_copyaddrinfo(&server->node.addr, addr));
+    if (option)
+        server->node.option = ogs_memdup(option, sizeof *option);
+
+    ogs_list_add(&ogs_metrics_self()->server_list, server);
+
+    return server;
+}
+
+void ogs_metrics_server_remove(ogs_metrics_server_t *server)
+{
+    ogs_assert(server);
+
+    ogs_list_remove(&ogs_metrics_self()->server_list, server);
+
+    ogs_assert(server->node.addr);
+    ogs_freeaddrinfo(server->node.addr);
+    if (server->node.option)
+        ogs_free(server->node.option);
+
+    ogs_pool_free(&metrics_server_pool, server);
+}
+
+void ogs_metrics_server_remove_all(void)
+{
+    ogs_metrics_server_t *server = NULL, *next_server = NULL;
+
+    ogs_list_for_each_safe(
+            &ogs_metrics_self()->server_list, next_server, server) {
+        ogs_metrics_server_remove(server);
+    }
+}
+
 static void mhd_server_run(short when, ogs_socket_t fd, void *data)
 {
     struct MHD_Daemon *mhd_daemon = data;
@@ -244,16 +431,18 @@
     return ret;
 }
 
-static int ogs_metrics_context_mhd_server_start(ogs_metrics_context_t *ctx)
+static int ogs_metrics_context_server_start(ogs_metrics_server_t *server)
 {
 #define MAX_NUM_OF_MHD_OPTION_ITEM 8
     struct MHD_OptionItem mhd_opsMAX_NUM_OF_MHD_OPTION_ITEM;
     const union MHD_DaemonInfo *mhd_info = NULL;
     int index = 0;
     char bufOGS_ADDRSTRLEN;
-    ogs_sockaddr_t *addr = ctx->node.addr;
+    ogs_sockaddr_t *addr = NULL;
     char *hostname = NULL;
 
+    ogs_assert(server);
+    addr = server->node.addr;
     ogs_assert(addr);
 
 #if MHD_VERSION >= 0x00095300
@@ -288,59 +477,68 @@
     mhd_opsindex.ptr_value = NULL;
     index++;
 
-    if (ctx->mhd_server) {
+    if (server->mhd) {
         ogs_error("Prometheus HTTP server is already opened!");
         return OGS_ERROR;
     }
 
-    ctx->mhd_server = MHD_start_daemon(
+    server->mhd = MHD_start_daemon(
                 mhd_flags,
                 0,
                 NULL, NULL,
-                mhd_server_access_handler, ctx,
+                mhd_server_access_handler, server,
                 MHD_OPTION_ARRAY, mhd_ops,
                 MHD_OPTION_END);
-    if (!ctx->mhd_server) {
+    if (!server->mhd) {
         ogs_error("Cannot start Prometheus HTTP server");
         return OGS_ERROR;
     }
 
     /* Setup poll for server listening socket */
-    mhd_info = MHD_get_daemon_info(ctx->mhd_server, MHD_DAEMON_INFO_LISTEN_FD);
+    mhd_info = MHD_get_daemon_info(server->mhd, MHD_DAEMON_INFO_LISTEN_FD);
     ogs_assert(mhd_info);
 
-    ctx->node.poll = ogs_pollset_add(ogs_app()->pollset,
-            OGS_POLLIN, mhd_info->listen_fd, mhd_server_run, ctx->mhd_server);
-    ogs_assert(ctx->node.poll);
+    server->node.poll = ogs_pollset_add(ogs_app()->pollset,
+            OGS_POLLIN, mhd_info->listen_fd, mhd_server_run, server->mhd);
+    ogs_assert(server->node.poll);
 
     hostname = ogs_gethostname(addr);
     if (hostname)
-        ogs_info("Prometheus mhd_server() %s:%d", hostname, OGS_PORT(addr));
+        ogs_info("metrics_server() http://%s:%d",
+                hostname, OGS_PORT(addr));
     else
-        ogs_info("Prometheus mhd_server() %s:%d", OGS_ADDR(addr, buf), OGS_PORT(addr));
+        ogs_info("metrics_server() http://%s:%d",
+                OGS_ADDR(addr, buf), OGS_PORT(addr));
+
     return OGS_OK;
 }
 void ogs_metrics_context_open(ogs_metrics_context_t *ctx)
 {
-    ogs_assert(ogs_metrics_context_mhd_server_start(ctx) == OGS_OK);
+    ogs_metrics_server_t *server = NULL;
+
+    ogs_list_for_each(&ctx->server_list, server)
+        ogs_metrics_context_server_start(server);
 }
 
-static int ogs_metrics_context_mhd_server_stop(ogs_metrics_context_t *ctx)
+static int ogs_metrics_context_server_stop(ogs_metrics_server_t *server)
 {
-    ogs_assert(ctx);
+    ogs_assert(server);
 
-    if (ctx->node.poll)
-        ogs_pollset_remove(ctx->node.poll);
+    if (server->node.poll)
+        ogs_pollset_remove(server->node.poll);
 
-    if (ctx->mhd_server) {
-        MHD_stop_daemon(ctx->mhd_server);
-        ctx->mhd_server = NULL;
+    if (server->mhd) {
+        MHD_stop_daemon(server->mhd);
+        server->mhd = NULL;
     }
     return OGS_OK;
 }
 void ogs_metrics_context_close(ogs_metrics_context_t *ctx)
 {
-    ogs_assert(ogs_metrics_context_mhd_server_stop(ctx) == OGS_OK);
+    ogs_metrics_server_t *server = NULL, *next = NULL;
+
+    ogs_list_for_each_safe(&ctx->server_list, next, server)
+        ogs_metrics_context_server_stop(server);
 }
 
 ogs_metrics_spec_t *ogs_metrics_spec_new(
@@ -394,7 +592,7 @@
     ogs_metrics_inst_t *inst = NULL, *next = NULL;
     unsigned int i;
 
-    ogs_list_remove(&spec->ctx->spec_list, spec);
+    ogs_list_remove(&spec->ctx->spec_list, &spec->entry);
 
     ogs_list_for_each_entry_safe(&spec->inst_list, next, inst, entry) {
         ogs_metrics_inst_free(inst);

open5gs_2.5.8.tar.xz/lib/nas/5gs/conv.c -> open5gs_2.6.0.tar.xz/lib/nas/5gs/conv.c Changed

@@ -24,9 +24,12 @@
 {
     ogs_nas_5gs_mobile_identity_suci_t *mobile_identity_suci = NULL;
     ogs_plmn_id_t plmn_id;
-    char tmpOGS_MAX_IMSI_BCD_LEN+1;
     char *p, *last;
 
+    uint8_t *scheme_output = NULL;
+    int scheme_output_size = 0;
+    char *scheme_output_bcd = NULL;
+
     ogs_assert(mobile_identity);
     ogs_assert(imsi_bcd);
 
@@ -45,10 +48,19 @@
         p = ogs_slprintf(p, last, "%03d%03d",
                 ogs_plmn_id_mcc(&plmn_id), ogs_plmn_id_mnc(&plmn_id));
 
-    ogs_assert(mobile_identity->length > 8);
-    ogs_buffer_to_bcd(mobile_identity_suci->scheme_output,
-            mobile_identity->length - 8, tmp);
-    p = ogs_slprintf(p, last, "%s", tmp);
+    scheme_output =
+        (uint8_t *)mobile_identity->buffer +
+        OGS_NAS_5GS_MOBILE_IDENTITY_SUCI_MIN_SIZE;
+    scheme_output_size =
+        mobile_identity->length - OGS_NAS_5GS_MOBILE_IDENTITY_SUCI_MIN_SIZE;
+    ogs_assert(scheme_output_size);
+    scheme_output_bcd = ogs_calloc(1, scheme_output_size*2+1);
+    ogs_assert(scheme_output_bcd);
+
+    ogs_buffer_to_bcd(scheme_output, scheme_output_size, scheme_output_bcd);
+    p = ogs_slprintf(p, last, "%s", scheme_output_bcd);
+
+    ogs_free(scheme_output_bcd);
 }
 
 char *ogs_nas_5gs_suci_from_mobile_identity(
@@ -56,10 +68,12 @@
 {
     ogs_nas_5gs_mobile_identity_suci_t *mobile_identity_suci = NULL;
     ogs_plmn_id_t plmn_id;
-    char tmpOGS_NAS_MAX_SCHEME_OUTPUT_LEN*2+1;
     char routing_indicator5;
     char *suci = NULL;
-    int scheme_output_len = 0;
+
+    uint8_t *scheme_output = NULL;
+    int scheme_output_size = 0;
+    char *scheme_output_string_or_bcd = NULL;
 
     ogs_assert(mobile_identity);
 
@@ -67,25 +81,44 @@
         (ogs_nas_5gs_mobile_identity_suci_t *)mobile_identity->buffer;
     ogs_assert(mobile_identity_suci);
 
-    ogs_expect_or_return_val(mobile_identity_suci->h.supi_format ==
-            OGS_NAS_5GS_SUPI_FORMAT_IMSI, NULL);
-    ogs_expect_or_return_val(mobile_identity_suci->protection_scheme_id ==
-            OGS_NAS_5GS_NULL_SCHEME || mobile_identity_suci->protection_scheme_id ==
-            OGS_NAS_5GS_ECIES_SCHEME_PROFILE_A || mobile_identity_suci->protection_scheme_id ==
-            OGS_NAS_5GS_ECIES_SCHEME_PROFILE_B, NULL);
+    if (mobile_identity_suci->h.supi_format !=
+            OGS_NAS_5GS_SUPI_FORMAT_IMSI) {
+        ogs_error("Not implemented SUPI format %d",
+            mobile_identity_suci->h.supi_format);
+        return NULL;
+    }
+    if (mobile_identity_suci->protection_scheme_id !=
+            OGS_PROTECTION_SCHEME_NULL &&
+        mobile_identity_suci->protection_scheme_id !=
+            OGS_PROTECTION_SCHEME_PROFILE_A &&
+        mobile_identity_suci->protection_scheme_id !=
+            OGS_PROTECTION_SCHEME_PROFILE_B) {
+        ogs_error("Not supported Protection-Scheme-Id %d",
+            mobile_identity_suci->protection_scheme_id);
+        return NULL;
+    }
 
     suci = ogs_msprintf("suci-%d-", mobile_identity_suci->h.supi_format);
-    ogs_expect_or_return_val(suci, NULL);
+    if (!suci) {
+        ogs_error("ogs_msprintf() failed");
+        return NULL;
+    }
 
     ogs_nas_to_plmn_id(&plmn_id, &mobile_identity_suci->nas_plmn_id);
     if (ogs_plmn_id_mnc_len(&plmn_id) == 2) {
         suci = ogs_mstrcatf(suci, "%03d-%02d-",
                 ogs_plmn_id_mcc(&plmn_id), ogs_plmn_id_mnc(&plmn_id));
-        ogs_expect_or_return_val(suci, NULL);
+        if (!suci) {
+            ogs_error("ogs_mstrcatf() failed");
+            return NULL;
+        }
     } else {
         suci = ogs_mstrcatf(suci, "%03d-%03d-",
                 ogs_plmn_id_mcc(&plmn_id), ogs_plmn_id_mnc(&plmn_id));
-        ogs_expect_or_return_val(suci, NULL);
+        if (!suci) {
+            ogs_error("ogs_mstrcatf() failed");
+            return NULL;
+        }
     }
 
     memset(routing_indicator, 0, sizeof(routing_indicator));
@@ -116,26 +149,33 @@
         routing_indicator0 = '0';
     }
 
-    scheme_output_len = mobile_identity->length - 8;
-    ogs_expect_or_return_val(scheme_output_len > 0, NULL);
-    ogs_expect_or_return_val(
-            scheme_output_len <= OGS_NAS_MAX_SCHEME_OUTPUT_LEN, NULL);
-
-    if (mobile_identity_suci->protection_scheme_id != OGS_NAS_5GS_NULL_SCHEME) {
-        ogs_hex_to_ascii(mobile_identity_suci->scheme_output, 
-            scheme_output_len, tmp, sizeof(tmp));
+    scheme_output =
+        (uint8_t *)mobile_identity->buffer +
+        OGS_NAS_5GS_MOBILE_IDENTITY_SUCI_MIN_SIZE;
+    scheme_output_size =
+        mobile_identity->length - OGS_NAS_5GS_MOBILE_IDENTITY_SUCI_MIN_SIZE;
+    ogs_assert(scheme_output_size);
+    scheme_output_string_or_bcd = ogs_calloc(1, scheme_output_size*2+1);
+    ogs_assert(scheme_output_string_or_bcd);
+
+    if (mobile_identity_suci->protection_scheme_id !=
+            OGS_PROTECTION_SCHEME_NULL) {
+        ogs_hex_to_ascii(scheme_output, scheme_output_size,
+                scheme_output_string_or_bcd, scheme_output_size*2+1);
     } else {
-        ogs_buffer_to_bcd(mobile_identity_suci->scheme_output,
-            scheme_output_len, tmp);
+        ogs_buffer_to_bcd(scheme_output, scheme_output_size,
+                scheme_output_string_or_bcd);
     }
 
     suci = ogs_mstrcatf(suci, "%s-%d-%d-%s",
             routing_indicator,
             mobile_identity_suci->protection_scheme_id,
             mobile_identity_suci->home_network_pki_value,
-            tmp);
+            scheme_output_string_or_bcd);
     ogs_expect(suci);
 
+    ogs_free(scheme_output_string_or_bcd);
+
     return suci;
 }

open5gs_2.5.8.tar.xz/lib/nas/5gs/encoder.c -> open5gs_2.6.0.tar.xz/lib/nas/5gs/encoder.c Changed

open5gs_2.5.8.tar.xz/lib/nas/5gs/support/nas-message.py -> open5gs_2.6.0.tar.xz/lib/nas/5gs/support/nas-message.py Changed

open5gs_2.5.8.tar.xz/lib/nas/5gs/types.c -> open5gs_2.6.0.tar.xz/lib/nas/5gs/types.c Changed

open5gs_2.5.8.tar.xz/lib/nas/5gs/types.h -> open5gs_2.6.0.tar.xz/lib/nas/5gs/types.h Changed

@@ -191,7 +191,6 @@
 
 /* 9.11.3.4 5GS mobile identity
  * M LV-E 6-n */
-#define OGS_NAS_MAX_SCHEME_OUTPUT_LEN 64
 typedef struct ogs_nas_5gs_mobile_identity_header_s {
 #define OGS_NAS_5GS_SUPI_FORMAT_IMSI 0
 #define OGS_NAS_5GS_SUPI_FORMAT_NETWORK_SPECIFIC_IDENTIFIER 1
@@ -199,6 +198,7 @@
     uint8_t odd_even:1;,
     uint8_t type:3;)
 } __attribute__ ((packed)) ogs_nas_5gs_mobile_identity_header_t;
+#define OGS_NAS_5GS_MOBILE_IDENTITY_SUCI_MIN_SIZE 8
 typedef struct ogs_nas_5gs_mobile_identity_suci_s {
     ogs_nas_5gs_mobile_identity_header_t h;
     ogs_nas_plmn_id_t nas_plmn_id;
@@ -207,12 +207,8 @@
     ED2(uint8_t routing_indicator4:4;,
         uint8_t routing_indicator3:4;)
 ED2(uint8_t spare3:4;,
-#define OGS_NAS_5GS_NULL_SCHEME 0
-#define OGS_NAS_5GS_ECIES_SCHEME_PROFILE_A 1
-#define OGS_NAS_5GS_ECIES_SCHEME_PROFILE_B 2
     uint8_t protection_scheme_id:4;)
     uint8_t home_network_pki_value;
-    uint8_t scheme_outputOGS_NAS_MAX_SCHEME_OUTPUT_LEN;
 } __attribute__ ((packed)) ogs_nas_5gs_mobile_identity_suci_t;
 typedef struct ogs_nas_5gs_mobile_identity_guti_s {
     ogs_nas_5gs_mobile_identity_header_t h;

open5gs_2.5.8.tar.xz/lib/nas/common/conv.c -> open5gs_2.6.0.tar.xz/lib/nas/common/conv.c Changed

@@ -72,3 +72,121 @@
 
     return ogs_bcd_to_buffer_reverse_order(in, out, out_len);
 }
+
+int ogs_nas_gprs_timer_from_sec(
+        ogs_nas_gprs_timer_t *gprs_timer, ogs_time_t sec)
+{
+    ogs_time_t timer_value = sec;
+
+    ogs_assert(gprs_timer);
+    memset(gprs_timer, 0, sizeof(*gprs_timer));
+
+    if (timer_value <= 63) {
+        if (timer_value%2 != 0) {
+            ogs_error("Not multiples of 2 seconds");
+            return OGS_ERROR;
+        }
+        gprs_timer->value = timer_value / 2;
+    } else {
+        if (timer_value%60 != 0) {
+            ogs_error("Not multiples of 1 minute");
+            return OGS_ERROR;
+        }
+        timer_value /= 60; /* multiples of 1 minute */
+        if (timer_value <= 31) {
+            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)");
+                return OGS_ERROR;
+            }
+            timer_value /= 10; /* multiples of decihours = 10 minutes */
+            if (timer_value <= 31) {
+                gprs_timer->unit = OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_DECI_HH;
+                gprs_timer->value = timer_value;
+            } else {
+                ogs_error("Overflow!");
+                return OGS_ERROR;
+            }
+        }
+    }
+
+    return OGS_OK;
+}
+
+int ogs_nas_gprs_timer_3_from_sec(
+        ogs_nas_gprs_timer_t *gprs_timer, ogs_time_t sec)
+{
+    ogs_time_t timer_value = sec;
+
+    ogs_assert(gprs_timer);
+    memset(gprs_timer, 0, sizeof(*gprs_timer));
+
+    if (timer_value <= 63) {
+        if (timer_value%2 != 0) {
+            ogs_error("Not multiples of 2 seconds");
+            return OGS_ERROR;
+        }
+        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");
+            return OGS_ERROR;
+        }
+        timer_value /= 60; /* multiples of 1 minute */
+        if (timer_value <= 31) {
+            gprs_timer->unit = OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_MM;
+            gprs_timer->value = timer_value;
+        } else {
+            if (timer_value%10 != 0) {
+                ogs_error("Not multiples of decihours(= 10 minutes)");
+                return OGS_ERROR;
+            }
+            timer_value /= 10; /* multiples of decihours = 10 mintues */
+            if (timer_value <= 31) {
+                gprs_timer->unit = OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_10_MM;
+                gprs_timer->value = timer_value;
+            } else {
+                if (timer_value%6 != 0) {
+                    ogs_error("Not multiples of 1 hour");
+                    return OGS_ERROR;
+                }
+                timer_value /= 6; /* multiples of 1 hour */
+                if (timer_value <= 31) {
+                    gprs_timer->unit =
+                        OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_HH;
+                    gprs_timer->value = timer_value;
+                } else {
+                    if (timer_value%10 != 0) {
+                        ogs_error("Not multiples of 10 hours");
+                        return OGS_ERROR;
+                    }
+                    timer_value /= 10; /* multiples of 10 hours */
+                    if (timer_value <= 31) {
+                        gprs_timer->unit =
+                            OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_10_HH;
+                        gprs_timer->value = timer_value;
+                    } else {
+                        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;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return OGS_OK;
+}

open5gs_2.5.8.tar.xz/lib/nas/common/conv.h -> open5gs_2.6.0.tar.xz/lib/nas/common/conv.h Changed

open5gs_2.5.8.tar.xz/lib/nas/common/types.h -> open5gs_2.6.0.tar.xz/lib/nas/common/types.h Changed

@@ -239,10 +239,10 @@
 /* 9.9.3.16 GPRS timer
  * See subclause 10.5.7.3 in 3GPP TS 24.008 13.
  * M V 1 or  O TV 2 */
-#define OGS_NAS_GRPS_TIMER_UNIT_MULTIPLES_OF_2_SS       0
-#define OGS_NAS_GRPS_TIMER_UNIT_MULTIPLES_OF_1_MM       1
-#define OGS_NAS_GRPS_TIMER_UNIT_MULTIPLES_OF_DECI_HH    2
-#define OGS_NAS_GRPS_TIMER_UNIT_DEACTIVATED             7
+#define OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_2_SS       0
+#define OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_1_MM       1
+#define OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_DECI_HH    2
+#define OGS_NAS_GPRS_TIMER_UNIT_DEACTIVATED             7
 typedef struct ogs_nas_gprs_timer_s {
 ED2(uint8_t unit:3;,
     uint8_t value:5;)
@@ -253,26 +253,24 @@
  * O TLV 3 */
 typedef struct ogs_nas_gprs_timer_2_s {
     uint8_t length;
-ED2(uint8_t unit:3;,
-    uint8_t value:5;)
+    ogs_nas_gprs_timer_t t;
 } __attribute__ ((packed)) ogs_nas_gprs_timer_2_t;
 
 /* 9.9.3.16B GPRS timer 3
  * See subclause 10.5.7.4a in 3GPP TS 24.008 13.
  * O TLV 3 */
-#define OGS_NAS_GRPS_TIMER_3_UNIT_MULTIPLES_OF_10_MM    0
-#define OGS_NAS_GRPS_TIMER_3_UNIT_MULTIPLES_OF_1_HH     1
-#define OGS_NAS_GRPS_TIMER_3_UNIT_MULTIPLES_OF_10_HH    2
-#define OGS_NAS_GRPS_TIMER_3_UNIT_MULTIPLES_OF_2_SS     3 
-#define OGS_NAS_GRPS_TIMER_3_UNIT_MULTIPLES_OF_30_SS    4
-#define OGS_NAS_GRPS_TIMER_3_UNIT_MULTIPLES_OF_1_MM     5
-#define OGS_NAS_GRPS_TIMER_3_UNIT_MULTIPLES_OF_320_HH   6
-#define OGS_NAS_GRPS_TIMER_3_UNIT_DEACTIVATED           7
+#define OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_10_MM    0
+#define OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_HH     1
+#define OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_10_HH    2
+#define OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_2_SS     3 
+#define OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_30_SS    4
+#define OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_MM     5
+#define OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_320_HH   6
+#define OGS_NAS_GPRS_TIMER_3_UNIT_DEACTIVATED           7
 
 typedef struct ogs_nas_gprs_timer_3_s {
     uint8_t length;
-ED2(uint8_t unit:3;,
-    uint8_t value:5;)
+    ogs_nas_gprs_timer_t t;
 } __attribute__ ((packed)) ogs_nas_gprs_timer_3_t;
 
 /* 9.9.3.18 IMEISV request

open5gs_2.5.8.tar.xz/lib/nas/eps/encoder.c -> open5gs_2.6.0.tar.xz/lib/nas/eps/encoder.c Changed

open5gs_2.5.8.tar.xz/lib/nas/eps/support/nas-message.py -> open5gs_2.6.0.tar.xz/lib/nas/eps/support/nas-message.py Changed

open5gs_2.5.8.tar.xz/lib/ngap/message.c -> open5gs_2.6.0.tar.xz/lib/ngap/message.c Changed

open5gs_2.5.8.tar.xz/lib/pfcp/build.c -> open5gs_2.6.0.tar.xz/lib/pfcp/build.c Changed

@@ -21,56 +21,88 @@
 
 ogs_pkbuf_t *ogs_pfcp_build_heartbeat_request(uint8_t type)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_heartbeat_request_t *req = NULL;
+    ogs_pkbuf_t *pkbuf = NULL;
 
     ogs_debug("Heartbeat Request");
 
-    req = &pfcp_message.pfcp_heartbeat_request;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    req = &pfcp_message->pfcp_heartbeat_request;
 
     req->recovery_time_stamp.presence = 1;
     req->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started;
 
-    pfcp_message.h.type = type;
-    return ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
+
+    ogs_free(pfcp_message);
+
+    return pkbuf;
 }
 
 ogs_pkbuf_t *ogs_pfcp_build_heartbeat_response(uint8_t type)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_heartbeat_response_t *rsp = NULL;
+    ogs_pkbuf_t *pkbuf = NULL;
 
     ogs_debug("Heartbeat Response");
 
-    rsp = &pfcp_message.pfcp_heartbeat_response;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    rsp = &pfcp_message->pfcp_heartbeat_response;
 
     rsp->recovery_time_stamp.presence = 1;
     rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started;
 
-    pfcp_message.h.type = type;
-    return ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
+
+    ogs_free(pfcp_message);
+
+    return pkbuf;
 }
 
 ogs_pkbuf_t *ogs_pfcp_cp_build_association_setup_request(uint8_t type)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_association_setup_request_t *req = NULL;
+    ogs_pkbuf_t *pkbuf = NULL;
 
     ogs_pfcp_node_id_t node_id;
     int node_id_len = 0, rv;
 
     ogs_debug("Association Setup Request");
 
-    req = &pfcp_message.pfcp_association_setup_request;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    req = &pfcp_message->pfcp_association_setup_request;
 
     rv = ogs_pfcp_sockaddr_to_node_id(
             ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
             ogs_app()->parameter.prefer_ipv4,
             &node_id, &node_id_len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_sockaddr_to_node_id() failed");
+        ogs_free(pfcp_message);
+        return NULL;
+    }
     req->node_id.presence = 1;
     req->node_id.data = &node_id;
     req->node_id.len = node_id_len;
@@ -81,29 +113,44 @@
     req->cp_function_features.presence = 1;
     req->cp_function_features.u8 = ogs_pfcp_self()->cp_function_features.octet5;
 
-    pfcp_message.h.type = type;
-    return ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
+
+    ogs_free(pfcp_message);
+
+    return pkbuf;
 }
 
 ogs_pkbuf_t *ogs_pfcp_cp_build_association_setup_response(uint8_t type,
         uint8_t cause)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_association_setup_response_t *rsp = NULL;
+    ogs_pkbuf_t *pkbuf = NULL;
 
     ogs_pfcp_node_id_t node_id;
     int node_id_len = 0, rv;
 
     ogs_debug("Association Setup Response");
 
-    rsp = &pfcp_message.pfcp_association_setup_response;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    rsp = &pfcp_message->pfcp_association_setup_response;
 
     rv = ogs_pfcp_sockaddr_to_node_id(
             ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
             ogs_app()->parameter.prefer_ipv4,
             &node_id, &node_id_len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_sockaddr_to_node_id() failed");
+        ogs_free(pfcp_message);
+        return NULL;
+    }
     rsp->node_id.presence = 1;
     rsp->node_id.data = &node_id;
     rsp->node_id.len = node_id_len;
@@ -117,14 +164,20 @@
     rsp->cp_function_features.presence = 1;
     rsp->cp_function_features.u8 = ogs_pfcp_self()->cp_function_features.octet5;
 
-    pfcp_message.h.type = type;
-    return ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
+
+    ogs_free(pfcp_message);
+
+    return pkbuf;
 }
 
 ogs_pkbuf_t *ogs_pfcp_up_build_association_setup_request(uint8_t type)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_association_setup_request_t *req = NULL;
+    ogs_pkbuf_t *pkbuf = NULL;
 
     ogs_pfcp_node_id_t node_id;
     int node_id_len = 0;
@@ -136,14 +189,23 @@
 
     ogs_debug("Association Setup Request");
 
-    req = &pfcp_message.pfcp_association_setup_request;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    req = &pfcp_message->pfcp_association_setup_request;
 
     rv = ogs_pfcp_sockaddr_to_node_id(
             ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
             ogs_app()->parameter.prefer_ipv4,
             &node_id, &node_id_len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_sockaddr_to_node_id() failed");
+        ogs_free(pfcp_message);
+        return NULL;
+    }
     req->node_id.presence = 1;
     req->node_id.data = &node_id;
     req->node_id.len = node_id_len;
@@ -172,15 +234,21 @@
         }
     }
 
-    pfcp_message.h.type = type;
-    return ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
+
+    ogs_free(pfcp_message);
+
+    return pkbuf;
 }
 
 ogs_pkbuf_t *ogs_pfcp_up_build_association_setup_response(uint8_t type,
         uint8_t cause)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_association_setup_response_t *rsp = NULL;
+    ogs_pkbuf_t *pkbuf = NULL;
 
     ogs_pfcp_node_id_t node_id;
     int node_id_len = 0;
@@ -192,14 +260,23 @@
 
     ogs_debug("Association Setup Response");
 
-    rsp = &pfcp_message.pfcp_association_setup_response;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    rsp = &pfcp_message->pfcp_association_setup_response;
 
     rv = ogs_pfcp_sockaddr_to_node_id(
             ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
             ogs_app()->parameter.prefer_ipv4,
             &node_id, &node_id_len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_sockaddr_to_node_id() failed");
+        ogs_free(pfcp_message);
+        return NULL;
+    }
     rsp->node_id.presence = 1;
     rsp->node_id.data = &node_id;
     rsp->node_id.len = node_id_len;
@@ -231,8 +308,13 @@
         }
     }
 
-    pfcp_message.h.type = type;
-    return ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
+
+    ogs_free(pfcp_message);
+
+    return pkbuf;
 }
 
 static struct {
@@ -314,6 +396,22 @@
         message->pdi.ue_ip_address.len = pdr->ue_ip_addr_len;
     }
 
+    for (j = 0; j < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; j++) {
+        if (!pdr->ipv4_framed_routes || !pdr->ipv4_framed_routesj)
+            break;
+        message->pdi.framed_routej.presence = 1;
+        message->pdi.framed_routej.data = pdr->ipv4_framed_routesj;
+        message->pdi.framed_routej.len = strlen(pdr->ipv4_framed_routesj);
+    }
+
+    for (j = 0; j < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; j++) {
+        if (!pdr->ipv6_framed_routes || !pdr->ipv6_framed_routesj)
+            break;
+        message->pdi.framed_ipv6_routej.presence = 1;
+        message->pdi.framed_ipv6_routej.data = pdr->ipv6_framed_routesj;
+        message->pdi.framed_ipv6_routej.len = strlen(pdr->ipv6_framed_routesj);
+    }
+
     if (pdr->f_teid_len) {
         memcpy(&pdrbufi.f_teid, &pdr->f_teid, pdr->f_teid_len);
         pdrbufi.f_teid.teid = htobe32(pdr->f_teid.teid);
@@ -789,8 +887,9 @@
 ogs_pkbuf_t *ogs_pfcp_build_session_report_request(
         uint8_t type, ogs_pfcp_user_plane_report_t *report)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_report_request_t *req = NULL;
+    ogs_pkbuf_t *pkbuf = NULL;
     ogs_pfcp_downlink_data_service_information_t info;
     unsigned int i;
 
@@ -798,8 +897,13 @@
 
     ogs_debug("PFCP session report request");
 
-    req = &pfcp_message.pfcp_session_report_request;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    req = &pfcp_message->pfcp_session_report_request;
 
     req->report_type.presence = 1;
     req->report_type.u8 = report->type.value;
@@ -910,39 +1014,61 @@
             report->error_indication.remote_f_teid_len;
     }
 
-    pfcp_message.h.type = type;
-    return ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
+
+    ogs_free(pfcp_message);
+
+    return pkbuf;
 }
 
 ogs_pkbuf_t *ogs_pfcp_build_session_report_response(
         uint8_t type, uint8_t cause)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_report_response_t *rsp = NULL;
+    ogs_pkbuf_t *pkbuf = NULL;
 
     ogs_debug("PFCP session report response");
 
-    rsp = &pfcp_message.pfcp_session_report_response;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    rsp = &pfcp_message->pfcp_session_report_response;
 
     rsp->cause.presence = 1;
     rsp->cause.u8 = cause;
 
-    pfcp_message.h.type = type;
-    return ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
+
+    ogs_free(pfcp_message);
+
+    return pkbuf;
 }
 
 ogs_pkbuf_t *ogs_pfcp_build_session_deletion_response( uint8_t type, uint8_t cause,
         ogs_pfcp_user_plane_report_t *report)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_deletion_response_t *rsp = NULL;
+    ogs_pkbuf_t *pkbuf = NULL;
     unsigned int i;
 
     ogs_debug("PFCP session deletion response");
 
-    rsp = &pfcp_message.pfcp_session_deletion_response;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    rsp = &pfcp_message->pfcp_session_deletion_response;
 
     rsp->cause.presence = 1;
     rsp->cause.u8 = cause;
@@ -997,6 +1123,11 @@
             }
         }
     }
-    pfcp_message.h.type = type;
-    return ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
+
+    ogs_free(pfcp_message);
+
+    return pkbuf;
 }

open5gs_2.5.8.tar.xz/lib/pfcp/context.c -> open5gs_2.6.0.tar.xz/lib/pfcp/context.c Changed

@@ -766,11 +766,17 @@
     if (!gnode) {
         gnode = ogs_gtp_node_add_by_ip(
             &ogs_gtp_self()->gtpu_peer_list, &ip, ogs_gtp_self()->gtpu_port);
-        ogs_expect_or_return_val(gnode, OGS_ERROR);
+        if (!gnode) {
+            ogs_error("ogs_gtp_node_add_by_ip() failed");
+            return OGS_ERROR;
+        }
 
         rv = ogs_gtp_connect(
                 ogs_gtp_self()->gtpu_sock, ogs_gtp_self()->gtpu_sock6, gnode);
-        ogs_expect_or_return_val(rv == OGS_OK, rv);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp_connect() failed");
+            return rv;
+        }
     }
 
     OGS_SETUP_GTP_NODE(far, gnode);
@@ -790,17 +796,26 @@
     if (pdr->f_teid_len == 0) return OGS_DONE;
 
     rv = ogs_pfcp_f_teid_to_ip(&pdr->f_teid, &ip);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_f_teid_to_ip() failed");
+        return rv;
+    }
 
     gnode = ogs_gtp_node_find_by_ip(&ogs_gtp_self()->gtpu_peer_list, &ip);
     if (!gnode) {
         gnode = ogs_gtp_node_add_by_ip(
             &ogs_gtp_self()->gtpu_peer_list, &ip, ogs_gtp_self()->gtpu_port);
-        ogs_expect_or_return_val(gnode, OGS_ERROR);
+        if (!gnode) {
+            ogs_error("ogs_gtp_node_add_by_ip() failed");
+            return OGS_ERROR;
+        }
 
         rv = ogs_gtp_connect(
                 ogs_gtp_self()->gtpu_sock, ogs_gtp_self()->gtpu_sock6, gnode);
-        ogs_expect_or_return_val(rv == OGS_OK, rv);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp_connect() failed");
+            return rv;
+        }
     }
 
     OGS_SETUP_GTP_NODE(pdr, gnode);
@@ -1004,6 +1019,8 @@
 
 void ogs_pfcp_pdr_remove(ogs_pfcp_pdr_t *pdr)
 {
+    int i;
+
     ogs_assert(pdr);
     ogs_assert(pdr->sess);
 
@@ -1033,6 +1050,24 @@
     if (pdr->id_node)
         ogs_pool_free(&pdr->sess->pdr_id_pool, pdr->id_node);
 
+    if (pdr->ipv4_framed_routes) {
+        for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+            if (!pdr->ipv4_framed_routesi)
+                break;
+            ogs_free(pdr->ipv4_framed_routesi);
+        }
+        ogs_free(pdr->ipv4_framed_routes);
+    }
+
+    if (pdr->ipv6_framed_routes) {
+        for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+            if (!pdr->ipv6_framed_routesi)
+                break;
+            ogs_free(pdr->ipv6_framed_routesi);
+        }
+        ogs_free(pdr->ipv6_framed_routes);
+    }
+
     ogs_pool_free(&ogs_pfcp_pdr_pool, pdr);
 }

open5gs_2.5.8.tar.xz/lib/pfcp/context.h -> open5gs_2.6.0.tar.xz/lib/pfcp/context.h Changed

open5gs_2.5.8.tar.xz/lib/pfcp/conv.c -> open5gs_2.6.0.tar.xz/lib/pfcp/conv.c Changed

@@ -81,12 +81,19 @@
     ogs_assert(list);
 
     addr = ogs_calloc(1, sizeof(ogs_sockaddr_t));
-    ogs_expect_or_return_val(addr, OGS_ERROR);
+    if (!addr) {
+        ogs_error("ogs_calloc() failed");
+        return OGS_ERROR;
+    }
     addr->ogs_sa_family = AF_INET;
     addr->ogs_sin_port = htobe16(port);
 
     addr6 = ogs_calloc(1, sizeof(ogs_sockaddr_t));
-    ogs_expect_or_return_val(addr6, OGS_ERROR);
+    if (!addr6) {
+        ogs_error("ogs_calloc() failed");
+        ogs_free(addr);
+        return OGS_ERROR;
+    }
     addr6->ogs_sa_family = AF_INET6;
     addr6->ogs_sin_port = htobe16(port);
 
@@ -185,8 +192,14 @@
 {
     const int hdr_len = 5;
 
-    ogs_expect_or_return_val(addr || addr6, OGS_ERROR);
-    ogs_expect_or_return_val(f_teid, OGS_ERROR);
+    if (!addr && !addr6) {
+        ogs_error("No addr");
+        return OGS_ERROR;
+    }
+    if (!f_teid) {
+        ogs_error("No F-TEID");
+        return OGS_ERROR;
+    }
     memset(f_teid, 0, sizeof *f_teid);
 
     if (addr && addr6) {
@@ -226,23 +239,35 @@
 
     if (f_teid->ipv4 && f_teid->ipv6) {
         *addr = ogs_calloc(1, sizeof(**addr));
-        ogs_expect_or_return_val(*addr, OGS_ERROR);
+        if (!(*addr)) {
+            ogs_error("ogs_calloc() failed");
+            return OGS_ERROR;
+        }
         (*addr)->sin.sin_addr.s_addr = f_teid->both.addr;
         (*addr)->ogs_sa_family = AF_INET;
 
         *addr6 = ogs_calloc(1, sizeof(**addr6));
-        ogs_expect_or_return_val(*addr6, OGS_ERROR);
+        if (!(*addr6)) {
+            ogs_error("ogs_calloc() failed");
+            return OGS_ERROR;
+        }
         memcpy((*addr6)->sin6.sin6_addr.s6_addr,
                 f_teid->both.addr6, OGS_IPV6_LEN);
         (*addr6)->ogs_sa_family = AF_INET6;
     } else if (f_teid->ipv4) {
         *addr = ogs_calloc(1, sizeof(**addr));
-        ogs_expect_or_return_val(*addr, OGS_ERROR);
+        if (!(*addr)) {
+            ogs_error("ogs_calloc() failed");
+            return OGS_ERROR;
+        }
         (*addr)->sin.sin_addr.s_addr = f_teid->addr;
         (*addr)->ogs_sa_family = AF_INET;
     } else if (f_teid->ipv6) {
         *addr6 = ogs_calloc(1, sizeof(**addr6));
-        ogs_expect_or_return_val(*addr6, OGS_ERROR);
+        if (!(*addr6)) {
+            ogs_error("ogs_calloc() failed");
+            return OGS_ERROR;
+        }
         memcpy((*addr6)->sin6.sin6_addr.s6_addr, f_teid->addr6, OGS_IPV6_LEN);
         (*addr6)->ogs_sa_family = AF_INET6;
     } else {

open5gs_2.5.8.tar.xz/lib/pfcp/handler.c -> open5gs_2.6.0.tar.xz/lib/pfcp/handler.c Changed

@@ -27,7 +27,10 @@
     ogs_assert(xact);
 
     rv = ogs_pfcp_send_heartbeat_response(xact);
-    ogs_expect_or_return_val(rv == OGS_OK, false);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_send_heartbeat_response() failed");
+        return false;
+    }
 
     return true;
 }
@@ -192,7 +195,10 @@
     memset(report, 0, sizeof(*report));
 
     sendbuf = ogs_pkbuf_copy(recvbuf);
-    ogs_expect_or_return_val(sendbuf, false);
+    if (!sendbuf) {
+        ogs_error("ogs_pkbuf_copy() failed");
+        return false;
+    }
 
     buffering = false;
 
@@ -478,6 +484,58 @@
                 pdr->ue_ip_addr_len);
     }
 
+    for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+        if (!pdr->ipv4_framed_routes || !pdr->ipv4_framed_routesi)
+            break;
+        ogs_free(pdr->ipv4_framed_routesi);
+        pdr->ipv4_framed_routesi = NULL;
+    }
+
+    for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+        if (!pdr->ipv6_framed_routes || !pdr->ipv6_framed_routesi)
+            break;
+        ogs_free(pdr->ipv6_framed_routesi);
+        pdr->ipv6_framed_routesi = NULL;
+    }
+
+    for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+        char *route;
+
+        if (!message->pdi.framed_routei.presence)
+            break;
+
+        if (!pdr->ipv4_framed_routes) {
+            pdr->ipv4_framed_routes = ogs_calloc(
+                    OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI, sizeof(pdr->ipv4_framed_routes0));
+            ogs_assert(pdr->ipv4_framed_routes);
+        }
+        route = ogs_malloc(message->pdi.framed_routei.len + 1);
+        ogs_assert(route);
+        memcpy(route, message->pdi.framed_routei.data,
+               message->pdi.framed_routei.len);
+        routemessage->pdi.framed_routei.len = '\0';
+        pdr->ipv4_framed_routesi = route;
+    }
+
+    for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+        char *route;
+
+        if (!message->pdi.framed_ipv6_routei.presence)
+            break;
+
+        if (!pdr->ipv6_framed_routes) {
+            pdr->ipv6_framed_routes = ogs_calloc(
+                    OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI, sizeof(pdr->ipv6_framed_routes0));
+            ogs_assert(pdr->ipv6_framed_routes);
+        }
+        route = ogs_malloc(message->pdi.framed_ipv6_routei.len + 1);
+        ogs_assert(route);
+        memcpy(route, message->pdi.framed_ipv6_routei.data,
+               message->pdi.framed_ipv6_routei.len);
+        routemessage->pdi.framed_ipv6_routei.len = '\0';
+        pdr->ipv6_framed_routesi = route;
+    }
+
     memset(&pdr->outer_header_removal, 0, sizeof(pdr->outer_header_removal));
     pdr->outer_header_removal_len = 0;

open5gs_2.5.8.tar.xz/lib/pfcp/message.c -> open5gs_2.6.0.tar.xz/lib/pfcp/message.c Changed

@@ -20,7 +20,7 @@
 /*******************************************************************************
  * This file had been created by pfcp-tlv.py script v0.1.0
  * Please do not modify this file but regenerate it via script.
- * Created on: 2022-11-26 23:47:22.086824 by acetcom
+ * Created on: 2023-01-10 12:02:27.807637 by mitmitmitm
  * from 29244-g91-modified.docx
  ******************************************************************************/
 
@@ -2189,8 +2189,10 @@
         &ogs_pfcp_tlv_desc_ethernet_packet_filter,
         &ogs_pfcp_tlv_desc_qfi,
         &ogs_pfcp_tlv_desc_framed_route,
+        &ogs_tlv_desc_more8,
         &ogs_pfcp_tlv_desc_framed_routing,
         &ogs_pfcp_tlv_desc_framed_ipv6_route,
+        &ogs_tlv_desc_more8,
         &ogs_pfcp_tlv_desc__interface_type,
         &ogs_pfcp_tlv_desc_ip_multicast_addressing_info_within_pfcp_session_establishment_request,
         NULL,
@@ -3099,8 +3101,10 @@
         &ogs_pfcp_tlv_desc_ue_ip_address,
         &ogs_pfcp_tlv_desc_ethernet_pdu_session_information,
         &ogs_pfcp_tlv_desc_framed_route,
+        &ogs_tlv_desc_more8,
         &ogs_pfcp_tlv_desc_framed_routing,
         &ogs_pfcp_tlv_desc_framed_ipv6_route,
+        &ogs_tlv_desc_more8,
         &ogs_pfcp_tlv_desc_qfi,
         &ogs_pfcp_tlv_desc__interface_type,
         NULL,

open5gs_2.5.8.tar.xz/lib/pfcp/message.h -> open5gs_2.6.0.tar.xz/lib/pfcp/message.h Changed

@@ -20,7 +20,7 @@
 /*******************************************************************************
  * This file had been created by pfcp-tlv.py script v0.1.0
  * Please do not modify this file but regenerate it via script.
- * Created on: 2022-11-26 23:47:22.074293 by acetcom
+ * Created on: 2023-01-10 12:02:27.782476 by mitmitmitm
  * from 29244-g91-modified.docx
  ******************************************************************************/
 
@@ -889,9 +889,9 @@
     ogs_pfcp_tlv_ethernet_pdu_session_information_t ethernet_pdu_session_information;
     ogs_pfcp_tlv_ethernet_packet_filter_t ethernet_packet_filter;
     ogs_pfcp_tlv_qfi_t qfi;
-    ogs_pfcp_tlv_framed_route_t framed_route;
+    ogs_pfcp_tlv_framed_route_t framed_route8;
     ogs_pfcp_tlv_framed_routing_t framed_routing;
-    ogs_pfcp_tlv_framed_ipv6_route_t framed_ipv6_route;
+    ogs_pfcp_tlv_framed_ipv6_route_t framed_ipv6_route8;
     ogs_pfcp_tlv__interface_type_t source_interface_type;
     ogs_pfcp_tlv_ip_multicast_addressing_info_within_pfcp_session_establishment_request_t ip_multicast_addressing_info;
 } ogs_pfcp_tlv_pdi_t;
@@ -1364,9 +1364,9 @@
     ogs_pfcp_tlv_redundant_transmission_parameters_t redundant_transmission_detection_parameters;
     ogs_pfcp_tlv_ue_ip_address_t ue_ip_address;
     ogs_pfcp_tlv_ethernet_pdu_session_information_t ethernet_pdu_session_information;
-    ogs_pfcp_tlv_framed_route_t framed_route;
+    ogs_pfcp_tlv_framed_route_t framed_route8;
     ogs_pfcp_tlv_framed_routing_t framed_routing;
-    ogs_pfcp_tlv_framed_ipv6_route_t framed_ipv6_route;
+    ogs_pfcp_tlv_framed_ipv6_route_t framed_ipv6_route8;
     ogs_pfcp_tlv_qfi_t qfi;
     ogs_pfcp_tlv__interface_type_t source_interface_type;
 } ogs_pfcp_tlv_create_traffic_endpoint_t;

open5gs_2.5.8.tar.xz/lib/pfcp/path.c -> open5gs_2.6.0.tar.xz/lib/pfcp/path.c Changed

@@ -143,13 +143,22 @@
     h.seid = 0;
 
     xact = ogs_pfcp_xact_local_create(node, cb, node);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     pkbuf = ogs_pfcp_build_heartbeat_request(h.type);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("ogs_pfcp_build_heartbeat_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -170,10 +179,16 @@
     h.seid = 0;
 
     pkbuf = ogs_pfcp_build_heartbeat_response(h.type);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("ogs_pfcp_build_heartbeat_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -196,13 +211,22 @@
     h.seid = 0;
 
     xact = ogs_pfcp_xact_local_create(node, cb, node);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     pkbuf = ogs_pfcp_cp_build_association_setup_request(h.type);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("ogs_pfcp_cp_build_association_setup_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -224,10 +248,16 @@
     h.seid = 0;
 
     pkbuf = ogs_pfcp_cp_build_association_setup_response(h.type, cause);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("ogs_pfcp_cp_build_association_setup_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -250,13 +280,22 @@
     h.seid = 0;
 
     xact = ogs_pfcp_xact_local_create(node, cb, node);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     pkbuf = ogs_pfcp_up_build_association_setup_request(h.type);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("ogs_pfcp_build_heartbeat_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -278,10 +317,16 @@
     h.seid = 0;
 
     pkbuf = ogs_pfcp_up_build_association_setup_response(h.type, cause);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("ogs_pfcp_up_build_association_setup_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -355,7 +400,10 @@
     }
 
     sendbuf = ogs_pkbuf_alloc(NULL, OGS_GTPV1U_5GC_HEADER_LEN);
-    ogs_expect_or_return_val(sendbuf, OGS_ERROR);
+    if (!sendbuf) {
+        ogs_error("ogs_pkbuf_alloc() failed");
+        return OGS_ERROR;
+    }
     ogs_pkbuf_reserve(sendbuf, OGS_GTPV1U_5GC_HEADER_LEN);
 
     memset(&gtp_hdesc, 0, sizeof(gtp_hdesc));
@@ -460,10 +508,16 @@
     }
 
     pkbuf = ogs_pfcp_build_msg(&errmsg);
-    ogs_expect_or_return(pkbuf);
+    if (!pkbuf) {
+        ogs_error("ogs_pfcp_build_msg() failed");
+        return;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &errmsg.h, pkbuf);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);

open5gs_2.5.8.tar.xz/lib/pfcp/support/cache/tlv-group-list.py -> open5gs_2.6.0.tar.xz/lib/pfcp/support/cache/tlv-group-list.py Changed

@@ -89,9 +89,11 @@
 ies.append({ "ie_type" : "Ethernet PDU Session Information", "ie_value" : "Ethernet PDU Session Information", "presence" : "O", "tlv_more" : "0", "comment" : "This IE may be present to identify all the (DL) Ethernet packets matching an Ethernet PDU session (see clause 5.13.1)."})
 ies.append({ "ie_type" : "Ethernet Packet Filter", "ie_value" : "Ethernet Packet Filter", "presence" : "O", "tlv_more" : "0", "comment" : "If present, this IE shall identify the Ethernet PDU to match for the incoming packet.Several IEs with the same IE type may be present to represent a list of Ethernet Packet Filters.The full set of applicable Ethernet Packet filters, if any, shall be provided during the creation or the modification of the PDI."})
 ies.append({ "ie_type" : "QFI", "ie_value" : "QFI", "presence" : "O", "tlv_more" : "0", "comment" : "This IE shall not be present if Traffic Endpoint ID is present and the QFI(s) are included in the Traffic Endpoint.If present, this IE shall identify the QoS Flow Identifier to match for the incoming packet.Several IEs with the same IE type may be present to provision a list of QFIs. When present, the full set of applicable QFIs shall be provided during the creation or the modification of the PDI. "})
-ies.append({ "ie_type" : "Framed-Route", "ie_value" : "Framed-Route", "presence" : "O", "tlv_more" : "0", "comment" : "This IE may be present for a DL PDR if the UPF indicated support of Framed Routing (see clause 8.2.25). If present, this IE shall describe a framed route.Several IEs with the same IE type may be present to provision a list of framed routes. (NOTE 5)"})
+type_list"Framed-Route""max_tlv_more" = "7"
+ies.append({ "ie_type" : "Framed-Route", "ie_value" : "Framed-Route", "presence" : "O", "tlv_more" : "7", "comment" : "This IE may be present for a DL PDR if the UPF indicated support of Framed Routing (see clause 8.2.25). If present, this IE shall describe a framed route.Several IEs with the same IE type may be present to provision a list of framed routes. (NOTE 5)"})
 ies.append({ "ie_type" : "Framed-Routing", "ie_value" : "Framed-Routing", "presence" : "O", "tlv_more" : "0", "comment" : "This IE may be present for a DL PDR if the UPF indicated support of Framed Routing (see clause 8.2.25). If present, this IE shall describe a framed route. "})
-ies.append({ "ie_type" : "Framed-IPv6-Route", "ie_value" : "Framed-IPv6-Route", "presence" : "O", "tlv_more" : "0", "comment" : "This IE may be present for a DL PDR if the UPF indicated support of Framed Routing (see clause 8.2.25). If present, this IE shall describe a framed IPv6 route.Several IEs with the same IE type may be present to provision a list of framed IPv6 routes. (NOTE 5)"})
+type_list"Framed-IPv6-Route""max_tlv_more" = "7"
+ies.append({ "ie_type" : "Framed-IPv6-Route", "ie_value" : "Framed-IPv6-Route", "presence" : "O", "tlv_more" : "7", "comment" : "This IE may be present for a DL PDR if the UPF indicated support of Framed Routing (see clause 8.2.25). If present, this IE shall describe a framed IPv6 route.Several IEs with the same IE type may be present to provision a list of framed IPv6 routes. (NOTE 5)"})
 ies.append({ "ie_type" : "3GPP Interface Type", "ie_value" : "Source Interface Type", "presence" : "O", "tlv_more" : "0", "comment" : "This IE may be present to indicate the 3GPP interface type of the source interface, if required by functionalities in the UP Function, e.g. for performance measurements."})
 ies.append({ "ie_type" : "IP Multicast Addressing Info within PFCP Session Establishment Request", "ie_value" : "IP Multicast Addressing Info", "presence" : "O", "tlv_more" : "0", "comment" : "This IE may be present in a DL PDR controlling DL IP multicast traffic (see clause5.25).When present, it shall contain a (range of) IP multicast address(es), and optionally source specific address(es), identifying a set of IP multicast flows. See Table7.5.2.2-4.Several IEs with the same IE type may be present to represent multiple IP multicast flows."})
 group_list"PDI" = { "index" : "102", "type" : "2", "ies" : ies }
@@ -206,9 +208,9 @@
 ies.append({ "ie_type" : "Redundant Transmission Parameters", "ie_value" : "Redundant Transmission Detection Parameters", "presence" : "O", "tlv_more" : "0", "comment" : "If present, this IE shall contain the information used for the reception of redundant uplink packets on N3/N9 interfaces.See Table7.5.2.2-5."})
 ies.append({ "ie_type" : "UE IP Address", "ie_value" : "UE IP address", "presence" : "O", "tlv_more" : "0", "comment" : "If present, this IE shall identify the source or destination IP address to match for the incoming packet. (NOTE 3)The CP function shall set the CHOOSE (CH) bit to 1 if the UP function supports the allocation of UE IP address/ prefix and the CP function requests the UP function to assign a UE IP address/prefix to the Traffic Endpoint."})
 ies.append({ "ie_type" : "Ethernet PDU Session Information", "ie_value" : "Ethernet PDU Session Information", "presence" : "O", "tlv_more" : "0", "comment" : "This IE may be present to identify all the (DL) Ethernet packets matching an Ethernet PDU session (see clause 5.13.1)."})
-ies.append({ "ie_type" : "Framed-Route", "ie_value" : "Framed-Route", "presence" : "O", "tlv_more" : "0", "comment" : "This IE may be present for a DL PDR if the UPF indicated support of Framed Routing (see clause 8.2.25). If present, this IE shall describe a framed route.Several IEs with the same IE type may be present to provision a list of framed routes. (NOTE 3)"})
+ies.append({ "ie_type" : "Framed-Route", "ie_value" : "Framed-Route", "presence" : "O", "tlv_more" : "7", "comment" : "This IE may be present for a DL PDR if the UPF indicated support of Framed Routing (see clause 8.2.25). If present, this IE shall describe a framed route.Several IEs with the same IE type may be present to provision a list of framed routes. (NOTE 3)"})
 ies.append({ "ie_type" : "Framed-Routing", "ie_value" : "Framed-Routing", "presence" : "O", "tlv_more" : "0", "comment" : "This IE may be present for a DL PDR if the UPF indicated support of Framed Routing (see clause 8.2.25). If present, this IE shall describe the framed routing associated to a framed route. "})
-ies.append({ "ie_type" : "Framed-IPv6-Route", "ie_value" : "Framed-IPv6-Route", "presence" : "O", "tlv_more" : "0", "comment" : "This IE may be present for a DL PDR if the UPF indicated support of Framed Routing (see clause 8.2.25). If present, this IE shall describe a framed IPv6 route.Several IEs with the same IE type may be present to provision a list of framed IPv6 routes. (NOTE 3)"})
+ies.append({ "ie_type" : "Framed-IPv6-Route", "ie_value" : "Framed-IPv6-Route", "presence" : "O", "tlv_more" : "7", "comment" : "This IE may be present for a DL PDR if the UPF indicated support of Framed Routing (see clause 8.2.25). If present, this IE shall describe a framed IPv6 route.Several IEs with the same IE type may be present to provision a list of framed IPv6 routes. (NOTE 3)"})
 ies.append({ "ie_type" : "QFI", "ie_value" : "QFI", "presence" : "O", "tlv_more" : "0", "comment" : "This IE may be present if the UPF has indicated it supports MTE feature as specified in clause 8.2.25.If present, this IE shall identify the QoS Flow Identifier to match for the incoming packet received from the traffic endpoint.Several IEs with the same IE type may be present to provision a list of QFIs. When present, the full set of applicable QFIs shall be provided."})
 ies.append({ "ie_type" : "3GPP Interface Type", "ie_value" : "Source Interface Type", "presence" : "O", "tlv_more" : "0", "comment" : "This IE may be present to indicate the 3GPP interface type of the source interface, if required by functionalities in the UP Function, e.g. for performance measurements.(NOTE 4)"})
 group_list"Create Traffic Endpoint" = { "index" : "227", "type" : "127", "ies" : ies }

open5gs_2.5.8.tar.xz/lib/pfcp/support/pfcp-tlv.py -> open5gs_2.6.0.tar.xz/lib/pfcp/support/pfcp-tlv.py Changed

open5gs_2.5.8.tar.xz/lib/pfcp/types.c -> open5gs_2.6.0.tar.xz/lib/pfcp/types.c Changed

@@ -686,3 +686,61 @@
 
     return size;
 }
+
+int16_t ogs_pfcp_build_user_id(
+        ogs_tlv_octet_t *octet, ogs_pfcp_user_id_t *user_id,
+        void *data, int data_len)
+{
+    ogs_pfcp_user_id_t target;
+    int16_t size = 0;
+
+    ogs_assert(user_id);
+    ogs_assert(octet);
+    ogs_assert(data);
+    ogs_assert(data_len);
+
+    octet->data = data;
+    memcpy(&target, user_id, sizeof(ogs_pfcp_user_id_t));
+
+    ogs_assert(size + sizeof(target.flags) <= data_len);
+    memcpy((unsigned char *)octet->data + size,
+            &target.flags, sizeof(target.flags));
+    size += sizeof(target.flags);
+
+    if (target.imsif) {
+        ogs_assert(size + sizeof(target.imsi_len) <= data_len);
+        memcpy((unsigned char *)octet->data + size,
+                &target.imsi_len, sizeof(target.imsi_len));
+        size += sizeof(target.imsi_len);
+
+        ogs_assert(size + user_id->imsi_len <= data_len);
+        memcpy((char *)octet->data + size, user_id->imsi, user_id->imsi_len);
+        size += user_id->imsi_len;
+    }
+    if (target.imeif) {
+        ogs_assert(size + sizeof(target.imeisv_len) <= data_len);
+        memcpy((unsigned char *)octet->data + size,
+                &target.imeisv_len, sizeof(target.imeisv_len));
+        size += sizeof(target.imeisv_len);
+
+        ogs_assert(size + user_id->imeisv_len <= data_len);
+        memcpy((char *)octet->data + size,
+                user_id->imeisv, user_id->imeisv_len);
+        size += user_id->imeisv_len;
+    }
+    if (target.msisdnf) {
+        ogs_assert(size + sizeof(target.msisdn_len) <= data_len);
+        memcpy((unsigned char *)octet->data + size,
+                &target.msisdn_len, sizeof(target.msisdn_len));
+        size += sizeof(target.msisdn_len);
+
+        ogs_assert(size + user_id->msisdn_len <= data_len);
+        memcpy((char *)octet->data + size,
+                user_id->msisdn, user_id->msisdn_len);
+        size += user_id->msisdn_len;
+    }
+
+    octet->len = size;
+
+    return octet->len;
+}

open5gs_2.5.8.tar.xz/lib/pfcp/types.h -> open5gs_2.6.0.tar.xz/lib/pfcp/types.h Changed

@@ -1400,6 +1400,115 @@
 int16_t ogs_pfcp_parse_volume_measurement(
         ogs_pfcp_volume_measurement_t *volume, ogs_tlv_octet_t *octet);
 
+/*
+ * 8.2.101 User ID
+ *
+ * The User ID IE type shall be encoded as shown in Figure 8.2.101-1.
+ *
+ * The following flags are coded within Octet 5:
+ *
+ * -Bit 1 – IMSIF: If this bit is set to "1",
+ *  then the Length of IMSI and IMSI fields shall be present,
+ *  otherwise these fields shall not be present.
+ * -Bit 2 – IMEIF: If this bit is set to "1",
+ *  then the Length of IMEI and IMEI fields shall be present,
+ *  otherwise these fields shall not be present.
+ * -Bit 3 – MSISDNF: If this bit is set to "1",
+ *  then the Length of MSISDN and MSISDN fields shall be present,
+ *  otherwise these fields shall not be present.
+ * -Bit 4 – NAIF: If this bit is set to "1",
+ *  then the Length of NAI and NAI fields shall be present,
+ *  otherwise these fields shall not be present.
+ * -Bit 5 – SUPIF: If this bit is set to "1",
+ *  then the Length of SUPI and SUPI fields shall be present,
+ *  otherwise these fields shall not be present.
+ * -Bit 6 – GPSIF: If this bit is set to "1",
+ *  then the Length of GPSI and GPSI fields shall be present,
+ *  otherwise these fields shall not be present.
+ * -Bit 7 – PEIF: If this bit is set to "1",
+ *  then the Length of PEI and PEI fields shall be present,
+ *  otherwise these fields shall not be present.
+ * - Bit 8: Spare, for future use and set to "0".
+ *
+ * One or more flags may be set to "1".
+ *
+ * For 5GS User Identities:
+ * -The SUPI field shall only be used for carrying a Global Cable Identifier
+ *  (GCI) or a Global Line Identifier (GLI). The IMSI and NAI, if received
+ *  by the SMF in the SUPI, shall be included in the IMSI and NAI field respectively.
+ * -The GPSI field shall only be used for carrying an External Identifier.
+ *  The MSISDN, if received by the SMF in the SUPI, shall be included
+ *  in the MSISDN field.
+ * -The PEI field shall only be used for carrying an MAC address or
+ *  an Extended Unique Identifier. The IMEI, if received by the SMF in the PEI,
+ *  shall be included in the IMEI field.
+ *
+ * The coding of IMSI field, from octets 7 to 'a' shall be encoded
+ * as the octets 5 to n+4 of the IMSI IE type
+ * specified in clause 8.3 of 3GPP TS 29.274 9.
+ *
+ * The coding of IMEI field, in octets 'b+1' to 'c' shall be encoded
+ * as the octets 5 to n+4 of the MEI IE type
+ * specified in clause 8.10 of 3GPP TS 29.274 9.
+ *
+ * The coding of MSISDN field, in octets 'd+1' to 'e' shall be encoded
+ * as the octets 5 to n+4 of the MSISDN IE type
+ * specified in clause 8.11 of 3GPP TS 29.274 9.
+ *
+ * The coding of the SUPI field, in octets 'h+1' to 'i' shall be encoded
+ * as the Supi data type specified in clause 5.3.2 of 3GPP TS 29.571 61.
+ *
+ * The coding of the GPSI field, in octets 'j+1' to 'k' shall be encoded
+ * as the Gpsi data type specified in clause 5.3.2 of 3GPP TS 29.571 61.
+ *
+ * The coding of the PEI field, in octets 'l+1' to 'm' shall be encoded
+ * as the Pei data type specified in clause 5.3.2 of 3GPP TS 29.571 61.
+ *
+ * The NAI field, in octets 'f+1' to 'g' shall be encoded as an Octet String
+ * (see IETF RFC 4282 36).
+ */
+typedef struct ogs_pfcp_user_id_flags_s {
+    union {
+        struct {
+ED8(uint8_t spare:1;,
+    uint8_t peif:1;,
+    uint8_t gpsif:1;,
+    uint8_t supif:1;,
+    uint8_t naif:1;,
+    uint8_t msisdnf:1;,
+    uint8_t imeif:1;,
+    uint8_t imsif:1;)
+        };
+    uint8_t flags;
+    };
+} ogs_pfcp_user_id_flags_t;
+
+typedef struct ogs_pfcp_user_id_s {
+    union {
+        struct {
+ED8(uint8_t spare:1;,
+    uint8_t peif:1;,
+    uint8_t gpsif:1;,
+    uint8_t supif:1;,
+    uint8_t naif:1;,
+    uint8_t msisdnf:1;,
+    uint8_t imeif:1;,
+    uint8_t imsif:1;)
+        };
+    uint8_t flags;
+    };
+
+    uint8_t imsi_len;
+    uint8_t imsiOGS_MAX_IMSI_LEN;
+    uint8_t imeisv_len;
+    uint8_t imeisvOGS_MAX_IMEISV_LEN;
+    uint8_t msisdn_len;
+    uint8_t msisdnOGS_MAX_MSISDN_LEN;
+} ogs_pfcp_user_id_t;
+
+int16_t ogs_pfcp_build_user_id(
+        ogs_tlv_octet_t *octet, ogs_pfcp_user_id_t *user_id,
+        void *data, int data_len);
 
 #ifdef __cplusplus
 }

open5gs_2.5.8.tar.xz/lib/pfcp/xact.c -> open5gs_2.6.0.tar.xz/lib/pfcp/xact.c Changed

@@ -93,12 +93,12 @@
     xact->tm_response = ogs_timer_add(
             ogs_app()->timer_mgr, response_timeout, xact);
     ogs_assert(xact->tm_response);
-    xact->response_rcount = ogs_app()->time.message.pfcp.n1_response_rcount,
+    xact->response_rcount = ogs_app()->time.message.pfcp.n1_response_rcount;
 
     xact->tm_holding = ogs_timer_add(
             ogs_app()->timer_mgr, holding_timeout, xact);
     ogs_assert(xact->tm_holding);
-    xact->holding_rcount = ogs_app()->time.message.pfcp.n1_holding_rcount,
+    xact->holding_rcount = ogs_app()->time.message.pfcp.n1_holding_rcount;
 
     xact->tm_delayed_commit = ogs_timer_add(
             ogs_app()->timer_mgr, delayed_commit_timeout, xact);
@@ -138,12 +138,12 @@
     xact->tm_response = ogs_timer_add(
             ogs_app()->timer_mgr, response_timeout, xact);
     ogs_assert(xact->tm_response);
-    xact->response_rcount = ogs_app()->time.message.pfcp.n1_response_rcount,
+    xact->response_rcount = ogs_app()->time.message.pfcp.n1_response_rcount;
 
     xact->tm_holding = ogs_timer_add(
             ogs_app()->timer_mgr, holding_timeout, xact);
     ogs_assert(xact->tm_holding);
-    xact->holding_rcount = ogs_app()->time.message.pfcp.n1_holding_rcount,
+    xact->holding_rcount = ogs_app()->time.message.pfcp.n1_holding_rcount;
 
     xact->tm_delayed_commit = ogs_timer_add(
             ogs_app()->timer_mgr, delayed_commit_timeout, xact);

open5gs_2.5.8.tar.xz/lib/proto/types.c -> open5gs_2.6.0.tar.xz/lib/proto/types.c Changed

@@ -143,7 +143,7 @@
     ogs_assert(amf_id);
     ogs_assert(hex);
 
-    OGS_HEX(hex, strlen(hex), hexbuf);
+    ogs_hex_from_string(hex, hexbuf, sizeof(hexbuf));
 
     amf_id->region = hexbuf0;
     amf_id->set1 = hexbuf1;
@@ -160,7 +160,10 @@
     ogs_assert(amf_id);
 
     str = ogs_calloc(1, OGS_AMFIDSTRLEN);
-    ogs_expect_or_return_val(str, NULL);
+    if (!str) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
 
     ogs_hex_to_ascii(amf_id, sizeof(ogs_amf_id_t), str, OGS_AMFIDSTRLEN);
 
@@ -194,78 +197,6 @@
     return amf_id;
 }
 
-char *ogs_supi_from_suci(char *suci)
-{
-#define MAX_SUCI_TOKEN 16
-    char *arrayMAX_SUCI_TOKEN;
-    char *p, *tmp;
-    int i;
-    char *supi = NULL;
-
-    ogs_assert(suci);
-    tmp = ogs_strdup(suci);
-    ogs_expect_or_return_val(tmp, NULL);
-
-    p = tmp;
-    i = 0;
-    while((arrayi++ = strsep(&p, "-"))) {
-        /* Empty Body */
-    }
-
-    SWITCH(array0)
-    CASE("suci")
-        SWITCH(array1)
-        CASE("0")   /* SUPI format : IMSI */
-            if (array2 && array3 && array7)
-                supi = ogs_msprintf("imsi-%s%s%s",
-                        array2, array3, array7);
-
-            break;
-        DEFAULT
-            ogs_error("Not implemented %s", array1);
-            break;
-        END
-        break;
-    DEFAULT
-        ogs_error("Not implemented %s", array0);
-        break;
-    END
-
-    ogs_free(tmp);
-    return supi;
-}
-
-char *ogs_supi_from_supi_or_suci(char *supi_or_suci)
-{
-    char *type = NULL;
-    char *supi = NULL;
-
-    ogs_assert(supi_or_suci);
-    type = ogs_id_get_type(supi_or_suci);
-    if (!type) {
-        ogs_error("ogs_id_get_type%s failed", supi_or_suci);
-        goto cleanup;
-    }
-    SWITCH(type)
-    CASE("imsi")
-        supi = ogs_strdup(supi_or_suci);
-        ogs_expect(supi);
-        break;
-    CASE("suci")
-        supi = ogs_supi_from_suci(supi_or_suci);
-        ogs_expect(supi);
-        break;
-    DEFAULT
-        ogs_error("Not implemented %s", type);
-        break;
-    END
-
-cleanup:
-    if (type)
-        ogs_free(type);
-    return supi;
-}
-
 char *ogs_id_get_type(char *str)
 {
     char *token, *p, *tmp;
@@ -529,8 +460,14 @@
 int ogs_sockaddr_to_ip(
         ogs_sockaddr_t *addr, ogs_sockaddr_t *addr6, ogs_ip_t *ip)
 {
-    ogs_expect_or_return_val(ip, OGS_ERROR);
-    ogs_expect_or_return_val(addr || addr6, OGS_ERROR);
+    if (!ip) {
+        ogs_error("No IP");
+        return OGS_ERROR;
+    }
+    if (!addr && !addr6) {
+        ogs_error("No Address");
+        return OGS_ERROR;
+    }
 
     memset(ip, 0, sizeof(ogs_ip_t));
 
@@ -559,7 +496,10 @@
     char *buf = NULL;
 
     buf = ogs_calloc(1, OGS_ADDRSTRLEN);
-    ogs_expect_or_return_val(buf, NULL);
+    if (!buf) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
 
     return (char*)OGS_INET_NTOP(&addr, buf);
 }
@@ -570,7 +510,10 @@
     ogs_assert(addr6);
 
     buf = ogs_calloc(1, OGS_ADDRSTRLEN);
-    ogs_expect_or_return_val(buf, NULL);
+    if (!buf) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
 
     return (char *)OGS_INET6_NTOP(addr6, buf);
 }
@@ -585,7 +528,10 @@
     memcpy(tmp, addr6, prefixlen >> 3);
 
     buf = ogs_calloc(1, OGS_ADDRSTRLEN);
-    ogs_expect_or_return_val(buf, NULL);
+    if (!buf) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
 
     if (OGS_INET6_NTOP(tmp, buf) == NULL) {
         ogs_fatal("Invalid IPv6 address");
@@ -643,7 +589,10 @@
     ogs_assert(prefixlen);
     ogs_assert(string);
     pv = v = ogs_strdup(string);
-    ogs_expect_or_return_val(v, OGS_ERROR);
+    if (!v) {
+        ogs_error("ogs_strdup() failed");
+        return OGS_ERROR;
+    }
 
     ipstr = strsep(&v, "/");
     if (ipstr)
@@ -656,7 +605,10 @@
     }
 
     rv = ogs_inet_pton(AF_INET6, ipstr, &tmp);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_inet_pton() failed");
+        return rv;
+    }
 
     memcpy(addr6, tmp.sin6.sin6_addr.s6_addr, OGS_IPV6_LEN);
     *prefixlen = atoi(mask_or_numbits);

open5gs_2.5.8.tar.xz/lib/proto/types.h -> open5gs_2.6.0.tar.xz/lib/proto/types.h Changed

@@ -50,14 +50,15 @@
 #define OGS_MAX_NUM_OF_FLOW_IN_BEARER   16
 
 #define OGS_MAX_NUM_OF_GTPU_RESOURCE    4
+#define OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI 8
 
-#define OGS_MAX_SDU_LEN                 OGS_HUGE_LEN
-#define OGS_MAX_PKT_LEN                 2048
 #define OGS_PLMN_ID_LEN                 3
 #define OGS_MAX_PLMN_ID_BCD_LEN         6
 
 #define OGS_CHRGCHARS_LEN               2
 
+#define OGS_MSIN_LEN                    5
+
 #define OGS_BCD_TO_BUFFER_LEN(x)        (((x)+1)/2)
 #define OGS_MAX_IMSI_BCD_LEN            15
 #define OGS_MAX_IMSI_LEN                \
@@ -176,14 +177,17 @@
         uint8_t region, uint16_t set, uint8_t pointer);
 
 /************************************
- * SUPI/SUCI                       */
-char *ogs_supi_from_suci(char *suci);
-char *ogs_supi_from_supi_or_suci(char *supi_or_suci);
+ * 9.11.3.4 5GS mobile identity
+ * - Protection Scheme */
+#define OGS_PROTECTION_SCHEME_NULL 0
+#define OGS_PROTECTION_SCHEME_PROFILE_A 1
+#define OGS_PROTECTION_SCHEME_PROFILE_B 2
 
 /************************************
  * SUPI/GPSI                       */
 #define OGS_ID_SUPI_TYPE_IMSI "imsi"
 #define OGS_ID_GPSI_TYPE_MSISDN "msisdn"
+#define OGS_ID_SUPI_TYPE_IMEISV "imeisv"
 char *ogs_id_get_type(char *str);
 char *ogs_id_get_value(char *str);
 
@@ -447,6 +451,7 @@
         (__pCCrULE)->num_of_flow = 0; \
     } while(0)
 
+
 /**********************************
  * PDN Structure                 */
 typedef struct ogs_session_s {
@@ -478,6 +483,8 @@
 
     ogs_paa_t paa;
     ogs_ip_t ue_ip;
+    char **ipv4_framed_routes;
+    char **ipv6_framed_routes;
     ogs_ip_t smf_ip;
 } ogs_session_t;
 
@@ -781,6 +788,11 @@
 int ogs_pcc_rule_update_qos_from_media(
         ogs_pcc_rule_t *pcc_rule, ogs_media_component_t *media_component);
 
+typedef struct ogs_datum_s {
+    unsigned char *data;
+    unsigned int size;
+} ogs_datum_t;
+
 #ifdef __cplusplus
 }
 #endif

open5gs_2.5.8.tar.xz/lib/s1ap/message.c -> open5gs_2.6.0.tar.xz/lib/s1ap/message.c Changed

open5gs_2.5.8.tar.xz/lib/sbi/client.c -> open5gs_2.6.0.tar.xz/lib/sbi/client.c Changed

@@ -98,18 +98,22 @@
     curl_global_cleanup();
 }
 
-ogs_sbi_client_t *ogs_sbi_client_add(ogs_sockaddr_t *addr)
+ogs_sbi_client_t *ogs_sbi_client_add(
+        OpenAPI_uri_scheme_e scheme, ogs_sockaddr_t *addr)
 {
     ogs_sbi_client_t *client = NULL;
     CURLM *multi = NULL;
 
+    ogs_assert(scheme);
     ogs_assert(addr);
 
     ogs_pool_alloc(&client_pool, &client);
     ogs_assert(client);
     memset(client, 0, sizeof(ogs_sbi_client_t));
 
-    ogs_debug("ogs_sbi_client_add()");
+    client->scheme = scheme;
+
+    ogs_debug("ogs_sbi_client_add%s", OpenAPI_uri_scheme_ToString(scheme));
     OGS_OBJECT_REF(client);
 
     ogs_assert(OGS_OK == ogs_copyaddrinfo(&client->node.addr, addr));
@@ -183,14 +187,17 @@
         ogs_sbi_client_remove(client);
 }
 
-ogs_sbi_client_t *ogs_sbi_client_find(ogs_sockaddr_t *addr)
+ogs_sbi_client_t *ogs_sbi_client_find(
+        OpenAPI_uri_scheme_e scheme, ogs_sockaddr_t *addr)
 {
     ogs_sbi_client_t *client = NULL;
 
+    ogs_assert(scheme);
     ogs_assert(addr);
 
     ogs_list_for_each(&ogs_sbi_self()->client_list, client) {
-        if (ogs_sockaddr_is_equal(client->node.addr, addr) == true)
+        if (client->scheme == scheme &&
+            ogs_sockaddr_is_equal(client->node.addr, addr) == true)
             break;
     }
 
@@ -302,7 +309,10 @@
     ogs_assert(request->h.method);
 
     ogs_pool_alloc(&connection_pool, &conn);
-    ogs_expect_or_return_val(conn, NULL);
+    if (!conn) {
+        ogs_error("ogs_pool_alloc() failed");
+        return NULL;
+    }
     memset(conn, 0, sizeof(connection_t));
 
     conn->client = client;
@@ -372,7 +382,10 @@
         request->h.uri = uri;
     }
 
-    curl_easy_setopt(conn->easy, CURLOPT_BUFFERSIZE, OGS_MAX_SDU_LEN*2);
+    curl_easy_setopt(conn->easy, CURLOPT_BUFFERSIZE, OGS_MAX_SDU_LEN);
+
+    curl_easy_setopt(conn->easy, CURLOPT_SSL_VERIFYPEER, 0);
+    curl_easy_setopt(conn->easy, CURLOPT_SSL_VERIFYHOST, 0);
 
     /* HTTP Method */
     if (strcmp(request->h.method, OGS_SBI_HTTP_METHOD_PUT) == 0 ||
@@ -627,7 +640,10 @@
     ogs_debug("%s %s", request->h.method, request->h.uri);
 
     conn = connection_add(client, client_cb, request, data);
-    ogs_expect_or_return_val(conn, false);
+    if (!conn) {
+        ogs_error("connection_add() failed");
+        return false;
+    }
 
     return true;
 }
@@ -636,6 +652,8 @@
         ogs_sbi_client_t *client, ogs_sbi_client_cb_f client_cb,
         ogs_sbi_request_t *request, void *data)
 {
+    bool rc;
+
     ogs_assert(request);
     ogs_assert(client);
 
@@ -656,7 +674,7 @@
         apiroot = ogs_sbi_client_apiroot(client);
         ogs_assert(apiroot);
 
-        path = ogs_sbi_getpath_from_uri(request->h.uri);
+        rc = ogs_sbi_getpath_from_uri(&path, request->h.uri);
         ogs_assert(path);
 
         request->h.uri = ogs_msprintf("%s/%s", apiroot, path);
@@ -669,10 +687,10 @@
         ogs_free(old);
     }
 
-    ogs_expect_or_return_val(true ==
-        ogs_sbi_client_send_request(client, client_cb, request, data), false);
+    rc = ogs_sbi_client_send_request(client, client_cb, request, data);
+    ogs_expect(rc == true);
 
-    return true;
+    return rc;
 }
 
 static size_t write_cb(void *contents, size_t size, size_t nmemb, void *data)

open5gs_2.5.8.tar.xz/lib/sbi/client.h -> open5gs_2.6.0.tar.xz/lib/sbi/client.h Changed

open5gs_2.5.8.tar.xz/lib/sbi/context.c -> open5gs_2.6.0.tar.xz/lib/sbi/context.c Changed

@@ -115,6 +115,44 @@
     return &self;
 }
 
+bool ogs_app_tls_server_enabled(void)
+{
+    if (self.tls.enabled == OGS_SBI_TLS_ENABLED_AUTO) {
+        if (self.tls.server.key && self.tls.server.cert)
+            return true;
+        else
+            return false;
+    } else if (self.tls.enabled == OGS_SBI_TLS_ENABLED_YES) {
+        ogs_assert(self.tls.server.key);
+        ogs_assert(self.tls.server.cert);
+        return true;
+    } else if (self.tls.enabled == OGS_SBI_TLS_ENABLED_NO) {
+        return false;
+    } else {
+        ogs_error("Unknown TLS enabled mode %d", self.tls.enabled);
+        return false;
+    }
+}
+
+bool ogs_app_tls_client_enabled(void)
+{
+    if (self.tls.enabled == OGS_SBI_TLS_ENABLED_AUTO) {
+        if (self.tls.client.key && self.tls.client.cert)
+            return true;
+        else
+            return false;
+    } else if (self.tls.enabled == OGS_SBI_TLS_ENABLED_YES) {
+        ogs_assert(self.tls.client.key);
+        ogs_assert(self.tls.client.cert);
+        return true;
+    } else if (self.tls.enabled == OGS_SBI_TLS_ENABLED_NO) {
+        return false;
+    } else {
+        ogs_error("Unknown TLS enabled mode %d", self.tls.enabled);
+        return false;
+    }
+}
+
 static int ogs_sbi_context_prepare(void)
 {
     self.sbi_port = OGS_SBI_HTTP_PORT;
@@ -123,6 +161,8 @@
     self.content_encoding = "gzip";
 #endif
 
+    self.tls.enabled = OGS_SBI_TLS_ENABLED_AUTO;
+
     return OGS_OK;
 }
 
@@ -130,7 +170,7 @@
         const char *local, const char *nrf, const char *scp)
 {
     /* If SMF is only used in 4G EPC, no SBI interface is required.  */
-    if (strcmp(local, "smf") != 0 &&
+    if (local && strcmp(local, "smf") != 0 &&
         ogs_list_first(&self.server_list) == NULL) {
         ogs_error("No %s.sbi: in '%s'", local, ogs_app()->file);
         return OGS_ERROR;
@@ -139,18 +179,19 @@
     ogs_assert(context_initialized == 1);
     switch (self.discovery_config.delegated) {
     case OGS_SBI_DISCOVERY_DELEGATED_AUTO:
-        if (strcmp(local, "nrf") == 0) {
+        if (local && strcmp(local, "nrf") == 0) {
             /* Skip NRF */
-        } else if (strcmp(local, "scp") == 0) {
+        } else if (local && strcmp(local, "scp") == 0) {
             /* Skip SCP */
-        } else if (strcmp(local, "smf") == 0) {
+        } else if (local && strcmp(local, "smf") == 0) {
             /* Skip SMF since SMF can run 4G */
         } else {
             if (NF_INSTANCE_CLIENT(self.nrf_instance) ||
                 NF_INSTANCE_CLIENT(self.scp_instance)) {
             } else {
                 ogs_error("DELEGATED_AUTO - Both NRF and %s are unavailable",
-                        strcmp(scp, "next_scp") == 0 ? "Next-hop SCP" : "SCP");
+                        scp && strcmp(scp, "next_scp") == 0 ?
+                            "Next-hop SCP" : "SCP");
                 return OGS_ERROR;
             }
         }
@@ -158,7 +199,8 @@
     case OGS_SBI_DISCOVERY_DELEGATED_YES:
         if (NF_INSTANCE_CLIENT(self.scp_instance) == NULL) {
             ogs_error("DELEGATED_YES - no %s available",
-                    strcmp(scp, "next_scp") == 0 ? "Next-hop SCP" : "SCP");
+                    scp && strcmp(scp, "next_scp") == 0 ?
+                        "Next-hop SCP" : "SCP");
             return OGS_ERROR;
         }
         break;
@@ -174,6 +216,27 @@
         ogs_assert_if_reached();
     }
 
+    if (self.tls.enabled == OGS_SBI_TLS_ENABLED_YES) {
+
+        if (!self.tls.server.key) {
+            ogs_error("No Server Key");
+            return OGS_ERROR;
+        }
+        if (!self.tls.server.cert) {
+            ogs_error("No Server Certificate");
+            return OGS_ERROR;
+        }
+
+        if (!self.tls.client.key) {
+            ogs_error("No Client Key");
+            return OGS_ERROR;
+        }
+        if (!self.tls.client.cert) {
+            ogs_error("No Client Certificate");
+            return OGS_ERROR;
+        }
+    }
+
     return OGS_OK;
 }
 
@@ -212,8 +275,6 @@
                         const char *hostnameOGS_MAX_NUM_OF_HOSTNAME;
                         int num_of_advertise = 0;
                         const char *advertiseOGS_MAX_NUM_OF_HOSTNAME;
-                        const char *key = NULL;
-                        const char *pem = NULL;
 
                         uint16_t port = self.sbi_port;
                         const char *dev = NULL;
@@ -307,22 +368,6 @@
                                         &sbi_iter, &option);
                                 if (rv != OGS_OK) return rv;
                                 is_option = true;
-                            } else if (!strcmp(sbi_key, "tls")) {
-                                ogs_yaml_iter_t tls_iter;
-                                ogs_yaml_iter_recurse(&sbi_iter, &tls_iter);
-
-                                while (ogs_yaml_iter_next(&tls_iter)) {
-                                    const char *tls_key =
-                                        ogs_yaml_iter_key(&tls_iter);
-                                    ogs_assert(tls_key);
-
-                                    if (!strcmp(tls_key, "key")) {
-                                        key = ogs_yaml_iter_value(&tls_iter);
-                                    } else if (!strcmp(tls_key, "pem")) {
-                                        pem = ogs_yaml_iter_value(&tls_iter);
-                                    } else
-                                        ogs_warn("unknown key `%s`", tls_key);
-                                }
                             } else
                                 ogs_warn("unknown key `%s`", sbi_key);
                         }
@@ -371,9 +416,6 @@
                             if (addr && ogs_app()->parameter.no_ipv4 == 0)
                                 ogs_sbi_server_set_advertise(
                                         server, AF_INET, addr);
-
-                            if (key) server->tls.key = key;
-                            if (pem) server->tls.pem = pem;
                         }
                         node6 = ogs_list_first(&list6);
                         if (node6) {
@@ -384,9 +426,6 @@
                             if (addr && ogs_app()->parameter.no_ipv6 == 0)
                                 ogs_sbi_server_set_advertise(
                                         server, AF_INET6, addr);
-
-                            if (key) server->tls.key = key;
-                            if (pem) server->tls.pem = pem;
                         }
 
                         if (addr)
@@ -502,8 +541,6 @@
                         int i, num = 0;
                         const char *hostnameOGS_MAX_NUM_OF_HOSTNAME;
                         uint16_t port = self.sbi_port;
-                        const char *key = NULL;
-                        const char *pem = NULL;
 
                         if (ogs_yaml_iter_type(&sbi_array) ==
                                 YAML_MAPPING_NODE) {
@@ -559,22 +596,6 @@
                             } else if (!strcmp(sbi_key, "port")) {
                                 const char *v = ogs_yaml_iter_value(&sbi_iter);
                                 if (v) port = atoi(v);
-                            } else if (!strcmp(sbi_key, "tls")) {
-                                ogs_yaml_iter_t tls_iter;
-                                ogs_yaml_iter_recurse(&sbi_iter, &tls_iter);
-
-                                while (ogs_yaml_iter_next(&tls_iter)) {
-                                    const char *tls_key =
-                                        ogs_yaml_iter_key(&tls_iter);
-                                    ogs_assert(tls_key);
-
-                                    if (!strcmp(tls_key, "key")) {
-                                        key = ogs_yaml_iter_value(&tls_iter);
-                                    } else if (!strcmp(tls_key, "pem")) {
-                                        pem = ogs_yaml_iter_value(&tls_iter);
-                                    } else
-                                        ogs_warn("unknown key `%s`", tls_key);
-                                }
                             } else if (!strcmp(sbi_key, "advertise")) {
                                 /* Nothing in client */
                             } else
@@ -595,13 +616,14 @@
 
                         if (addr == NULL) continue;
 
-                        client = ogs_sbi_client_add(addr);
+                        client = ogs_sbi_client_add(
+                                    ogs_app_tls_client_enabled() == true ?
+                                        OpenAPI_uri_scheme_https :
+                                        OpenAPI_uri_scheme_http,
+                                    addr);
                         ogs_assert(client);
                         OGS_SBI_SETUP_CLIENT(self.nrf_instance, client);
 
-                        if (key) client->tls.key = key;
-                        if (pem) client->tls.pem = pem;
-
                         ogs_freeaddrinfo(addr);
 
                     } while (ogs_yaml_iter_type(&sbi_array) ==
@@ -625,8 +647,6 @@
                         int i, num = 0;
                         const char *hostnameOGS_MAX_NUM_OF_HOSTNAME;
                         uint16_t port = self.sbi_port;
-                        const char *key = NULL;
-                        const char *pem = NULL;
 
                         if (ogs_yaml_iter_type(&sbi_array) ==
                                 YAML_MAPPING_NODE) {
@@ -682,22 +702,6 @@
                             } else if (!strcmp(sbi_key, "port")) {
                                 const char *v = ogs_yaml_iter_value(&sbi_iter);
                                 if (v) port = atoi(v);
-                            } else if (!strcmp(sbi_key, "tls")) {
-                                ogs_yaml_iter_t tls_iter;
-                                ogs_yaml_iter_recurse(&sbi_iter, &tls_iter);
-
-                                while (ogs_yaml_iter_next(&tls_iter)) {
-                                    const char *tls_key =
-                                        ogs_yaml_iter_key(&tls_iter);
-                                    ogs_assert(tls_key);
-
-                                    if (!strcmp(tls_key, "key")) {
-                                        key = ogs_yaml_iter_value(&tls_iter);
-                                    } else if (!strcmp(tls_key, "pem")) {
-                                        pem = ogs_yaml_iter_value(&tls_iter);
-                                    } else
-                                        ogs_warn("unknown key `%s`", tls_key);
-                                }
                             } else if (!strcmp(sbi_key, "advertise")) {
                                 /* Nothing in client */
                             } else
@@ -718,19 +722,155 @@
 
                         if (addr == NULL) continue;
 
-                        client = ogs_sbi_client_add(addr);
+                        client = ogs_sbi_client_add(
+                                    ogs_app_tls_client_enabled() == true ?
+                                        OpenAPI_uri_scheme_https :
+                                        OpenAPI_uri_scheme_http,
+                                    addr);
                         ogs_assert(client);
                         OGS_SBI_SETUP_CLIENT(self.scp_instance, client);
 
-                        if (key) client->tls.key = key;
-                        if (pem) client->tls.pem = pem;
-
                         ogs_freeaddrinfo(addr);
 
                     } while (ogs_yaml_iter_type(&sbi_array) ==
                             YAML_SEQUENCE_NODE);
                 }
             }
+        } else if (!strcmp(root_key, "tls")) {
+            ogs_yaml_iter_t tls_iter;
+            ogs_yaml_iter_recurse(&root_iter, &tls_iter);
+            while (ogs_yaml_iter_next(&tls_iter)) {
+                const char *tls_key = ogs_yaml_iter_key(&tls_iter);
+                ogs_assert(tls_key);
+                if (!strcmp(tls_key, "enabled")) {
+                    const char *v = ogs_yaml_iter_value(&tls_iter);
+                    if (!strcmp(v, "auto"))
+                        self.tls.enabled = OGS_SBI_TLS_ENABLED_AUTO;
+                    else if (!strcmp(v, "yes"))
+                        self.tls.enabled = OGS_SBI_TLS_ENABLED_YES;
+                    else if (!strcmp(v, "no"))
+                        self.tls.enabled = OGS_SBI_TLS_ENABLED_NO;
+                    else
+                        ogs_warn("unknown 'tls.enabled' value `%s`", v);
+                } else if (!strcmp(tls_key, "server")) {
+                    ogs_yaml_iter_t server_iter;
+                    ogs_yaml_iter_recurse(&tls_iter, &server_iter);
+
+                    while (ogs_yaml_iter_next(&server_iter)) {
+                        const char *server_key =
+                            ogs_yaml_iter_key(&server_iter);
+                        ogs_assert(server_key);
+                        if (!strcmp(server_key, "cacert")) {
+                            self.tls.server.cacert =
+                                ogs_yaml_iter_value(&server_iter);
+                        } else if (!strcmp(server_key, "cert")) {
+                            self.tls.server.cert =
+                                ogs_yaml_iter_value(&server_iter);
+                        } else if (!strcmp(server_key, "key")) {
+                            self.tls.server.key =
+                                ogs_yaml_iter_value(&server_iter);
+                        } else
+                            ogs_warn("unknown key `%s`", server_key);
+                    }
+                } else if (!strcmp(tls_key, "client")) {
+                    ogs_yaml_iter_t client_iter;
+                    ogs_yaml_iter_recurse(&tls_iter, &client_iter);
+
+                    while (ogs_yaml_iter_next(&client_iter)) {
+                        const char *client_key =
+                            ogs_yaml_iter_key(&client_iter);
+                        ogs_assert(client_key);
+                        if (!strcmp(client_key, "cacert")) {
+                            self.tls.client.cacert =
+                                ogs_yaml_iter_value(&client_iter);
+                        } else if (!strcmp(client_key, "cert")) {
+                            self.tls.client.cert =
+                                ogs_yaml_iter_value(&client_iter);
+                        } else if (!strcmp(client_key, "key")) {
+                            self.tls.client.key =
+                                ogs_yaml_iter_value(&client_iter);
+                        } else
+                            ogs_warn("unknown key `%s`", client_key);
+                    }
+                } else
+                    ogs_warn("unknown key `%s`", tls_key);
+            }
+        } else if (!strcmp(root_key, "hnet")) {
+            ogs_yaml_iter_t hnet_array, hnet_iter;
+            ogs_yaml_iter_recurse(&root_iter, &hnet_array);
+            do {
+                uint8_t id = 0, scheme = 0;
+                const char *filename = NULL;
+
+                if (ogs_yaml_iter_type(&hnet_array) ==
+                        YAML_MAPPING_NODE) {
+                    memcpy(&hnet_iter, &hnet_array,
+                            sizeof(ogs_yaml_iter_t));
+                } else if (ogs_yaml_iter_type(&hnet_array) ==
+                    YAML_SEQUENCE_NODE) {
+                    if (!ogs_yaml_iter_next(&hnet_array))
+                        break;
+                    ogs_yaml_iter_recurse(&hnet_array,
+                            &hnet_iter);
+                } else if (ogs_yaml_iter_type(&hnet_array) ==
+                    YAML_SCALAR_NODE) {
+                    break;
+                } else
+                    ogs_assert_if_reached();
+
+                while (ogs_yaml_iter_next(&hnet_iter)) {
+                    const char *hnet_key =
+                        ogs_yaml_iter_key(&hnet_iter);
+                    ogs_assert(hnet_key);
+                    if (!strcmp(hnet_key, "id")) {
+                        const char *v = ogs_yaml_iter_value(&hnet_iter);
+                        if (v) {
+                            if (atoi(v) >= 1 && atoi(v) <= 254) id = atoi(v);
+                        }
+                    } else if (!strcmp(hnet_key, "scheme")) {
+                        const char *v = ogs_yaml_iter_value(&hnet_iter);
+                        if (v) {
+                            if (atoi(v) == 1 || atoi(v) == 2)
+                                scheme = atoi(v);
+                        }
+                    } else if (!strcmp(hnet_key, "key")) {
+                        filename = ogs_yaml_iter_value(&hnet_iter);
+                    } else
+                        ogs_warn("unknown key `%s`", hnet_key);
+                }
+
+                if (id >= OGS_HOME_NETWORK_PKI_VALUE_MIN &&
+                    id <= OGS_HOME_NETWORK_PKI_VALUE_MAX &&
+                    filename) {
+                    if (scheme == OGS_PROTECTION_SCHEME_PROFILE_A) {
+                        rv = ogs_pem_decode_curve25519_key(
+                                filename, self.hnetid.key);
+                        if (rv == OGS_OK) {
+                            self.hnetid.avail = true;
+                            self.hnetid.scheme = scheme;
+                        } else {
+                            ogs_error(
+                                    "ogs_pem_decode_curve25519_key%s failed",
+                                    filename);
+                        }
+                    } else if (scheme == OGS_PROTECTION_SCHEME_PROFILE_B) {
+                        rv = ogs_pem_decode_secp256r1_key(
+                                filename, self.hnetid.key);
+                        if (rv == OGS_OK) {
+                            self.hnetid.avail = true;
+                            self.hnetid.scheme = scheme;
+                        } else {
+                            ogs_error(
+                                    "ogs_pem_decode_secp256r1_key%s failed",
+                                    filename);
+                        }
+                    } else
+                        ogs_error("Invalid scheme %d", scheme);
+                } else
+                    ogs_error("Invalid home network configuration "
+                            "id:%d, filename:%s", id, filename);
+            } while (ogs_yaml_iter_type(&hnet_array) ==
+                    YAML_SEQUENCE_NODE);
         }
     }
 
@@ -998,6 +1138,7 @@
     nf_service->name = ogs_strdup(name);
     ogs_assert(nf_service->name);
     nf_service->scheme = scheme;
+    ogs_assert(nf_service->scheme);
 
     nf_service->status = OpenAPI_nf_service_status_REGISTERED;
 
@@ -1329,7 +1470,6 @@
     ogs_uuid_t uuid;
     char idOGS_UUID_FORMATTED_LENGTH + 1;
     char *hostname = NULL;
-    OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
 
     ogs_assert(nf_instance);
     ogs_assert(name);
@@ -1337,26 +1477,10 @@
     ogs_uuid_get(&uuid);
     ogs_uuid_format(id, &uuid);
 
-    ogs_list_for_each(&ogs_sbi_self()->server_list, server) {
-        OpenAPI_uri_scheme_e s;
-
-        if (server->tls.key && server->tls.pem)
-            s = OpenAPI_uri_scheme_https;
-        else
-            s = OpenAPI_uri_scheme_http;
-
-        if (scheme == OpenAPI_uri_scheme_NULL) {
-            scheme = s;
-        } else if (scheme != s) {
-            ogs_fatal("Please CHECK CONFIGURATION - sbi%d:%s",
-                    nf_instance->nf_type,
-                    OpenAPI_nf_type_ToString(nf_instance->nf_type));
-            ogs_assert_if_reached();
-            return NULL;
-        }
-    }
-
-    nf_service = ogs_sbi_nf_service_add(nf_instance, id, name, scheme);
+    nf_service = ogs_sbi_nf_service_add(nf_instance, id, name,
+                    ogs_app_tls_server_enabled() == true ?
+                        OpenAPI_uri_scheme_https :
+                        OpenAPI_uri_scheme_http);
     ogs_assert(nf_service);
 
     hostname = NULL;
@@ -1410,12 +1534,16 @@
     return nf_service;
 }
 
-static ogs_sbi_client_t *find_client_by_fqdn(char *fqdn, int port)
+static ogs_sbi_client_t *find_client_by_fqdn(
+        OpenAPI_uri_scheme_e scheme, char *fqdn, int port)
 {
     int rv;
     ogs_sockaddr_t *addr = NULL;
     ogs_sbi_client_t *client = NULL;
 
+    ogs_assert(scheme);
+    ogs_assert(fqdn);
+
     rv = ogs_getaddrinfo(&addr, AF_UNSPEC, fqdn,
             port ? port : ogs_sbi_self()->sbi_port, 0);
     if (rv != OGS_OK) {
@@ -1423,9 +1551,9 @@
         return NULL;
     }
 
-    client = ogs_sbi_client_find(addr);
+    client = ogs_sbi_client_find(scheme, addr);
     if (!client) {
-        client = ogs_sbi_client_add(addr);
+        client = ogs_sbi_client_add(scheme, addr);
         ogs_assert(client);
     }
 
@@ -1439,9 +1567,13 @@
 {
     ogs_sbi_client_t *client = NULL;
     ogs_sockaddr_t *addr = NULL;
+    OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
+
+    scheme = ogs_app_tls_client_enabled() == true ?
+                OpenAPI_uri_scheme_https : OpenAPI_uri_scheme_http;
 
     if (nf_instance->fqdn)
-        client = find_client_by_fqdn(nf_instance->fqdn, 0);
+        client = find_client_by_fqdn(scheme, nf_instance->fqdn, 0);
 
     if (!client) {
         /* At this point, CLIENT selection method is very simple. */
@@ -1449,9 +1581,9 @@
         if (nf_instance->num_of_ipv6) addr = nf_instance->ipv60;
 
         if (addr) {
-            client = ogs_sbi_client_find(addr);
+            client = ogs_sbi_client_find(scheme, addr);
             if (!client) {
-                client = ogs_sbi_client_add(addr);
+                client = ogs_sbi_client_add(scheme, addr);
                 ogs_assert(client);
             }
         }
@@ -1465,8 +1597,10 @@
     ogs_sbi_client_t *client = NULL;
     ogs_sockaddr_t *addr = NULL;
 
+    ogs_assert(nf_service->scheme);
+
     if (nf_service->fqdn)
-        client = find_client_by_fqdn(nf_service->fqdn, 0);
+        client = find_client_by_fqdn(nf_service->scheme, nf_service->fqdn, 0);
 
     if (!client) {
         /* At this point, CLIENT selection method is very simple. */
@@ -1477,9 +1611,9 @@
         }
 
         if (addr) {
-            client = ogs_sbi_client_find(addr);
+            client = ogs_sbi_client_find(nf_service->scheme, addr);
             if (!client) {
-                client = ogs_sbi_client_add(addr);
+                client = ogs_sbi_client_add(nf_service->scheme, addr);
                 ogs_assert(client);
             }
         }
@@ -1660,7 +1794,10 @@
     ogs_assert(sbi_object);
 
     ogs_pool_alloc(&xact_pool, &xact);
-    ogs_expect_or_return_val(xact, NULL);
+    if (!xact) {
+        ogs_error("ogs_pool_alloc() failed");
+        return NULL;
+    }
     memset(xact, 0, sizeof(ogs_sbi_xact_t));
 
     xact->sbi_object = sbi_object;

open5gs_2.5.8.tar.xz/lib/sbi/context.h -> open5gs_2.6.0.tar.xz/lib/sbi/context.h Changed

@@ -46,10 +46,34 @@
     bool prefer_requester_nf_instance_id;
 } ogs_sbi_discovery_config_t;
 
+typedef enum {
+    OGS_SBI_TLS_ENABLED_AUTO = 0,
+    OGS_SBI_TLS_ENABLED_YES,
+    OGS_SBI_TLS_ENABLED_NO,
+} ogs_sbi_tls_enabled_mode_e;
+
 typedef struct ogs_sbi_context_s {
     ogs_sbi_discovery_config_t discovery_config; /* SCP Discovery Delegated */
 
-    uint32_t sbi_port;                      /* SBI local port */
+    struct {
+        ogs_sbi_tls_enabled_mode_e enabled;
+        struct {
+            const char *cacert;
+            const char *cert;
+            const char *key;
+        } server, client;
+    } tls;
+
+#define OGS_HOME_NETWORK_PKI_VALUE_MIN 1
+#define OGS_HOME_NETWORK_PKI_VALUE_MAX 254
+
+    struct {
+        uint8_t avail;
+        uint8_t scheme;
+        uint8_t keyOGS_ECCKEY_LEN; /* 32 bytes Private Key */
+    } hnetOGS_HOME_NETWORK_PKI_VALUE_MAX+1; /* PKI Value : 1 ~ 254 */
+
+    uint16_t sbi_port;                      /* SBI local port */
 
     ogs_list_t server_list;
     ogs_list_t client_list;

open5gs_2.5.8.tar.xz/lib/sbi/conv.c -> open5gs_2.6.0.tar.xz/lib/sbi/conv.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+ * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com>
  *
  * This file is part of Open5GS.
  *
@@ -20,6 +20,258 @@
 #include "ogs-sbi.h"
 #include "yuarel.h"
 
+static int parse_scheme_output(
+        char *_protection_scheme_id, char *_scheme_output,
+        ogs_datum_t *ecckey, ogs_datum_t *cipher_text, uint8_t *mactag)
+{
+    uint8_t protection_scheme_id;
+    uint8_t scheme_output_size;
+    uint8_t *scheme_output = NULL;
+    uint8_t *p = NULL;
+
+    ogs_assert(_protection_scheme_id);
+    ogs_assert(_scheme_output);
+    ogs_assert(ecckey);
+    ogs_assert(mactag);
+    ogs_assert(cipher_text);
+
+    scheme_output_size = strlen(_scheme_output)/2;
+    if (scheme_output_size <= ((OGS_ECCKEY_LEN+1) + OGS_MACTAG_LEN)) {
+        ogs_error("Not enought length %d", (int)strlen(_scheme_output));
+        return OGS_ERROR;
+    }
+
+    scheme_output = ogs_calloc(1, scheme_output_size);
+    ogs_assert(scheme_output);
+
+    ogs_ascii_to_hex(_scheme_output, strlen(_scheme_output),
+            scheme_output, scheme_output_size);
+
+    protection_scheme_id = atoi(_protection_scheme_id);
+    if (protection_scheme_id == OGS_PROTECTION_SCHEME_PROFILE_A) {
+        ecckey->size = OGS_ECCKEY_LEN;
+    } else if (protection_scheme_id == OGS_PROTECTION_SCHEME_PROFILE_B) {
+        ecckey->size = OGS_ECCKEY_LEN+1;
+    } else {
+        ogs_free(scheme_output);
+
+        ogs_fatal("Invalid protection scheme id %s", _protection_scheme_id);
+        ogs_assert_if_reached();
+
+        return OGS_ERROR;
+    }
+
+    cipher_text->size = OGS_MSIN_LEN;
+
+    p = scheme_output;
+    ecckey->data = ogs_memdup(p, ecckey->size);
+    ogs_assert(ecckey->data);
+
+    p += ecckey->size;
+    cipher_text->data = ogs_memdup(p, cipher_text->size);
+    ogs_assert(cipher_text->data);
+
+    p += cipher_text->size;
+    memcpy(mactag, p, OGS_MACTAG_LEN);
+
+    ogs_free(scheme_output);
+
+    return OGS_OK;
+}
+
+char *ogs_supi_from_suci(char *suci)
+{
+#define MAX_SUCI_TOKEN 16
+    char *arrayMAX_SUCI_TOKEN;
+    char *p, *tmp;
+    int i;
+    char *supi = NULL;
+
+    ogs_assert(suci);
+    tmp = ogs_strdup(suci);
+    if (!tmp) {
+        ogs_error("ogs_strdup() failed");
+        return NULL;
+    }
+
+    p = tmp;
+    i = 0;
+    while((arrayi++ = strsep(&p, "-"))) {
+        /* Empty Body */
+    }
+
+    SWITCH(array0)
+    CASE("suci")
+        SWITCH(array1)
+        CASE("0")   /* SUPI format : IMSI */
+            if (array2 && array3 && array5 && array6 && array7) {
+                uint8_t protection_scheme_id = atoi(array5);
+                uint8_t home_network_pki_value = atoi(array6);
+
+                if (protection_scheme_id == OGS_PROTECTION_SCHEME_NULL) {
+                    supi = ogs_msprintf("imsi-%s%s%s",
+                            array2, array3, array7);
+                } else if (protection_scheme_id ==
+                            OGS_PROTECTION_SCHEME_PROFILE_A ||
+                        protection_scheme_id ==
+                            OGS_PROTECTION_SCHEME_PROFILE_B) {
+
+                    ogs_datum_t pubkey;
+                    ogs_datum_t cipher_text;
+                    ogs_datum_t plain_text;
+                    char *plain_bcd;
+                    uint8_t mactag1OGS_MACTAG_LEN, mactag2OGS_MACTAG_LEN;
+
+                    uint8_t zOGS_ECCKEY_LEN;
+
+                    uint8_t ekOGS_KEY_LEN;
+                    uint8_t icbOGS_IVEC_LEN;
+                    uint8_t mkOGS_SHA256_DIGEST_SIZE;
+
+                    if (home_network_pki_value <
+                            OGS_HOME_NETWORK_PKI_VALUE_MIN ||
+                        home_network_pki_value >
+                            OGS_HOME_NETWORK_PKI_VALUE_MAX) {
+                        ogs_error("Invalid HNET PKI Value %s", array6);
+                        break;
+                    }
+
+                    if (!ogs_sbi_self()->hnethome_network_pki_value.avail) {
+                        ogs_error("HNET PKI Value Not Avaiable %s", array6);
+                        break;
+                    }
+
+                    if (ogs_sbi_self()->hnethome_network_pki_value.scheme
+                            != protection_scheme_id) {
+                        ogs_error("Scheme Not Matched %d != %s",
+                            ogs_sbi_self()->hnetprotection_scheme_id.scheme,
+                            array5);
+                        break;
+                    }
+
+                    if (parse_scheme_output(
+                            array5, array7,
+                            &pubkey, &cipher_text, mactag1) != OGS_OK) {
+                        ogs_error("parse_scheme_output%s failed", array7);
+                        break;
+                    }
+
+                    if (protection_scheme_id ==
+                            OGS_PROTECTION_SCHEME_PROFILE_A) {
+                        curve25519_donna(z,
+                            ogs_sbi_self()->hnethome_network_pki_value.key,
+                            pubkey.data);
+                    } else if (protection_scheme_id ==
+                            OGS_PROTECTION_SCHEME_PROFILE_B) {
+                        if (ecdh_shared_secret(
+                                pubkey.data,
+                                ogs_sbi_self()->
+                                    hnethome_network_pki_value.key,
+                                z) != 1) {
+                            ogs_error("ecdh_shared_secret() failed");
+                            ogs_log_hexdump(OGS_LOG_ERROR,
+                                    pubkey.data, OGS_ECCKEY_LEN);
+                            ogs_log_hexdump(OGS_LOG_ERROR,
+                                ogs_sbi_self()->
+                                    hnethome_network_pki_value.key,
+                                    OGS_ECCKEY_LEN);
+                            goto cleanup;
+                        }
+                    } else
+                        ogs_assert_if_reached();
+
+                    ogs_kdf_ansi_x963(
+                        z, OGS_ECCKEY_LEN, pubkey.data, pubkey.size,
+                        ek, icb, mk);
+
+                    ogs_hmac_sha256(
+                            mk, OGS_SHA256_DIGEST_SIZE,
+                            cipher_text.data, cipher_text.size,
+                            mactag2, OGS_MACTAG_LEN);
+
+                    if (memcmp(mactag1, mactag2, OGS_MACTAG_LEN) != 0) {
+                        ogs_error("MAC-tag not matched");
+                        ogs_log_hexdump(OGS_LOG_ERROR, mactag1, OGS_MACTAG_LEN);
+                        ogs_log_hexdump(OGS_LOG_ERROR, mactag2, OGS_MACTAG_LEN);
+                        goto cleanup;
+                    }
+
+                    plain_text.size = cipher_text.size;
+                    plain_text.data = ogs_calloc(1, plain_text.size);
+                    ogs_assert(plain_text.data);
+
+                    ogs_aes_ctr128_encrypt(
+                            ek, icb, cipher_text.data, cipher_text.size,
+                            plain_text.data);
+
+                    plain_bcd = ogs_calloc(1, plain_text.size*2+1);
+                    ogs_assert(plain_bcd);
+
+                    ogs_buffer_to_bcd(
+                        plain_text.data, plain_text.size, plain_bcd);
+
+                    supi = ogs_msprintf("imsi-%s%s%s",
+                            array2, array3, plain_bcd);
+                    ogs_assert(supi);
+
+                    if (plain_text.data)
+                        ogs_free(plain_text.data);
+                    ogs_free(plain_bcd);
+cleanup:
+                    if (pubkey.data)
+                        ogs_free(pubkey.data);
+                    if (cipher_text.data)
+                        ogs_free(cipher_text.data);
+                } else {
+                    ogs_error("Invalid Protection Scheme %s", array5);
+                }
+            }
+            break;
+        DEFAULT
+            ogs_error("Not implemented %s", array1);
+            break;
+        END
+        break;
+    DEFAULT
+        ogs_error("Not implemented %s", array0);
+        break;
+    END
+
+    ogs_free(tmp);
+    return supi;
+}
+
+char *ogs_supi_from_supi_or_suci(char *supi_or_suci)
+{
+    char *type = NULL;
+    char *supi = NULL;
+
+    ogs_assert(supi_or_suci);
+    type = ogs_id_get_type(supi_or_suci);
+    if (!type) {
+        ogs_error("ogs_id_get_type%s failed", supi_or_suci);
+        goto cleanup;
+    }
+    SWITCH(type)
+    CASE("imsi")
+        supi = ogs_strdup(supi_or_suci);
+        ogs_expect(supi);
+        break;
+    CASE("suci")
+        supi = ogs_supi_from_suci(supi_or_suci);
+        ogs_expect(supi);
+        break;
+    DEFAULT
+        ogs_error("Not implemented %s", type);
+        break;
+    END
+
+cleanup:
+    if (type)
+        ogs_free(type);
+    return supi;
+}
+
 char *ogs_uridup(bool https, ogs_sockaddr_t *addr, ogs_sbi_header_t *h)
 {
     char bufOGS_ADDRSTRLEN;
@@ -79,32 +331,26 @@
 char *ogs_sbi_server_uri(ogs_sbi_server_t *server, ogs_sbi_header_t *h)
 {
     ogs_sockaddr_t *advertise = NULL;
-    bool https = false;
 
     ogs_assert(server);
 
-    if (server->tls.key && server->tls.pem)
-        https = true;
-
     advertise = server->advertise;
 
     if (!advertise)
         advertise = server->node.addr;
     ogs_assert(advertise);
 
-    return ogs_uridup(https, advertise, h);
+    return ogs_uridup(ogs_app_tls_server_enabled() == true, advertise, h);
 }
 
 char *ogs_sbi_client_uri(ogs_sbi_client_t *client, ogs_sbi_header_t *h)
 {
-    bool https = false;
-
     ogs_assert(client);
 
-    if (client->tls.key && client->tls.pem)
-        https = true;
-
-    return ogs_uridup(https, client->node.addr, h);
+    return ogs_uridup(
+            ogs_app_tls_client_enabled() == true &&
+            client->scheme == OpenAPI_uri_scheme_https,
+            client->node.addr, h);
 }
 
 char *ogs_sbi_client_apiroot(ogs_sbi_client_t *client)
@@ -158,14 +404,15 @@
     return item;
 }
 
-ogs_sockaddr_t *ogs_sbi_getaddr_from_uri(char *uri)
+bool ogs_sbi_getaddr_from_uri(
+        OpenAPI_uri_scheme_e *scheme, ogs_sockaddr_t **addr, char *uri)
 {
     int rv;
     struct yuarel yuarel;
     char *p = NULL;
     int port;
 
-    ogs_sockaddr_t *addr = NULL;
+    ogs_assert(uri);
 
     p = ogs_strdup(uri);
 
@@ -173,64 +420,67 @@
     if (rv != OGS_OK) {
         ogs_free(p);
         ogs_error("yuarel_parse() failed %s", uri);
-        return NULL;
+        return false;
     }
 
     if (!yuarel.scheme) {
         ogs_error("No http.scheme found %s", uri);
         ogs_free(p);
-        return NULL;
+        return false;
     }
 
     if (strcmp(yuarel.scheme, "https") == 0) {
         port = OGS_SBI_HTTPS_PORT;
+        *scheme = OpenAPI_uri_scheme_https;
     } else if (strcmp(yuarel.scheme, "http") == 0) {
         port = OGS_SBI_HTTP_PORT;
+        *scheme = OpenAPI_uri_scheme_http;
     } else {
         ogs_error("Invalid http.scheme %s:%s", yuarel.scheme, uri);
         ogs_free(p);
-        return NULL;
+        return false;
     }
 
     if (!yuarel.host) {
         ogs_error("No http.host found %s", uri);
         ogs_free(p);
-        return NULL;
+        return false;
     }
 
     if (yuarel.port) port = yuarel.port;
 
-    rv = ogs_getaddrinfo(&addr, AF_UNSPEC, yuarel.host, port, 0);
+    rv = ogs_getaddrinfo(addr, AF_UNSPEC, yuarel.host, port, 0);
     if (rv != OGS_OK) {
         ogs_error("ogs_getaddrinfo() failed %s", uri);
         ogs_free(p);
-        return NULL;
+        return false;
     }
 
     ogs_free(p);
-    return addr;
+    return true;
 }
 
-char *ogs_sbi_getpath_from_uri(char *uri)
+bool ogs_sbi_getpath_from_uri(char **path, char *uri)
 {
     int rv;
     struct yuarel yuarel;
     char *p = NULL;
-    char *path = NULL;
+
+    ogs_assert(uri);
 
     p = ogs_strdup(uri);
 
     rv = yuarel_parse(&yuarel, p);
     if (rv != OGS_OK) {
-        ogs_free(p);
         ogs_error("yuarel_parse() failed %s", uri);
-        return NULL;
+        ogs_free(p);
+        return false;
     }
 
     if (!yuarel.scheme) {
         ogs_error("No http.scheme found %s", uri);
         ogs_free(p);
-        return NULL;
+        return false;
     }
 
     if (strcmp(yuarel.scheme, "https") == 0) {
@@ -240,26 +490,26 @@
     } else {
         ogs_error("Invalid http.scheme %s:%s", yuarel.scheme, uri);
         ogs_free(p);
-        return NULL;
+        return false;
     }
 
     if (!yuarel.host) {
         ogs_error("No http.host found %s", uri);
         ogs_free(p);
-        return NULL;
+        return false;
     }
 
     if (!yuarel.path) {
         ogs_error("No http.path found %s", uri);
         ogs_free(p);
-        return NULL;
+        return false;
     }
 
-    path = ogs_strdup(yuarel.path);
-    ogs_assert(path);
+    *path = ogs_strdup(yuarel.path);
+    ogs_assert(*path);
 
     ogs_free(p);
-    return path;
+    return true;
 }
 
 char *ogs_sbi_bitrate_to_string(uint64_t bitrate, int unit)
@@ -290,6 +540,11 @@
     unit = strrchr(str, ' ');
     bitrate = atoll(str);
 
+    if (!unit) {
+        ogs_error("No Unit %s", str);
+        return bitrate;
+    }
+
     SWITCH(unit+1)
     CASE("Kbps")
         return bitrate * 1024;
@@ -530,7 +785,10 @@
     sNSSAI.sd = ogs_s_nssai_sd_to_string(s_nssai->sd);
 
     item = OpenAPI_snssai_convertToJSON(&sNSSAI);
-    ogs_expect_or_return_val(item, NULL);
+    if (!item) {
+        ogs_error("OpenAPI_snssai_convertToJSON() failed");
+        return NULL;
+    }
     if (sNSSAI.sd) ogs_free(sNSSAI.sd);
 
     v = cJSON_Print(item);
@@ -572,12 +830,23 @@
     ogs_assert(plmn_id);
 
     PlmnId = ogs_calloc(1, sizeof(*PlmnId));
-    ogs_expect_or_return_val(PlmnId, NULL);
+    if (!PlmnId) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
 
     PlmnId->mcc = ogs_plmn_id_mcc_string(plmn_id);
-    ogs_expect_or_return_val(PlmnId->mcc, NULL);
+    if (!PlmnId->mcc) {
+        ogs_error("ogs_plmn_id_mcc_string() failed");
+        ogs_sbi_free_plmn_id(PlmnId);
+        return NULL;
+    }
     PlmnId->mnc = ogs_plmn_id_mnc_string(plmn_id);
-    ogs_expect_or_return_val(PlmnId->mnc, NULL);
+    if (!PlmnId->mnc) {
+        ogs_error("ogs_plmn_id_mnc_string() failed");
+        ogs_sbi_free_plmn_id(PlmnId);
+        return NULL;
+    }
 
     return PlmnId;
 }
@@ -615,12 +884,23 @@
     ogs_assert(plmn_id);
 
     PlmnIdNid = ogs_calloc(1, sizeof(*PlmnIdNid));
-    ogs_expect_or_return_val(PlmnIdNid, NULL);
+    if (!PlmnIdNid) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
 
     PlmnIdNid->mcc = ogs_plmn_id_mcc_string(plmn_id);
-    ogs_expect_or_return_val(PlmnIdNid->mcc, NULL);
+    if (!PlmnIdNid->mcc) {
+        ogs_error("ogs_plmn_id_mcc_string() failed");
+        ogs_sbi_free_plmn_id_nid(PlmnIdNid);
+        return NULL;
+    }
     PlmnIdNid->mnc = ogs_plmn_id_mnc_string(plmn_id);
-    ogs_expect_or_return_val(PlmnIdNid->mnc, NULL);
+    if (!PlmnIdNid->mnc) {
+        ogs_error("ogs_plmn_id_mnc_string() failed");
+        ogs_sbi_free_plmn_id_nid(PlmnIdNid);
+        return NULL;
+    }
 
     return PlmnIdNid;
 }
@@ -660,12 +940,23 @@
     ogs_assert(guami);
 
     Guami = ogs_calloc(1, sizeof(*Guami));
-    ogs_assert(Guami);
+    if (!Guami) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
 
     Guami->plmn_id = ogs_sbi_build_plmn_id_nid(&guami->plmn_id);
-    ogs_expect_or_return_val(Guami->plmn_id, NULL);
+    if (!Guami->plmn_id) {
+        ogs_error("ogs_sbi_build_plmn_id_nid() failed");
+        ogs_sbi_free_guami(Guami);
+        return NULL;
+    }
     Guami->amf_id = ogs_amf_id_to_string(&guami->amf_id);
-    ogs_expect_or_return_val(Guami->amf_id, NULL);
+    if (!Guami->amf_id) {
+        ogs_error("ogs_amf_id_to_string() failed");
+        ogs_sbi_free_guami(Guami);
+        return NULL;
+    }
 
     return Guami;
 }
@@ -704,24 +995,49 @@
     ogs_assert(tai);
     ogs_assert(nr_cgi);
 
-    Tai = ogs_calloc(1, sizeof(*Tai));
-    ogs_expect_or_return_val(Tai, NULL);
+    NrLocation = ogs_calloc(1, sizeof(*NrLocation));
+    if (!NrLocation) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    NrLocation->tai = Tai = ogs_calloc(1, sizeof(*Tai));
+    if (!Tai) {
+        ogs_error("ogs_calloc() failed");
+        ogs_sbi_free_nr_location(NrLocation);
+        return NULL;
+    }
     Tai->plmn_id = ogs_sbi_build_plmn_id(&tai->plmn_id);
-    ogs_expect_or_return_val(Tai->plmn_id, NULL);
+    if (!Tai->plmn_id) {
+        ogs_error("ogs_sbi_build_plmn_id() failed");
+        ogs_sbi_free_nr_location(NrLocation);
+        return NULL;
+    }
     Tai->tac = ogs_uint24_to_0string(tai->tac);
-    ogs_expect_or_return_val(Tai->tac, NULL);
+    if (!Tai->tac) {
+        ogs_error("ogs_uint24_to_0string() failed");
+        ogs_sbi_free_nr_location(NrLocation);
+        return NULL;
+    }
 
-    Ncgi = ogs_calloc(1, sizeof(*Ncgi));
-    ogs_expect_or_return_val(Ncgi, NULL);
+    NrLocation->ncgi = Ncgi = ogs_calloc(1, sizeof(*Ncgi));
+    if (!Ncgi) {
+        ogs_error("ogs_calloc() failed");
+        ogs_sbi_free_nr_location(NrLocation);
+        return NULL;
+    }
     Ncgi->plmn_id = ogs_sbi_build_plmn_id(&nr_cgi->plmn_id);
-    ogs_expect_or_return_val(Ncgi->plmn_id, NULL);
+    if (!Ncgi->plmn_id) {
+        ogs_error("ogs_sbi_build_plmn_id() failed");
+        ogs_sbi_free_nr_location(NrLocation);
+        return NULL;
+    }
     Ncgi->nr_cell_id = ogs_uint36_to_0string(nr_cgi->cell_id);
-    ogs_expect_or_return_val(Ncgi->nr_cell_id, NULL);
-
-    NrLocation = ogs_calloc(1, sizeof(*NrLocation));
-    ogs_expect_or_return_val(NrLocation, NULL);
-    NrLocation->tai = Tai;
-    NrLocation->ncgi = Ncgi;
+    if (!Ncgi->nr_cell_id) {
+        ogs_error("ogs_uint36_to_0string() failed");
+        ogs_sbi_free_nr_location(NrLocation);
+        return NULL;
+    }
 
     return NrLocation;
 }
@@ -941,3 +1257,17 @@
 
     ogs_free(QosData);
 }
+
+char *ogs_sbi_s_nssai_to_string_plain(ogs_s_nssai_t *s_nssai)
+{
+    ogs_assert(s_nssai);
+    if (s_nssai->sd.v !=
+            OGS_S_NSSAI_NO_SD_VALUE) {
+        return ogs_msprintf("%d%06x",
+            s_nssai->sst,
+            s_nssai->sd.v);
+    } else {
+        return ogs_msprintf("%d",
+            s_nssai->sst);
+    }
+}

open5gs_2.5.8.tar.xz/lib/sbi/conv.h -> open5gs_2.6.0.tar.xz/lib/sbi/conv.h Changed

@@ -32,6 +32,9 @@
 typedef struct ogs_sbi_client_s ogs_sbi_client_t;
 typedef struct ogs_sbi_header_s ogs_sbi_header_t;
 
+char *ogs_supi_from_suci(char *suci);
+char *ogs_supi_from_supi_or_suci(char *supi_or_suci);
+
 char *ogs_uridup(bool https, ogs_sockaddr_t *addr, ogs_sbi_header_t *h);
 char *ogs_sbi_server_uri(ogs_sbi_server_t *server, ogs_sbi_header_t *h);
 char *ogs_sbi_client_apiroot(ogs_sbi_client_t *client);
@@ -39,8 +42,9 @@
 
 char *ogs_sbi_parse_uri(char *uri, const char *delim, char **saveptr);
 
-ogs_sockaddr_t *ogs_sbi_getaddr_from_uri(char *uri);
-char *ogs_sbi_getpath_from_uri(char *uri);
+bool ogs_sbi_getaddr_from_uri(
+        OpenAPI_uri_scheme_e *scheme, ogs_sockaddr_t **addr, char *uri);
+bool ogs_sbi_getpath_from_uri(char **path, char *uri);
 
 #define OGS_SBI_BITRATE_BPS     0
 #define OGS_SBI_BITRATE_KBPS    1
@@ -87,6 +91,7 @@
 void ogs_sbi_free_pcc_rule(OpenAPI_pcc_rule_t *PccRule);
 OpenAPI_qos_data_t *ogs_sbi_build_qos_data(ogs_pcc_rule_t *pcc_rule);
 void ogs_sbi_free_qos_data(OpenAPI_qos_data_t *QosData);
+char *ogs_sbi_s_nssai_to_string_plain(ogs_s_nssai_t *s_nssai);
 
 #ifdef __cplusplus
 }

open5gs_2.5.8.tar.xz/lib/sbi/meson.build -> open5gs_2.6.0.tar.xz/lib/sbi/meson.build Changed

@@ -20,11 +20,8 @@
 libsbi_sources = files('''
     contrib/multipart_parser.c
 
-    custom/any_type.c
-
     custom/links.c
     custom/ue_authentication_ctx.c
-    custom/patch_item.c
 
     yuarel.c
     types.c
@@ -51,7 +48,9 @@
 
 sbi_cc_flags = '-DOGS_SBI_COMPILATION'
 
-libgnutls_dep = cc.find_library('gnutls', required : true)
+libgnutls_dep = dependency('gnutls', required : true)
+libssl_dep = dependency('libssl', required : true)
+libcrypto_dep = dependency('libcrypto', required : true)
 libnghttp2_dep = dependency('libnghttp2', version: '>=1.18.1')
 libmicrohttpd_dep = dependency('libmicrohttpd', version: '>=0.9.40')
 libcurl_dep = dependency('libcurl', version: '>=7.52.1')
@@ -65,6 +64,8 @@
                     libapp_dep,
                     libsbi_openapi_dep,
                     libgnutls_dep,
+                    libssl_dep,
+                    libcrypto_dep,
                     libnghttp2_dep,
                     libmicrohttpd_dep,
                     libcurl_dep,
@@ -78,6 +79,8 @@
                     libapp_dep,
                     libsbi_openapi_dep,
                     libgnutls_dep,
+                    libssl_dep,
+                    libcrypto_dep,
                     libnghttp2_dep,
                     libmicrohttpd_dep,
                     libcurl_dep)

open5gs_2.5.8.tar.xz/lib/sbi/message.c -> open5gs_2.6.0.tar.xz/lib/sbi/message.c Changed

@@ -196,13 +196,24 @@
     ogs_sbi_request_t *request = NULL;
 
     ogs_pool_alloc(&request_pool, &request);
-    ogs_expect_or_return_val(request, NULL);
+    if (!request) {
+        ogs_error("ogs_pool_alloc() failed");
+        return NULL;
+    }
     memset(request, 0, sizeof(ogs_sbi_request_t));
 
     request->http.params = ogs_hash_make();
-    ogs_expect_or_return_val(request->http.params, NULL);
+    if (!request->http.params) {
+        ogs_error("ogs_hash_make() failed");
+        ogs_sbi_request_free(request);
+        return NULL;
+    }
     request->http.headers = ogs_hash_make();
-    ogs_expect_or_return_val(request->http.headers, NULL);
+    if (!request->http.headers) {
+        ogs_error("ogs_hash_make() failed");
+        ogs_sbi_request_free(request);
+        return NULL;
+    }
 
     return request;
 }
@@ -212,13 +223,24 @@
     ogs_sbi_response_t *response = NULL;
 
     ogs_pool_alloc(&response_pool, &response);
-    ogs_expect_or_return_val(response, NULL);
+    if (!response) {
+        ogs_error("ogs_pool_alloc() failed");
+        return NULL;
+    }
     memset(response, 0, sizeof(ogs_sbi_response_t));
 
     response->http.params = ogs_hash_make();
-    ogs_expect_or_return_val(response->http.params, NULL);
+    if (!response->http.params) {
+        ogs_error("ogs_hash_make() failed");
+        ogs_sbi_response_free(response);
+        return NULL;
+    }
     response->http.headers = ogs_hash_make();
-    ogs_expect_or_return_val(response->http.headers, NULL);
+    if (!response->http.headers) {
+        ogs_error("ogs_hash_make() failed");
+        ogs_sbi_response_free(response);
+        return NULL;
+    }
 
     return response;
 }
@@ -260,37 +282,88 @@
     ogs_assert(message);
 
     request = ogs_sbi_request_new();
-    ogs_expect_or_return_val(request, NULL);
+    if (!request) {
+        ogs_error("ogs_pool_alloc() failed");
+        return NULL;
+    }
 
-    ogs_expect_or_return_val(message->h.method, NULL);
+    if (!message->h.method) {
+        ogs_error("No Method");
+        ogs_sbi_request_free(request);
+        return NULL;
+    }
     request->h.method = ogs_strdup(message->h.method);
+    if (!request->h.method) {
+        ogs_error("ogs_strdup() failed");
+        ogs_sbi_request_free(request);
+        return NULL;
+    }
     if (message->h.uri) {
         request->h.uri = ogs_strdup(message->h.uri);
-        ogs_expect_or_return_val(request->h.uri, NULL);
+        if (!request->h.uri) {
+            ogs_error("ogs_strdup() failed");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
     } else {
-        ogs_expect_or_return_val(message->h.service.name, NULL);
+        if (!message->h.service.name) {
+            ogs_error("No Service Name");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
         request->h.service.name = ogs_strdup(message->h.service.name);
-        ogs_expect_or_return_val(message->h.api.version, NULL);
+        if (!request->h.service.name) {
+            ogs_error("ogs_strdup() failed");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
+        if (!message->h.api.version) {
+            ogs_error("No API Version");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
         request->h.api.version = ogs_strdup(message->h.api.version);
-        ogs_expect_or_return_val(request->h.api.version, NULL);
+        if (!request->h.api.version) {
+            ogs_error("ogs_strdup() failed");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
 
-        ogs_expect_or_return_val(message->h.resource.component0, NULL);
+        if (!message->h.resource.component0) {
+            ogs_error("No Resource");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
         for (i = 0; i < OGS_SBI_MAX_NUM_OF_RESOURCE_COMPONENT &&
-                            message->h.resource.componenti; i++)
+                            message->h.resource.componenti; i++) {
             request->h.resource.componenti = ogs_strdup(
                     message->h.resource.componenti);
+            if (!request->h.resource.componenti) {
+                ogs_error("ogs_strdup() failed");
+                ogs_sbi_request_free(request);
+                return NULL;
+            }
+        }
     }
 
     /* Discovery Parameter */
     if (message->param.target_nf_type) {
         char *v = OpenAPI_nf_type_ToString(message->param.target_nf_type);
-        ogs_expect_or_return_val(v, NULL);
+        if (!v) {
+            ogs_error("OpenAPI_nf_type_ToString() failed");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
         ogs_sbi_header_set(request->http.params,
                 OGS_SBI_PARAM_TARGET_NF_TYPE, v);
     }
     if (message->param.requester_nf_type) {
         char *v = OpenAPI_nf_type_ToString(message->param.requester_nf_type);
-        ogs_expect_or_return_val(v, NULL);
+        if (!v) {
+            ogs_error("OpenAPI_nf_type_ToString() failed");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
         ogs_sbi_header_set(request->http.params,
                 OGS_SBI_PARAM_REQUESTER_NF_TYPE, v);
     }
@@ -335,12 +408,20 @@
     }
     if (message->param.nf_type) {
         char *v = OpenAPI_nf_type_ToString(message->param.nf_type);
-        ogs_expect_or_return_val(v, NULL);
+        if (!v) {
+            ogs_error("OpenAPI_nf_type_ToString() failed");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
         ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_NF_TYPE, v);
     }
     if (message->param.limit) {
         char *v = ogs_msprintf("%d", message->param.limit);
-        ogs_expect_or_return_val(v, NULL);
+        if (!v) {
+            ogs_error("OpenAPI_nf_type_ToString() failed");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
         ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_LIMIT, v);
         ogs_free(v);
     }
@@ -359,12 +440,20 @@
             cJSON *item = NULL;
 
             item = OpenAPI_plmn_id_convertToJSON(&plmn_id);
-            ogs_expect_or_return_val(item, NULL);
+            if (!item) {
+                ogs_error("OpenAPI_plmn_id_convertToJSON() failed");
+                ogs_sbi_request_free(request);
+                return NULL;
+            }
             if (plmn_id.mnc) ogs_free(plmn_id.mnc);
             if (plmn_id.mcc) ogs_free(plmn_id.mcc);
 
             v = cJSON_Print(item);
-            ogs_expect_or_return_val(v, NULL);
+            if (!v) {
+                ogs_error("cJSON_Print() failed");
+                ogs_sbi_request_free(request);
+                return NULL;
+            }
             cJSON_Delete(item);
 
             ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_PLMN_ID, v);
@@ -373,13 +462,21 @@
     }
     if (message->param.single_nssai_presence) {
         char *v = ogs_sbi_s_nssai_to_string(&message->param.s_nssai);
-        ogs_expect_or_return_val(v, NULL);
+        if (!v) {
+            ogs_error("ogs_sbi_s_nssai_to_string() failed");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
         ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_SINGLE_NSSAI, v);
         ogs_free(v);
     }
     if (message->param.snssai_presence) {
         char *v = ogs_sbi_s_nssai_to_string(&message->param.s_nssai);
-        ogs_expect_or_return_val(v, NULL);
+        if (!v) {
+            ogs_error("ogs_sbi_s_nssai_to_string() failed");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
         ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_SNSSAI, v);
         ogs_free(v);
     }
@@ -390,8 +487,16 @@
         char *v = NULL;
         cJSON *item = NULL;
 
-        ogs_expect_or_return_val(message->param.s_nssai.sst, NULL);
-        ogs_expect_or_return_val(message->param.roaming_indication, NULL);
+        if (!message->param.s_nssai.sst) {
+            ogs_error("No S-NSSAI SST");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
+        if (!message->param.roaming_indication) {
+            ogs_error("No Roaming Indication");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
 
         memset(&sNSSAI, 0, sizeof(sNSSAI));
         sNSSAI.sst = message->param.s_nssai.sst;
@@ -405,10 +510,19 @@
 
         item = OpenAPI_slice_info_for_pdu_session_convertToJSON(
                 &SliceInfoForPDUSession);
-        ogs_expect_or_return_val(item, NULL);
+        if (!item) {
+            ogs_error("OpenAPI_slice_info_for_pdu_session_convertToJSON() "
+                    "failed");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
 
         v = cJSON_Print(item);
-        ogs_expect_or_return_val(v, NULL);
+        if (!v) {
+            ogs_error("cJSON_Print() failed");
+            ogs_sbi_request_free(request);
+            return NULL;
+        }
         cJSON_Delete(item);
 
         ogs_sbi_header_set(request->http.params,
@@ -427,8 +541,11 @@
                 OGS_SBI_PARAM_IPV6PREFIX, message->param.ipv6prefix);
     }
 
-    ogs_expect_or_return_val(true ==
-            build_content(&request->http, message), NULL);
+    if (build_content(&request->http, message) == false) {
+        ogs_error("build_content() failed");
+        ogs_sbi_request_free(request);
+        return NULL;
+    }
 
     if (message->http.accept) {
         ogs_sbi_header_set(request->http.headers, OGS_SBI_ACCEPT,
@@ -489,13 +606,19 @@
     ogs_assert(message);
 
     response = ogs_sbi_response_new();
-    ogs_expect_or_return_val(response, NULL);
+    if (!response) {
+        ogs_error("ogs_pool_alloc() failed");
+        return NULL;
+    }
 
     response->status = status;
 
     if (response->status != OGS_SBI_HTTP_STATUS_NO_CONTENT) {
-        ogs_expect_or_return_val(true ==
-            build_content(&response->http, message), NULL);
+        if (build_content(&response->http, message) == false) {
+            ogs_error("build_content() failed");
+            ogs_sbi_response_free(response);
+            return NULL;
+        }
     }
 
     if (message->http.location) {
@@ -1213,6 +1336,8 @@
                         }
                     }
                     break;
+                CASE(OGS_SBI_HTTP_METHOD_DELETE)
+                    break;
                 DEFAULT
                     rv = OGS_ERROR;
                     ogs_error("Unknown method %s", message->h.method);
@@ -2011,8 +2136,10 @@
     ogs_assert(http);
 
     if (message->num_of_part) {
-        ogs_expect_or_return_val(true ==
-                build_multipart(http, message), false);
+        if (build_multipart(http, message) == false) {
+            ogs_error("build_multipart() failed");
+            return false;
+        }
     } else {
         http->content = build_json(message);
         if (http->content) {
@@ -2112,7 +2239,7 @@
             } else {
                 offset = data->partdata->num_of_part.content_length;
                 if ((data->partdata->num_of_part.content_length + length) >
-                        OGS_HUGE_LEN) {
+                        OGS_MAX_SDU_LEN) {
                     ogs_error("Overflow length %d:%d",
                         (int)data->partdata->num_of_part.content_length,
                         (int)length);
@@ -2227,8 +2354,10 @@
                 data.parti.content_type;
             http->parthttp->num_of_part.pkbuf =
                 ogs_pkbuf_alloc(NULL, data.parti.content_length);
-            ogs_expect_or_return_val(
-                http->parthttp->num_of_part.pkbuf, OGS_ERROR);
+            if (!(http->parthttp->num_of_part.pkbuf)) {
+                ogs_error("ogs_pkbuf_alloc() failed");
+                return OGS_ERROR;
+            }
             ogs_pkbuf_put_data(http->parthttp->num_of_part.pkbuf,
                 data.parti.content, data.parti.content_length);
 
@@ -2238,8 +2367,10 @@
                 http->parthttp->num_of_part.content_type;
             message->partmessage->num_of_part.pkbuf =
                 ogs_pkbuf_copy(http->parthttp->num_of_part.pkbuf);
-            ogs_expect_or_return_val(
-                message->partmessage->num_of_part.pkbuf, OGS_ERROR);
+            if (!(message->parthttp->num_of_part.pkbuf)) {
+                ogs_error("ogs_pkbuf_alloc() failed");
+                return OGS_ERROR;
+            }
 
             http->num_of_part++;
             message->num_of_part++;
@@ -2283,16 +2414,22 @@
     strcpy(boundary, "=-");
     ogs_base64_encode_binary(boundary + 2, digest, 16);
 
-    p = http->content = ogs_calloc(1, OGS_HUGE_LEN);
-    ogs_expect_or_return_val(p, false);
-    last = p + OGS_HUGE_LEN;
+    p = http->content = ogs_calloc(1, OGS_MAX_SDU_LEN);
+    if (!p) {
+        ogs_error("ogs_calloc() failed");
+        return false;
+    }
+    last = p + OGS_MAX_SDU_LEN;
 
     /* First boundary */
     p = ogs_slprintf(p, last, "--%s\r\n", boundary);
 
     /* Encapsulated multipart part (application/json) */
     json = build_json(message);
-    ogs_expect_or_return_val(json, false);
+    if (!json) {
+        ogs_error("build_json() failed");
+        return false;
+    }
 
     p = ogs_slprintf(p, last, "%s\r\n\r\n%s",
             OGS_SBI_CONTENT_TYPE ": " OGS_SBI_CONTENT_JSON_TYPE, json);
@@ -2317,7 +2454,10 @@
 
     content_type = ogs_msprintf("%s; boundary=\"%s\"",
             OGS_SBI_CONTENT_MULTIPART_TYPE, boundary);
-    ogs_expect_or_return_val(content_type, false);
+    if (!content_type) {
+        ogs_error("ogs_msprintf() failed");
+        return false;
+    }
 
     ogs_sbi_header_set(http->headers, OGS_SBI_CONTENT_TYPE, content_type);
 
@@ -2426,7 +2566,10 @@
     ogs_assert(discovery_option);
 
     service_names = ogs_strdup(discovery_option->service_names0);
-    ogs_expect_or_return_val(service_names, NULL);
+    if (!service_names) {
+        ogs_error("ogs_strdup() failed");
+        return NULL;;
+    }
 
     if (discovery_option->num_of_service_names > 1) {
         for (i = 1; i < discovery_option->num_of_service_names; i++)

open5gs_2.5.8.tar.xz/lib/sbi/mhd-server.c -> open5gs_2.6.0.tar.xz/lib/sbi/mhd-server.c Changed

open5gs_2.5.8.tar.xz/lib/sbi/nghttp2-server.c -> open5gs_2.6.0.tar.xz/lib/sbi/nghttp2-server.c Changed

@@ -75,6 +75,7 @@
     int32_t                 last_stream_id;
 
     struct h2_settings      settings;
+    SSL*                    ssl;
 } ogs_sbi_session_t;
 
 typedef struct ogs_sbi_stream_s {
@@ -116,6 +117,78 @@
     ogs_pool_final(&session_pool);
 }
 
+#ifndef OPENSSL_NO_NEXTPROTONEG
+static int next_proto_cb(SSL *ssl, const unsigned char **data,
+                         unsigned int *len, void *arg) {
+    static unsigned char next_proto_list256;
+    (void)ssl;
+    (void)arg;
+
+    next_proto_list0 = NGHTTP2_PROTO_VERSION_ID_LEN;
+    memcpy(&next_proto_list1, NGHTTP2_PROTO_VERSION_ID, NGHTTP2_PROTO_VERSION_ID_LEN);
+
+    *data = next_proto_list;
+    *len = 1 + NGHTTP2_PROTO_VERSION_ID_LEN;
+    return SSL_TLSEXT_ERR_OK;
+}
+#endif
+
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+static int alpn_select_proto_cb(SSL *ssl, const unsigned char **out,
+                                unsigned char *outlen, const unsigned char *in,
+                                unsigned int inlen, void *arg) {
+    int rv;
+    (void)ssl;
+    (void)arg;
+
+    rv = nghttp2_select_next_protocol((unsigned char **)out, outlen, in, inlen);
+    if (rv != 1) {
+        return SSL_TLSEXT_ERR_NOACK;
+    }
+
+    return SSL_TLSEXT_ERR_OK;
+}
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
+
+static SSL_CTX *create_ssl_ctx(const char *key_file, const char *cert_file) {
+    SSL_CTX *ssl_ctx;
+
+    ssl_ctx = SSL_CTX_new(TLS_server_method());
+    if (!ssl_ctx) {
+        ogs_error("Could not create SSL/TLS context: %s", ERR_error_string(ERR_get_error(), NULL));
+        return NULL;
+    }
+    SSL_CTX_set_options(ssl_ctx,
+                          SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
+                          SSL_OP_NO_COMPRESSION |
+                          SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+    if (SSL_CTX_set1_curves_list(ssl_ctx, "P-256") != 1) {
+        ogs_error("SSL_CTX_set1_curves_list failed: %s", ERR_error_string(ERR_get_error(), NULL));
+        return NULL;
+    }
+#endif /* !(OPENSSL_VERSION_NUMBER >= 0x30000000L) */
+
+    if (SSL_CTX_use_PrivateKey_file(ssl_ctx, key_file, SSL_FILETYPE_PEM) != 1) {
+        ogs_error("Could not read private key file - key_file=%s", key_file);
+        return NULL;
+    }
+    if (SSL_CTX_use_certificate_chain_file(ssl_ctx, cert_file) != 1) {
+        ogs_error("Could not read certificate file - cert_file=%s ", cert_file);
+        return NULL;
+    }
+
+#ifndef OPENSSL_NO_NEXTPROTONEG
+    SSL_CTX_set_next_protos_advertised_cb(ssl_ctx, next_proto_cb, NULL);
+#endif /* !OPENSSL_NO_NEXTPROTONEG */
+
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+    SSL_CTX_set_alpn_select_cb(ssl_ctx, alpn_select_proto_cb, NULL);
+#endif /* OPENSSL_VERSION_NUMBER >= 0x10002000L */
+
+    return ssl_ctx;
+}
+
 static int server_start(ogs_sbi_server_t *server,
         int (*cb)(ogs_sbi_request_t *request, void *data))
 {
@@ -127,6 +200,19 @@
     addr = server->node.addr;
     ogs_assert(addr);
 
+    /* Create SSL CTX */
+    if (ogs_app_tls_server_enabled() == true) {
+        ogs_assert(ogs_sbi_self()->tls.server.key);
+        ogs_assert(ogs_sbi_self()->tls.server.cert);
+        server->ssl_ctx = create_ssl_ctx(
+                    ogs_sbi_self()->tls.server.key,
+                    ogs_sbi_self()->tls.server.cert);
+        if (!server->ssl_ctx) {
+            ogs_error("Cannot create SSL CTX");
+            return OGS_ERROR;
+        }
+    }
+
     sock = ogs_tcp_server(addr, server->node.option);
     if (!sock) {
         ogs_error("Cannot start SBI server");
@@ -145,9 +231,12 @@
 
     hostname = ogs_gethostname(addr);
     if (hostname)
-        ogs_info("nghttp2_server() %s:%d", hostname, OGS_PORT(addr));
+        ogs_info("nghttp2_server() %s://%s:%d",
+                server->ssl_ctx ? "https" : "http",
+                hostname, OGS_PORT(addr));
     else
-        ogs_info("nghttp2_server() %s:%d",
+        ogs_info("nghttp2_server() %s://%s:%d",
+                server->ssl_ctx ? "https" : "http",
                 OGS_ADDR(addr, buf), OGS_PORT(addr));
 
     return OGS_OK;
@@ -157,6 +246,10 @@
 {
     ogs_assert(server);
 
+    /* Free SSL CTX */
+    if (server->ssl_ctx)
+        SSL_CTX_free(server->ssl_ctx);
+
     if (server->node.poll)
         ogs_pollset_remove(server->node.poll);
 
@@ -305,10 +398,15 @@
 
     ogs_assert(response);
 
+    if (response->status >= 600) {
+        ogs_error("Invalid response status %d", response->status);
+        return false;
+    }
+
     stream = ogs_pool_cycle(&stream_pool, stream);
     if (!stream) {
         ogs_error("stream has already been removed");
-        return true;
+        return false;
     }
 
     sbi_sess = stream->session;
@@ -330,11 +428,13 @@
         nvlen++;
 
     nva = ogs_calloc(nvlen, sizeof(nghttp2_nv));
-    ogs_expect_or_return_val(nva, false);
+    if (!nva) {
+        ogs_error("ogs_calloc() failed");
+        return false;
+    }
 
     i = 0;
 
-    ogs_expect_or_return_val(response->status < 600, false);
     ogs_assert(strlen(status_stringresponse->status) == 3);
     add_header(&nvai++, ":status", status_stringresponse->status);
 
@@ -424,11 +524,18 @@
     ogs_assert(sbi_sess);
 
     ogs_pool_alloc(&stream_pool, &stream);
-    ogs_expect_or_return_val(stream, NULL);
+    if (!stream) {
+        ogs_error("ogs_pool_alloc() failed");
+        return NULL;
+    }
     memset(stream, 0, sizeof(ogs_sbi_stream_t));
 
     stream->request = ogs_sbi_request_new();
-    ogs_expect_or_return_val(stream->request, NULL);
+    if (!stream->request) {
+        ogs_error("ogs_sbi_request_new() failed");
+        ogs_pool_free(&stream_pool, stream);
+        return NULL;
+    }
 
     stream->stream_id = stream_id;
     sbi_sess->last_stream_id = stream_id;
@@ -475,16 +582,33 @@
     ogs_assert(sock);
 
     ogs_pool_alloc(&session_pool, &sbi_sess);
-    ogs_expect_or_return_val(sbi_sess, NULL);
+    if (!sbi_sess) {
+        ogs_error("ogs_pool_alloc() failed");
+        return NULL;
+    }
     memset(sbi_sess, 0, sizeof(ogs_sbi_session_t));
 
     sbi_sess->server = server;
     sbi_sess->sock = sock;
 
     sbi_sess->addr = ogs_calloc(1, sizeof(ogs_sockaddr_t));
-    ogs_expect_or_return_val(sbi_sess->addr, NULL);
+    if (!sbi_sess->addr) {
+        ogs_error("ogs_calloc() failed");
+        ogs_pool_free(&session_pool, sbi_sess);
+        return NULL;
+    }
     memcpy(sbi_sess->addr, &sock->remote_addr, sizeof(ogs_sockaddr_t));
 
+    if (server->ssl_ctx) {
+        sbi_sess->ssl = SSL_new(server->ssl_ctx);
+        if (!sbi_sess->ssl) {
+            ogs_error("SSL_new() failed");
+            ogs_pool_free(&session_pool, sbi_sess);
+            ogs_free(sbi_sess->addr);
+            return NULL;
+        }
+    }
+
     ogs_list_add(&server->session_list, sbi_sess);
 
     return sbi_sess;
@@ -501,11 +625,14 @@
 
     ogs_list_remove(&server->session_list, sbi_sess);
 
+    if (sbi_sess->ssl)
+        SSL_free(sbi_sess->ssl);
+
     stream_remove_all(sbi_sess);
     nghttp2_session_del(sbi_sess->session);
 
-    ogs_assert(sbi_sess->poll.read);
-    ogs_pollset_remove(sbi_sess->poll.read);
+    if (sbi_sess->poll.read)
+        ogs_pollset_remove(sbi_sess->poll.read);
 
     if (sbi_sess->poll.write)
         ogs_pollset_remove(sbi_sess->poll.write);
@@ -566,6 +693,18 @@
     sbi_sess = session_add(server, new);
     ogs_assert(sbi_sess);
 
+    if (sbi_sess->ssl) {
+        int err;
+        SSL_set_fd(sbi_sess->ssl, new->fd);
+        SSL_set_accept_state(sbi_sess->ssl);
+        err = SSL_accept(sbi_sess->ssl);
+        if (err <= 0) {
+            ogs_error("SSL_accept failed %s", ERR_error_string(ERR_get_error(), NULL));
+            session_remove(sbi_sess);
+            return;
+        }
+    }
+
     sbi_sess->poll.read = ogs_pollset_add(ogs_app()->pollset,
         OGS_POLLIN, new->fd, recv_handler, sbi_sess);
     ogs_assert(sbi_sess->poll.read);
@@ -595,7 +734,11 @@
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
 
-    n = ogs_recv(fd, pkbuf->data, OGS_MAX_SDU_LEN, 0);
+    if (sbi_sess->ssl)
+        n = SSL_read(sbi_sess->ssl, pkbuf->data, OGS_MAX_SDU_LEN);
+    else
+        n = ogs_recv(fd, pkbuf->data, OGS_MAX_SDU_LEN, 0);
+
     if (n > 0) {
         ogs_pkbuf_put(pkbuf, n);
 
@@ -1294,7 +1437,11 @@
     ogs_assert(pkbuf);
     ogs_list_remove(&sbi_sess->write_queue, pkbuf);
 
-    ogs_send(fd, pkbuf->data, pkbuf->len, 0);
+    if (sbi_sess->ssl)
+        SSL_write(sbi_sess->ssl, pkbuf->data, pkbuf->len);
+    else
+        ogs_send(fd, pkbuf->data, pkbuf->len, 0);
+
     ogs_log_hexdump(OGS_LOG_DEBUG, pkbuf->data, pkbuf->len);
 
     ogs_pkbuf_free(pkbuf);

open5gs_2.5.8.tar.xz/lib/sbi/nnrf-build.c -> open5gs_2.6.0.tar.xz/lib/sbi/nnrf-build.c Changed

@@ -1217,7 +1217,8 @@
     ogs_sbi_request_t *request = NULL;
 
     OpenAPI_list_t *PatchItemList;
-    OpenAPI_patch_item_t item;
+    OpenAPI_patch_item_t StatusItem;
+    OpenAPI_patch_item_t LoadItem;
 
     nf_instance = ogs_sbi_self()->nf_instance;
     ogs_assert(nf_instance);
@@ -1239,17 +1240,28 @@
         goto end;
     }
 
-    memset(&item, 0, sizeof(item));
-    item.op = OpenAPI_patch_operation_replace;
-    item.path = (char *)"/nfStatus";
-    item.value = OpenAPI_any_type_create_string(
+    memset(&StatusItem, 0, sizeof(StatusItem));
+    StatusItem.op = OpenAPI_patch_operation_replace;
+    StatusItem.path = (char *)"/nfStatus";
+    StatusItem.value = OpenAPI_any_type_create_string(
         OpenAPI_nf_status_ToString(OpenAPI_nf_status_REGISTERED));
-    if (!item.value) {
-        ogs_error("No item.value");
+    if (!StatusItem.value) {
+        ogs_error("No status item.value");
         goto end;
     }
 
-    OpenAPI_list_add(PatchItemList, &item);
+    OpenAPI_list_add(PatchItemList, &StatusItem);
+
+    memset(&LoadItem, 0, sizeof(LoadItem));
+    LoadItem.op = OpenAPI_patch_operation_replace;
+    LoadItem.path = (char *)"/load";
+    LoadItem.value = OpenAPI_any_type_create_number(ogs_sbi_self()->nf_instance->load);
+    if (!LoadItem.value) {
+        ogs_error("No load item.value");
+        goto end;
+    }
+
+    OpenAPI_list_add(PatchItemList, &LoadItem);
 
     message.PatchItemList = PatchItemList;
 
@@ -1258,7 +1270,8 @@
 
 end:
     OpenAPI_list_free(PatchItemList);
-    OpenAPI_any_type_free(item.value);
+    OpenAPI_any_type_free(StatusItem.value);
+    OpenAPI_any_type_free(LoadItem.value);
 
     return request;
 }

open5gs_2.5.8.tar.xz/lib/sbi/nnrf-handler.c -> open5gs_2.6.0.tar.xz/lib/sbi/nnrf-handler.c Changed

open5gs_2.5.8.tar.xz/lib/sbi/ogs-sbi.h -> open5gs_2.6.0.tar.xz/lib/sbi/ogs-sbi.h Changed

open5gs_2.5.8.tar.xz/lib/sbi/openapi/include/list.h -> open5gs_2.6.0.tar.xz/lib/sbi/openapi/include/list.h Changed

open5gs_2.5.8.tar.xz/lib/sbi/openapi/meson.build -> open5gs_2.6.0.tar.xz/lib/sbi/openapi/meson.build Changed

open5gs_2.6.0.tar.xz/lib/sbi/openapi/model/any_type.c Added

@@ -0,0 +1,121 @@
+#include "any_type.h"
+
+bool OpenAPI_IsInvalid(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsInvalid(item->json);
+}
+bool OpenAPI_IsFalse(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsFalse(item->json);
+}
+bool OpenAPI_IsTrue(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsTrue(item->json);
+}
+bool OpenAPI_IsBool(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsBool(item->json);
+}
+bool OpenAPI_IsNull(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsNull(item->json);
+}
+bool OpenAPI_IsNumber(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsNumber(item->json);
+}
+bool OpenAPI_IsString(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsString(item->json);
+}
+bool OpenAPI_IsArray(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsArray(item->json);
+}
+bool OpenAPI_IsObject(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsObject(item->json);
+}
+bool OpenAPI_IsRaw(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsRaw(item->json);
+}
+
+static OpenAPI_any_type_t *any_create(cJSON *json) {
+    OpenAPI_any_type_t *any_type = NULL;
+
+    if (!json) {
+        return NULL;
+    }
+
+    any_type = ogs_calloc(1, sizeof(*any_type));
+    if (!any_type) {
+        cJSON_Delete(json);
+    }
+    any_type->json = json;
+
+    return any_type;
+}
+
+OpenAPI_any_type_t *OpenAPI_any_type_create(cJSON *json) {
+    OpenAPI_any_type_t *any_type_local_var =
+        any_create(cJSON_Duplicate(json, true));
+    ogs_assert(any_type_local_var);
+
+    return any_type_local_var;
+}
+
+OpenAPI_any_type_t *OpenAPI_any_type_parseFromJSON(cJSON *json) {
+    return OpenAPI_any_type_create(json);
+}
+
+cJSON *OpenAPI_any_type_convertToJSON(OpenAPI_any_type_t *any_type) {
+    cJSON *item = NULL;
+
+    if (any_type == NULL) {
+        ogs_error("OpenAPI_any_type_convertToJSON() failed AnyType");
+        return NULL;
+    }
+
+    item = cJSON_Duplicate(any_type->json, true);
+    if (item == NULL) {
+        ogs_error("OpenAPI_any_type_convertToJSON() failed AnyType");
+        return NULL;
+    }
+
+    return item;
+}
+
+OpenAPI_any_type_t *OpenAPI_any_type_create_true(void)
+{
+    return OpenAPI_any_type_create_bool(true);
+}
+
+OpenAPI_any_type_t *OpenAPI_any_type_create_false(void)
+{
+    return OpenAPI_any_type_create_bool(false);
+}
+
+OpenAPI_any_type_t *OpenAPI_any_type_create_bool(bool boolean)
+{
+    return any_create(boolean ? cJSON_CreateTrue() : cJSON_CreateFalse());
+}
+
+OpenAPI_any_type_t *OpenAPI_any_type_create_number(double num)
+{
+    return any_create(cJSON_CreateNumber(num));
+}
+
+
+OpenAPI_any_type_t *OpenAPI_any_type_create_string(const char *string)
+{
+    return any_create(cJSON_CreateString(string));
+}
+
+void OpenAPI_any_type_free(OpenAPI_any_type_t *any_type)
+{
+    if (any_type) {
+        cJSON_Delete(any_type->json);
+        ogs_free(any_type);
+    }
+}

open5gs_2.6.0.tar.xz/lib/sbi/openapi/model/any_type.h Added

@@ -0,0 +1,55 @@
+#ifndef OGS_SBI_ANY_TYPE_H
+#define OGS_SBI_ANY_TYPE_H
+
+#include "../external/cJSON.h"
+#include "ogs-core.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define OpenAPI_Invalid (0)
+#define OpenAPI_False  (1 << 0)
+#define OpenAPI_True   (1 << 1)
+#define OpenAPI_NULL   (1 << 2)
+#define OpenAPI_Number (1 << 3)
+#define OpenAPI_String (1 << 4)
+#define OpenAPI_Array  (1 << 5)
+#define OpenAPI_Object (1 << 6)
+#define OpenAPI_Raw    (1 << 7) /* raw json */
+
+#define OpenAPI_IsReference 256
+#define OpenAPI_StringIsConst 512
+
+typedef struct OpenAPI_any_type_s OpenAPI_any_type_t;
+typedef struct OpenAPI_any_type_s {
+    cJSON *json;
+} OpenAPI_any_type_t;
+
+bool OpenAPI_IsInvalid(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsFalse(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsTrue(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsBool(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsNull(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsNumber(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsString(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsArray(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsObject(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsRaw(const OpenAPI_any_type_t * const item);
+
+OpenAPI_any_type_t *OpenAPI_any_type_create(cJSON *json);
+OpenAPI_any_type_t *OpenAPI_any_type_parseFromJSON(cJSON *json);
+cJSON *OpenAPI_any_type_convertToJSON(OpenAPI_any_type_t *any_type);
+
+OpenAPI_any_type_t *OpenAPI_any_type_create_true(void);
+OpenAPI_any_type_t *OpenAPI_any_type_create_false(void);
+OpenAPI_any_type_t *OpenAPI_any_type_create_bool(bool boolean);
+OpenAPI_any_type_t *OpenAPI_any_type_create_number(double num);
+OpenAPI_any_type_t *OpenAPI_any_type_create_string(const char *string);
+void OpenAPI_any_type_free(OpenAPI_any_type_t *any_type);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OGS_SBI_ANY_TYPE_H */

open5gs_2.5.8.tar.xz/lib/sbi/openapi/model/change_item.c -> open5gs_2.6.0.tar.xz/lib/sbi/openapi/model/change_item.c Changed

@@ -8,8 +8,8 @@
     OpenAPI_change_type_e op,
     char *path,
     char *from,
-    char *orig_value,
-    char *new_value
+    OpenAPI_any_type_t *orig_value,
+    OpenAPI_any_type_t *new_value
 )
 {
     OpenAPI_change_item_t *change_item_local_var = ogs_malloc(sizeof(OpenAPI_change_item_t));
@@ -32,8 +32,8 @@
     OpenAPI_lnode_t *node;
     ogs_free(change_item->path);
     ogs_free(change_item->from);
-    ogs_free(change_item->orig_value);
-    ogs_free(change_item->new_value);
+    OpenAPI_any_type_free(change_item->orig_value);
+    OpenAPI_any_type_free(change_item->new_value);
     ogs_free(change_item);
 }
 
@@ -65,14 +65,26 @@
     }
 
     if (change_item->orig_value) {
-    if (cJSON_AddStringToObject(item, "origValue", change_item->orig_value) == NULL) {
+    cJSON *orig_value_object = OpenAPI_any_type_convertToJSON(change_item->orig_value);
+    if (orig_value_object == NULL) {
+        ogs_error("OpenAPI_change_item_convertToJSON() failed orig_value");
+        goto end;
+    }
+    cJSON_AddItemToObject(item, "origValue", orig_value_object);
+    if (item->child == NULL) {
         ogs_error("OpenAPI_change_item_convertToJSON() failed orig_value");
         goto end;
     }
     }
 
     if (change_item->new_value) {
-    if (cJSON_AddStringToObject(item, "newValue", change_item->new_value) == NULL) {
+    cJSON *new_value_object = OpenAPI_any_type_convertToJSON(change_item->new_value);
+    if (new_value_object == NULL) {
+        ogs_error("OpenAPI_change_item_convertToJSON() failed new_value");
+        goto end;
+    }
+    cJSON_AddItemToObject(item, "newValue", new_value_object);
+    if (item->child == NULL) {
         ogs_error("OpenAPI_change_item_convertToJSON() failed new_value");
         goto end;
     }
@@ -120,28 +132,24 @@
 
     cJSON *orig_value = cJSON_GetObjectItemCaseSensitive(change_itemJSON, "origValue");
 
+    OpenAPI_any_type_t *orig_value_local_object = NULL;
     if (orig_value) {
-    if (!cJSON_IsString(orig_value)) {
-        ogs_error("OpenAPI_change_item_parseFromJSON() failed orig_value");
-        goto end;
-    }
+    orig_value_local_object = OpenAPI_any_type_parseFromJSON(orig_value);
     }
 
     cJSON *new_value = cJSON_GetObjectItemCaseSensitive(change_itemJSON, "newValue");
 
+    OpenAPI_any_type_t *new_value_local_object = NULL;
     if (new_value) {
-    if (!cJSON_IsString(new_value)) {
-        ogs_error("OpenAPI_change_item_parseFromJSON() failed new_value");
-        goto end;
-    }
+    new_value_local_object = OpenAPI_any_type_parseFromJSON(new_value);
     }
 
     change_item_local_var = OpenAPI_change_item_create (
         opVariable,
         ogs_strdup(path->valuestring),
         from ? ogs_strdup(from->valuestring) : NULL,
-        orig_value ? ogs_strdup(orig_value->valuestring) : NULL,
-        new_value ? ogs_strdup(new_value->valuestring) : NULL
+        orig_value ? orig_value_local_object : NULL,
+        new_value ? new_value_local_object : NULL
     );
 
     return change_item_local_var;

open5gs_2.5.8.tar.xz/lib/sbi/openapi/model/change_item.h -> open5gs_2.6.0.tar.xz/lib/sbi/openapi/model/change_item.h Changed

open5gs_2.5.8.tar.xz/lib/sbi/openapi/model/nf_profile.c -> open5gs_2.6.0.tar.xz/lib/sbi/openapi/model/nf_profile.c Changed

open5gs_2.6.0.tar.xz/lib/sbi/openapi/model/patch_item.c Added

@@ -0,0 +1,169 @@
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include "patch_item.h"
+
+OpenAPI_patch_item_t *OpenAPI_patch_item_create(
+    OpenAPI_patch_operation_e op,
+    char *path,
+    char *from,
+    OpenAPI_any_type_t *value
+)
+{
+    OpenAPI_patch_item_t *patch_item_local_var = ogs_malloc(sizeof(OpenAPI_patch_item_t));
+    ogs_assert(patch_item_local_var);
+
+    patch_item_local_var->op = op;
+    patch_item_local_var->path = path;
+    patch_item_local_var->from = from;
+    patch_item_local_var->value = value;
+
+    return patch_item_local_var;
+}
+
+void OpenAPI_patch_item_free(OpenAPI_patch_item_t *patch_item)
+{
+    if (NULL == patch_item) {
+        return;
+    }
+    OpenAPI_lnode_t *node;
+    ogs_free(patch_item->path);
+    ogs_free(patch_item->from);
+    OpenAPI_any_type_free(patch_item->value);
+    ogs_free(patch_item);
+}
+
+cJSON *OpenAPI_patch_item_convertToJSON(OpenAPI_patch_item_t *patch_item)
+{
+    cJSON *item = NULL;
+
+    if (patch_item == NULL) {
+        ogs_error("OpenAPI_patch_item_convertToJSON() failed PatchItem");
+        return NULL;
+    }
+
+    item = cJSON_CreateObject();
+    if (cJSON_AddStringToObject(item, "op", OpenAPI_patch_operation_ToString(patch_item->op)) == NULL) {
+        ogs_error("OpenAPI_patch_item_convertToJSON() failed op");
+        goto end;
+    }
+
+    if (cJSON_AddStringToObject(item, "path", patch_item->path) == NULL) {
+        ogs_error("OpenAPI_patch_item_convertToJSON() failed path");
+        goto end;
+    }
+
+    if (patch_item->from) {
+    if (cJSON_AddStringToObject(item, "from", patch_item->from) == NULL) {
+        ogs_error("OpenAPI_patch_item_convertToJSON() failed from");
+        goto end;
+    }
+    }
+
+    if (patch_item->value) {
+    cJSON *value_object = OpenAPI_any_type_convertToJSON(patch_item->value);
+    if (value_object == NULL) {
+        ogs_error("OpenAPI_patch_item_convertToJSON() failed value");
+        goto end;
+    }
+    cJSON_AddItemToObject(item, "value", value_object);
+    if (item->child == NULL) {
+        ogs_error("OpenAPI_patch_item_convertToJSON() failed value");
+        goto end;
+    }
+    }
+
+end:
+    return item;
+}
+
+OpenAPI_patch_item_t *OpenAPI_patch_item_parseFromJSON(cJSON *patch_itemJSON)
+{
+    OpenAPI_patch_item_t *patch_item_local_var = NULL;
+    cJSON *op = cJSON_GetObjectItemCaseSensitive(patch_itemJSON, "op");
+    if (!op) {
+        ogs_error("OpenAPI_patch_item_parseFromJSON() failed op");
+        goto end;
+    }
+
+    OpenAPI_patch_operation_e opVariable = 0;
+    if (!cJSON_IsString(op)) {
+        ogs_error("OpenAPI_patch_item_parseFromJSON() failed op");
+        goto end;
+    }
+    opVariable = OpenAPI_patch_operation_FromString(op->valuestring);
+
+    cJSON *path = cJSON_GetObjectItemCaseSensitive(patch_itemJSON, "path");
+    if (!path) {
+        ogs_error("OpenAPI_patch_item_parseFromJSON() failed path");
+        goto end;
+    }
+
+    if (!cJSON_IsString(path)) {
+        ogs_error("OpenAPI_patch_item_parseFromJSON() failed path");
+        goto end;
+    }
+
+    cJSON *from = cJSON_GetObjectItemCaseSensitive(patch_itemJSON, "from");
+
+    if (from) {
+    if (!cJSON_IsString(from)) {
+        ogs_error("OpenAPI_patch_item_parseFromJSON() failed from");
+        goto end;
+    }
+    }
+
+    cJSON *value = cJSON_GetObjectItemCaseSensitive(patch_itemJSON, "value");
+
+    OpenAPI_any_type_t *value_local_object = NULL;
+    if (value) {
+    value_local_object = OpenAPI_any_type_parseFromJSON(value);
+    }
+
+    patch_item_local_var = OpenAPI_patch_item_create (
+        opVariable,
+        ogs_strdup(path->valuestring),
+        from ? ogs_strdup(from->valuestring) : NULL,
+        value ? value_local_object : NULL
+    );
+
+    return patch_item_local_var;
+end:
+    return NULL;
+}
+
+OpenAPI_patch_item_t *OpenAPI_patch_item_copy(OpenAPI_patch_item_t *dst, OpenAPI_patch_item_t *src)
+{
+    cJSON *item = NULL;
+    char *content = NULL;
+
+    ogs_assert(src);
+    item = OpenAPI_patch_item_convertToJSON(src);
+    if (!item) {
+        ogs_error("OpenAPI_patch_item_convertToJSON() failed");
+        return NULL;
+    }
+
+    content = cJSON_Print(item);
+    cJSON_Delete(item);
+
+    if (!content) {
+        ogs_error("cJSON_Print() failed");
+        return NULL;
+    }
+
+    item = cJSON_Parse(content);
+    ogs_free(content);
+    if (!item) {
+        ogs_error("cJSON_Parse() failed");
+        return NULL;
+    }
+
+    OpenAPI_patch_item_free(dst);
+    dst = OpenAPI_patch_item_parseFromJSON(item);
+    cJSON_Delete(item);
+
+    return dst;
+}
+

open5gs_2.6.0.tar.xz/lib/sbi/openapi/model/patch_item.h Added

@@ -0,0 +1,46 @@
+/*
+ * patch_item.h
+ *
+ * 
+ */
+
+#ifndef _OpenAPI_patch_item_H_
+#define _OpenAPI_patch_item_H_
+
+#include <string.h>
+#include "../external/cJSON.h"
+#include "../include/list.h"
+#include "../include/keyValuePair.h"
+#include "../include/binary.h"
+#include "any_type.h"
+#include "patch_operation.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct OpenAPI_patch_item_s OpenAPI_patch_item_t;
+typedef struct OpenAPI_patch_item_s {
+    OpenAPI_patch_operation_e op;
+    char *path;
+    char *from;
+    OpenAPI_any_type_t *value;
+} OpenAPI_patch_item_t;
+
+OpenAPI_patch_item_t *OpenAPI_patch_item_create(
+    OpenAPI_patch_operation_e op,
+    char *path,
+    char *from,
+    OpenAPI_any_type_t *value
+);
+void OpenAPI_patch_item_free(OpenAPI_patch_item_t *patch_item);
+OpenAPI_patch_item_t *OpenAPI_patch_item_parseFromJSON(cJSON *patch_itemJSON);
+cJSON *OpenAPI_patch_item_convertToJSON(OpenAPI_patch_item_t *patch_item);
+OpenAPI_patch_item_t *OpenAPI_patch_item_copy(OpenAPI_patch_item_t *dst, OpenAPI_patch_item_t *src);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _OpenAPI_patch_item_H_ */
+

open5gs_2.5.8.tar.xz/lib/sbi/openapi/src/list.c -> open5gs_2.6.0.tar.xz/lib/sbi/openapi/src/list.c Changed

@@ -101,6 +101,16 @@
     }
 }
 
+void OpenAPI_list_clear(OpenAPI_list_t *list)
+{
+    if (list) {
+        OpenAPI_list_iterate_forward(list, OpenAPI_lnode_free, NULL);
+        list->first = NULL;
+        list->last = NULL;
+        list->count = 0;
+    }
+}
+
 void OpenAPI_list_add(OpenAPI_list_t *list, void *dataToAddInList)
 {
     OpenAPI_lnode_t *newListEntry = listEntry_create(dataToAddInList);
@@ -128,6 +138,27 @@
     list->count++;
 }
 
+void OpenAPI_list_insert_prev(OpenAPI_list_t *list, OpenAPI_lnode_t *lnode,
+                              void *dataToAddInList)
+{
+    OpenAPI_lnode_t *newListEntry = listEntry_create(dataToAddInList);
+    if (newListEntry == NULL) {
+        ogs_assert_if_reached();
+        return;
+    } else if (lnode->prev == NULL) {
+        list->first = newListEntry;
+        lnode->prev = newListEntry;
+        newListEntry->prev = NULL;
+        newListEntry->next = lnode;
+    } else {
+        lnode->prev->next = newListEntry;
+        newListEntry->prev = lnode->prev;
+        newListEntry->next = lnode;
+        lnode->prev = newListEntry;
+    }
+    list->count++;
+}
+
 void OpenAPI_list_remove(OpenAPI_list_t *list, OpenAPI_lnode_t *elementToRemove)
 {
     OpenAPI_lnode_t *elementBeforeElementToRemove = elementToRemove->prev;

open5gs_2.5.8.tar.xz/lib/sbi/path.c -> open5gs_2.6.0.tar.xz/lib/sbi/path.c Changed

@@ -167,6 +167,7 @@
 
 bool ogs_sbi_discover_and_send(ogs_sbi_xact_t *xact)
 {
+    bool rc;
     ogs_sbi_client_t *client = NULL, *scp_client = NULL;
     ogs_sbi_nf_instance_t *nf_instance = NULL;
 
@@ -219,14 +220,15 @@
                     request->h.service.name, request->h.api.version);
         }
     } else {
+        OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
         ogs_sockaddr_t *addr = NULL;
 
-        addr = ogs_sbi_getaddr_from_uri(request->h.uri);
-        if (!addr) {
+        rc = ogs_sbi_getaddr_from_uri(&scheme, &addr, request->h.uri);
+        if (rc == false || scheme == OpenAPI_uri_scheme_NULL) {
             ogs_error("Invalid URL %s", request->h.uri);
             return false;
         }
-        client = ogs_sbi_client_find(addr);
+        client = ogs_sbi_client_find(scheme, addr);
         ogs_freeaddrinfo(addr);
     }
 
@@ -250,9 +252,10 @@
 
             ogs_free(apiroot);
 
-            ogs_expect_or_return_val(true ==
-                ogs_sbi_client_send_via_scp(
-                    scp_client, ogs_sbi_client_handler, request, xact), false);
+            rc = ogs_sbi_client_send_via_scp(
+                    scp_client, ogs_sbi_client_handler, request, xact);
+            ogs_expect(rc == true);
+            return rc;
 
         } else {
             /*
@@ -271,9 +274,10 @@
                         nf_instance->id);
             }
 
-            ogs_expect_or_return_val(true ==
-                ogs_sbi_client_send_via_scp(
-                    scp_client, client_discover_cb, request, xact), false);
+            rc = ogs_sbi_client_send_via_scp(
+                    scp_client, client_discover_cb, request, xact);
+            ogs_expect(rc == true);
+            return rc;
         }
 
     } else if (client) {
@@ -282,9 +286,10 @@
          ***********************/
 
         /* If `client` instance is available, use direct communication */
-        ogs_expect_or_return_val(true ==
-            ogs_sbi_client_send_request(
-                client, ogs_sbi_client_handler, request, xact), false);
+        rc = ogs_sbi_client_send_request(
+                client, ogs_sbi_client_handler, request, xact);
+        ogs_expect(rc == true);
+        return rc;
 
     } else {
         /**********************************************
@@ -337,11 +342,17 @@
                     ogs_sbi_service_type_to_name(service_type));
 
         client = NF_INSTANCE_CLIENT(nf_instance);
-        ogs_expect_or_return_val(client, false);
+        if (!client) {
+            ogs_error("No Client");
+            return false;
+        }
 
         request = ogs_nnrf_disc_build_discover(
                     target_nf_type, requester_nf_type, discovery_option);
-        ogs_expect_or_return_val(request, false);
+        if (!request) {
+            ogs_error("ogs_nnrf_disc_build_discover() failed");
+            return false;
+        }
 
         rc = ogs_sbi_client_send_request(
                 client, ogs_sbi_client_handler, request, xact);
@@ -361,6 +372,7 @@
 bool ogs_sbi_send_request_to_nf_instance(
         ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact)
 {
+    bool rc;
     ogs_sbi_request_t *request = NULL;
     ogs_sbi_client_t *client = NULL;
 
@@ -385,17 +397,19 @@
             return false;
         }
     } else {
+        bool rc;
+        OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
         ogs_sockaddr_t *addr = NULL;
         char bufOGS_ADDRSTRLEN;
 
-        addr = ogs_sbi_getaddr_from_uri(request->h.uri);
-        if (!addr) {
+        rc = ogs_sbi_getaddr_from_uri(&scheme, &addr, request->h.uri);
+        if (rc == false || scheme == OpenAPI_uri_scheme_NULL) {
             ogs_error("%s:%s Invalid URL %s",
                     OpenAPI_nf_type_ToString(nf_instance->nf_type),
                     nf_instance->id, request->h.uri);
             return false;
         }
-        client = ogs_sbi_client_find(addr);
+        client = ogs_sbi_client_find(scheme, addr);
         if (!client) {
             ogs_error("%s:%s Cannot find client %s:%d",
                     OpenAPI_nf_type_ToString(nf_instance->nf_type),
@@ -407,17 +421,18 @@
         ogs_freeaddrinfo(addr);
     }
 
-    ogs_expect_or_return_val(true ==
-        ogs_sbi_send_request_to_client(
-            client, ogs_sbi_client_handler, request, xact), false);
+    rc = ogs_sbi_send_request_to_client(
+            client, ogs_sbi_client_handler, request, xact);
+    ogs_expect(rc == true);
 
-    return true;
+    return rc;
 }
 
 bool ogs_sbi_send_request_to_client(
         ogs_sbi_client_t *client, ogs_sbi_client_cb_f client_cb,
         ogs_sbi_request_t *request, void *data)
 {
+    bool rc;
     ogs_sbi_client_t *scp_client = NULL;
     char *apiroot = NULL;
 
@@ -445,9 +460,9 @@
 
         ogs_free(apiroot);
 
-        ogs_expect_or_return_val(true ==
-            ogs_sbi_client_send_via_scp(
-                scp_client, client_cb, request, data), false);
+        rc = ogs_sbi_client_send_via_scp(
+                scp_client, client_cb, request, data);
+        ogs_expect(rc == true);
 
     } else {
 
@@ -456,13 +471,13 @@
          ***********************/
 
         /* Direct communication since `client' instance is always avaiable */
-        ogs_expect_or_return_val(true ==
-            ogs_sbi_client_send_request(
-                client, client_cb, request, data), false);
+        rc = ogs_sbi_client_send_request(
+                client, client_cb, request, data);
+        ogs_expect(rc == true);
 
     }
 
-    return true;
+    return rc;
 }
 
 bool ogs_sbi_send_notification_request(
@@ -470,6 +485,7 @@
         ogs_sbi_discovery_option_t *discovery_option,
         ogs_sbi_request_t *request, void *data)
 {
+    bool rc;
     ogs_sbi_client_t *client = NULL, *scp_client = NULL;
     OpenAPI_nf_type_e target_nf_type = OpenAPI_nf_type_NULL;
 
@@ -494,9 +510,9 @@
         build_default_discovery_parameter(
             request, service_type, discovery_option);
 
-        ogs_expect_or_return_val(true ==
-            ogs_sbi_client_send_via_scp(
-                scp_client, ogs_sbi_client_handler, request, data), false);
+        rc = ogs_sbi_client_send_via_scp(
+                scp_client, ogs_sbi_client_handler, request, data);
+        ogs_expect(rc == true);
 
     } else if (client) {
 
@@ -505,9 +521,9 @@
          ***********************/
 
         /* NRF is avaiable */
-        ogs_expect_or_return_val(true ==
-            ogs_sbi_client_send_request(
-                client, ogs_sbi_client_handler, request, data), false);
+        rc = ogs_sbi_client_send_request(
+                client, ogs_sbi_client_handler, request, data);
+        ogs_expect(rc == true);
 
 
     } else {
@@ -516,6 +532,7 @@
                 scp_client ? "SCP" : "No-SCP",
                 ogs_sbi_service_type_to_name(service_type),
                 request->h.service.name, request->h.api.version);
+        rc = false;
         ogs_assert_if_reached();
     }
 
@@ -532,7 +549,10 @@
     memset(&sendmsg, 0, sizeof(sendmsg));
 
     response = ogs_sbi_build_response(&sendmsg, status);
-    ogs_expect_or_return_val(response, false);
+    if (!response) {
+        ogs_error("ogs_sbi_build_response() failed");
+        return false;
+    }
 
     return ogs_sbi_server_send_response(stream, response);
 }

open5gs_2.5.8.tar.xz/lib/sbi/server.c -> open5gs_2.6.0.tar.xz/lib/sbi/server.c Changed

open5gs_2.5.8.tar.xz/lib/sbi/server.h -> open5gs_2.6.0.tar.xz/lib/sbi/server.h Changed

open5gs_2.5.8.tar.xz/lib/sbi/support/20210629/modified/TS29571_CommonData.yaml -> open5gs_2.6.0.tar.xz/lib/sbi/support/20210629/modified/TS29571_CommonData.yaml Changed

open5gs_2.5.8.tar.xz/lib/sbi/support/20210629/openapi-generator/config.yaml -> open5gs_2.6.0.tar.xz/lib/sbi/support/20210629/openapi-generator/config.yaml Changed

open5gs_2.6.0.tar.xz/lib/sbi/support/20210629/openapi-generator/templates/any_type.c Added

@@ -0,0 +1,121 @@
+#include "any_type.h"
+
+bool OpenAPI_IsInvalid(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsInvalid(item->json);
+}
+bool OpenAPI_IsFalse(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsFalse(item->json);
+}
+bool OpenAPI_IsTrue(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsTrue(item->json);
+}
+bool OpenAPI_IsBool(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsBool(item->json);
+}
+bool OpenAPI_IsNull(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsNull(item->json);
+}
+bool OpenAPI_IsNumber(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsNumber(item->json);
+}
+bool OpenAPI_IsString(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsString(item->json);
+}
+bool OpenAPI_IsArray(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsArray(item->json);
+}
+bool OpenAPI_IsObject(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsObject(item->json);
+}
+bool OpenAPI_IsRaw(const OpenAPI_any_type_t * const item)
+{
+    return item && cJSON_IsRaw(item->json);
+}
+
+static OpenAPI_any_type_t *any_create(cJSON *json) {
+    OpenAPI_any_type_t *any_type = NULL;
+
+    if (!json) {
+        return NULL;
+    }
+
+    any_type = ogs_calloc(1, sizeof(*any_type));
+    if (!any_type) {
+        cJSON_Delete(json);
+    }
+    any_type->json = json;
+
+    return any_type;
+}
+
+OpenAPI_any_type_t *OpenAPI_any_type_create(cJSON *json) {
+    OpenAPI_any_type_t *any_type_local_var =
+        any_create(cJSON_Duplicate(json, true));
+    ogs_assert(any_type_local_var);
+
+    return any_type_local_var;
+}
+
+OpenAPI_any_type_t *OpenAPI_any_type_parseFromJSON(cJSON *json) {
+    return OpenAPI_any_type_create(json);
+}
+
+cJSON *OpenAPI_any_type_convertToJSON(OpenAPI_any_type_t *any_type) {
+    cJSON *item = NULL;
+
+    if (any_type == NULL) {
+        ogs_error("OpenAPI_any_type_convertToJSON() failed AnyType");
+        return NULL;
+    }
+
+    item = cJSON_Duplicate(any_type->json, true);
+    if (item == NULL) {
+        ogs_error("OpenAPI_any_type_convertToJSON() failed AnyType");
+        return NULL;
+    }
+
+    return item;
+}
+
+OpenAPI_any_type_t *OpenAPI_any_type_create_true(void)
+{
+    return OpenAPI_any_type_create_bool(true);
+}
+
+OpenAPI_any_type_t *OpenAPI_any_type_create_false(void)
+{
+    return OpenAPI_any_type_create_bool(false);
+}
+
+OpenAPI_any_type_t *OpenAPI_any_type_create_bool(bool boolean)
+{
+    return any_create(boolean ? cJSON_CreateTrue() : cJSON_CreateFalse());
+}
+
+OpenAPI_any_type_t *OpenAPI_any_type_create_number(double num)
+{
+    return any_create(cJSON_CreateNumber(num));
+}
+
+
+OpenAPI_any_type_t *OpenAPI_any_type_create_string(const char *string)
+{
+    return any_create(cJSON_CreateString(string));
+}
+
+void OpenAPI_any_type_free(OpenAPI_any_type_t *any_type)
+{
+    if (any_type) {
+        cJSON_Delete(any_type->json);
+        ogs_free(any_type);
+    }
+}

open5gs_2.6.0.tar.xz/lib/sbi/support/20210629/openapi-generator/templates/any_type.h Added

@@ -0,0 +1,55 @@
+#ifndef OGS_SBI_ANY_TYPE_H
+#define OGS_SBI_ANY_TYPE_H
+
+#include "../external/cJSON.h"
+#include "ogs-core.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define OpenAPI_Invalid (0)
+#define OpenAPI_False  (1 << 0)
+#define OpenAPI_True   (1 << 1)
+#define OpenAPI_NULL   (1 << 2)
+#define OpenAPI_Number (1 << 3)
+#define OpenAPI_String (1 << 4)
+#define OpenAPI_Array  (1 << 5)
+#define OpenAPI_Object (1 << 6)
+#define OpenAPI_Raw    (1 << 7) /* raw json */
+
+#define OpenAPI_IsReference 256
+#define OpenAPI_StringIsConst 512
+
+typedef struct OpenAPI_any_type_s OpenAPI_any_type_t;
+typedef struct OpenAPI_any_type_s {
+    cJSON *json;
+} OpenAPI_any_type_t;
+
+bool OpenAPI_IsInvalid(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsFalse(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsTrue(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsBool(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsNull(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsNumber(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsString(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsArray(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsObject(const OpenAPI_any_type_t * const item);
+bool OpenAPI_IsRaw(const OpenAPI_any_type_t * const item);
+
+OpenAPI_any_type_t *OpenAPI_any_type_create(cJSON *json);
+OpenAPI_any_type_t *OpenAPI_any_type_parseFromJSON(cJSON *json);
+cJSON *OpenAPI_any_type_convertToJSON(OpenAPI_any_type_t *any_type);
+
+OpenAPI_any_type_t *OpenAPI_any_type_create_true(void);
+OpenAPI_any_type_t *OpenAPI_any_type_create_false(void);
+OpenAPI_any_type_t *OpenAPI_any_type_create_bool(bool boolean);
+OpenAPI_any_type_t *OpenAPI_any_type_create_number(double num);
+OpenAPI_any_type_t *OpenAPI_any_type_create_string(const char *string);
+void OpenAPI_any_type_free(OpenAPI_any_type_t *any_type);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OGS_SBI_ANY_TYPE_H */

open5gs_2.5.8.tar.xz/lib/sbi/support/20210629/openapi-generator/templates/list.c.mustache -> open5gs_2.6.0.tar.xz/lib/sbi/support/20210629/openapi-generator/templates/list.c.mustache Changed

@@ -101,6 +101,16 @@
     }
 }
 
+void OpenAPI_list_clear(OpenAPI_list_t *list)
+{
+    if (list) {
+        OpenAPI_list_iterate_forward(list, OpenAPI_lnode_free, NULL);
+        list->first = NULL;
+        list->last = NULL;
+        list->count = 0;
+    }
+}
+
 void OpenAPI_list_add(OpenAPI_list_t *list, void *dataToAddInList)
 {
     OpenAPI_lnode_t *newListEntry = listEntry_create(dataToAddInList);
@@ -128,6 +138,27 @@
     list->count++;
 }
 
+void OpenAPI_list_insert_prev(OpenAPI_list_t *list, OpenAPI_lnode_t *lnode,
+                              void *dataToAddInList)
+{
+    OpenAPI_lnode_t *newListEntry = listEntry_create(dataToAddInList);
+    if (newListEntry == NULL) {
+        ogs_assert_if_reached();
+        return;
+    } else if (lnode->prev == NULL) {
+        list->first = newListEntry;
+        lnode->prev = newListEntry;
+        newListEntry->prev = NULL;
+        newListEntry->next = lnode;
+    } else {
+        lnode->prev->next = newListEntry;
+        newListEntry->prev = lnode->prev;
+        newListEntry->next = lnode;
+        lnode->prev = newListEntry;
+    }
+    list->count++;
+}
+
 void OpenAPI_list_remove(OpenAPI_list_t *list, OpenAPI_lnode_t *elementToRemove)
 {
     OpenAPI_lnode_t *elementBeforeElementToRemove = elementToRemove->prev;

open5gs_2.5.8.tar.xz/lib/sbi/support/20210629/openapi-generator/templates/list.h.mustache -> open5gs_2.6.0.tar.xz/lib/sbi/support/20210629/openapi-generator/templates/list.h.mustache Changed

open5gs_2.5.8.tar.xz/lib/sbi/support/20210629/openapi-generator/templates/model-body.mustache -> open5gs_2.6.0.tar.xz/lib/sbi/support/20210629/openapi-generator/templates/model-body.mustache Changed

@@ -81,6 +81,9 @@
                 {{#isFreeFormObject}}
     OpenAPI_{{datatype}}_t *{{name}}{{^-last}},{{/-last}}
                 {{/isFreeFormObject}}
+                {{#isAnyType}}
+    OpenAPI_{{datatype}}_t *{{name}}{{^-last}},{{/-last}}
+                {{/isAnyType}}
             {{/isEnum}}
         {{/isPrimitiveType}}
         {{#isPrimitiveType}}
@@ -174,8 +177,11 @@
     ogs_free({{{classname}}}->{{{name}}});
                 {{/isEmail}}
                 {{#isFreeFormObject}}
-    OpenAPI_object_free({{{classname}}}->{{{name}}});
+    OpenAPI_{{{datatype}}}_free({{{classname}}}->{{{name}}});
                 {{/isFreeFormObject}}
+                {{#isAnyType}}
+    OpenAPI_{{{datatype}}}_free({{{classname}}}->{{{name}}});
+                {{/isAnyType}}
             {{/isEnum}}
         {{/isPrimitiveType}}
         {{#isPrimitiveType}}
@@ -388,6 +394,21 @@
         goto end;
     }
                 {{/isFreeFormObject}}
+                {{#isAnyType}}
+                    {{^required}}
+    if ({{{classname}}}->{{{name}}}) {
+                    {{/required}}
+    cJSON *{{{name}}}_object = OpenAPI_any_type_convertToJSON({{{classname}}}->{{{name}}});
+    if ({{{name}}}_object == NULL) {
+        ogs_error("OpenAPI_{{classname}}_convertToJSON() failed {{{name}}}");
+        goto end;
+    }
+    cJSON_AddItemToObject(item, "{{{baseName}}}", {{{name}}}_object);
+    if (item->child == NULL) {
+        ogs_error("OpenAPI_{{classname}}_convertToJSON() failed {{{name}}}");
+        goto end;
+    }
+                {{/isAnyType}}
             {{/isEnum}}
         {{/isPrimitiveType}}
     {{/isContainer}}
@@ -669,8 +690,19 @@
                     {{^required}}
     if ({{{name}}}) {
                     {{/required}}
+    if (!cJSON_IsObject({{{name}}})) {
+        ogs_error("OpenAPI_{{classname}}_parseFromJSON() failed {{{name}}}");
+        goto end;
+    }
     {{{name}}}_local_object = OpenAPI_object_parseFromJSON({{{name}}});
                 {{/isFreeFormObject}}
+                {{#isAnyType}}
+    OpenAPI_any_type_t *{{name}}_local_object = NULL;
+                    {{^required}}
+    if ({{{name}}}) {
+                    {{/required}}
+    {{{name}}}_local_object = OpenAPI_any_type_parseFromJSON({{{name}}});
+                {{/isAnyType}}
             {{/isEnum}}
         {{/isPrimitiveType}}
     {{/isContainer}}
@@ -849,6 +881,9 @@
                 {{#isFreeFormObject}}
         {{^required}}{{{name}}} ? {{/required}}{{{name}}}_local_object{{^required}} : NULL{{/required}}{{^-last}},{{/-last}}
                 {{/isFreeFormObject}}
+                {{#isAnyType}}
+        {{^required}}{{{name}}} ? {{/required}}{{{name}}}_local_object{{^required}} : NULL{{/required}}{{^-last}},{{/-last}}
+                {{/isAnyType}}
             {{/isEnum}}
         {{/isPrimitiveType}}
         {{#isPrimitiveType}}

open5gs_2.5.8.tar.xz/lib/sbi/support/20210629/openapi-generator/templates/model-header.mustache -> open5gs_2.6.0.tar.xz/lib/sbi/support/20210629/openapi-generator/templates/model-header.mustache Changed

open5gs_2.5.8.tar.xz/meson.build -> open5gs_2.6.0.tar.xz/meson.build Changed

@@ -16,15 +16,16 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 project('open5gs', 'c', 'cpp',
-    version : '2.5.8',
+    version : '2.6.0',
     license : 'AGPL-3.0-or-later',
     meson_version : '>= 0.43.0',
     default_options : 
+        'warning_level=1',
         'c_std=gnu89',
     ,
 )
 
-libogslib_version = '2.5.8'
+libogslib_version = '2.6.0'
 
 prefix = get_option('prefix')
 bindir = join_paths(prefix, get_option('bindir'))
@@ -32,6 +33,8 @@
 sysconfdir = join_paths(prefix, get_option('sysconfdir'))
 localstatedir = join_paths(prefix, get_option('localstatedir'))
 
+open5gs_build_dir = meson.current_build_dir()
+
 cc = meson.get_compiler('c')
 host_system = host_machine.system()
 
@@ -39,8 +42,13 @@
 #python = import('python')
 #python3 = python.find_installation('python3')
 python3 = find_program('python3', 'python')
+if meson.version().version_compare('>=0.55.0')
+python3_exe = join_paths(python3.full_path())
+else
 python3_exe = join_paths(python3.path())
+endif
 mkdir_p = 'import os; os.makedirs("@0@", exist_ok=True) if not os.environ.get("DESTDIR") else False;'
+symlink = 'import os; os.symlink("@0@", "@1@") if not os.environ.get("DESTDIR") and not os.path.islink("@1@") else False;'
 install_conf = 'import os; import shutil; shutil.copy("@0@", "@1@") if not os.environ.get("DESTDIR") and not os.path.isfile(os.path.join("@1@", os.path.split("@0@")1)) else False;'
 cppcheck = find_program('cppcheck', required: false)
 clangtidy = find_program('run-clang-tidy', required: false) # requires clang-tools package
@@ -48,7 +56,6 @@
     clangtidy = find_program('clang-tidy', required: false)
 endif
 
-
 meson.add_install_script(python3_exe, '-c',
         mkdir_p.format(join_paths(localstatedir, 'log', 'open5gs')))
 
@@ -57,7 +64,6 @@
     possible_cc_flags = 
         '-Wextra',
         '-Wlogical-op',
-        '-Werror=missing-include-dirs',
         '-Werror=pointer-arith',
         '-Werror=init-self',
         '-Wfloat-equal',
@@ -132,7 +138,8 @@
   '        bindir:                       ' + bindir,
   '        sysconfdir:                   ' + sysconfdir,
   '        localstatedir:                ' + localstatedir,
-  '        source code location:         ' + meson.source_root(),
+  '        build location:               ' + meson.current_build_dir(),
+  '        source location:              ' + meson.current_source_dir(),
   '        compiler:                     ' + cc.get_id(),
   '        debugging support:            ' + get_option('buildtype'),
   '',
@@ -141,20 +148,22 @@
 
 if cppcheck.found()
     run_target('analyze-cppcheck',
-    command :  'misc/static_code_analyze.sh',
-        cppcheck.path(),
-        meson.build_root(),
-        meson.source_root()
+    command :  'misc/static-code-analyze.sh',
+        meson.version().version_compare('>=0.55.0') ?
+          cppcheck.full_path() : cppcheck.path(),
+        meson.current_build_dir(),
+        meson.current_source_dir()
         
     )
 endif
 
 if clangtidy.found()
     run_target('analyze-clang-tidy',
-    command :  'misc/static_code_analyze.sh',
-        clangtidy.path(),
-        meson.build_root(),
-        meson.source_root()
+    command :  'misc/static-code-analyze.sh',
+        meson.version().version_compare('>=0.55.0') ?
+          clangtidy.full_path() : clangtidy.path(),
+        meson.current_build_dir(),
+        meson.current_source_dir()
         
     )
 endif

open5gs_2.6.0.tar.xz/misc/gen-hnkey.sh Added

open5gs_2.6.0.tar.xz/misc/ipv6-netconf.sh Changed

open5gs_2.6.0.tar.xz/misc/make-certs.sh Added

open5gs_2.6.0.tar.xz/misc/static-code-analyze.sh Changed

open5gs_2.5.8.tar.xz/src/amf/amf-sm.c -> open5gs_2.6.0.tar.xz/src/amf/amf-sm.c Changed

@@ -45,7 +45,7 @@
 
 void amf_state_operational(ogs_fsm_t *s, amf_event_t *e)
 {
-    int rv;
+    int r, rv;
     char bufOGS_ADDRSTRLEN;
     const char *api_version = NULL;
 
@@ -370,6 +370,8 @@
                 break;
             }
 
+            state = sbi_xact->state;
+
             amf_ue = (amf_ue_t *)sbi_xact->sbi_object;
             ogs_assert(amf_ue);
 
@@ -382,6 +384,7 @@
 
                 e->amf_ue = amf_ue;
                 e->h.sbi.message = &sbi_message;;
+                e->h.sbi.state = state;
 
                 ogs_fsm_dispatch(&amf_ue->sm, e);
             } else {
@@ -542,6 +545,7 @@
             e->amf_ue = amf_ue;
             e->sess = sess;
             e->h.sbi.message = &sbi_message;;
+            e->h.sbi.state = state;
 
             amf_nnssf_nsselection_handle_get(sess, &sbi_message);
             break;
@@ -567,6 +571,8 @@
             ogs_assert(nf_instance);
             ogs_assert(OGS_FSM_STATE(&nf_instance->sm));
 
+            ogs_sbi_self()->nf_instance->load = get_ran_ue_load();
+
             ogs_fsm_dispatch(&nf_instance->sm, e);
             if (OGS_FSM_CHECK(&nf_instance->sm, ogs_sbi_nf_state_exception))
                 ogs_error("%s:%s State machine exception %d",
@@ -615,9 +621,10 @@
                 }
 
                 ogs_error("%s Cannot receive SBI message", amf_ue->suci);
-                ogs_expect(OGS_OK ==
-                    nas_5gs_send_gmm_reject_from_sbi(amf_ue,
-                        OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT));
+                r = nas_5gs_send_gmm_reject_from_sbi(amf_ue,
+                        OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 break;
 
             case OGS_SBI_OBJ_SESS_TYPE:
@@ -632,16 +639,17 @@
                 ogs_error("%d:%d Cannot receive SBI message",
                         sess->psi, sess->pti);
                 if (sess->payload_container_type) {
-                    ogs_expect(OGS_OK ==
-                        nas_5gs_send_back_gsm_message(sess,
+                    r = nas_5gs_send_back_gsm_message(sess,
                             OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                            AMF_NAS_BACKOFF_TIME));
+                            AMF_NAS_BACKOFF_TIME);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 } else {
-                    ogs_expect(OGS_OK ==
-                        ngap_send_error_indication2(amf_ue,
+                    r = ngap_send_error_indication2(amf_ue,
                             NGAP_Cause_PR_transport,
-                            NGAP_CauseTransport_transport_resource_unavailable)
-                    );
+                            NGAP_CauseTransport_transport_resource_unavailable);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
                 break;
 
@@ -749,10 +757,11 @@
             ogs_fsm_dispatch(&gnb->sm, e);
         } else {
             ogs_error("Cannot decode NGAP message");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication(
+            r = ngap_send_error_indication(
                     gnb, NULL, NULL, NGAP_Cause_PR_protocol, 
-                    NGAP_CauseProtocol_abstract_syntax_error_falsely_constructed_message));
+                    NGAP_CauseProtocol_abstract_syntax_error_falsely_constructed_message);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
 
         ogs_ngap_free(&ngap_message);
@@ -770,7 +779,9 @@
             pkbuf = e->pkbuf;
             ogs_assert(pkbuf);
 
-            ogs_expect(OGS_OK == ngap_send_to_ran_ue(ran_ue, pkbuf));
+            r = ngap_send_to_ran_ue(ran_ue, pkbuf);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             ogs_timer_delete(e->timer);
             break;
         case AMF_TIMER_NG_HOLDING:
@@ -805,11 +816,13 @@
             if (!amf_ue) {
                 amf_ue = amf_ue_add(ran_ue);
                 if (amf_ue == NULL) {
-                    ogs_expect(OGS_OK ==
-                        ngap_send_ran_ue_context_release_command(ran_ue,
+                    r = ngap_send_ran_ue_context_release_command(
+                            ran_ue,
                             NGAP_Cause_PR_misc,
                             NGAP_CauseMisc_control_processing_overload,
-                            NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0));
+                            NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     ogs_pkbuf_free(pkbuf);
                     return;
                 }
@@ -865,12 +878,25 @@
                 /* De-associate NG with NAS/EMM */
                 ran_ue_deassociate(amf_ue->ran_ue);
 
-                ogs_expect(OGS_OK ==
-                    ngap_send_ran_ue_context_release_command(amf_ue->ran_ue,
+                r = ngap_send_ran_ue_context_release_command(amf_ue->ran_ue,
                         NGAP_Cause_PR_nas, NGAP_CauseNas_normal_release,
-                        NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0));
+                        NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             amf_ue_associate_ran_ue(amf_ue, ran_ue);
+
+            /*
+             * TS 24.501
+             * 5.3.7 Handling of the periodic registration update timer
+             *
+             * The mobile reachable timer shall be stopped
+             * when a NAS signalling connection is established for the UE.
+             * The implicit de-registration timer shall be stopped
+             * when a NAS signalling connection is established for the UE.
+             */
+            CLEAR_AMF_UE_TIMER(amf_ue->mobile_reachable);
+            CLEAR_AMF_UE_TIMER(amf_ue->implicit_deregistration);
         }
 
         ogs_assert(amf_ue);

open5gs_2.5.8.tar.xz/src/amf/context.c -> open5gs_2.6.0.tar.xz/src/amf/context.c Changed

@@ -123,6 +123,8 @@
 
 static int amf_context_validation(void)
 {
+    ogs_nas_gprs_timer_t gprs_timer;
+
     if (ogs_list_first(&self.ngap_list) == NULL &&
         ogs_list_first(&self.ngap_list6) == NULL) {
         ogs_error("No amf.ngap in '%s'", ogs_app()->file);
@@ -171,6 +173,16 @@
                 ogs_app()->file);
         return OGS_ERROR;
     }
+    if (ogs_nas_gprs_timer_from_sec(&gprs_timer, self.time.t3502.value) !=
+        OGS_OK) {
+        ogs_error("Not support GPRS Timer 2 %d", (int)self.time.t3502.value);
+        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);
+        return OGS_ERROR;
+    }
 
     return OGS_OK;
 }
@@ -830,6 +842,55 @@
                 } else
                     ogs_warn("unknown key `%s`", amf_key);
             }
+        } else if (!strcmp(root_key, "time")) {
+            ogs_yaml_iter_t time_iter;
+            ogs_yaml_iter_recurse(&root_iter, &time_iter);
+            while (ogs_yaml_iter_next(&time_iter)) {
+                const char *time_key = ogs_yaml_iter_key(&time_iter);
+                ogs_assert(time_key);
+                if (!strcmp(time_key, "t3502")) {
+                    ogs_yaml_iter_t t3502_iter;
+                    ogs_yaml_iter_recurse(&time_iter, &t3502_iter);
+
+                    while (ogs_yaml_iter_next(&t3502_iter)) {
+                        const char *t3502_key =
+                            ogs_yaml_iter_key(&t3502_iter);
+                        ogs_assert(t3502_key);
+
+                        if (!strcmp(t3502_key, "value")) {
+                            const char *v = ogs_yaml_iter_value(&t3502_iter);
+                            if (v)
+                                self.time.t3502.value = atoll(v);
+                        } else
+                            ogs_warn("unknown key `%s`", t3502_key);
+                    }
+                } else if (!strcmp(time_key, "t3512")) {
+                    ogs_yaml_iter_t t3512_iter;
+                    ogs_yaml_iter_recurse(&time_iter, &t3512_iter);
+
+                    while (ogs_yaml_iter_next(&t3512_iter)) {
+                        const char *t3512_key =
+                            ogs_yaml_iter_key(&t3512_iter);
+                        ogs_assert(t3512_key);
+
+                        if (!strcmp(t3512_key, "value")) {
+                            const char *v = ogs_yaml_iter_value(&t3512_iter);
+                            if (v)
+                                self.time.t3512.value = atoll(v);
+                        } else
+                            ogs_warn("unknown key `%s`", t3512_key);
+                    }
+                } else if (!strcmp(time_key, "nf_instance")) {
+                    /* handle config in app library */
+                } else if (!strcmp(time_key, "subscription")) {
+                    /* handle config in app library */
+                } else if (!strcmp(time_key, "message")) {
+                    /* handle config in app library */
+                } else if (!strcmp(time_key, "handover")) {
+                    /* handle config in app library */
+                } else
+                    ogs_warn("unknown key `%s`", time_key);
+            }
         }
     }
 
@@ -1317,6 +1378,22 @@
         return NULL;
     }
     amf_ue->t3570.pkbuf = NULL;
+    amf_ue->mobile_reachable.timer = ogs_timer_add(
+            ogs_app()->timer_mgr, amf_timer_mobile_reachable_expire, amf_ue);
+    if (!amf_ue->mobile_reachable.timer) {
+        ogs_error("ogs_timer_add() failed");
+        ogs_pool_free(&amf_ue_pool, amf_ue);
+        return NULL;
+    }
+    amf_ue->mobile_reachable.pkbuf = NULL;
+    amf_ue->implicit_deregistration.timer = ogs_timer_add(
+            ogs_app()->timer_mgr, amf_timer_implicit_deregistration_expire, amf_ue);
+    if (!amf_ue->implicit_deregistration.timer) {
+        ogs_error("ogs_timer_add() failed");
+        ogs_pool_free(&amf_ue_pool, amf_ue);
+        return NULL;
+    }
+    amf_ue->implicit_deregistration.pkbuf = NULL;
 
     /* SBI Type */
     amf_ue->sbi.type = OGS_SBI_OBJ_UE_TYPE;
@@ -1325,6 +1402,8 @@
     OGS_SBI_FEATURES_SET(amf_ue->am_policy_control_features,
             OGS_SBI_NPCF_AM_POLICY_CONTROL_UE_AMBR_AUTHORIZATION);
 
+    amf_ue->rat_restrictions = OpenAPI_list_create();
+
     ogs_list_init(&amf_ue->sess_list);
 
     /* Initialization */
@@ -1362,6 +1441,8 @@
     /* Clear 5GSM Message */
     AMF_UE_CLEAR_5GSM_MESSAGE(amf_ue);
 
+    OpenAPI_list_free(amf_ue->rat_restrictions);
+
     /* Remove all session context */
     amf_sess_remove_all(amf_ue);
 
@@ -1415,6 +1496,8 @@
     ogs_timer_delete(amf_ue->t3555.timer);
     ogs_timer_delete(amf_ue->t3560.timer);
     ogs_timer_delete(amf_ue->t3570.timer);
+    ogs_timer_delete(amf_ue->mobile_reachable.timer);
+    ogs_timer_delete(amf_ue->implicit_deregistration.timer);
 
     /* Free SBI object memory */
     ogs_sbi_object_free(&amf_ue->sbi);
@@ -1526,18 +1609,23 @@
                 (ogs_nas_5gs_mobile_identity_suci_t *)mobile_identity->buffer;
 
             if (mobile_identity_suci->protection_scheme_id !=
-                    OGS_NAS_5GS_NULL_SCHEME &&
+                    OGS_PROTECTION_SCHEME_NULL &&
                 mobile_identity_suci->protection_scheme_id !=
-                    OGS_NAS_5GS_ECIES_SCHEME_PROFILE_A &&
+                    OGS_PROTECTION_SCHEME_PROFILE_A &&
                 mobile_identity_suci->protection_scheme_id !=
-                    OGS_NAS_5GS_ECIES_SCHEME_PROFILE_B) {
+                    OGS_PROTECTION_SCHEME_PROFILE_B) {
                 ogs_error("Invalid ProtectionSchemeID(%d) in SUCI",
                     mobile_identity_suci->protection_scheme_id);
                 return NULL;
             }
 
             suci = ogs_nas_5gs_suci_from_mobile_identity(mobile_identity);
-            ogs_assert(suci);
+            if (!suci) {
+                ogs_error("Cannot get the SUCI from Mobilie Identity");
+                ogs_log_hexdump(OGS_LOG_ERROR,
+                        mobile_identity->buffer, mobile_identity->length);
+                return NULL;
+            }
 
             amf_ue = amf_ue_find_by_suci(suci);
             if (amf_ue) {
@@ -2246,6 +2334,13 @@
     ogs_info("Removed Number of gNB-UEs is now %d", num_of_ran_ue);
 }
 
+int get_ran_ue_load()
+{
+    return (((ogs_pool_size(&ran_ue_pool) -
+            ogs_pool_avail(&ran_ue_pool)) * 100) /
+            ogs_pool_size(&ran_ue_pool));
+}
+
 static void stats_add_amf_session(void)
 {
     amf_metrics_inst_global_inc(AMF_METR_GLOB_GAUGE_AMF_SESS);
@@ -2519,3 +2614,20 @@
 
     return true;
 }
+
+bool amf_ue_is_rat_restricted(amf_ue_t *amf_ue)
+{
+    OpenAPI_lnode_t *node = NULL;
+    OpenAPI_rat_type_e rat;
+
+    ogs_assert(amf_ue);
+
+    rat = amf_ue_rat_type(amf_ue);
+
+    OpenAPI_list_for_each(amf_ue->rat_restrictions, node) {
+        if (node->data == (void *)rat) {
+            return true;
+        }
+    }
+    return false;
+}

open5gs_2.5.8.tar.xz/src/amf/context.h -> open5gs_2.6.0.tar.xz/src/amf/context.h Changed

@@ -109,6 +109,12 @@
     ogs_list_t      ngap_list;      /* AMF NGAP IPv4 Server List */
     ogs_list_t      ngap_list6;     /* AMF NGAP IPv6 Server List */
 
+    struct {
+        struct {
+            ogs_time_t value;       /* Timer Value(Seconds) */
+        } t3502, t3512;
+    } time;
+
 } amf_context_t;
 
 typedef struct amf_gnb_s {
@@ -341,6 +347,7 @@
     /* SubscribedInfo */
     ogs_bitrate_t   ue_ambr;
     int num_of_slice;
+    OpenAPI_list_t *rat_restrictions;
     ogs_slice_data_t sliceOGS_MAX_NUM_OF_SLICE;
 
     uint64_t        am_policy_control_features; /* SBI Features */
@@ -361,6 +368,8 @@
         CLEAR_AMF_UE_TIMER((__aMF)->t3555); \
         CLEAR_AMF_UE_TIMER((__aMF)->t3560); \
         CLEAR_AMF_UE_TIMER((__aMF)->t3570); \
+        CLEAR_AMF_UE_TIMER((__aMF)->mobile_reachable); \
+        CLEAR_AMF_UE_TIMER((__aMF)->implicit_deregistration); \
     } while(0);
 #define CLEAR_AMF_UE_TIMER(__aMF_UE_TIMER) \
     do { \
@@ -375,7 +384,7 @@
         ogs_pkbuf_t     *pkbuf;
         ogs_timer_t     *timer;
         uint32_t        retry_count;;
-    } t3513, t3522, t3550, t3555, t3560, t3570;
+    } t3513, t3522, t3550, t3555, t3560, t3570, mobile_reachable, implicit_deregistration;
 
     /* UE Radio Capability */
     OCTET_STRING_t  ueRadioCapability;
@@ -394,9 +403,6 @@
         long cause;
     } handover;
 
-    /* Network Initiated De-Registration */
-    bool network_initiated_de_reg;
-
     /* SubscriptionId of Subscription to Data Change Notification to UDM */
     char *data_change_subscription_id;
 
@@ -781,6 +787,8 @@
 void amf_clear_subscribed_info(amf_ue_t *amf_ue);
 
 bool amf_update_allowed_nssai(amf_ue_t *amf_ue);
+bool amf_ue_is_rat_restricted(amf_ue_t *amf_ue);
+int get_ran_ue_load(void);
 
 #ifdef __cplusplus
 }

open5gs_2.5.8.tar.xz/src/amf/gmm-build.c -> open5gs_2.6.0.tar.xz/src/amf/gmm-build.c Changed

@@ -29,7 +29,7 @@
 
 ogs_pkbuf_t *gmm_build_registration_accept(amf_ue_t *amf_ue)
 {
-    int served_tai_index = 0;
+    int rv, served_tai_index = 0;
     ogs_pkbuf_t *pkbuf = NULL;
 
     ogs_nas_5gs_message_t message;
@@ -50,6 +50,7 @@
     ogs_nas_pdu_session_reactivation_result_t *pdu_session_reactivation_result =
         &registration_accept->pdu_session_reactivation_result;
     ogs_nas_gprs_timer_3_t *t3512_value = &registration_accept->t3512_value;
+    ogs_nas_gprs_timer_2_t *t3502_value = &registration_accept->t3502_value;
 
     ogs_assert(amf_ue);
 
@@ -127,18 +128,24 @@
     network_feature_support->ims_vops_3gpp = 1;
 
     /* Set T3512 */
-    registration_accept->presencemask |= OGS_NAS_5GS_REGISTRATION_ACCEPT_T3512_VALUE_PRESENT;
-    t3512_value->length = 1;
-    t3512_value->unit = OGS_NAS_GRPS_TIMER_3_UNIT_MULTIPLES_OF_1_HH;
-    t3512_value->value = 9;
+    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;
+    }
 
-#if 0
     /* Set T3502 */
-    registration_accept->presencemask |= OGS_NAS_5GS_REGISTRATION_ACCEPT_T3502_VALUE_PRESENT;
-    registration_accept->t3502_value.length = 1;
-    registration_accept->t3502_value.unit = OGS_NAS_GRPS_TIMER_UNIT_MULTIPLES_OF_1_MM;
-    registration_accept->t3502_value.value = 12;
-#endif
+    if (amf_self()->time.t3502.value) {
+        rv = ogs_nas_gprs_timer_from_sec(
+                &t3502_value->t, amf_self()->time.t3502.value);
+        ogs_assert(rv == OGS_OK);
+        registration_accept->presencemask |=
+            OGS_NAS_5GS_REGISTRATION_ACCEPT_T3502_VALUE_PRESENT;
+        t3502_value->length = 1;
+    }
 
     if (amf_ue->nas.present.pdu_session_status) {
         registration_accept->presencemask |=
@@ -650,9 +657,9 @@
         dl_nas_transport->presencemask |=
             OGS_NAS_5GS_DL_NAS_TRANSPORT_BACK_OFF_TIMER_VALUE_PRESENT;
         back_off_timer_value->length = 1;
-        back_off_timer_value->unit =
-            OGS_NAS_GRPS_TIMER_3_UNIT_MULTIPLES_OF_2_SS;
-        back_off_timer_value->value = backoff_time / 2;
+        back_off_timer_value->t.unit =
+            OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_2_SS;
+        back_off_timer_value->t.value = backoff_time / 2;
     }
 
     gmmbuf = nas_5gs_security_encode(amf_ue, &message);

open5gs_2.5.8.tar.xz/src/amf/gmm-handler.c -> open5gs_2.6.0.tar.xz/src/amf/gmm-handler.c Changed

@@ -136,11 +136,11 @@
             (ogs_nas_5gs_mobile_identity_suci_t *)mobile_identity->buffer;
 
         if (mobile_identity_suci->protection_scheme_id !=
-                OGS_NAS_5GS_NULL_SCHEME &&
+                OGS_PROTECTION_SCHEME_NULL &&
             mobile_identity_suci->protection_scheme_id !=
-                OGS_NAS_5GS_ECIES_SCHEME_PROFILE_A &&
+                OGS_PROTECTION_SCHEME_PROFILE_A &&
             mobile_identity_suci->protection_scheme_id !=
-                OGS_NAS_5GS_ECIES_SCHEME_PROFILE_B) {
+                OGS_PROTECTION_SCHEME_PROFILE_B) {
             ogs_error("Invalid ProtectionSchemeID(%d) in SUCI",
                 mobile_identity_suci->protection_scheme_id);
             return OGS_5GMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE;
@@ -273,6 +273,11 @@
         return OGS_5GMM_CAUSE_UE_SECURITY_CAPABILITIES_MISMATCH;
     }
 
+    if (amf_ue_is_rat_restricted(amf_ue)) {
+        ogs_error("Registration rejected due to RAT restrictions");
+        return OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED;
+    }
+
     return OGS_5GMM_CAUSE_REQUEST_ACCEPTED;
 }
 
@@ -543,7 +548,7 @@
 {
     amf_sess_t *sess = NULL;
     uint16_t psimask = 0;
-    int xact_count = 0;
+    int xact_count = 0, r;
 
     ogs_nas_uplink_data_status_t *uplink_data_status = NULL;
     ogs_nas_pdu_session_status_t *pdu_session_status = NULL;
@@ -629,9 +634,11 @@
         }
     }
 
-    if (amf_sess_xact_count(amf_ue) == xact_count)
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_service_accept(amf_ue));
+    if (amf_sess_xact_count(amf_ue) == xact_count) {
+        r = nas_5gs_send_service_accept(amf_ue);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
+    }
 
     return OGS_5GMM_CAUSE_REQUEST_ACCEPTED;
 }
@@ -639,6 +646,7 @@
 int gmm_handle_deregistration_request(amf_ue_t *amf_ue,
         ogs_nas_5gs_deregistration_request_from_ue_t *deregistration_request)
 {
+    int r;
     ogs_nas_de_registration_type_t *de_registration_type = NULL;
 
     ogs_assert(amf_ue);
@@ -685,9 +693,11 @@
     amf_sbi_send_release_all_sessions(
             amf_ue, AMF_RELEASE_SM_CONTEXT_NO_STATE);
 
-    if (ogs_list_count(&amf_ue->sess_list) == 0)
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_de_registration_accept(amf_ue));
+    if (ogs_list_count(&amf_ue->sess_list) == 0) {
+        r = nas_5gs_send_de_registration_accept(amf_ue);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
+    }
 
     return OGS_OK;
 }
@@ -735,7 +745,7 @@
     ogs_assert(true ==
         amf_ue_sbi_discover_and_send(
             OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
-            amf_nausf_auth_build_authenticate_confirmation, amf_ue, NULL));
+            amf_nausf_auth_build_authenticate_confirmation, amf_ue, 0, NULL));
 
     return OGS_OK;
 }
@@ -769,8 +779,12 @@
         mobile_identity_suci =
             (ogs_nas_5gs_mobile_identity_suci_t *)mobile_identity->buffer;
         if (mobile_identity_suci->protection_scheme_id !=
-                OGS_NAS_5GS_NULL_SCHEME) {
-            ogs_error("Not implemented ProtectionSchemeID(%d) in SUCI",
+                OGS_PROTECTION_SCHEME_NULL &&
+            mobile_identity_suci->protection_scheme_id !=
+                OGS_PROTECTION_SCHEME_PROFILE_A &&
+            mobile_identity_suci->protection_scheme_id !=
+                OGS_PROTECTION_SCHEME_PROFILE_B) {
+            ogs_error("Invalid ProtectionSchemeID(%d) in SUCI",
                 mobile_identity_suci->protection_scheme_id);
             return OGS_ERROR;
         }
@@ -876,6 +890,7 @@
 int gmm_handle_ul_nas_transport(amf_ue_t *amf_ue,
         ogs_nas_5gs_ul_nas_transport_t *ul_nas_transport)
 {
+    int r;
     ogs_slice_data_t *selected_slice = NULL;
     amf_sess_t *sess = NULL;
     amf_nsmf_pdusession_sm_context_param_t param;
@@ -897,34 +912,38 @@
 
     if (!payload_container_type->value) {
         ogs_error("%s No Payload container type", amf_ue->supi);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(
-                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION));
+        r = nas_5gs_send_gmm_status(
+                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     if (!payload_container->length) {
         ogs_error("%s No Payload container length", amf_ue->supi);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(
-                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION));
+        r = nas_5gs_send_gmm_status(
+                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     if (!payload_container->buffer) {
         ogs_error("%s No Payload container buffer", amf_ue->supi);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(
-                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION));
+        r = nas_5gs_send_gmm_status(
+                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     if ((ul_nas_transport->presencemask &
         OGS_NAS_5GS_UL_NAS_TRANSPORT_PDU_SESSION_ID_PRESENT) == 0) {
         ogs_error("%s No PDU session ID", amf_ue->supi);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(
-                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION));
+        r = nas_5gs_send_gmm_status(
+                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -932,9 +951,10 @@
     if (*pdu_session_id == OGS_NAS_PDU_SESSION_IDENTITY_UNASSIGNED) {
         ogs_error("%s PDU session identity is unassigned",
                 amf_ue->supi);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(
-                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION));
+        r = nas_5gs_send_gmm_status(
+                amf_ue, OGS_5GMM_CAUSE_INVALID_MANDATORY_INFORMATION);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -955,9 +975,10 @@
             if (!sess) {
                 ogs_error("%s No Session Context %d",
                     amf_ue->supi, gsm_header->message_type);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_gmm_status(amf_ue,
-                    OGS_5GMM_CAUSE_INSUFFICIENT_USER_PLANE_RESOURCES_FOR_THE_PDU_SESSION));
+                r = nas_5gs_send_gmm_status(amf_ue,
+                    OGS_5GMM_CAUSE_INSUFFICIENT_USER_PLANE_RESOURCES_FOR_THE_PDU_SESSION);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return OGS_ERROR;
             }
         }
@@ -1063,8 +1084,10 @@
             if (!selected_slice || !sess->dnn) {
                 ogs_warn("%s DNN Not Supported OR "
                             "Not Subscribed in the Slice", amf_ue->supi);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_gmm_status(amf_ue, OGS_5GMM_CAUSE_DNN_NOT_SUPPORTED_OR_NOT_SUBSCRIBED_IN_THE_SLICE));
+                r = nas_5gs_send_gmm_status(amf_ue,
+                        OGS_5GMM_CAUSE_DNN_NOT_SUPPORTED_OR_NOT_SUBSCRIBED_IN_THE_SLICE);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return OGS_ERROR;
             }
 
@@ -1128,9 +1151,10 @@
             if (!SESSION_CONTEXT_IN_SMF(sess)) {
                 ogs_error("%s:%d Session Context is not in SMF %d",
                     amf_ue->supi, sess->psi, gsm_header->message_type);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_back_gsm_message(sess,
-                        OGS_5GMM_CAUSE_DNN_NOT_SUPPORTED_OR_NOT_SUBSCRIBED_IN_THE_SLICE, 0));
+                r = nas_5gs_send_back_gsm_message(sess,
+                        OGS_5GMM_CAUSE_DNN_NOT_SUPPORTED_OR_NOT_SUBSCRIBED_IN_THE_SLICE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return OGS_ERROR;
             }
 
@@ -1183,9 +1207,10 @@
                     memset(&param, 0, sizeof(param));
                     param.acknowledgement_requested = 1;
                     param.guti = 1;
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_configuration_update_command(
-                            amf_ue, &param));
+                    r = nas_5gs_send_configuration_update_command(
+                            amf_ue, &param);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                     AMF_UE_CLEAR_PAGING_INFO(amf_ue);
                 }
@@ -1203,9 +1228,10 @@
     default:
         ogs_error("%s Unknown Payload container type %d",
             amf_ue->supi, payload_container_type->value);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(amf_ue,
-                OGS_5GMM_CAUSE_MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED));
+        r = nas_5gs_send_gmm_status(amf_ue,
+                OGS_5GMM_CAUSE_MESSAGE_TYPE_NON_EXISTENT_OR_NOT_IMPLEMENTED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }

open5gs_2.5.8.tar.xz/src/amf/gmm-sm.c -> open5gs_2.6.0.tar.xz/src/amf/gmm-sm.c Changed

@@ -58,6 +58,8 @@
 
     ogs_sbi_message_t *sbi_message = NULL;
 
+    int r, state = 0;
+
     ogs_assert(e);
 
     if (e->sess) {
@@ -94,8 +96,9 @@
                 OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
             } else {
                 amf_ue->t3570.retry_count++;
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_identity_request(amf_ue));
+                r = nas_5gs_send_identity_request(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -108,9 +111,10 @@
                 OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
             } else {
                 amf_ue->t3522.retry_count++;
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_de_registration_request(amf_ue,
-                        OpenAPI_deregistration_reason_NULL));
+                r = nas_5gs_send_de_registration_request(amf_ue,
+                        OpenAPI_deregistration_reason_NULL);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -123,6 +127,7 @@
     case OGS_EVENT_SBI_CLIENT:
         sbi_message = e->h.sbi.message;
         ogs_assert(sbi_message);
+        state = e->h.sbi.state;
 
         SWITCH(sbi_message->h.service.name)
         CASE(OGS_SBI_SERVICE_NAME_NAUSF_AUTH)
@@ -130,7 +135,8 @@
             CASE(OGS_SBI_RESOURCE_NAME_UE_AUTHENTICATIONS)
 
                 if (sbi_message->res_status != OGS_SBI_HTTP_STATUS_CREATED &&
-                    sbi_message->res_status != OGS_SBI_HTTP_STATUS_OK) {
+                    sbi_message->res_status != OGS_SBI_HTTP_STATUS_OK &&
+                    sbi_message->res_status != OGS_SBI_HTTP_STATUS_NO_CONTENT) {
                     if (sbi_message->res_status ==
                             OGS_SBI_HTTP_STATUS_NOT_FOUND) {
                         ogs_warn("%s Cannot find SUCI %d",
@@ -149,6 +155,11 @@
                 CASE(OGS_SBI_HTTP_METHOD_PUT)
                     ogs_warn("%s Ignore SBI message", amf_ue->suci);
                     break;
+                CASE(OGS_SBI_HTTP_METHOD_DELETE)
+                    if (amf_ue->confirmation_url_for_5g_aka)
+                        ogs_free(amf_ue->confirmation_url_for_5g_aka);
+                    amf_ue->confirmation_url_for_5g_aka = NULL;
+                    break;
                 DEFAULT
                     ogs_error("%s Invalid HTTP method %s",
                             amf_ue->suci, sbi_message->h.method);
@@ -156,6 +167,12 @@
                 END
                 break;
 
+            CASE(OGS_SBI_RESOURCE_NAME_5G_AKA)
+            CASE(OGS_SBI_RESOURCE_NAME_5G_AKA_CONFIRMATION)
+            CASE(OGS_SBI_RESOURCE_NAME_EAP_SESSION)
+                ogs_warn("%s Ignore SBI message", amf_ue->supi);
+                break;
+
             DEFAULT
                 ogs_error("Invalid resource name %s",
                         sbi_message->h.resource.component0);
@@ -164,21 +181,52 @@
             break;
 
         CASE(OGS_SBI_SERVICE_NAME_NUDM_UECM)
+            if (sbi_message->res_status != OGS_SBI_HTTP_STATUS_CREATED &&
+                sbi_message->res_status != OGS_SBI_HTTP_STATUS_NO_CONTENT &&
+                sbi_message->res_status != OGS_SBI_HTTP_STATUS_OK) {
+                ogs_error("%s HTTP response error %d",
+                        amf_ue->supi, sbi_message->res_status);
+                break;
+            }
 
             SWITCH(sbi_message->h.resource.component1)
             CASE(OGS_SBI_RESOURCE_NAME_REGISTRATIONS)
-                if (sbi_message->res_status != OGS_SBI_HTTP_STATUS_CREATED &&
-                    sbi_message->res_status != OGS_SBI_HTTP_STATUS_NO_CONTENT &&
-                    sbi_message->res_status != OGS_SBI_HTTP_STATUS_OK) {
-                    ogs_error("%s HTTP response error %d",
-                            amf_ue->supi, sbi_message->res_status);
-                    break;
-                }
-
                 SWITCH(sbi_message->h.method)
                 CASE(OGS_SBI_HTTP_METHOD_PUT)
                     ogs_warn("%s Ignore SBI message", amf_ue->supi);
                     break;
+                CASE(OGS_SBI_HTTP_METHOD_PATCH)
+                    SWITCH(sbi_message->h.resource.component2)
+                    CASE(OGS_SBI_RESOURCE_NAME_AMF_3GPP_ACCESS)
+                       if (amf_ue->data_change_subscription_id) {
+                            ogs_free(amf_ue->data_change_subscription_id);
+                            amf_ue->data_change_subscription_id = NULL;
+                        }
+
+                        if (state == AMF_NETWORK_INITIATED_DE_REGISTERED) {
+                            amf_sbi_send_release_all_sessions(amf_ue, state);
+                            if ((ogs_list_count(&amf_ue->sess_list) == 0) &&
+                                (PCF_AM_POLICY_ASSOCIATED(amf_ue))) {
+                                ogs_assert(true ==
+                                    amf_ue_sbi_discover_and_send(
+                                        OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL,
+                                        NULL,
+                                        amf_npcf_am_policy_control_build_delete,
+                                        amf_ue, state, NULL));
+                            }
+                        } else {
+                            ogs_assert(true ==
+                                amf_ue_sbi_discover_and_send(
+                                    OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
+                                    amf_nausf_auth_build_authenticate_delete,
+                                    amf_ue, state, NULL));
+                        }
+                        break;
+                    DEFAULT
+                        ogs_warn("Ignoring invalid resource name %s",
+                                 sbi_message->h.resource.component2);
+                    END
+                    break;
 
                 DEFAULT
                     ogs_error("%s Invalid HTTP method %s",
@@ -195,19 +243,34 @@
             break;
 
         CASE(OGS_SBI_SERVICE_NAME_NUDM_SDM)
+            if ((sbi_message->res_status != OGS_SBI_HTTP_STATUS_OK) &&
+                (sbi_message->res_status != OGS_SBI_HTTP_STATUS_CREATED) &&
+                (sbi_message->res_status != OGS_SBI_HTTP_STATUS_NO_CONTENT)) {
+                ogs_error("%s HTTP response error %d",
+                          amf_ue->supi, sbi_message->res_status);
+                break;
+            }
 
             SWITCH(sbi_message->h.resource.component1)
             CASE(OGS_SBI_RESOURCE_NAME_AM_DATA)
             CASE(OGS_SBI_RESOURCE_NAME_SMF_SELECT_DATA)
             CASE(OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA)
+                ogs_warn("%s Ignore SBI message", amf_ue->supi);
+                break;
+
             CASE(OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS)
-                if ((sbi_message->res_status != OGS_SBI_HTTP_STATUS_OK) &&
-                    (sbi_message->res_status != OGS_SBI_HTTP_STATUS_CREATED)) {
-                    ogs_error("%s HTTP response error %d",
-                            amf_ue->supi, sbi_message->res_status);
+                SWITCH(sbi_message->h.method)
+                CASE(OGS_SBI_HTTP_METHOD_DELETE)
+                    ogs_assert(true ==
+                        amf_ue_sbi_discover_and_send(
+                            OGS_SBI_SERVICE_TYPE_NUDM_UECM, NULL,
+                            amf_nudm_uecm_build_registration_delete,
+                            amf_ue, state, NULL));
                     break;
-                }
-                ogs_warn("%s Ignore SBI message", amf_ue->supi);
+                DEFAULT
+                    ogs_warn("%s Ignore invalid HTTP method %s",
+                            amf_ue->suci, sbi_message->h.method);
+                END
                 break;
 
             DEFAULT
@@ -226,9 +289,11 @@
                     break;
 
                 CASE(OGS_SBI_HTTP_METHOD_DELETE)
-                    if (!amf_ue->network_initiated_de_reg)
-                        ogs_assert(OGS_OK ==
-                            nas_5gs_send_de_registration_accept(amf_ue));
+                    if (state != AMF_NETWORK_INITIATED_DE_REGISTERED) {
+                        r = nas_5gs_send_de_registration_accept(amf_ue);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
+                    }
 
                     PCF_AM_POLICY_CLEAR(amf_ue);
                     break;
@@ -259,6 +324,8 @@
 
 void gmm_state_registered(ogs_fsm_t *s, amf_event_t *e)
 {
+    int i, r;
+
     amf_ue_t *amf_ue = NULL;
     amf_sess_t *sess = NULL;
 
@@ -277,8 +344,20 @@
 
     switch (e->h.id) {
     case OGS_FSM_ENTRY_SIG:
+        ogs_assert(amf_ue->num_of_slice <= OGS_MAX_NUM_OF_SLICE);
+        for (i = 0; i < amf_ue->num_of_slice; i++) {
+            amf_metrics_inst_by_slice_add(&amf_ue->nr_tai.plmn_id,
+                    &amf_ue->slicei.s_nssai,
+                    AMF_METR_GAUGE_RM_REGISTEREDSUBNBR, 1);
+        }
         break;
     case OGS_FSM_EXIT_SIG:
+        ogs_assert(amf_ue->num_of_slice <= OGS_MAX_NUM_OF_SLICE);
+        for (i = 0; i < amf_ue->num_of_slice; i++) {
+            amf_metrics_inst_by_slice_add(&amf_ue->nr_tai.plmn_id,
+                    &amf_ue->slicei.s_nssai,
+                    AMF_METR_GAUGE_RM_REGISTEREDSUBNBR, -1);
+        }
         break;
 
     case AMF_EVENT_5GMM_MESSAGE:
@@ -305,23 +384,18 @@
                     }
                 }
 
-                /* Clear Paging Info */
                 AMF_UE_CLEAR_PAGING_INFO(amf_ue);
-
-                /* Clear N2 Transfer */
                 AMF_UE_CLEAR_N2_TRANSFER(
                         amf_ue, pdu_session_resource_setup_request);
-
-                /* Clear 5GSM Message */
                 AMF_UE_CLEAR_5GSM_MESSAGE(amf_ue);
-
-                /* Clear t3513 Timers */
                 CLEAR_AMF_UE_TIMER(amf_ue->t3513);
 
             } else {
                 amf_ue->t3513.retry_count++;
                 /* If t3513 is timeout, the saved pkbuf is used.  */
-                ogs_assert(OGS_OK == ngap_send_paging(amf_ue));
+                r = ngap_send_paging(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -340,8 +414,9 @@
                  * If t3555 is timeout, the saved pkbuf is used.
                  * In this case, ack should be set to 1 for timer expiration
                  */
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_configuration_update_command(amf_ue, NULL));
+                r = nas_5gs_send_configuration_update_command(amf_ue, NULL);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -354,11 +429,71 @@
                 OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
             } else {
                 amf_ue->t3570.retry_count++;
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_identity_request(amf_ue));
+                r = nas_5gs_send_identity_request(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
+        case AMF_TIMER_MOBILE_REACHABLE:
+
+            /*
+             * TS 24.501
+             * 5.3.7 Handling of the periodic registration update timer and
+             *
+             * Upon expiry of the mobile reachable timer the network shall
+             * start the implicit de-registration timer over 3GPP access.
+             * The default value of the implicit de-registration timer over
+             * 3GPP access is 4 minutes greater than the value of timer T3512.
+             */
+
+            ogs_warn("%s Mobile Reachable Timer Expired", amf_ue->supi);
+
+            ogs_list_for_each(&amf_ue->sess_list, sess) {
+                if (sess->paging.ongoing == true &&
+                    sess->paging.n1n2_failure_txf_notif_uri != NULL) {
+                    ogs_assert(true ==
+                        amf_sbi_send_n1_n2_failure_notify(
+                            sess,
+                            OpenAPI_n1_n2_message_transfer_cause_UE_NOT_REACHABLE_FOR_SESSION));
+                }
+            }
+
+            /* Stop Paging */
+            AMF_UE_CLEAR_PAGING_INFO(amf_ue);
+            AMF_UE_CLEAR_N2_TRANSFER(
+                    amf_ue, pdu_session_resource_setup_request);
+            AMF_UE_CLEAR_5GSM_MESSAGE(amf_ue);
+            CLEAR_AMF_UE_TIMER(amf_ue->t3513);
+
+            ogs_timer_start(amf_ue->implicit_deregistration.timer,
+                    ogs_time_from_sec(amf_self()->time.t3512.value + 240));
+            break;
+        case AMF_TIMER_IMPLICIT_DEREGISTRATION:
+
+            /*
+             * TS 24.501
+             * 5.3.7 Handling of the periodic registration update timer and
+             *
+             * If the implicit de-registration timer expires before the UE
+             * contacts the network, the network shall implicitly de-register
+             * the UE.
+             *
+             * TS 23.502
+             * 4.2.2.3.3 Network-initiated Deregistration
+             *
+             * The AMF does not send the Deregistration Request message
+             * to the UE for Implicit Deregistration.
+             */
+
+            ogs_info("%s Do Network-initiated De-register UE", amf_ue->supi);
+
+            ogs_assert(true == amf_ue_sbi_discover_and_send(
+                    OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
+                    amf_nudm_sdm_build_subscription_delete,
+                    amf_ue, AMF_NETWORK_INITIATED_DE_REGISTERED, NULL));
+            OGS_FSM_TRAN(s, &gmm_state_de_registered);
+            break;
         default:
             ogs_error("Unknown timer%s:%d",
                     amf_timer_get_name(e->h.timer_id), e->h.timer_id);
@@ -380,7 +515,7 @@
 
 static void common_register_state(ogs_fsm_t *s, amf_event_t *e)
 {
-    int rv, xact_count = 0;
+    int r, rv, xact_count = 0;
     ogs_nas_5gmm_cause_t gmm_cause;
 
     amf_ue_t *amf_ue = NULL;
@@ -421,16 +556,18 @@
             if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                 ogs_error("gmm_handle_registration_request() failed %d",
                             gmm_cause);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_registration_reject(amf_ue, gmm_cause));
+                r = nas_5gs_send_registration_reject(amf_ue, gmm_cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
 
             if (!AMF_UE_HAVE_SUCI(amf_ue)) {
                 CLEAR_AMF_UE_TIMER(amf_ue->t3570);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_identity_request(amf_ue));
+                r = nas_5gs_send_identity_request(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 break;
             }
 
@@ -441,8 +578,9 @@
                 if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                     ogs_error("%s gmm_handle_registration_update() "
                                 "failed %d", amf_ue->suci, gmm_cause);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_registration_reject(amf_ue, gmm_cause));
+                    r = nas_5gs_send_registration_reject(amf_ue, gmm_cause);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     OGS_FSM_TRAN(s, gmm_state_exception);
                     break;
                 }
@@ -462,14 +600,15 @@
                                 OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL,
                                 NULL,
                                 amf_npcf_am_policy_control_build_create,
-                                amf_ue, NULL));
+                                amf_ue, 0, NULL));
                         OGS_FSM_TRAN(s, &gmm_state_initial_context_setup);
                         break;
                     }
 
                     CLEAR_AMF_UE_TIMER(amf_ue->t3550);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_registration_accept(amf_ue));
+                    r = nas_5gs_send_registration_accept(amf_ue);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
 
                 if (amf_ue->next.m_tmsi)
@@ -485,7 +624,8 @@
                     ogs_assert(true ==
                         amf_ue_sbi_discover_and_send(
                             OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
-                            amf_nausf_auth_build_authenticate, amf_ue, NULL));
+                            amf_nausf_auth_build_authenticate,
+                            amf_ue, 0, NULL));
                 }
 
                 OGS_FSM_TRAN(s, &gmm_state_authentication);
@@ -500,28 +640,29 @@
             if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                 ogs_error("%s gmm_handle_service_request() failed %d",
                             amf_ue->suci, gmm_cause);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_service_reject(amf_ue, gmm_cause));
+                r = nas_5gs_send_service_reject(amf_ue, gmm_cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
 
             if (!AMF_UE_HAVE_SUCI(amf_ue)) {
                 ogs_info("Service request : Unknown UE");
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_service_reject(amf_ue,
-                    OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)
-                );
+                r = nas_5gs_send_service_reject(amf_ue,
+                    OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
 
             if (!h.integrity_protected || !SECURITY_CONTEXT_IS_VALID(amf_ue)) {
                 ogs_error("No Security Context");
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_service_reject(amf_ue,
-                    OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)
-                );
+                r = nas_5gs_send_service_reject(amf_ue,
+                    OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
@@ -531,8 +672,9 @@
             if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                 ogs_error("%s gmm_handle_service_update() failed %d",
                             amf_ue->suci, gmm_cause);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_service_reject(amf_ue, gmm_cause));
+                r = nas_5gs_send_service_reject(amf_ue, gmm_cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
             }
 
@@ -563,7 +705,8 @@
                 ogs_assert(true ==
                     amf_ue_sbi_discover_and_send(
                         OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
-                        amf_nausf_auth_build_authenticate, amf_ue, NULL));
+                        amf_nausf_auth_build_authenticate,
+                        amf_ue, 0, NULL));
             }
 
             OGS_FSM_TRAN(s, &gmm_state_authentication);
@@ -590,10 +733,11 @@
             /* De-associate NG with NAS/EMM */
             ran_ue_deassociate(amf_ue->ran_ue);
 
-            ogs_assert(OGS_OK ==
-                ngap_send_ran_ue_context_release_command(amf_ue->ran_ue,
+            r = ngap_send_ran_ue_context_release_command(amf_ue->ran_ue,
                     NGAP_Cause_PR_misc, NGAP_CauseMisc_om_intervention,
-                    NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0));
+                    NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             OGS_FSM_TRAN(s, &gmm_state_de_registered);
             break;
@@ -660,7 +804,7 @@
 
 void gmm_state_authentication(ogs_fsm_t *s, amf_event_t *e)
 {
-    int rv;
+    int r, rv;
     ogs_nas_5gmm_cause_t gmm_cause;
 
     amf_ue_t *amf_ue = NULL;
@@ -706,8 +850,9 @@
                     amf_ue, &nas_message->gmm.authentication_response);
 
             if (rv != OGS_OK) {
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_authentication_reject(amf_ue));
+                r = nas_5gs_send_authentication_reject(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
             }
             break;
@@ -739,7 +884,8 @@
                 ogs_assert(true ==
                     amf_ue_sbi_discover_and_send(
                         OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
-                        amf_nausf_auth_build_authenticate, amf_ue, NULL));
+                        amf_nausf_auth_build_authenticate,
+                        amf_ue, 0, NULL));
                 return;
 
             case OGS_5GMM_CAUSE_SYNCH_FAILURE:
@@ -753,7 +899,7 @@
                     amf_ue_sbi_discover_and_send(
                         OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
                         amf_nausf_auth_build_authenticate,
-                        amf_ue, authentication_failure_parameter->auts));
+                        amf_ue, 0, authentication_failure_parameter->auts));
                 return;
 
             default:
@@ -763,8 +909,9 @@
                 break;
             }
 
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_authentication_reject(amf_ue));
+            r = nas_5gs_send_authentication_reject(amf_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
 
             break;
@@ -776,8 +923,9 @@
             if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                 ogs_error("%s gmm_handle_registration_request() failed %d",
                             amf_ue->suci, gmm_cause);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_registration_reject(amf_ue, gmm_cause));
+                r = nas_5gs_send_registration_reject(amf_ue, gmm_cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
@@ -785,7 +933,7 @@
             ogs_assert(true ==
                 amf_ue_sbi_discover_and_send(
                     OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
-                    amf_nausf_auth_build_authenticate, amf_ue, NULL));
+                    amf_nausf_auth_build_authenticate, amf_ue, 0, NULL));
             break;
 
         case OGS_NAS_5GS_5GMM_STATUS:
@@ -814,17 +962,15 @@
                     amf_timer_cfg(AMF_TIMER_T3560)->max_count) {
                 ogs_warn("%s Retransmission failed. Stop retransmission",
                         amf_ue->suci);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_authentication_reject(amf_ue));
+                r = nas_5gs_send_authentication_reject(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
             } else {
-                rv = nas_5gs_send_authentication_request(amf_ue);
-                if (rv == OGS_OK) {
-                    amf_ue->t3560.retry_count++;
-                } else {
-                    ogs_error("nas_5gs_send_authentication_request() failed");
-                    OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
-                }
+                amf_ue->t3560.retry_count++;
+                r = nas_5gs_send_authentication_request(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
         default:
@@ -852,9 +998,10 @@
                         ogs_error("%s HTTP response error %d",
                             amf_ue->suci, sbi_message->res_status);
                     }
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_gmm_reject_from_sbi(
-                            amf_ue, sbi_message->res_status));
+                    r = nas_5gs_send_gmm_reject_from_sbi(
+                            amf_ue, sbi_message->res_status);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
                     break;
                 }
@@ -866,8 +1013,9 @@
                     if (rv != OGS_OK) {
                         ogs_error("%s Cannot handle SBI message",
                                 amf_ue->suci);
-                        ogs_assert(OGS_OK ==
-                            nas_5gs_send_authentication_reject(amf_ue));
+                        r = nas_5gs_send_authentication_reject(amf_ue);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
                         OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
                     }
                     break;
@@ -877,8 +1025,9 @@
                     if (rv != OGS_OK) {
                         ogs_error("%s Cannot handle SBI message",
                                 amf_ue->suci);
-                        ogs_assert(OGS_OK ==
-                            nas_5gs_send_authentication_reject(amf_ue));
+                        r = nas_5gs_send_authentication_reject(amf_ue);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
                         OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
                     } else {
                         OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_security_mode);
@@ -912,7 +1061,7 @@
 
 void gmm_state_security_mode(ogs_fsm_t *s, amf_event_t *e)
 {
-    int rv;
+    int r;
     ogs_nas_5gmm_cause_t gmm_cause;
     amf_ue_t *amf_ue = NULL;
     ogs_nas_5gs_message_t *nas_message = NULL;
@@ -929,8 +1078,9 @@
     switch (e->h.id) {
     case OGS_FSM_ENTRY_SIG:
         CLEAR_AMF_UE_TIMER(amf_ue->t3560);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_security_mode_command(amf_ue));
+        r = nas_5gs_send_security_mode_command(amf_ue);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         break;
     case OGS_FSM_EXIT_SIG:
         break;
@@ -979,8 +1129,9 @@
                 ogs_error("%s gmm_handle_security_mode_complete() "
                             "failed %d in type %d",
                             amf_ue->suci, gmm_cause, amf_ue->nas.message_type);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_gmm_reject(amf_ue, gmm_cause));
+                r = nas_5gs_send_gmm_reject(amf_ue, gmm_cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
@@ -994,7 +1145,7 @@
             ogs_assert(true ==
                 amf_ue_sbi_discover_and_send(
                     OGS_SBI_SERVICE_TYPE_NUDM_UECM, NULL,
-                    amf_nudm_uecm_build_registration, amf_ue, NULL));
+                    amf_nudm_uecm_build_registration, amf_ue, 0, NULL));
 
             if (amf_ue->nas.message_type == OGS_NAS_5GS_REGISTRATION_REQUEST) {
                 OGS_FSM_TRAN(s, &gmm_state_initial_context_setup);
@@ -1021,8 +1172,9 @@
             if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                 ogs_error("%s gmm_handle_registration_request() failed %d",
                             amf_ue->suci, gmm_cause);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_registration_reject(amf_ue, gmm_cause));
+                r = nas_5gs_send_registration_reject(amf_ue, gmm_cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
@@ -1030,17 +1182,17 @@
             ogs_assert(true ==
                 amf_ue_sbi_discover_and_send(
                     OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
-                    amf_nausf_auth_build_authenticate, amf_ue, NULL));
+                    amf_nausf_auth_build_authenticate, amf_ue, 0, NULL));
 
             OGS_FSM_TRAN(s, &gmm_state_authentication);
             break;
 
         case OGS_NAS_5GS_SERVICE_REQUEST:
             ogs_info("%s Service request", amf_ue->supi);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_service_reject(amf_ue,
-                    OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)
-            );
+            r = nas_5gs_send_service_reject(amf_ue,
+                    OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             OGS_FSM_TRAN(s, &gmm_state_exception);
             break;
 
@@ -1069,18 +1221,16 @@
             if (amf_ue->t3560.retry_count >=
                     amf_timer_cfg(AMF_TIMER_T3560)->max_count) {
                 ogs_warn("%s Retransmission failed. Stop", amf_ue->supi);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_gmm_reject(amf_ue,
-                        OGS_5GMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED));
+                r = nas_5gs_send_gmm_reject(amf_ue,
+                        OGS_5GMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
             } else {
-                rv = nas_5gs_send_security_mode_command(amf_ue);
-                if (rv == OGS_OK) {
-                    amf_ue->t3560.retry_count++;
-                } else {
-                    ogs_error("nas_5gs_send_security_mode_command() failed");
-                    OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
-                }
+                amf_ue->t3560.retry_count++;
+                r = nas_5gs_send_security_mode_command(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
         default:
@@ -1097,7 +1247,7 @@
 
 void gmm_state_initial_context_setup(ogs_fsm_t *s, amf_event_t *e)
 {
-    int rv, xact_count = 0;
+    int rv, r, state, xact_count = 0;
     ogs_nas_5gmm_cause_t gmm_cause;
 
     amf_ue_t *amf_ue = NULL;
@@ -1132,6 +1282,7 @@
     case OGS_EVENT_SBI_CLIENT:
         sbi_message = e->h.sbi.message;
         ogs_assert(sbi_message);
+        state = e->h.sbi.state;
 
         SWITCH(sbi_message->h.service.name)
         CASE(OGS_SBI_SERVICE_NAME_NUDM_UECM)
@@ -1143,9 +1294,10 @@
                     sbi_message->res_status != OGS_SBI_HTTP_STATUS_OK) {
                     ogs_error("%s HTTP response error %d",
                             amf_ue->supi, sbi_message->res_status);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_gmm_reject(
-                            amf_ue, OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED));
+                    r = nas_5gs_send_gmm_reject(
+                            amf_ue, OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
                     break;
                 }
@@ -1156,7 +1308,8 @@
                         amf_ue_sbi_discover_and_send(
                             OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
                             amf_nudm_sdm_build_get,
-                            amf_ue, (char *)OGS_SBI_RESOURCE_NAME_AM_DATA));
+                            amf_ue, state,
+                            (char *)OGS_SBI_RESOURCE_NAME_AM_DATA));
                     break;
 
                 DEFAULT
@@ -1184,20 +1337,23 @@
                     (sbi_message->res_status != OGS_SBI_HTTP_STATUS_CREATED)) {
                     ogs_error("%s HTTP response error %d",
                             amf_ue->supi, sbi_message->res_status);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_gmm_reject(
-                            amf_ue, OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED));
+                    r = nas_5gs_send_gmm_reject(
+                            amf_ue, OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
                     break;
                 }
 
-                rv = amf_nudm_sdm_handle_provisioned(amf_ue, sbi_message);
+                rv = amf_nudm_sdm_handle_provisioned(
+                        amf_ue, state, sbi_message);
                 if (rv != OGS_OK) {
                     ogs_error("%s amf_nudm_sdm_handle_provisioned(%s) failed",
                             amf_ue->supi, sbi_message->h.resource.component1);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_gmm_reject(
-                            amf_ue, OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED));
+                    r = nas_5gs_send_gmm_reject(
+                            amf_ue, OGS_5GMM_CAUSE_5GS_SERVICES_NOT_ALLOWED);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
                     break;
                 }
@@ -1227,8 +1383,9 @@
                     ogs_assert(amf_ue->nas.message_type ==
                             OGS_NAS_5GS_REGISTRATION_REQUEST);
                     CLEAR_AMF_UE_TIMER(amf_ue->t3550);
-                    ogs_assert(OGS_OK ==
-                            nas_5gs_send_registration_accept(amf_ue));
+                    r = nas_5gs_send_registration_accept(amf_ue);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                     /* In nsmf-handler.c
                      *
@@ -1332,8 +1489,9 @@
              */
             memset(&param, 0, sizeof(param));
             param.nitz = 1;
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_configuration_update_command(amf_ue, &param));
+            r = nas_5gs_send_configuration_update_command(amf_ue, &param);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             OGS_FSM_TRAN(s, &gmm_state_registered);
             break;
@@ -1346,8 +1504,9 @@
             if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                 ogs_error("%s gmm_handle_registration_request() failed %d",
                             amf_ue->suci, gmm_cause);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_registration_reject(amf_ue, gmm_cause));
+                r = nas_5gs_send_registration_reject(amf_ue, gmm_cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
@@ -1358,17 +1517,18 @@
                 ogs_assert(true ==
                     amf_ue_sbi_discover_and_send(
                         OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
-                        amf_nausf_auth_build_authenticate, amf_ue, NULL));
+                        amf_nausf_auth_build_authenticate,
+                        amf_ue, 0, NULL));
             }
             OGS_FSM_TRAN(s, &gmm_state_authentication);
             break;
 
         case OGS_NAS_5GS_SERVICE_REQUEST:
             ogs_info("%s Service request", amf_ue->supi);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_service_reject(amf_ue,
-                    OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)
-            );
+            r = nas_5gs_send_service_reject(amf_ue,
+                OGS_5GMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             OGS_FSM_TRAN(s, &gmm_state_exception);
             break;
 
@@ -1400,13 +1560,10 @@
                         amf_ue->suci);
                 OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
             } else {
-                rv = nas_5gs_send_registration_accept(amf_ue);
-                if (rv == OGS_OK) {
-                    amf_ue->t3550.retry_count++;
-                } else {
-                    ogs_error("nas_5gs_send_registration_accept() failed");
-                    OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_exception);
-                }
+                amf_ue->t3550.retry_count++;
+                r = nas_5gs_send_registration_accept(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
         default:
@@ -1423,7 +1580,7 @@
 
 void gmm_state_exception(ogs_fsm_t *s, amf_event_t *e)
 {
-    int xact_count = 0;
+    int xact_count = 0, r;
     ogs_nas_5gmm_cause_t gmm_cause;
 
     amf_ue_t *amf_ue = NULL;
@@ -1454,11 +1611,13 @@
         amf_sbi_send_release_all_sessions(
                 amf_ue, AMF_RELEASE_SM_CONTEXT_NO_STATE);
 
-        if (ogs_list_count(&amf_ue->sess_list) == 0)
-            ogs_assert(OGS_OK ==
-                ngap_send_amf_ue_context_release_command(amf_ue,
+        if (ogs_list_count(&amf_ue->sess_list) == 0) {
+            r = ngap_send_amf_ue_context_release_command(amf_ue,
                     NGAP_Cause_PR_nas, NGAP_CauseNas_normal_release,
-                    NGAP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                    NGAP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
+        }
         break;
     case OGS_FSM_EXIT_SIG:
         break;
@@ -1483,16 +1642,18 @@
             if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                 ogs_error("gmm_handle_registration_request() failed %d",
                             gmm_cause);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_registration_reject(amf_ue, gmm_cause));
+                r = nas_5gs_send_registration_reject(amf_ue, gmm_cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, gmm_state_exception);
                 break;
             }
 
             if (!AMF_UE_HAVE_SUCI(amf_ue)) {
                 CLEAR_AMF_UE_TIMER(amf_ue->t3570);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_identity_request(amf_ue));
+                r = nas_5gs_send_identity_request(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
                 OGS_FSM_TRAN(s, &gmm_state_de_registered);
                 break;
@@ -1505,8 +1666,9 @@
                 if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
                     ogs_error("%s gmm_handle_registration_update() "
                                 "failed %d", amf_ue->suci, gmm_cause);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_registration_reject(amf_ue, gmm_cause));
+                    r = nas_5gs_send_registration_reject(amf_ue, gmm_cause);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     OGS_FSM_TRAN(s, gmm_state_exception);
                     break;
                 }
@@ -1524,14 +1686,15 @@
                                 OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL,
                                 NULL,
                                 amf_npcf_am_policy_control_build_create,
-                                amf_ue, NULL));
+                                amf_ue, 0, NULL));
                         OGS_FSM_TRAN(s, &gmm_state_initial_context_setup);
                         break;
                     }
 
                     CLEAR_AMF_UE_TIMER(amf_ue->t3550);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_registration_accept(amf_ue));
+                    r = nas_5gs_send_registration_accept(amf_ue);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
 
                 if (amf_ue->next.m_tmsi)
@@ -1547,7 +1710,8 @@
                     ogs_assert(true ==
                         amf_ue_sbi_discover_and_send(
                             OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
-                            amf_nausf_auth_build_authenticate, amf_ue, NULL));
+                            amf_nausf_auth_build_authenticate,
+                            amf_ue, 0, NULL));
                 }
 
                 OGS_FSM_TRAN(s, &gmm_state_authentication);

open5gs_2.5.8.tar.xz/src/amf/init.c -> open5gs_2.6.0.tar.xz/src/amf/init.c Changed

open5gs_2.5.8.tar.xz/src/amf/metrics.c -> open5gs_2.6.0.tar.xz/src/amf/metrics.c Changed

@@ -64,33 +64,242 @@
     .name = "gnb",
     .description = "gNodeBs",
 },
+/* Global Counters: */
 };
-static int amf_metrics_init_inst_global(void)
+int amf_metrics_init_inst_global(void)
 {
     return amf_metrics_init_inst(amf_metrics_inst_global, amf_metrics_spec_global,
                 _AMF_METR_GLOB_MAX, 0, NULL);
 }
-static int amf_metrics_free_inst_global(void)
+int amf_metrics_free_inst_global(void)
 {
     return amf_metrics_free_inst(amf_metrics_inst_global, _AMF_METR_GLOB_MAX);
 }
 
-int amf_metrics_open(void)
+/* BY SLICE */
+const char *labels_slice = {
+    "plmnid",
+    "snssai"
+};
+
+#define AMF_METR_BY_SLICE_GAUGE_ENTRY(_id, _name, _desc) \
+    _id = { \
+        .type = OGS_METRICS_METRIC_TYPE_GAUGE, \
+        .name = _name, \
+        .description = _desc, \
+        .num_labels = OGS_ARRAY_SIZE(labels_slice), \
+        .labels = labels_slice, \
+    },
+ogs_metrics_spec_t *amf_metrics_spec_by_slice_AMF_METR_BY_SLICE_MAX;
+ogs_hash_t *metrics_hash_by_slice = NULL;   /* hash table for SLICE labels */
+amf_metrics_spec_def_t amf_metrics_spec_def_by_slice_AMF_METR_BY_SLICE_MAX = {
+/* Gauges: */
+AMF_METR_BY_SLICE_GAUGE_ENTRY(
+    AMF_METR_GAUGE_RM_REGISTEREDSUBNBR,
+    "fivegs_amffunction_rm_registeredsubnbr",
+    "Number of registered state subscribers per AMF")
+};
+void amf_metrics_init_by_slice(void);
+int amf_metrics_free_inst_by_slice(ogs_metrics_inst_t **inst);
+typedef struct amf_metric_key_by_slice_s {
+    ogs_plmn_id_t               plmn_id;
+    ogs_s_nssai_t               snssai;
+    amf_metric_type_by_slice_t  t;
+} amf_metric_key_by_slice_t;
+
+void amf_metrics_init_by_slice(void)
+{
+    metrics_hash_by_slice = ogs_hash_make();
+    ogs_assert(metrics_hash_by_slice);
+}
+
+void amf_metrics_inst_by_slice_add(ogs_plmn_id_t *plmn,
+        ogs_s_nssai_t *snssai, amf_metric_type_by_slice_t t, int val)
+{
+    ogs_metrics_inst_t *metrics = NULL;
+    amf_metric_key_by_slice_t *slice_key;
+
+    slice_key = ogs_calloc(1, sizeof(*slice_key));
+    ogs_assert(slice_key);
+
+    if (plmn) {
+        slice_key->plmn_id = *plmn;
+    }
+
+    if (snssai) {
+        slice_key->snssai = *snssai;
+    } else {
+        slice_key->snssai.sst = 0;
+        slice_key->snssai.sd.v = OGS_S_NSSAI_NO_SD_VALUE;
+    }
+
+    slice_key->t = t;
+
+    metrics = ogs_hash_get(metrics_hash_by_slice,
+            slice_key, sizeof(*slice_key));
+
+    if (!metrics) {
+        char plmn_idOGS_PLMNIDSTRLEN = "";
+        char *s_nssai = NULL;
+
+        if (plmn) {
+            ogs_plmn_id_to_string(plmn, plmn_id);
+        }
+
+        if (snssai) {
+            s_nssai = ogs_sbi_s_nssai_to_string_plain(snssai);
+        } else {
+            s_nssai = ogs_strdup("");
+        }
+
+        metrics = ogs_metrics_inst_new(amf_metrics_spec_by_slicet,
+                amf_metrics_spec_def_by_slice->num_labels,
+                (const char *){ plmn_id, s_nssai });
+
+        ogs_assert(metrics);
+        ogs_hash_set(metrics_hash_by_slice,
+                slice_key, sizeof(*slice_key), metrics);
+
+        if (s_nssai)
+            ogs_free(s_nssai);
+    } else {
+        ogs_free(slice_key);
+    }
+
+    ogs_metrics_inst_add(metrics, val);
+}
+
+int amf_metrics_free_inst_by_slice(ogs_metrics_inst_t **inst)
+{
+    return amf_metrics_free_inst(inst, _AMF_METR_BY_SLICE_MAX);
+}
+
+/* BY CAUSE */
+const char *labels_cause = {
+    "cause"
+};
+
+#define AMF_METR_BY_CAUSE_CTR_ENTRY(_id, _name, _desc) \
+    _id = { \
+        .type = OGS_METRICS_METRIC_TYPE_COUNTER, \
+        .name = _name, \
+        .description = _desc, \
+        .num_labels = OGS_ARRAY_SIZE(labels_cause), \
+        .labels = labels_cause, \
+    },
+ogs_metrics_spec_t *amf_metrics_spec_by_cause_AMF_METR_BY_CAUSE_MAX;
+ogs_hash_t *metrics_hash_by_cause = NULL;   /* hash table for CAUSE labels */
+amf_metrics_spec_def_t amf_metrics_spec_def_by_cause_AMF_METR_BY_CAUSE_MAX = {
+/* Counters: */
+AMF_METR_BY_CAUSE_CTR_ENTRY(
+    AMF_METR_CTR_RM_REG_INITFAIL,
+    "fivegs_amffunction_rm_reginitfail",
+    "Number of failed initial registrations at the AMF")
+};
+void amf_metrics_init_by_cause(void);
+int amf_metrics_free_inst_by_cause(ogs_metrics_inst_t **inst);
+typedef struct amf_metric_key_by_cause_s {
+    uint8_t                     cause;
+    amf_metric_type_by_cause_t  t;
+} amf_metric_key_by_cause_t;
+
+void amf_metrics_init_by_cause(void)
+{
+    metrics_hash_by_cause = ogs_hash_make();
+    ogs_assert(metrics_hash_by_cause);
+}
+
+void amf_metrics_inst_by_cause_add(uint8_t cause,
+        amf_metric_type_by_cause_t t, int val)
+{
+    ogs_metrics_inst_t *metrics = NULL;
+    amf_metric_key_by_cause_t *cause_key;
+
+    cause_key = ogs_calloc(1, sizeof(*cause_key));
+    ogs_assert(cause_key);
+
+    cause_key->cause = cause;
+    cause_key->t = t;
+
+    metrics = ogs_hash_get(metrics_hash_by_cause,
+            cause_key, sizeof(*cause_key));
+
+    if (!metrics) {
+        char cause_str4;
+        ogs_snprintf(cause_str, sizeof(cause_str), "%d", cause);
+
+        metrics = ogs_metrics_inst_new(amf_metrics_spec_by_causet,
+                amf_metrics_spec_def_by_cause->num_labels,
+                (const char *){ cause_str });
+
+        ogs_assert(metrics);
+        ogs_hash_set(metrics_hash_by_cause,
+                cause_key, sizeof(*cause_key), metrics);
+    } else {
+        ogs_free(cause_key);
+    }
+
+    ogs_metrics_inst_add(metrics, val);
+}
+
+int amf_metrics_free_inst_by_cause(ogs_metrics_inst_t **inst)
+{
+    return amf_metrics_free_inst(inst, _AMF_METR_BY_CAUSE_MAX);
+}
+
+void amf_metrics_init(void)
 {
     ogs_metrics_context_t *ctx = ogs_metrics_self();
-    ogs_metrics_context_open(ctx);
+    ogs_metrics_context_init();
 
     amf_metrics_init_spec(ctx, amf_metrics_spec_global, amf_metrics_spec_def_global,
             _AMF_METR_GLOB_MAX);
 
+    amf_metrics_init_spec(ctx, amf_metrics_spec_by_slice,
+            amf_metrics_spec_def_by_slice, _AMF_METR_BY_SLICE_MAX);
+    amf_metrics_init_spec(ctx, amf_metrics_spec_by_cause,
+            amf_metrics_spec_def_by_cause, _AMF_METR_BY_CAUSE_MAX);
+
     amf_metrics_init_inst_global();
-    return 0;
+
+    amf_metrics_init_by_slice();
+    amf_metrics_init_by_cause();
 }
 
-int amf_metrics_close(void)
+void amf_metrics_final(void)
 {
-    ogs_metrics_context_t *ctx = ogs_metrics_self();
-    amf_metrics_free_inst_global();
-    ogs_metrics_context_close(ctx);
-    return OGS_OK;
-}
\ No newline at end of file
+    ogs_hash_index_t *hi;
+
+    if (metrics_hash_by_slice) {
+        for (hi = ogs_hash_first(metrics_hash_by_slice); hi; hi = ogs_hash_next(hi)) {
+            amf_metric_key_by_slice_t *key =
+                (amf_metric_key_by_slice_t *)ogs_hash_this_key(hi);
+            //void *val = ogs_hash_this_val(hi);
+
+            ogs_hash_set(metrics_hash_by_slice, key, sizeof(*key), NULL);
+
+            ogs_free(key);
+            /* don't free val (metric ifself) -
+             * it will be free'd by ogs_metrics_context_final() */
+            //ogs_free(val);
+        }
+        ogs_hash_destroy(metrics_hash_by_slice);
+    }
+    if (metrics_hash_by_cause) {
+        for (hi = ogs_hash_first(metrics_hash_by_cause); hi; hi = ogs_hash_next(hi)) {
+            amf_metric_key_by_cause_t *key =
+                (amf_metric_key_by_cause_t *)ogs_hash_this_key(hi);
+            //void *val = ogs_hash_this_val(hi);
+
+            ogs_hash_set(metrics_hash_by_cause, key, sizeof(*key), NULL);
+
+            ogs_free(key);
+            /* don't free val (metric ifself) -
+             * it will be free'd by ogs_metrics_context_final() */
+            //ogs_free(val);
+        }
+        ogs_hash_destroy(metrics_hash_by_cause);
+    }
+
+    ogs_metrics_context_final();
+}

open5gs_2.5.8.tar.xz/src/amf/metrics.h -> open5gs_2.6.0.tar.xz/src/amf/metrics.h Changed

@@ -15,6 +15,9 @@
 } amf_metric_type_global_t;
 extern ogs_metrics_inst_t *amf_metrics_inst_global_AMF_METR_GLOB_MAX;
 
+int amf_metrics_init_inst_global(void);
+int amf_metrics_free_inst_global(void);
+
 static inline void amf_metrics_inst_global_set(amf_metric_type_global_t t, int val)
 { ogs_metrics_inst_set(amf_metrics_inst_globalt, val); }
 static inline void amf_metrics_inst_global_add(amf_metric_type_global_t t, int val)
@@ -24,8 +27,27 @@
 static inline void amf_metrics_inst_global_dec(amf_metric_type_global_t t)
 { ogs_metrics_inst_dec(amf_metrics_inst_globalt); }
 
-int amf_metrics_open(void);
-int amf_metrics_close(void);
+/* BY SLICE */
+typedef enum amf_metric_type_by_slice_s {
+    AMF_METR_GAUGE_RM_REGISTEREDSUBNBR = 0,
+    _AMF_METR_BY_SLICE_MAX,
+} amf_metric_type_by_slice_t;
+
+void amf_metrics_inst_by_slice_add(
+    ogs_plmn_id_t *plmn, ogs_s_nssai_t *snssai,
+    amf_metric_type_by_slice_t t, int val);
+
+/* BY CAUSE */
+typedef enum amf_metric_type_by_cause_s {
+    AMF_METR_CTR_RM_REG_INITFAIL = 0,
+    _AMF_METR_BY_CAUSE_MAX,
+} amf_metric_type_by_cause_t;
+
+void amf_metrics_inst_by_cause_add(
+    uint8_t cause, amf_metric_type_by_cause_t t, int val);
+
+void amf_metrics_init(void);
+void amf_metrics_final(void);
 
 #ifdef __cplusplus
 }

open5gs_2.5.8.tar.xz/src/amf/namf-handler.c -> open5gs_2.6.0.tar.xz/src/amf/namf-handler.c Changed

@@ -27,7 +27,7 @@
 int amf_namf_comm_handle_n1_n2_message_transfer(
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
-    int status;
+    int status, r;
 
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *ran_ue = NULL;
@@ -206,7 +206,9 @@
                  * sm-context-ref is created in 1-CLIENT.
                  * So, the PDU session establishment accpet can be transmitted.
                  */
-                    ogs_expect(OGS_OK == ngap_send_to_ran_ue(ran_ue, ngapbuf));
+                    r = ngap_send_to_ran_ue(ran_ue, ngapbuf);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 } else {
                     sess->pdu_session_establishment_accept = ngapbuf;
                 }
@@ -221,9 +223,11 @@
              *********************************************/
 
             if (CM_IDLE(amf_ue)) {
+                bool rc;
                 ogs_sbi_server_t *server = NULL;
                 ogs_sbi_header_t header;
                 ogs_sbi_client_t *client = NULL;
+                OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
                 ogs_sockaddr_t *addr = NULL;
 
                 if (!N1N2MessageTransferReqData->n1n2_failure_txf_notif_uri) {
@@ -232,9 +236,9 @@
                     return OGS_ERROR;
                 }
 
-                addr = ogs_sbi_getaddr_from_uri(
+                rc = ogs_sbi_getaddr_from_uri(&scheme, &addr,
                         N1N2MessageTransferReqData->n1n2_failure_txf_notif_uri);
-                if (!addr) {
+                if (rc == false || scheme == OpenAPI_uri_scheme_NULL) {
                     ogs_error("%s:%d Invalid URI %s",
                             amf_ue->supi, sess->psi,
                             N1N2MessageTransferReqData->
@@ -242,13 +246,12 @@
                     return OGS_ERROR;;
                 }
 
-                client = ogs_sbi_client_find(addr);
+                client = ogs_sbi_client_find(scheme, addr);
                 if (!client) {
-                    client = ogs_sbi_client_add(addr);
+                    client = ogs_sbi_client_add(scheme, addr);
                     ogs_assert(client);
                 }
                 OGS_SBI_SETUP_CLIENT(&sess->paging, client);
-
                 ogs_freeaddrinfo(addr);
 
                 status = OGS_SBI_HTTP_STATUS_ACCEPTED;
@@ -271,20 +274,28 @@
 
                 sendmsg.http.location = ogs_sbi_server_uri(server, &header);
 
-                /* Store Paging Info */
-                AMF_SESS_STORE_PAGING_INFO(
+                if (ogs_timer_running(
+                            amf_ue->implicit_deregistration.timer) == true) {
+                    ogs_warn("%s Paging failed. Stop", amf_ue->supi);
+                } else {
+                    /* Store Paging Info */
+                    AMF_SESS_STORE_PAGING_INFO(
                         sess, sendmsg.http.location,
                         N1N2MessageTransferReqData->n1n2_failure_txf_notif_uri);
 
-                /* Store N2 Transfer message */
-                AMF_SESS_STORE_N2_TRANSFER(
-                        sess, pdu_session_resource_setup_request, n2buf);
-
-                ogs_assert(OGS_OK == ngap_send_paging(amf_ue));
+                    /* Store N2 Transfer message */
+                    AMF_SESS_STORE_N2_TRANSFER(
+                            sess, pdu_session_resource_setup_request, n2buf);
+
+                    r = ngap_send_paging(amf_ue);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
+                }
 
             } else if (CM_CONNECTED(amf_ue)) {
-                ogs_assert(OGS_OK ==
-                    nas_send_pdu_session_setup_request(sess, NULL, n2buf));
+                r = nas_send_pdu_session_setup_request(sess, NULL, n2buf);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
             } else {
 
@@ -330,20 +341,28 @@
 
             sendmsg.http.location = ogs_sbi_server_uri(server, &header);
 
-            /* Store Paging Info */
-            AMF_SESS_STORE_PAGING_INFO(
-                    sess, sendmsg.http.location, NULL);
-
-            /* Store 5GSM Message */
-            AMF_SESS_STORE_5GSM_MESSAGE(sess,
-                    OGS_NAS_5GS_PDU_SESSION_MODIFICATION_COMMAND,
-                    n1buf, n2buf);
+            if (ogs_timer_running(
+                        amf_ue->implicit_deregistration.timer) == true) {
+                ogs_warn("%s Paging failed. Stop", amf_ue->supi);
+            } else {
+                /* Store Paging Info */
+                AMF_SESS_STORE_PAGING_INFO(
+                        sess, sendmsg.http.location, NULL);
 
-            ogs_assert(OGS_OK == ngap_send_paging(amf_ue));
+                /* Store 5GSM Message */
+                AMF_SESS_STORE_5GSM_MESSAGE(sess,
+                        OGS_NAS_5GS_PDU_SESSION_MODIFICATION_COMMAND,
+                        n1buf, n2buf);
+
+                r = ngap_send_paging(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
+            }
 
         } else if (CM_CONNECTED(amf_ue)) {
-            ogs_expect(OGS_OK ==
-                nas_send_pdu_session_modification_command(sess, n1buf, n2buf));
+            r = nas_send_pdu_session_modification_command(sess, n1buf, n2buf);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
         } else {
             ogs_fatal("%s Invalid AMF-UE state", amf_ue->supi);
@@ -375,8 +394,9 @@
             }
 
         } else if (CM_CONNECTED(amf_ue)) {
-            ogs_expect(OGS_OK ==
-                nas_send_pdu_session_release_command(sess, NULL, n2buf));
+            r = nas_send_pdu_session_release_command(sess, NULL, n2buf);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         } else {
             ogs_fatal("%s Invalid AMF-UE state", amf_ue->supi);
             ogs_assert_if_reached();
@@ -498,6 +518,43 @@
     return OGS_OK;
 }
 
+static int do_network_initiated_de_register(
+        amf_ue_t *amf_ue, OpenAPI_deregistration_reason_e dereg_reason)
+{
+    int r;
+    if ((CM_CONNECTED(amf_ue)) &&
+        (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_registered))) {
+
+        r = nas_5gs_send_de_registration_request(amf_ue, dereg_reason);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
+
+        amf_sbi_send_release_all_sessions(
+            amf_ue, AMF_NETWORK_INITIATED_DE_REGISTERED);
+
+        if ((ogs_list_count(&amf_ue->sess_list) == 0) &&
+            (PCF_AM_POLICY_ASSOCIATED(amf_ue))) {
+            ogs_assert(true ==
+                amf_ue_sbi_discover_and_send(
+                    OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL, NULL,
+                    amf_npcf_am_policy_control_build_delete,
+                    amf_ue, AMF_NETWORK_INITIATED_DE_REGISTERED, NULL));
+        }
+
+        OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_de_registered);
+        return OGS_OK;
+
+    } else if (CM_IDLE(amf_ue)) {
+        /* TODO: need to page UE */
+        ogs_error("Not implemented : need to page UE");
+        return OGS_ERROR;
+    } else {
+        ogs_fatal("Invalid State");
+        ogs_assert_if_reached();
+        return OGS_ERROR;
+    }
+}
+
 int amf_namf_callback_handle_dereg_notify(
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
@@ -553,38 +610,12 @@
      * session associated with non-emergency service as described in clause 4.3.4.
      */
 
-
-    if ((CM_CONNECTED(amf_ue)) &&
-        (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_registered)))
-    {
-        amf_ue->network_initiated_de_reg = true;
-
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_de_registration_request(amf_ue,
-                DeregistrationData->dereg_reason));
-
-            amf_sbi_send_release_all_sessions(
-                amf_ue, AMF_RELEASE_SM_CONTEXT_NO_STATE);
-
-            if ((ogs_list_count(&amf_ue->sess_list) == 0) &&
-                (PCF_AM_POLICY_ASSOCIATED(amf_ue)))
-            {
-                ogs_assert(true ==
-                    amf_ue_sbi_discover_and_send(
-                        OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL, NULL,
-                        amf_npcf_am_policy_control_build_delete, amf_ue, NULL));
-            }
-
-            OGS_FSM_TRAN(&amf_ue->sm, &gmm_state_de_registered);
-    }
-    else if (CM_IDLE(amf_ue)) {
-        /* TODO: need to page UE */
-        /*ngap_send_paging(amf_ue);*/
-    }
-    else {
-        status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
-        ogs_error("%s Deregistration notification for UE in wrong state", amf_ue->supi);
-        goto cleanup;
+    if (do_network_initiated_de_register(
+            amf_ue, DeregistrationData->dereg_reason) != OGS_OK) {
+      status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+      ogs_error("%s Deregistration notification for UE in wrong state",
+                amf_ue->supi);
+      goto cleanup;
     }
 
 cleanup:
@@ -597,10 +628,199 @@
     return OGS_OK;
 }
 
+static int update_rat_res_add_one(cJSON *restriction,
+                                  OpenAPI_list_t *restrictions, long index)
+{
+    void *restr;
+
+    if (!cJSON_IsString(restriction)) {
+        ogs_error("Invalid type of ratRestriction element");
+        return OGS_ERROR;
+    }
+
+    restr = (void *) OpenAPI_rat_type_FromString(cJSON_GetStringValue(restriction));
+
+    if (index == restrictions->count) {
+        OpenAPI_list_add(restrictions, restr);
+    } else if (restrictions->count < index && index <= 0) {
+        OpenAPI_list_insert_prev(
+            restrictions, OpenAPI_list_find(restrictions, index), restr);
+    } else {
+        ogs_error("Can't add RAT restriction to invalid index");
+        return OGS_ERROR;
+    }
+    return OGS_OK;
+}
+
+static int update_rat_res_array(cJSON *json_restrictions,
+                                OpenAPI_list_t *restrictions)
+{
+    cJSON *restriction;
+
+    if (!cJSON_IsArray(json_restrictions)) {
+        ogs_error("Invalid type of ratRestrictions");
+        return OGS_ERROR;
+    }
+
+    OpenAPI_list_clear(restrictions);
+
+    cJSON_ArrayForEach(restriction, json_restrictions) {
+        if (update_rat_res_add_one(restriction, restrictions,
+                                   restrictions->count) != OGS_OK) {
+            return OGS_ERROR;
+        }
+    }
+    return OGS_OK;
+}
+
+static int update_rat_res(OpenAPI_change_item_t *item_change,
+                          OpenAPI_list_t *restrictions)
+{
+    cJSON* json = item_change->new_value->json;
+    cJSON* json_restrictions;
+
+    if (!item_change->path) {
+        return OGS_ERROR;
+    }
+
+    switch (item_change->op) {
+    case OpenAPI_change_type_REPLACE:
+    case OpenAPI_change_type_ADD:
+        if (!strcmp(item_change->path, "")) {
+            if (!cJSON_IsObject(json)) {
+                ogs_error("Invalid type of am-data");
+            }
+            json_restrictions = cJSON_GetObjectItemCaseSensitive(
+                                    json, "ratRestrictions");
+            if (json_restrictions) {
+                return update_rat_res_array(json_restrictions, restrictions);
+            } else {
+                return OGS_OK;
+            }
+        } else if (!strcmp(item_change->path, "/ratRestrictions")) {
+            return update_rat_res_array(json, restrictions);
+        } else if (strstr(item_change->path, "/ratRestrictions/") ==
+                   item_change->path) {
+            char *index = item_change->path + strlen("/ratRestrictions/");
+            long i = strcmp(index, "-") ? atol(index) : restrictions->count;
+
+            return update_rat_res_add_one(json, restrictions, i);
+        }
+        return OGS_OK;
+
+    case OpenAPI_change_type__REMOVE:
+        if (!strcmp(item_change->path, "")) {
+            OpenAPI_list_clear(restrictions);
+            return OGS_OK;
+        } else if (!strcmp(item_change->path, "/ratRestrictions")) {
+            OpenAPI_list_clear(restrictions);
+            return OGS_OK;
+        } else if (strstr(item_change->path, "/ratRestrictions/") ==
+                   item_change->path) {
+            char *index = item_change->path + strlen("/ratRestrictions/");
+            long i = atol(index);
+
+            if (restrictions->count < i && i <= 0) {
+            OpenAPI_list_remove(
+                restrictions, OpenAPI_list_find(restrictions, i));
+            } else {
+                ogs_error("Can't add RAT restriction to invalid index");
+                return OGS_ERROR;
+            }
+        }
+        return OGS_OK;
+
+    default:
+        return OGS_OK;
+    }
+
+}
+
+static int update_ambr_check_one(cJSON *obj, uint64_t *limit,
+                                 bool *ambr_changed)
+{
+    if (!cJSON_IsString(obj)) {
+        ogs_error("Invalid type of subscribedUeAmbr");
+        return OGS_ERROR;
+    }
+    *limit = ogs_sbi_bitrate_from_string(obj->valuestring);
+    *ambr_changed = true;
+    return OGS_OK;
+}
+
+static int update_ambr_check_obj(cJSON *obj, ogs_bitrate_t *ambr,
+                                 bool *ambr_changed)
+{
+    if (!cJSON_IsObject(obj)) {
+        if (obj == NULL || cJSON_IsNull(obj)) {
+            /* Limit of 0 means unlimited. */
+            ambr->uplink = 0;
+            ambr->downlink = 0;
+            *ambr_changed = true;
+            return OGS_OK;
+        } else {
+            ogs_error("Invalid type of subscribedUeAmbr");
+            return OGS_ERROR;
+        }
+    }
+
+    if (update_ambr_check_one(
+            cJSON_GetObjectItemCaseSensitive(obj, "uplink"),
+            &ambr->uplink, ambr_changed)) {
+        return OGS_ERROR;
+    }
+    if (update_ambr_check_one(
+            cJSON_GetObjectItemCaseSensitive(obj, "downlink"),
+            &ambr->downlink, ambr_changed)) {
+        return OGS_ERROR;
+    }
+    return OGS_OK;
+}
+
+static int update_ambr(OpenAPI_change_item_t *item_change,
+                       ogs_bitrate_t *ambr, bool *ambr_changed)
+{
+    cJSON* json = item_change->new_value->json;
+
+    if (!item_change->path) {
+        return OGS_ERROR;
+    }
+
+    switch (item_change->op) {
+    case OpenAPI_change_type_REPLACE:
+    case OpenAPI_change_type_ADD:
+        if (!strcmp(item_change->path, "")) {
+            if (!cJSON_IsObject(json)) {
+                ogs_error("Invalid type of am-data");
+            }
+            return update_ambr_check_obj(
+                cJSON_GetObjectItemCaseSensitive(json, "subscribedUeAmbr"),
+                ambr, ambr_changed);
+        } else if (!strcmp(item_change->path, "/subscribedUeAmbr")) {
+            return update_ambr_check_obj(json, ambr, ambr_changed);
+        } else if (!strcmp(item_change->path, "/subscribedUeAmbr/uplink")) {
+            return update_ambr_check_one(json, &ambr->uplink, ambr_changed);
+        } else if (!strcmp(item_change->path, "/subscribedUeAmbr/downlink")) {
+            return update_ambr_check_one(json, &ambr->downlink, ambr_changed);
+        }
+        return OGS_OK;
+
+
+    case OpenAPI_change_type__REMOVE:
+        if (!strcmp(item_change->path, "/subscribedUeAmbr")) {
+            update_ambr_check_obj(NULL, ambr, ambr_changed);
+        }
+        return OGS_OK;
+    default:
+        return OGS_OK;
+    }
+}
+
 int amf_namf_callback_handle_sdm_data_change_notify(
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
     int status = OGS_SBI_HTTP_STATUS_NO_CONTENT;
+    int r;
 
     amf_ue_t *amf_ue = NULL;
 
@@ -613,6 +833,8 @@
     char *ueid = NULL;
     char *res_name = NULL;
 
+    bool ambr_changed = false;
+
     ogs_assert(stream);
     ogs_assert(recvmsg);
 
@@ -624,8 +846,7 @@
     }
 
 
-    OpenAPI_list_for_each(ModificationNotification->notify_items, node)
-    {
+    OpenAPI_list_for_each(ModificationNotification->notify_items, node) {
         OpenAPI_notify_item_t *item = node->data;
 
         char *saveptr = NULL;
@@ -655,29 +876,14 @@
         CASE(OGS_SBI_RESOURCE_NAME_AM_DATA)
             OpenAPI_lnode_t *node_ci;
 
-            OpenAPI_list_for_each(item->changes, node_ci)
-            {
-                /*
-                OpenAPI_change_item_t *item_change = node_ci->data;
-                item_change->path;
-                item_change->from;
-                item_change->new_value;
-                item_change->orig_value;
-                */
-                /*
-                switch (item_change->op) {
-                    case OpenAPI_change_type_ADD:
-                        break;
-                    case OpenAPI_change_type_MOVE:
-                        break;
-                    case OpenAPI_change_type__REMOVE:
-                        break;
-                    case OpenAPI_change_type_REPLACE:
-                        break;
-                    default:
-                        break;
+            OpenAPI_list_for_each(item->changes, node_ci) {
+                OpenAPI_change_item_t *change_item = node_ci->data;
+                if (update_rat_res(change_item, amf_ue->rat_restrictions) ||
+                        update_ambr(change_item, &amf_ue->ue_ambr,
+                            &ambr_changed)) {
+                    status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+                    goto cleanup;
                 }
-                */
             }
             break;
         DEFAULT
@@ -693,6 +899,29 @@
         res_name = NULL;
     }
 
+    if (amf_ue_is_rat_restricted(amf_ue)) {
+        if (do_network_initiated_de_register(amf_ue,
+            OpenAPI_deregistration_reason_REREGISTRATION_REQUIRED) != OGS_OK) {
+            status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+            ogs_error("%s Deregistration notification for UE in wrong state",
+                      amf_ue->supi);
+            goto cleanup;
+        }
+        ogs_assert(true ==
+                amf_ue_sbi_discover_and_send(
+                    OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
+                    amf_nudm_sdm_build_subscription_delete, amf_ue, 0, NULL));
+    } else if (ambr_changed) {
+        ogs_pkbuf_t *ngapbuf;
+
+        ngapbuf = ngap_build_ue_context_modification_request(amf_ue);
+        ogs_assert(ngapbuf);
+
+        r = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
+    }
+
 cleanup:
     if (ueid)
         ogs_free(ueid);

open5gs_2.5.8.tar.xz/src/amf/nas-path.c -> open5gs_2.6.0.tar.xz/src/amf/nas-path.c Changed

@@ -24,16 +24,20 @@
 
 int nas_5gs_send_to_gnb(amf_ue_t *amf_ue, ogs_pkbuf_t *pkbuf)
 {
+    int rv;
     ogs_assert(pkbuf);
 
     amf_ue = amf_ue_cycle(amf_ue);
     if (!amf_ue) {
-        ogs_warn("UE(amf-ue) context has already been removed");
+        ogs_error("UE(amf-ue) context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
-    return ngap_send_to_ran_ue(amf_ue->ran_ue, pkbuf);
+    rv = ngap_send_to_ran_ue(amf_ue->ran_ue, pkbuf);
+    ogs_expect(rv == OGS_OK);
+
+    return rv;
 }
 
 int nas_5gs_send_to_downlink_nas_transport(amf_ue_t *amf_ue, ogs_pkbuf_t *pkbuf)
@@ -46,21 +50,24 @@
 
     amf_ue = amf_ue_cycle(amf_ue);
     if (!amf_ue) {
-        ogs_warn("UE(amf-ue) context has already been removed");
+        ogs_error("UE(amf-ue) context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
     if (!ran_ue) {
-        ogs_warn("NG context has already been removed");
+        ogs_error("NG context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     ngapbuf = ngap_build_downlink_nas_transport(
             ran_ue, pkbuf, false, false);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    if (!ngapbuf) {
+        ogs_error("ngap_build_downlink_nas_transport() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
     ogs_expect(rv == OGS_OK);
@@ -80,26 +87,38 @@
 
     ogs_assert(amf_ue);
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
-    ogs_expect_or_return_val(ran_ue, OGS_ERROR);
+    if (!ran_ue) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Registration accept", amf_ue->supi);
 
     if (amf_ue->next.m_tmsi) {
         if (amf_ue->t3550.pkbuf) {
             gmmbuf = amf_ue->t3550.pkbuf;
-            ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
         } else {
             gmmbuf = gmm_build_registration_accept(amf_ue);
-            ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+            if (!gmmbuf) {
+                ogs_error("gmm_build_registration_accept() failed");
+                return OGS_ERROR;
+            }
         }
 
         amf_ue->t3550.pkbuf = ogs_pkbuf_copy(gmmbuf);
-        ogs_expect_or_return_val(amf_ue->t3550.pkbuf, OGS_ERROR);
+        if (!amf_ue->t3550.pkbuf) {
+            ogs_error("ogs_pkbuf_copy(amf_ue->t3550.pkbuf) failed");
+            ogs_pkbuf_free(gmmbuf);
+            return OGS_ERROR;
+        }
         ogs_timer_start(amf_ue->t3550.timer,
                 amf_timer_cfg(AMF_TIMER_T3550)->duration);
     } else {
         gmmbuf = gmm_build_registration_accept(amf_ue);
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+        if (!gmmbuf) {
+            ogs_error("gmm_build_registration_accept() failed");
+            return OGS_ERROR;
+        }
     }
 
     /*
@@ -125,31 +144,41 @@
     if (ran_ue->initial_context_setup_request_sent == false &&
         (ran_ue->ue_context_requested == true || transfer_needed == true)) {
         ngapbuf = ngap_ue_build_initial_context_setup_request(amf_ue, gmmbuf);
-        ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+        if (!ngapbuf) {
+            ogs_error("ngap_ue_build_initial_context_setup_request() failed");
+            return OGS_ERROR;
+        }
 
         rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
-        ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+        ogs_expect(rv == OGS_OK);
 
         ran_ue->initial_context_setup_request_sent = true;
     } else {
         if (transfer_needed == true) {
             ngapbuf = ngap_ue_build_pdu_session_resource_setup_request(
                     amf_ue, gmmbuf);
-            ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+            if (!ngapbuf) {
+                ogs_error("ngap_ue_build_pdu_session_resource_setup_request()"
+                        " failed");
+                return OGS_ERROR;
+            }
 
             rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
-            ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+            ogs_expect(rv == OGS_OK);
         } else {
             ngapbuf = ngap_build_downlink_nas_transport(
                     ran_ue, gmmbuf, true, true);
-            ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+            if (!ngapbuf) {
+                ogs_error("ngap_build_downlink_nas_transport() failed");
+                return OGS_ERROR;
+            }
 
             rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
-            ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+            ogs_expect(rv == OGS_OK);
         }
     }
 
-    return OGS_OK;
+    return rv;
 }
 
 int nas_5gs_send_registration_reject(
@@ -158,12 +187,17 @@
     int rv;
     ogs_pkbuf_t *gmmbuf = NULL;
 
+    amf_metrics_inst_by_cause_add(gmm_cause, AMF_METR_CTR_RM_REG_INITFAIL, 1);
+
     ogs_assert(amf_ue);
 
     ogs_warn("%s Registration reject %d", amf_ue->suci, gmm_cause);
 
     gmmbuf = gmm_build_registration_reject(gmm_cause);
-    ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+    if (!gmmbuf) {
+        ogs_error("gmm_build_registration_reject() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_5gs_send_to_downlink_nas_transport(amf_ue, gmmbuf);
     ogs_expect(rv == OGS_OK);
@@ -182,12 +216,18 @@
 
     ogs_assert(amf_ue);
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
-    ogs_expect_or_return_val(ran_ue, OGS_ERROR);
+    if (!ran_ue) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Service accept", amf_ue->supi);
 
     gmmbuf = gmm_build_service_accept(amf_ue);
-    ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+    if (!gmmbuf) {
+        ogs_error("gmm_build_registration_reject() failed");
+        return OGS_ERROR;
+    }
 
     /*
      * Previously, AMF would sends PDUSessionResourceSetupRequest
@@ -212,27 +252,34 @@
     if (ran_ue->initial_context_setup_request_sent == false &&
         (ran_ue->ue_context_requested == true || transfer_needed == true)) {
         ngapbuf = ngap_ue_build_initial_context_setup_request(amf_ue, gmmbuf);
-        ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+        if (!ngapbuf) {
+            ogs_error("ngap_ue_build_initial_context_setup_request() failed");
+            return OGS_ERROR;
+        }
 
         rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
-        ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+        ogs_expect(rv == OGS_OK);
 
         ran_ue->initial_context_setup_request_sent = true;
     } else {
         if (transfer_needed == true) {
             ngapbuf = ngap_ue_build_pdu_session_resource_setup_request(
                     amf_ue, gmmbuf);
-            ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+            if (!ngapbuf) {
+                ogs_error("ngap_ue_build_pdu_session_resource_setup_request()"
+                        " failed");
+                return OGS_ERROR;
+            }
 
             rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
-            ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+            ogs_expect(rv == OGS_OK);
         } else {
             rv = nas_5gs_send_to_downlink_nas_transport(amf_ue, gmmbuf);
-            ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+            ogs_expect(rv == OGS_OK);
         }
     }
 
-    return OGS_OK;
+    return rv;
 }
 
 int nas_5gs_send_service_reject(
@@ -246,7 +293,10 @@
     ogs_debug("%s Service reject", amf_ue->supi);
 
     gmmbuf = gmm_build_service_reject(amf_ue, gmm_cause);
-    ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+    if (!gmmbuf) {
+        ogs_error("gmm_build_registration_reject() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_5gs_send_to_downlink_nas_transport(amf_ue, gmmbuf);
     ogs_expect(rv == OGS_OK);
@@ -263,7 +313,10 @@
 
     ogs_assert(amf_ue);
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
-    ogs_expect_or_return_val(ran_ue, OGS_ERROR);
+    if (!ran_ue) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s De-registration accept", amf_ue->supi);
 
@@ -271,10 +324,16 @@
         int rv;
 
         gmmbuf = gmm_build_de_registration_accept(amf_ue);
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+        if (!gmmbuf) {
+            ogs_error("gmm_build_registration_reject() failed");
+            return OGS_ERROR;
+        }
 
         rv = nas_5gs_send_to_downlink_nas_transport(amf_ue, gmmbuf);
-        ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+        if (rv != OGS_OK) {
+            ogs_error("nas_5gs_send_to_downlink_nas_transport() failed");
+            return rv;
+        }
     }
 
     rv = ngap_send_ran_ue_context_release_command(ran_ue,
@@ -295,25 +354,34 @@
 
     ogs_assert(amf_ue);
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
-    ogs_expect_or_return_val(ran_ue, OGS_ERROR);
+    if (!ran_ue) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s De-registration request", amf_ue->supi);
 
     if (amf_ue->t3522.pkbuf) {
         gmmbuf = amf_ue->t3522.pkbuf;
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
     } else {
         gmmbuf = gmm_build_de_registration_request(amf_ue, dereg_reason);
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+        if (!gmmbuf) {
+            ogs_error("gmm_build_de_registration_request() failed");
+            return OGS_ERROR;
+        }
     }
 
     amf_ue->t3522.pkbuf = ogs_pkbuf_copy(gmmbuf);
-    ogs_expect_or_return_val(amf_ue->t3522.pkbuf, OGS_ERROR);
+    if (!amf_ue->t3522.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(amf_ue->t3522.pkbuf) failed");
+        ogs_pkbuf_free(gmmbuf);
+        return OGS_ERROR;
+    }
     ogs_timer_start(amf_ue->t3522.timer,
             amf_timer_cfg(AMF_TIMER_T3522)->duration);
 
     rv = nas_5gs_send_to_downlink_nas_transport(amf_ue, gmmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -329,14 +397,20 @@
 
     if (amf_ue->t3570.pkbuf) {
         gmmbuf = amf_ue->t3570.pkbuf;
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
     } else {
         gmmbuf = gmm_build_identity_request(amf_ue);
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+        if (!gmmbuf) {
+            ogs_error("gmm_build_identity_request() failed");
+            return OGS_ERROR;
+        }
     }
 
     amf_ue->t3570.pkbuf = ogs_pkbuf_copy(gmmbuf);
-    ogs_expect_or_return_val(amf_ue->t3570.pkbuf, OGS_ERROR);
+    if (!amf_ue->t3570.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(amf_ue->t3570.pkbuf) failed");
+        ogs_pkbuf_free(gmmbuf);
+        return OGS_ERROR;
+    }
     ogs_timer_start(amf_ue->t3570.timer,
             amf_timer_cfg(AMF_TIMER_T3570)->duration);
 
@@ -357,14 +431,20 @@
 
     if (amf_ue->t3560.pkbuf) {
         gmmbuf = amf_ue->t3560.pkbuf;
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
     } else {
         gmmbuf = gmm_build_authentication_request(amf_ue);
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+        if (!gmmbuf) {
+            ogs_error("gmm_build_authentication_request() failed");
+            return OGS_ERROR;
+        }
     }
 
     amf_ue->t3560.pkbuf = ogs_pkbuf_copy(gmmbuf);
-    ogs_expect_or_return_val(amf_ue->t3560.pkbuf, OGS_ERROR);
+    if (!amf_ue->t3560.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(amf_ue->t3560.pkbuf) failed");
+        ogs_pkbuf_free(gmmbuf);
+        return OGS_ERROR;
+    }
     ogs_timer_start(amf_ue->t3560.timer,
             amf_timer_cfg(AMF_TIMER_T3560)->duration);
 
@@ -379,12 +459,17 @@
     int rv;
     ogs_pkbuf_t *gmmbuf = NULL;
 
+    amf_metrics_inst_by_cause_add(0, AMF_METR_CTR_RM_REG_INITFAIL, 1);
+
     ogs_assert(amf_ue);
 
     ogs_warn("%s Authentication reject", amf_ue->suci);
 
     gmmbuf = gmm_build_authentication_reject();
-    ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+    if (!gmmbuf) {
+        ogs_error("gmm_build_authentication_reject() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_5gs_send_to_downlink_nas_transport(amf_ue, gmmbuf);
     ogs_expect(rv == OGS_OK);
@@ -403,14 +488,20 @@
 
     if (amf_ue->t3560.pkbuf) {
         gmmbuf = amf_ue->t3560.pkbuf;
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
     } else {
         gmmbuf = gmm_build_security_mode_command(amf_ue);
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+        if (!gmmbuf) {
+            ogs_error("gmm_build_security_mode_command() failed");
+            return OGS_ERROR;
+        }
     }
 
     amf_ue->t3560.pkbuf = ogs_pkbuf_copy(gmmbuf);
-    ogs_expect_or_return_val(amf_ue->t3560.pkbuf, OGS_ERROR);
+    if (!amf_ue->t3560.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(amf_ue->t3560.pkbuf) failed");
+        ogs_pkbuf_free(gmmbuf);
+        return OGS_ERROR;
+    }
     ogs_timer_start(amf_ue->t3560.timer,
             amf_timer_cfg(AMF_TIMER_T3560)->duration);
 
@@ -432,21 +523,34 @@
 
     if (amf_ue->t3555.pkbuf) {
         gmmbuf = amf_ue->t3555.pkbuf;
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
 
         amf_ue->t3555.pkbuf = ogs_pkbuf_copy(gmmbuf);
-        ogs_expect_or_return_val(amf_ue->t3555.pkbuf, OGS_ERROR);
+        if (!amf_ue->t3555.pkbuf) {
+            ogs_error("ogs_pkbuf_copy(amf_ue->t3555.pkbuf) failed");
+            ogs_pkbuf_free(gmmbuf);
+            return OGS_ERROR;
+        }
         ogs_timer_start(amf_ue->t3555.timer,
                 amf_timer_cfg(AMF_TIMER_T3555)->duration);
 
     } else {
-        ogs_expect_or_return_val(param, OGS_ERROR);
+        if (!param) {
+            ogs_error("No param");
+            return OGS_ERROR;
+        }
         gmmbuf = gmm_build_configuration_update_command(amf_ue, param);
-        ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+        if (!gmmbuf) {
+            ogs_error("gmm_build_configuration_update_command() failed");
+            return OGS_ERROR;
+        }
 
         if (param->acknowledgement_requested) {
             amf_ue->t3555.pkbuf = ogs_pkbuf_copy(gmmbuf);
-            ogs_expect_or_return_val(amf_ue->t3555.pkbuf, OGS_ERROR);
+            if (!amf_ue->t3555.pkbuf) {
+                ogs_error("ogs_pkbuf_copy(amf_ue->t3555.pkbuf) failed");
+                ogs_pkbuf_free(gmmbuf);
+                return OGS_ERROR;
+            }
             ogs_timer_start(amf_ue->t3555.timer,
                     amf_timer_cfg(AMF_TIMER_T3555)->duration);
         }
@@ -472,17 +576,17 @@
     ogs_assert(sess);
     amf_ue = amf_ue_cycle(sess->amf_ue);
     if (!amf_ue) {
-        ogs_warn("UE(amf-ue) context has already been removed");
+        ogs_error("UE(amf-ue) context has already been removed");
         if (n1smbuf) ogs_pkbuf_free(n1smbuf);
         ogs_pkbuf_free(n2smbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
     if (!ran_ue) {
         ogs_warn("NG context has already been removed");
         if (n1smbuf) ogs_pkbuf_free(n1smbuf);
         ogs_pkbuf_free(n2smbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     if (n1smbuf) {
@@ -504,10 +608,7 @@
         }
 
         rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
-        if (rv != OGS_OK) {
-            ogs_error("nas_5gs_send_to_gnb() failed");
-            return OGS_ERROR;
-        }
+        ogs_expect(rv == OGS_OK);
 
         ran_ue->initial_context_setup_request_sent = true;
     } else {
@@ -519,10 +620,7 @@
         }
 
         rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
-        if (rv != OGS_OK) {
-            ogs_error("nas_5gs_send_to_gnb() failed");
-            return OGS_ERROR;
-        }
+        ogs_expect(rv == OGS_OK);
     }
 
     return rv;
@@ -542,17 +640,17 @@
     ogs_assert(sess);
     amf_ue = amf_ue_cycle(sess->amf_ue);
     if (!amf_ue) {
-        ogs_warn("UE(amf-ue) context has already been removed");
+        ogs_error("UE(amf-ue) context has already been removed");
         if (n1smbuf) ogs_pkbuf_free(n1smbuf);
         ogs_pkbuf_free(n2smbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
     if (!ran_ue) {
         ogs_warn("NG context has already been removed");
         if (n1smbuf) ogs_pkbuf_free(n1smbuf);
         ogs_pkbuf_free(n2smbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     if (n1smbuf) {
@@ -603,17 +701,17 @@
     ogs_assert(sess);
     amf_ue = amf_ue_cycle(sess->amf_ue);
     if (!amf_ue) {
-        ogs_warn("UE(amf-ue) context has already been removed");
+        ogs_error("UE(amf-ue) context has already been removed");
         if (n1smbuf) ogs_pkbuf_free(n1smbuf);
         ogs_pkbuf_free(n2smbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
     if (!ran_ue) {
         ogs_warn("NG context has already been removed");
         if (n1smbuf) ogs_pkbuf_free(n1smbuf);
         ogs_pkbuf_free(n2smbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     if (n1smbuf) {
@@ -685,7 +783,10 @@
     ogs_debug("%s 5GMM status", amf_ue->supi);
 
     gmmbuf = gmm_build_status(amf_ue, cause);
-    ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+    if (!gmmbuf) {
+        ogs_error("gmm_build_status() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_5gs_send_to_downlink_nas_transport(amf_ue, gmmbuf);
     ogs_expect(rv == OGS_OK);
@@ -772,9 +873,12 @@
 
     gmmbuf = gmm_build_dl_nas_transport(sess,
             payload_container_type, payload_container, cause, backoff_time);
-    ogs_expect_or_return_val(gmmbuf, OGS_ERROR);
+    if (!gmmbuf) {
+        ogs_error("gmm_build_dl_nas_transport() failed");
+        return OGS_ERROR;
+    }
     rv = nas_5gs_send_to_downlink_nas_transport(amf_ue, gmmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -819,10 +923,13 @@
     ogs_assert(sess->payload_container);
 
     pbuf = ogs_pkbuf_copy(sess->payload_container);
-    ogs_expect_or_return_val(pbuf, OGS_ERROR);
+    if (!pbuf) {
+        ogs_error("ogs_pkbuf_copy(pbuf) failed");
+        return OGS_ERROR;
+    }
 
-    rv = nas_5gs_send_dl_nas_transport(sess, sess->payload_container_type, pbuf,
-            cause, backoff_time);
+    rv = nas_5gs_send_dl_nas_transport(
+            sess, sess->payload_container_type, pbuf, cause, backoff_time);
     ogs_expect(rv == OGS_OK);
 
     return rv;

open5gs_2.5.8.tar.xz/src/amf/nausf-build.c -> open5gs_2.6.0.tar.xz/src/amf/nausf-build.c Changed

open5gs_2.5.8.tar.xz/src/amf/nausf-build.h -> open5gs_2.6.0.tar.xz/src/amf/nausf-build.h Changed

open5gs_2.5.8.tar.xz/src/amf/nausf-handler.c -> open5gs_2.6.0.tar.xz/src/amf/nausf-handler.c Changed

open5gs_2.5.8.tar.xz/src/amf/ngap-build.c -> open5gs_2.6.0.tar.xz/src/amf/ngap-build.c Changed

@@ -380,9 +380,9 @@
      * The UE Aggregate Maximum Bit Rate IE should be sent to the NG-RAN node
      * if the AMF has not sent it previously
      */
-    if (ran_ue->ue_ambr_sent == false && ue_ambr) {
+    if (ran_ue->ue_ambr_sent == false && ue_ambr &&
+        amf_ue->ue_ambr.downlink && amf_ue->ue_ambr.uplink) {
         ogs_assert(amf_ue);
-        ogs_assert(amf_ue->ue_ambr.downlink && amf_ue->ue_ambr.uplink);
 
         ie = CALLOC(1, sizeof(NGAP_DownlinkNASTransport_IEs_t));
         ASN_SEQUENCE_ADD(&DownlinkNASTransport->protocolIEs, ie);
@@ -520,8 +520,8 @@
      *
      * SHOULD NOT CHECK PREVIOUSLY SENT
      */
-    if (PDU_RES_SETUP_REQ_TRANSFER_NEEDED(amf_ue) == true) {
-        ogs_assert(amf_ue->ue_ambr.downlink && amf_ue->ue_ambr.uplink);
+    if (PDU_RES_SETUP_REQ_TRANSFER_NEEDED(amf_ue) == true &&
+        amf_ue->ue_ambr.downlink && amf_ue->ue_ambr.uplink) {
 
         ie = CALLOC(1, sizeof(NGAP_InitialContextSetupRequestIEs_t));
         ASN_SEQUENCE_ADD(&InitialContextSetupRequest->protocolIEs, ie);
@@ -764,6 +764,146 @@
     return ogs_ngap_encode(&pdu);
 }
 
+ogs_pkbuf_t *ngap_build_ue_context_modification_request(amf_ue_t *amf_ue)
+{
+    ran_ue_t *ran_ue = NULL;
+
+    NGAP_NGAP_PDU_t pdu;
+    NGAP_InitiatingMessage_t *initiatingMessage = NULL;
+    NGAP_UEContextModificationRequest_t *UEContextModificationRequest = NULL;
+
+    NGAP_UEContextModificationRequestIEs_t *ie = NULL;
+    NGAP_AMF_UE_NGAP_ID_t *AMF_UE_NGAP_ID = NULL;
+    NGAP_RAN_UE_NGAP_ID_t *RAN_UE_NGAP_ID = NULL;
+    NGAP_UEAggregateMaximumBitRate_t *UEAggregateMaximumBitRate = NULL;
+    NGAP_UESecurityCapabilities_t *UESecurityCapabilities = NULL;
+    NGAP_SecurityKey_t *SecurityKey = NULL;
+
+    amf_ue = amf_ue_cycle(amf_ue);
+    ogs_assert(amf_ue);
+    ran_ue = ran_ue_cycle(amf_ue->ran_ue);
+    ogs_assert(ran_ue);
+
+    ogs_debug("UEContextModificationRequest(UE)");
+
+    memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t));
+    pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage;
+    pdu.choice.initiatingMessage = CALLOC(1, sizeof(NGAP_InitiatingMessage_t));
+
+    initiatingMessage = pdu.choice.initiatingMessage;
+    initiatingMessage->procedureCode =
+        NGAP_ProcedureCode_id_UEContextModification;
+    initiatingMessage->criticality = NGAP_Criticality_reject;
+    initiatingMessage->value.present =
+        NGAP_InitiatingMessage__value_PR_UEContextModificationRequest;
+
+    UEContextModificationRequest =
+        &initiatingMessage->value.choice.UEContextModificationRequest;
+
+    ie = CALLOC(1, sizeof(NGAP_UEContextModificationRequestIEs_t));
+    ASN_SEQUENCE_ADD(&UEContextModificationRequest->protocolIEs, ie);
+
+    ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_reject;
+    ie->value.present =
+        NGAP_UEContextModificationRequestIEs__value_PR_AMF_UE_NGAP_ID;
+
+    AMF_UE_NGAP_ID = &ie->value.choice.AMF_UE_NGAP_ID;
+
+    ie = CALLOC(1, sizeof(NGAP_UEContextModificationRequestIEs_t));
+    ASN_SEQUENCE_ADD(&UEContextModificationRequest->protocolIEs, ie);
+
+    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_reject;
+    ie->value.present =
+        NGAP_UEContextModificationRequestIEs__value_PR_RAN_UE_NGAP_ID;
+
+    RAN_UE_NGAP_ID = &ie->value.choice.RAN_UE_NGAP_ID;
+
+    ie = CALLOC(1, sizeof(NGAP_UEContextModificationRequestIEs_t));
+    ASN_SEQUENCE_ADD(&UEContextModificationRequest->protocolIEs, ie);
+
+    ie->id = NGAP_ProtocolIE_ID_id_UEAggregateMaximumBitRate;
+    ie->criticality = NGAP_Criticality_reject;
+    ie->value.present = NGAP_UEContextModificationRequestIEs__value_PR_UEAggregateMaximumBitRate;
+
+    UEAggregateMaximumBitRate = &ie->value.choice.UEAggregateMaximumBitRate;
+
+    asn_uint642INTEGER(
+            &UEAggregateMaximumBitRate->uEAggregateMaximumBitRateUL,
+            amf_ue->ue_ambr.uplink == 0 ? MAX_BIT_RATE : amf_ue->ue_ambr.uplink);
+    asn_uint642INTEGER(
+            &UEAggregateMaximumBitRate->uEAggregateMaximumBitRateDL,
+            amf_ue->ue_ambr.downlink == 0 ? MAX_BIT_RATE : amf_ue->ue_ambr.downlink);
+
+    ran_ue->ue_ambr_sent = true;
+
+    ie = CALLOC(1, sizeof(NGAP_UEContextModificationRequestIEs_t));
+    ASN_SEQUENCE_ADD(&UEContextModificationRequest->protocolIEs, ie);
+
+    ie->id = NGAP_ProtocolIE_ID_id_UESecurityCapabilities;
+    ie->criticality = NGAP_Criticality_reject;
+    ie->value.present =
+        NGAP_UEContextModificationRequestIEs__value_PR_UESecurityCapabilities;
+
+    UESecurityCapabilities = &ie->value.choice.UESecurityCapabilities;
+
+    ie = CALLOC(1, sizeof(NGAP_UEContextModificationRequestIEs_t));
+    ASN_SEQUENCE_ADD(&UEContextModificationRequest->protocolIEs, ie);
+
+    ie->id = NGAP_ProtocolIE_ID_id_SecurityKey;
+    ie->criticality = NGAP_Criticality_reject;
+    ie->value.present =
+        NGAP_UEContextModificationRequestIEs__value_PR_SecurityKey;
+
+    SecurityKey = &ie->value.choice.SecurityKey;
+
+    ogs_debug("    RAN_UE_NGAP_ID%d AMF_UE_NGAP_ID%lld",
+            ran_ue->ran_ue_ngap_id, (long long)ran_ue->amf_ue_ngap_id);
+
+    asn_uint642INTEGER(AMF_UE_NGAP_ID, ran_ue->amf_ue_ngap_id);
+    *RAN_UE_NGAP_ID = ran_ue->ran_ue_ngap_id;
+
+    UESecurityCapabilities->nRencryptionAlgorithms.size = 2;
+    UESecurityCapabilities->nRencryptionAlgorithms.buf =
+        CALLOC(UESecurityCapabilities->
+                    nRencryptionAlgorithms.size, sizeof(uint8_t));
+    UESecurityCapabilities->nRencryptionAlgorithms.bits_unused = 0;
+    UESecurityCapabilities->nRencryptionAlgorithms.buf0 =
+        (amf_ue->ue_security_capability.nr_ea << 1);
+
+    UESecurityCapabilities->nRintegrityProtectionAlgorithms.size = 2;
+    UESecurityCapabilities->nRintegrityProtectionAlgorithms.buf =
+        CALLOC(UESecurityCapabilities->
+                    nRintegrityProtectionAlgorithms.size, sizeof(uint8_t));
+    UESecurityCapabilities->nRintegrityProtectionAlgorithms.bits_unused = 0;
+    UESecurityCapabilities->nRintegrityProtectionAlgorithms.buf0 =
+        (amf_ue->ue_security_capability.nr_ia << 1);
+
+    UESecurityCapabilities->eUTRAencryptionAlgorithms.size = 2;
+    UESecurityCapabilities->eUTRAencryptionAlgorithms.buf =
+        CALLOC(UESecurityCapabilities->
+                    eUTRAencryptionAlgorithms.size, sizeof(uint8_t));
+    UESecurityCapabilities->eUTRAencryptionAlgorithms.bits_unused = 0;
+    UESecurityCapabilities->eUTRAencryptionAlgorithms.buf0 =
+        (amf_ue->ue_security_capability.eutra_ea << 1);
+
+    UESecurityCapabilities->eUTRAintegrityProtectionAlgorithms.size = 2;
+    UESecurityCapabilities->eUTRAintegrityProtectionAlgorithms.buf =
+        CALLOC(UESecurityCapabilities->
+                    eUTRAintegrityProtectionAlgorithms.size, sizeof(uint8_t));
+    UESecurityCapabilities->eUTRAintegrityProtectionAlgorithms.bits_unused = 0;
+    UESecurityCapabilities->eUTRAintegrityProtectionAlgorithms.buf0 =
+        (amf_ue->ue_security_capability.eutra_ia << 1);
+
+    SecurityKey->size = OGS_SHA256_DIGEST_SIZE;
+    SecurityKey->buf = CALLOC(SecurityKey->size, sizeof(uint8_t));
+    SecurityKey->bits_unused = 0;
+    memcpy(SecurityKey->buf, amf_ue->kgnb, SecurityKey->size);
+
+    return ogs_ngap_encode(&pdu);
+}
+
 ogs_pkbuf_t *ngap_sess_build_initial_context_setup_request(
             amf_sess_t *sess, ogs_pkbuf_t *gmmbuf, ogs_pkbuf_t *n2smbuf)
 {
@@ -840,8 +980,8 @@
      *
      * SHOULD NOT CHECK PREVIOUSLY SENT
      */
-    if (gmmbuf || n2smbuf) {
-        ogs_assert(amf_ue->ue_ambr.downlink && amf_ue->ue_ambr.uplink);
+    if ((gmmbuf || n2smbuf) &&
+        amf_ue->ue_ambr.downlink && amf_ue->ue_ambr.uplink) {
 
         ie = CALLOC(1, sizeof(NGAP_InitialContextSetupRequestIEs_t));
         ASN_SEQUENCE_ADD(&InitialContextSetupRequest->protocolIEs, ie);
@@ -1270,8 +1410,8 @@
      * if the AMF has not sent it previously.
      */
     if (ran_ue->ue_ambr_sent == false &&
-        PDU_RES_SETUP_REQ_TRANSFER_NEEDED(amf_ue) == true) {
-        ogs_assert(amf_ue->ue_ambr.downlink && amf_ue->ue_ambr.uplink);
+        PDU_RES_SETUP_REQ_TRANSFER_NEEDED(amf_ue) == true &&
+        amf_ue->ue_ambr.downlink && amf_ue->ue_ambr.uplink) {
 
         ie = CALLOC(1, sizeof(NGAP_PDUSessionResourceSetupRequestIEs_t));
         ASN_SEQUENCE_ADD(&PDUSessionResourceSetupRequest->protocolIEs, ie);
@@ -1415,8 +1555,8 @@
      * The UE Aggregate Maximum Bit Rate IE should be sent to the NG-RAN node
      * if the AMF has not sent it previously.
      */
-    if (ran_ue->ue_ambr_sent == false) {
-        ogs_assert(amf_ue->ue_ambr.downlink && amf_ue->ue_ambr.uplink);
+    if (ran_ue->ue_ambr_sent == false &&
+        amf_ue->ue_ambr.downlink && amf_ue->ue_ambr.uplink) {
 
         ie = CALLOC(1, sizeof(NGAP_PDUSessionResourceSetupRequestIEs_t));
         ASN_SEQUENCE_ADD(&PDUSessionResourceSetupRequest->protocolIEs, ie);
@@ -1767,7 +1907,11 @@
 
     rv = ogs_asn_copy_ie(&asn_DEF_NGAP_SONConfigurationTransfer,
             transfer, SONConfigurationTransfer);
-    ogs_assert(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_asn_copy_ie() failed");
+        ogs_asn_free(&asn_DEF_NGAP_NGAP_PDU, &pdu);
+        return NULL;
+    }
 
     return ogs_ngap_encode(&pdu);
 }
@@ -2021,8 +2165,8 @@
     ogs_debug("    Group%d Cause%d",
             Cause->present, (int)Cause->choice.radioNetwork);
 
-    if (HANDOVER_REQUEST_TRANSFER_NEEDED(amf_ue) == true) {
-        ogs_assert(amf_ue->ue_ambr.downlink && amf_ue->ue_ambr.uplink);
+    if (HANDOVER_REQUEST_TRANSFER_NEEDED(amf_ue) == true &&
+        amf_ue->ue_ambr.downlink && amf_ue->ue_ambr.uplink) {
 
         ie = CALLOC(1, sizeof(NGAP_HandoverRequestIEs_t));
         ogs_assert(ie);
@@ -2507,7 +2651,7 @@
     return ogs_ngap_encode(&pdu);
 }
 
-ogs_pkbuf_t *ngap_build_uplink_ran_status_transfer(
+ogs_pkbuf_t *ngap_build_downlink_ran_status_transfer(
     ran_ue_t *target_ue,
     NGAP_RANStatusTransfer_TransparentContainer_t *transfer)
 {
@@ -2582,7 +2726,11 @@
     rv = ogs_asn_copy_ie(
             &asn_DEF_NGAP_RANStatusTransfer_TransparentContainer,
             transfer, RANStatusTransfer_TransparentContainer);
-    ogs_assert(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_asn_copy_ie() failed");
+        ogs_asn_free(&asn_DEF_NGAP_NGAP_PDU, &pdu);
+        return NULL;
+    }
 
     return ogs_ngap_encode(&pdu);
 }

open5gs_2.5.8.tar.xz/src/amf/ngap-build.h -> open5gs_2.6.0.tar.xz/src/amf/ngap-build.h Changed

open5gs_2.5.8.tar.xz/src/amf/ngap-handler.c -> open5gs_2.6.0.tar.xz/src/amf/ngap-handler.c Changed

@@ -100,7 +100,7 @@
 void ngap_handle_ng_setup_request(amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i, j, k;
+    int i, j, k, r;
 
     NGAP_InitiatingMessage_t *initiatingMessage = NULL;
     NGAP_NGSetupRequest_t *NGSetupRequest = NULL;
@@ -148,8 +148,9 @@
         ogs_error("No GlobalRANNodeID");
         group = NGAP_Cause_PR_protocol;
         cause = NGAP_CauseProtocol_semantic_error;
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -158,8 +159,9 @@
         ogs_error("No globalGNB_ID");
         group = NGAP_Cause_PR_protocol;
         cause = NGAP_CauseProtocol_semantic_error;
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -167,8 +169,9 @@
         ogs_error("No SupportedTAList");
         group = NGAP_Cause_PR_protocol;
         cause = NGAP_CauseProtocol_semantic_error;
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -191,8 +194,9 @@
             ogs_error("No SupportedTAItem");
             group = NGAP_Cause_PR_protocol;
             cause = NGAP_CauseProtocol_semantic_error;
-            ogs_assert(OGS_OK ==
-                ngap_send_ng_setup_failure(gnb, group, cause));
+            r = ngap_send_ng_setup_failure(gnb, group, cause);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -216,8 +220,9 @@
                 ogs_error("No BroadcastPLMNItem");
                 group = NGAP_Cause_PR_protocol;
                 cause = NGAP_CauseProtocol_semantic_error;
-                ogs_assert(OGS_OK ==
-                    ngap_send_ng_setup_failure(gnb, group, cause));
+                r = ngap_send_ng_setup_failure(gnb, group, cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -248,8 +253,9 @@
                     ogs_error("No SliceSupportItem");
                     group = NGAP_Cause_PR_protocol;
                     cause = NGAP_CauseProtocol_semantic_error;
-                    ogs_assert(OGS_OK ==
-                        ngap_send_ng_setup_failure(gnb, group, cause));
+                    r = ngap_send_ng_setup_failure(gnb, group, cause);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     return;
                 }
 
@@ -285,8 +291,9 @@
         group = NGAP_Cause_PR_misc;
         cause = NGAP_CauseMisc_control_processing_overload;
 
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -296,8 +303,9 @@
         group = NGAP_Cause_PR_protocol;
         cause = NGAP_CauseProtocol_message_not_compatible_with_receiver_state;
 
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -307,8 +315,9 @@
         group = NGAP_Cause_PR_misc;
         cause = NGAP_CauseMisc_unknown_PLMN_or_SNPN;
 
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -319,21 +328,23 @@
         group = NGAP_Cause_PR_radioNetwork;
         cause = NGAP_CauseRadioNetwork_slice_not_supported;
 
-        ogs_assert(OGS_OK ==
-            ngap_send_ng_setup_failure(gnb, group, cause));
+        r = ngap_send_ng_setup_failure(gnb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     amf_gnb_set_gnb_id(gnb, gnb_id);
 
     gnb->state.ng_setup_success = true;
-    ogs_assert(OGS_OK ==
-        ngap_send_ng_setup_response(gnb));
+    r = ngap_send_ng_setup_response(gnb);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void ngap_handle_initial_ue_message(amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
-    int i;
+    int i, r;
     char bufOGS_ADDRSTRLEN;
 
     ran_ue_t *ran_ue = NULL;
@@ -389,9 +400,10 @@
 
     if (!RAN_UE_NGAP_ID) {
         ogs_error("No RAN_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, NULL, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, NULL, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -399,10 +411,11 @@
     if (!ran_ue) {
         ran_ue = ran_ue_add(gnb, *RAN_UE_NGAP_ID);
         if (ran_ue == NULL) {
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication(gnb, NULL, NULL,
+            r = ngap_send_error_indication(gnb, NULL, NULL,
                     NGAP_Cause_PR_misc,
-                    NGAP_CauseMisc_control_processing_overload));
+                    NGAP_CauseMisc_control_processing_overload);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -456,21 +469,36 @@
                     /* De-associate NG with NAS/EMM */
                     ran_ue_deassociate(amf_ue->ran_ue);
 
-                    ogs_assert(OGS_OK ==
-                        ngap_send_ran_ue_context_release_command(amf_ue->ran_ue,
+                    r = ngap_send_ran_ue_context_release_command(
+                            amf_ue->ran_ue,
                             NGAP_Cause_PR_nas, NGAP_CauseNas_normal_release,
-                            NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0));
+                            NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
                 amf_ue_associate_ran_ue(amf_ue, ran_ue);
+
+                /*
+                 * TS 24.501
+                 * 5.3.7 Handling of the periodic registration update timer
+                 *
+                 * The mobile reachable timer shall be stopped
+                 * when a NAS signalling connection is established for the UE.
+                 * The implicit de-registration timer shall be stopped
+                 * when a NAS signalling connection is established for the UE.
+                 */
+                CLEAR_AMF_UE_TIMER(amf_ue->mobile_reachable);
+                CLEAR_AMF_UE_TIMER(amf_ue->implicit_deregistration);
             }
         }
     }
 
     if (!UserLocationInformation) {
         ogs_error("No UserLocationInformation");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, &ran_ue->ran_ue_ngap_id, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, &ran_ue->ran_ue_ngap_id, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -478,17 +506,19 @@
             NGAP_UserLocationInformation_PR_userLocationInformationNR) {
         ogs_error("Not implemented UserLocationInformation%d",
                 UserLocationInformation->present);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, &ran_ue->ran_ue_ngap_id, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_unspecified));
+        r = ngap_send_error_indication(gnb, &ran_ue->ran_ue_ngap_id, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_unspecified);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!NAS_PDU) {
         ogs_error("No NAS_PDU");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, &ran_ue->ran_ue_ngap_id, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, &ran_ue->ran_ue_ngap_id, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -511,14 +541,15 @@
         }
     }
 
-    ngap_send_to_nas(ran_ue, NGAP_ProcedureCode_id_InitialUEMessage, NAS_PDU);
+    ogs_expect(OGS_OK == ngap_send_to_nas(
+                ran_ue, NGAP_ProcedureCode_id_InitialUEMessage, NAS_PDU));
 }
 
 void ngap_handle_uplink_nas_transport(
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *ran_ue = NULL;
@@ -570,18 +601,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -589,11 +622,12 @@
     if (!ran_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -601,19 +635,21 @@
     if (!amf_ue) {
         ogs_error("Cannot find AMF-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &ran_ue->ran_ue_ngap_id, &ran_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!UserLocationInformation) {
         ogs_error("No UserLocationInformation");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, &ran_ue->ran_ue_ngap_id, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, &ran_ue->ran_ue_ngap_id, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -621,18 +657,20 @@
             NGAP_UserLocationInformation_PR_userLocationInformationNR) {
         ogs_error("Not implemented UserLocationInformation%d",
                 UserLocationInformation->present);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, &ran_ue->ran_ue_ngap_id, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_unspecified));
+        r = ngap_send_error_indication(gnb, &ran_ue->ran_ue_ngap_id, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_unspecified);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!NAS_PDU) {
         ogs_error("No NAS_PDU");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &ran_ue->ran_ue_ngap_id, &ran_ue->amf_ue_ngap_id,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -653,14 +691,15 @@
     memcpy(&amf_ue->nr_tai, &ran_ue->saved.nr_tai, sizeof(ogs_5gs_tai_t));
     memcpy(&amf_ue->nr_cgi, &ran_ue->saved.nr_cgi, sizeof(ogs_nr_cgi_t));
 
-    ngap_send_to_nas(ran_ue, NGAP_ProcedureCode_id_UplinkNASTransport, NAS_PDU);
+    ogs_expect(OGS_OK == ngap_send_to_nas(
+                ran_ue, NGAP_ProcedureCode_id_UplinkNASTransport, NAS_PDU));
 }
 
 void ngap_handle_ue_radio_capability_info_indication(
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     ran_ue_t *ran_ue = NULL;
     uint64_t amf_ue_ngap_id;
@@ -709,18 +748,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -728,11 +769,12 @@
     if (!ran_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -741,10 +783,11 @@
 
     if (!UERadioCapability) {
         ogs_error("No UERadioCapability");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &ran_ue->ran_ue_ngap_id, &ran_ue->amf_ue_ngap_id,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -757,7 +800,7 @@
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *ran_ue = NULL;
@@ -810,18 +853,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -829,11 +874,12 @@
     if (!ran_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -844,11 +890,12 @@
     if (!amf_ue) {
         ogs_error("Cannot find AMF-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &ran_ue->ran_ue_ngap_id, &ran_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -858,27 +905,30 @@
 
         if (!PDUSessionItem) {
             ogs_error("No PDUSessionResourceSetupItemCxtRes");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         transfer = &PDUSessionItem->pDUSessionResourceSetupResponseTransfer;
         if (!transfer) {
             ogs_error("No PDUSessionResourceSetupResponseTransfer");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         if (PDUSessionItem->pDUSessionID ==
                 OGS_NAS_PDU_SESSION_IDENTITY_UNASSIGNED) {
             ogs_error("PDU Session Identity is unassigned");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -886,20 +936,22 @@
         if (!sess) {
             ogs_error("Cannot find PDU Session ID %d",
                     (int)PDUSessionItem->pDUSessionID);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
+            r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_radioNetwork,
-                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         if (!SESSION_CONTEXT_IN_SMF(sess)) {
             ogs_error("Session Context is not in SMF %d",
                     (int)PDUSessionItem->pDUSessionID);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
+            r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_radioNetwork,
-                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -951,9 +1003,10 @@
 
             switch (sess->gsm_message.type) {
             case OGS_NAS_5GS_PDU_SESSION_MODIFICATION_COMMAND:
-                ogs_expect(OGS_OK ==
-                        nas_send_pdu_session_modification_command(sess,
-                            sess->gsm_message.n1buf, sess->gsm_message.n2buf));
+                r = nas_send_pdu_session_modification_command(sess,
+                            sess->gsm_message.n1buf, sess->gsm_message.n2buf);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
                 /* n1buf is de-allocated
                  * in gmm_build_dl_nas_transport() */
@@ -1000,8 +1053,9 @@
         memset(&param, 0, sizeof(param));
         param.acknowledgement_requested = 1;
         param.guti = 1;
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_configuration_update_command(amf_ue, &param));
+        r = nas_5gs_send_configuration_update_command(amf_ue, &param);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         AMF_UE_CLEAR_PAGING_INFO(amf_ue);
     }
@@ -1011,7 +1065,7 @@
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i, old_xact_count = 0, new_xact_count = 0;
+    int i, r, old_xact_count = 0, new_xact_count = 0;
 
     ran_ue_t *ran_ue = NULL;
     amf_ue_t *amf_ue = NULL;
@@ -1059,18 +1113,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1078,11 +1134,12 @@
     if (!ran_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1091,10 +1148,11 @@
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &ran_ue->ran_ue_ngap_id, &ran_ue->amf_ue_ngap_id,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     ogs_debug("    CauseGroup:%d Cause:%d",
@@ -1131,14 +1189,89 @@
     }
 
     if (old_xact_count == new_xact_count) {
-        ogs_assert(OGS_OK ==
-            ngap_send_ran_ue_context_release_command(ran_ue,
+        r = ngap_send_ran_ue_context_release_command(ran_ue,
                 NGAP_Cause_PR_nas, NGAP_CauseNas_normal_release,
-                NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0));
+                NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     }
 }
 
-void ngap_handle_ue_context_release_request(
+void ngap_handle_ue_context_modification_response(
+        amf_gnb_t *gnb, ogs_ngap_message_t *message)
+{
+    int i;
+    char bufOGS_ADDRSTRLEN;
+    uint64_t amf_ue_ngap_id;
+
+    ran_ue_t *ran_ue = NULL;
+
+    NGAP_SuccessfulOutcome_t *SuccessfulOutcome = NULL;
+    NGAP_UEContextModificationResponse_t *UEContextModificationResponse = NULL;
+
+    NGAP_UEContextModificationResponseIEs_t *ie = NULL;
+    NGAP_RAN_UE_NGAP_ID_t *RAN_UE_NGAP_ID = NULL;
+    NGAP_AMF_UE_NGAP_ID_t *AMF_UE_NGAP_ID = NULL;
+    /* NGAP_RRCState_t *RRCState = NULL; */
+    /* NGAP_UserLocationInformation_t *UserLocationInformation = NULL; */
+    /* NGAP_CriticalityDiagnostics_t *CriticalityDiagnostics = NULL; */
+
+    ogs_assert(gnb);
+    ogs_assert(gnb->sctp.sock);
+
+    ogs_assert(message);
+    SuccessfulOutcome = message->choice.successfulOutcome;
+    ogs_assert(SuccessfulOutcome);
+    UEContextModificationResponse = &SuccessfulOutcome->value.choice.UEContextModificationResponse;
+    ogs_assert(UEContextModificationResponse);
+
+    ogs_warn("UEContextModificationResponse");
+
+    for (i = 0; i < UEContextModificationResponse->protocolIEs.list.count; i++) {
+        ie = UEContextModificationResponse->protocolIEs.list.arrayi;
+        switch (ie->id) {
+        case NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID:
+            RAN_UE_NGAP_ID = &ie->value.choice.RAN_UE_NGAP_ID;
+            break;
+        case NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID:
+            AMF_UE_NGAP_ID = &ie->value.choice.AMF_UE_NGAP_ID;
+            break;
+        /* case NGAP_ProtocolIE_ID_id_RRCState: */
+        /*     RRCState = &ie->value.choice.RRCState; */
+        /*     break; */
+        /* case NGAP_ProtocolIE_ID_id_UserLocationInformation: */
+        /*     UserLocationInformation = &ie->value.choice.UserLocationInformation; */
+        /* case NGAP_ProtocolIE_ID_id_CriticalityDiagnostics: */
+        /*     CriticalityDiagnostics = &ie->value.choice.CriticalityDiagnostics; */
+        default:
+            break;
+        }
+    }
+
+    ogs_debug("    IP%s RAN_ID%d",
+            OGS_ADDR(gnb->sctp.addr, buf), gnb->gnb_id);
+
+    if (AMF_UE_NGAP_ID) {
+
+        if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
+                    (unsigned long *)&amf_ue_ngap_id) != 0) {
+            ogs_warn("Invalid AMF_UE_NGAP_ID");
+        }
+
+        ran_ue = ran_ue_find_by_amf_ue_ngap_id(amf_ue_ngap_id);
+        if (!ran_ue)
+            ogs_warn("No RAN UE Context : AMF_UE_NGAP_ID%lld",
+                    (long long)amf_ue_ngap_id);
+
+    } else if (RAN_UE_NGAP_ID) {
+        ran_ue = ran_ue_find_by_ran_ue_ngap_id(gnb, *RAN_UE_NGAP_ID);
+        if (!ran_ue)
+            ogs_warn("No RAN UE Context : RAN_UE_NGAP_ID%d",
+                    (int)*RAN_UE_NGAP_ID);
+    }
+}
+
+void ngap_handle_ue_context_modification_failure(
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     int i;
@@ -1146,6 +1279,86 @@
     uint64_t amf_ue_ngap_id;
 
     ran_ue_t *ran_ue = NULL;
+
+    NGAP_UnsuccessfulOutcome_t *UnsuccessfulOutcome = NULL;
+    NGAP_UEContextModificationFailure_t *UEContextModificationFailiure = NULL;
+
+    NGAP_UEContextModificationFailureIEs_t *ie = NULL;
+    NGAP_RAN_UE_NGAP_ID_t *RAN_UE_NGAP_ID = NULL;
+    NGAP_AMF_UE_NGAP_ID_t *AMF_UE_NGAP_ID = NULL;
+    NGAP_Cause_t *Cause = NULL;
+
+    ogs_assert(gnb);
+    ogs_assert(gnb->sctp.sock);
+
+    ogs_assert(message);
+    UnsuccessfulOutcome = message->choice.unsuccessfulOutcome;
+    ogs_assert(UnsuccessfulOutcome);
+    UEContextModificationFailiure = &UnsuccessfulOutcome->value.choice.UEContextModificationFailure;
+    ogs_assert(UEContextModificationFailiure);
+
+    ogs_warn("UEContextModificationFailiure");
+
+    for (i = 0; i < UEContextModificationFailiure->protocolIEs.list.count; i++) {
+        ie = UEContextModificationFailiure->protocolIEs.list.arrayi;
+        switch (ie->id) {
+        case NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID:
+            RAN_UE_NGAP_ID = &ie->value.choice.RAN_UE_NGAP_ID;
+            break;
+        case NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID:
+            AMF_UE_NGAP_ID = &ie->value.choice.AMF_UE_NGAP_ID;
+            break;
+        case NGAP_ProtocolIE_ID_id_Cause:
+            Cause = &ie->value.choice.Cause;
+            break;
+        default:
+            break;
+        }
+    }
+
+    ogs_warn("    IP%s RAN_ID%d",
+            OGS_ADDR(gnb->sctp.addr, buf), gnb->gnb_id);
+
+    if (AMF_UE_NGAP_ID) {
+
+        if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
+                    (unsigned long *)&amf_ue_ngap_id) != 0) {
+            ogs_warn("Invalid AMF_UE_NGAP_ID");
+        }
+
+        ran_ue = ran_ue_find_by_amf_ue_ngap_id(amf_ue_ngap_id);
+        if (!ran_ue)
+            ogs_warn("No RAN UE Context : AMF_UE_NGAP_ID%lld",
+                    (long long)amf_ue_ngap_id);
+        else
+            ogs_warn("    RAN_UE_NGAP_ID%d AMF_UE_NGAP_ID%lld",
+                    ran_ue->ran_ue_ngap_id, (long long)ran_ue->amf_ue_ngap_id);
+
+    } else if (RAN_UE_NGAP_ID) {
+        ran_ue = ran_ue_find_by_ran_ue_ngap_id(gnb, *RAN_UE_NGAP_ID);
+        if (!ran_ue)
+            ogs_warn("No RAN UE Context : RAN_UE_NGAP_ID%d",
+                    (int)*RAN_UE_NGAP_ID);
+        else
+            ogs_warn("    RAN_UE_NGAP_ID%d AMF_UE_NGAP_ID%lld",
+                    ran_ue->ran_ue_ngap_id, (long long)ran_ue->amf_ue_ngap_id);
+    }
+
+    if (Cause) {
+        ogs_warn("    CauseGroup:%d Cause:%d",
+                Cause->present, (int)Cause->choice.radioNetwork);
+    }
+}
+
+
+void ngap_handle_ue_context_release_request(
+        amf_gnb_t *gnb, ogs_ngap_message_t *message)
+{
+    int i, r;
+    char bufOGS_ADDRSTRLEN;
+    uint64_t amf_ue_ngap_id;
+
+    ran_ue_t *ran_ue = NULL;
     amf_ue_t *amf_ue = NULL;
     amf_sess_t *sess = NULL;
 
@@ -1196,18 +1409,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1215,11 +1430,12 @@
     if (!ran_ue) {
         ogs_warn("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1228,10 +1444,11 @@
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &ran_ue->ran_ue_ngap_id, &ran_ue->amf_ue_ngap_id,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1256,10 +1473,11 @@
     if (!amf_ue) {
         ogs_error("Cannot find AMF-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_ran_ue_context_release_command(ran_ue,
+        r = ngap_send_ran_ue_context_release_command(ran_ue,
                 Cause->present, (int)Cause->choice.radioNetwork,
-                NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0));
+                NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     } else {
         int xact_count = amf_sess_xact_count(amf_ue);
 
@@ -1277,20 +1495,22 @@
 
                 if (!PDUSessionItem) {
                     ogs_error("No PDUSessionResourceSetupItemSURes");
-                    ogs_assert(OGS_OK ==
-                        ngap_send_error_indication2(
+                    r = ngap_send_error_indication2(
                             amf_ue, NGAP_Cause_PR_protocol,
-                            NGAP_CauseProtocol_semantic_error));
+                            NGAP_CauseProtocol_semantic_error);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     return;
                 }
 
                 if (PDUSessionItem->pDUSessionID ==
                         OGS_NAS_PDU_SESSION_IDENTITY_UNASSIGNED) {
                     ogs_error("PDU Session Identity is unassigned");
-                    ogs_assert(OGS_OK ==
-                        ngap_send_error_indication2(
+                    r = ngap_send_error_indication2(
                             amf_ue, NGAP_Cause_PR_protocol,
-                            NGAP_CauseProtocol_semantic_error));
+                            NGAP_CauseProtocol_semantic_error);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     return;
                 }
 
@@ -1303,19 +1523,21 @@
                 }
             }
         }
-
-        if (amf_sess_xact_count(amf_ue) == xact_count)
-            ogs_assert(OGS_OK ==
-                ngap_send_amf_ue_context_release_command(amf_ue,
+ 
+        if (amf_sess_xact_count(amf_ue) == xact_count) {
+            r = ngap_send_amf_ue_context_release_command(amf_ue,
                     Cause->present, (int)Cause->choice.radioNetwork,
-                    NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK, 0));
+                    NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK, 0);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
+        }
     }
 }
 
 void ngap_handle_ue_context_release_complete(
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
-    int i;
+    int i, r;
     char bufOGS_ADDRSTRLEN;
     uint64_t amf_ue_ngap_id;
 
@@ -1359,18 +1581,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1378,11 +1602,12 @@
     if (!ran_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1391,6 +1616,7 @@
 
 void ngap_handle_ue_context_release_action(ran_ue_t *ran_ue)
 {
+    int r;
     amf_ue_t *amf_ue = NULL;
 
     ogs_assert(ran_ue);
@@ -1417,6 +1643,32 @@
          * to prevent retransmission of NAS messages.
          */
         CLEAR_AMF_UE_ALL_TIMERS(amf_ue);
+
+        /*
+         * TS 24.501
+         * 5.3.7 Handling of the periodic registration update timer and
+         *
+         * Start AMF_TIMER_MOBILE_REACHABLE
+         * mobile reachable timer
+         * The network supervises the periodic registration update procedure
+         * of the UE by means of the mobile reachable timer.
+         * If the UE is not registered for emergency services,
+         * the mobile reachable timer shall be longer than the value of timer
+         * T3512. In this case, by default, the mobile reachable timer is
+         * 4 minutes greater than the value of timer T3512.
+         * The mobile reachable timer shall be reset and started with the
+         * value as indicated above, when the AMF releases the NAS signalling
+         * connection for the UE.
+         *
+         * TODO: If the UE is registered for emergency services, the AMF shall
+         * set the mobile reachable timer with a value equal to timer T3512.
+         */
+        if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_registered) &&
+            ran_ue->ue_ctx_rel_action == NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK) {
+
+            ogs_timer_start(amf_ue->mobile_reachable.timer,
+                    ogs_time_from_sec(amf_self()->time.t3512.value + 240));
+        }
     }
 
     switch (ran_ue->ue_ctx_rel_action) {
@@ -1427,13 +1679,19 @@
     case NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK:
         ogs_debug("    Action: NG normal release");
         ran_ue_remove(ran_ue);
-        ogs_expect_or_return(amf_ue);
+        if (!amf_ue) {
+            ogs_error("No UE(amf-ue) Context");
+            return;
+        }
         amf_ue_deassociate(amf_ue);
         break;
     case NGAP_UE_CTX_REL_UE_CONTEXT_REMOVE:
         ogs_debug("    Action: UE context remove");
         ran_ue_remove(ran_ue);
-        ogs_expect_or_return(amf_ue);
+        if (!amf_ue) {
+            ogs_error("No UE(amf-ue) context");
+            return;
+        }
         amf_ue_remove(amf_ue);
         break;
     case NGAP_UE_CTX_REL_NG_HANDOVER_COMPLETE:
@@ -1442,7 +1700,10 @@
         source_ue_deassociate_target_ue(ran_ue);
         ran_ue_remove(ran_ue);
 
-        ogs_expect_or_return(amf_ue);
+        if (!amf_ue) {
+            ogs_error("No UE(amf-ue) context");
+            return;
+        }
         break;
     case NGAP_UE_CTX_REL_NG_HANDOVER_CANCEL:
         ogs_warn("    Action: NG handover cancel");
@@ -1450,11 +1711,18 @@
         source_ue_deassociate_target_ue(ran_ue);
         ran_ue_remove(ran_ue);
 
-        ogs_expect_or_return(amf_ue);
-        ogs_expect_or_return(amf_ue->ran_ue);
+        if (!amf_ue) {
+            ogs_error("No UE(amf-ue) context");
+            return;
+        }
+        if (!amf_ue->ran_ue) {
+            ogs_error("No NG context");
+            return;
+        }
 
-        ogs_assert(OGS_OK ==
-            ngap_send_handover_cancel_ack(amf_ue->ran_ue));
+        r = ngap_send_handover_cancel_ack(amf_ue->ran_ue);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         break;
     case NGAP_UE_CTX_REL_NG_HANDOVER_FAILURE:
         ogs_warn("    Action: NG handover failure");
@@ -1462,7 +1730,10 @@
         source_ue_deassociate_target_ue(ran_ue);
         ran_ue_remove(ran_ue);
 
-        ogs_expect_or_return(amf_ue);
+        if (!amf_ue) {
+            ogs_error("No UE(amf-ue) context");
+            return;
+        }
         break;
     default:
         ogs_error("Invalid Action%d", ran_ue->ue_ctx_rel_action);
@@ -1474,7 +1745,7 @@
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *ran_ue = NULL;
@@ -1535,18 +1806,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1554,11 +1827,12 @@
     if (!ran_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1569,11 +1843,12 @@
     if (!amf_ue) {
         ogs_error("Cannot find AMF-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &ran_ue->ran_ue_ngap_id, &ran_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1585,33 +1860,36 @@
 
             if (!PDUSessionItem) {
                 ogs_error("No PDUSessionResourceSetupItemSURes");
-                ogs_assert(OGS_OK ==
-                    ngap_send_error_indication2(
+                r = ngap_send_error_indication2(
                         amf_ue,
                         NGAP_Cause_PR_protocol,
-                        NGAP_CauseProtocol_semantic_error));
+                        NGAP_CauseProtocol_semantic_error);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
             transfer = &PDUSessionItem->pDUSessionResourceSetupResponseTransfer;
             if (!transfer) {
                 ogs_error("No PDUSessionResourceSetupResponseTransfer");
-                ogs_assert(OGS_OK ==
-                    ngap_send_error_indication2(
+                r = ngap_send_error_indication2(
                         amf_ue,
                         NGAP_Cause_PR_protocol,
-                        NGAP_CauseProtocol_semantic_error));
+                        NGAP_CauseProtocol_semantic_error);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
             if (PDUSessionItem->pDUSessionID ==
                     OGS_NAS_PDU_SESSION_IDENTITY_UNASSIGNED) {
                 ogs_error("PDU Session Identity is unassigned");
-                ogs_assert(OGS_OK ==
-                    ngap_send_error_indication2(
+                r = ngap_send_error_indication2(
                         amf_ue,
                         NGAP_Cause_PR_protocol,
-                        NGAP_CauseProtocol_semantic_error));
+                        NGAP_CauseProtocol_semantic_error);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -1619,20 +1897,22 @@
             if (!sess) {
                 ogs_error("Cannot find PDU Session ID %d",
                         (int)PDUSessionItem->pDUSessionID);
-                ogs_assert(OGS_OK ==
-                    ngap_send_error_indication2(amf_ue,
+                r = ngap_send_error_indication2(amf_ue,
                         NGAP_Cause_PR_radioNetwork,
-                        NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                        NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
             if (!SESSION_CONTEXT_IN_SMF(sess)) {
                 ogs_error("Session Context is not in SMF %d",
                         (int)PDUSessionItem->pDUSessionID);
-                ogs_assert(OGS_OK ==
-                    ngap_send_error_indication2(amf_ue,
+                r = ngap_send_error_indication2(amf_ue,
                         NGAP_Cause_PR_radioNetwork,
-                        NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                        NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -1664,11 +1944,12 @@
 
             if (!PDUSessionFailedItem) {
                 ogs_error("No PDUSessionResourceFailedToSetupItemSURes");
-                ogs_assert(OGS_OK ==
-                    ngap_send_error_indication2(
+                r = ngap_send_error_indication2(
                         amf_ue,
                         NGAP_Cause_PR_protocol,
-                        NGAP_CauseProtocol_semantic_error));
+                        NGAP_CauseProtocol_semantic_error);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -1677,22 +1958,24 @@
                     pDUSessionResourceSetupUnsuccessfulTransfer;
             if (!transfer) {
                 ogs_error("No PDUSessionResourceSetupUnsuccessfulTransfer");
-                ogs_assert(OGS_OK ==
-                    ngap_send_error_indication2(
+                r = ngap_send_error_indication2(
                         amf_ue,
                         NGAP_Cause_PR_protocol,
-                        NGAP_CauseProtocol_semantic_error));
+                        NGAP_CauseProtocol_semantic_error);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
             if (PDUSessionFailedItem->pDUSessionID ==
                     OGS_NAS_PDU_SESSION_IDENTITY_UNASSIGNED) {
                 ogs_error("PDU Session Identity is unassigned");
-                ogs_assert(OGS_OK ==
-                    ngap_send_error_indication2(
+                r = ngap_send_error_indication2(
                         amf_ue,
                         NGAP_Cause_PR_protocol,
-                        NGAP_CauseProtocol_semantic_error));
+                        NGAP_CauseProtocol_semantic_error);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -1701,21 +1984,23 @@
             if (!sess) {
                 ogs_error("Cannot find PDU Session ID %d",
                         (int)PDUSessionFailedItem->pDUSessionID);
-                ogs_assert(OGS_OK ==
-                    ngap_send_error_indication2(
+                r = ngap_send_error_indication2(
                         amf_ue,
                         NGAP_Cause_PR_radioNetwork,
-                        NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                        NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
             if (!SESSION_CONTEXT_IN_SMF(sess)) {
                 ogs_error("Session Context is not in SMF %d",
                         (int)PDUSessionFailedItem->pDUSessionID);
-                ogs_assert(OGS_OK ==
-                    ngap_send_error_indication2(amf_ue,
+                r = ngap_send_error_indication2(amf_ue,
                         NGAP_Cause_PR_radioNetwork,
-                        NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                        NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -1777,9 +2062,10 @@
         }
     } else {
         ogs_error("No PDUSessionResourceList");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     }
 }
 
@@ -1787,7 +2073,7 @@
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *ran_ue = NULL;
@@ -1840,18 +2126,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1859,11 +2147,12 @@
     if (!ran_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1874,19 +2163,21 @@
     if (!amf_ue) {
         ogs_error("Cannot find AMF-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &ran_ue->ran_ue_ngap_id, &ran_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!PDUSessionList) {
         ogs_error("No PDUSessionResourceModifyListModRes");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1897,27 +2188,30 @@
 
         if (!PDUSessionItem) {
             ogs_error("No PDUSessionResourceModifyItemModRes");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         transfer = &PDUSessionItem->pDUSessionResourceModifyResponseTransfer;
         if (!transfer) {
             ogs_error("No PDUSessionResourceModifyResponseTransfer");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         if (PDUSessionItem->pDUSessionID ==
                 OGS_NAS_PDU_SESSION_IDENTITY_UNASSIGNED) {
             ogs_error("PDU Session Identity is unassigned");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -1925,20 +2219,22 @@
         if (!sess) {
             ogs_error("Cannot find PDU Session ID %d",
                     (int)PDUSessionItem->pDUSessionID);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
+            r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_radioNetwork,
-                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         if (!SESSION_CONTEXT_IN_SMF(sess)) {
             ogs_error("Session Context is not in SMF %d",
                     (int)PDUSessionItem->pDUSessionID);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
+            r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_radioNetwork,
-                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -1962,7 +2258,7 @@
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *ran_ue = NULL;
@@ -2016,18 +2312,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2035,11 +2333,12 @@
     if (!ran_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2050,19 +2349,21 @@
     if (!amf_ue) {
         ogs_error("Cannot find AMF-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &ran_ue->ran_ue_ngap_id, &ran_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!PDUSessionList) {
         ogs_error("No PDUSessionResourceReleasedListRelRes");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2073,27 +2374,30 @@
 
         if (!PDUSessionItem) {
             ogs_error("No PDUSessionResourceReleasedItemRelRes");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         transfer = &PDUSessionItem->pDUSessionResourceReleaseResponseTransfer;
         if (!transfer) {
             ogs_error("No PDUSessionResourceReleaseResponseTransfer");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         if (PDUSessionItem->pDUSessionID ==
                 OGS_NAS_PDU_SESSION_IDENTITY_UNASSIGNED) {
             ogs_error("PDU Session Identity is unassigned");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -2101,20 +2405,22 @@
         if (!sess) {
             ogs_error("Cannot find PDU Session ID %d",
                     (int)PDUSessionItem->pDUSessionID);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
+            r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_radioNetwork,
-                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         if (!SESSION_CONTEXT_IN_SMF(sess)) {
             ogs_error("Session Context is not in SMF %d",
                     (int)PDUSessionItem->pDUSessionID);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
+            r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_radioNetwork,
-                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -2138,7 +2444,7 @@
         amf_gnb_t *gnb, ogs_ngap_message_t *message, ogs_pkbuf_t *pkbuf)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     NGAP_InitiatingMessage_t *initiatingMessage = NULL;
     NGAP_UplinkRANConfigurationTransfer_t
@@ -2193,18 +2499,20 @@
                 NGAP_GlobalRANNodeID_PR_globalGNB_ID) {
             ogs_error("Not implemented targetGlobalRANNodeID->present%d",
                     targetGlobalRANNodeID->present);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication(gnb, NULL, NULL,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication(gnb, NULL, NULL,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         targetGlobalGNB_ID = targetGlobalRANNodeID->choice.globalGNB_ID;
         if (!targetGlobalGNB_ID) {
             ogs_error("No targetGlobalGNB_ID");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication(gnb, NULL, NULL,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication(gnb, NULL, NULL,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -2218,18 +2526,20 @@
                 NGAP_GlobalRANNodeID_PR_globalGNB_ID) {
             ogs_error("Not implemented sourceGlobalRANNodeID->present%d",
                     sourceGlobalRANNodeID->present);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication(gnb, NULL, NULL,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication(gnb, NULL, NULL,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         sourceGlobalGNB_ID = sourceGlobalRANNodeID->choice.globalGNB_ID;
         if (!sourceGlobalGNB_ID) {
             ogs_error("No sourceGlobalGNB_ID");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication(gnb, NULL, NULL,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication(gnb, NULL, NULL,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -2245,15 +2555,18 @@
         if (!target_gnb) {
             ogs_error("Uplink RAN configuration transfer : "
                     "cannot find target gNB-id0x%x", target_gnb_id);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication(gnb, NULL, NULL,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication(gnb, NULL, NULL,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
-        ogs_assert(OGS_OK ==
-            ngap_send_downlink_ran_configuration_transfer(
-                target_gnb, SONConfigurationTransfer));
+        r = ngap_send_downlink_ran_configuration_transfer(
+                target_gnb, SONConfigurationTransfer);
+        ogs_expect(r == OGS_OK);
+        /* ogs_asn_copy_ie() could be failed from received packet.
+         * So we should not use ogs_assert(r != OGS_ERROR).*/
     }
 }
 
@@ -2261,7 +2574,7 @@
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *ran_ue = NULL;
@@ -2333,26 +2646,29 @@
 
     if (!RAN_UE_NGAP_ID) {
         ogs_error("No RAN_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, NULL, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, NULL, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2360,11 +2676,12 @@
     if (!ran_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2372,11 +2689,12 @@
     if (!amf_ue) {
         ogs_error("Cannot find AMF-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &ran_ue->ran_ue_ngap_id, &ran_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2393,9 +2711,10 @@
 
     if (!UserLocationInformation) {
         ogs_error("No UserLocationInformation");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2403,33 +2722,37 @@
             NGAP_UserLocationInformation_PR_userLocationInformationNR) {
         ogs_error("Not implemented UserLocationInformation%d",
                 UserLocationInformation->present);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_unspecified));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_unspecified);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!UESecurityCapabilities) {
         ogs_error("No UESecurityCapabilities");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!PDUSessionResourceToBeSwitchedDLList) {
         ogs_error("No PDUSessionResourceToBeSwitchedDLList");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!SECURITY_CONTEXT_IS_VALID(amf_ue)) {
         ogs_error("No Security Context");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_nas, NGAP_CauseNas_authentication_failure));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_nas, NGAP_CauseNas_authentication_failure);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2496,27 +2819,30 @@
 
         if (!PDUSessionItem) {
             ogs_error("No NGAP_PDUSessionResourceToBeSwitchedDLItem");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         transfer = &PDUSessionItem->pathSwitchRequestTransfer;
         if (!transfer) {
             ogs_error("No PDUSessionResourceSetupResponseTransfer");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         if (PDUSessionItem->pDUSessionID ==
                 OGS_NAS_PDU_SESSION_IDENTITY_UNASSIGNED) {
             ogs_error("PDU Session Identity is unassigned");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -2524,20 +2850,22 @@
         if (!sess) {
             ogs_error("Cannot find PDU Session ID %d",
                     (int)PDUSessionItem->pDUSessionID);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
+            r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_radioNetwork,
-                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         if (!SESSION_CONTEXT_IN_SMF(sess)) {
             ogs_error("Session Context is not in SMF %d",
                     (int)PDUSessionItem->pDUSessionID);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
+            r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_radioNetwork,
-                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -2561,7 +2889,7 @@
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *source_ue = NULL, *target_ue = NULL;
@@ -2637,18 +2965,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2656,11 +2986,12 @@
     if (!source_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2671,51 +3002,57 @@
     if (!amf_ue) {
         ogs_error("Cannot find AMF-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &source_ue->ran_ue_ngap_id, &source_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!HandoverType) {
         ogs_error("No HandoverType");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!TargetID) {
         ogs_error("No TargetID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (TargetID->present != NGAP_TargetID_PR_targetRANNodeID) {
         ogs_error("Not implemented TargetID%d", TargetID->present);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     targetRANNodeID = TargetID->choice.targetRANNodeID;
     if (!targetRANNodeID) {
         ogs_error("No targetRANNodeID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2723,18 +3060,20 @@
     if (globalRANNodeID->present != NGAP_GlobalRANNodeID_PR_globalGNB_ID) {
         ogs_error("Not implemented globalRANNodeID%d",
                 globalRANNodeID->present);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     globalGNB_ID = globalRANNodeID->choice.globalGNB_ID;
     if (!globalGNB_ID) {
         ogs_error("No globalGNB_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2743,42 +3082,47 @@
     if (!target_gnb) {
         ogs_error("Handover required : cannot find target gNB-id0x%x",
                 target_gnb_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!PDUSessionList) {
         ogs_error("No PDUSessionList");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!SourceToTarget_TransparentContainer) {
         ogs_error("No SourceToTarget_TransparentContainer");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!SECURITY_CONTEXT_IS_VALID(amf_ue)) {
         ogs_error("No Security Context");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_nas, NGAP_CauseNas_authentication_failure));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_nas, NGAP_CauseNas_authentication_failure);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     /* Target UE */
     target_ue = ran_ue_add(target_gnb, INVALID_UE_NGAP_ID);
     if (target_ue == NULL) {
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue, NGAP_Cause_PR_misc,
-                NGAP_CauseMisc_control_processing_overload));
+        r = ngap_send_error_indication2(amf_ue, NGAP_Cause_PR_misc,
+                NGAP_CauseMisc_control_processing_overload);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2815,27 +3159,30 @@
 
         if (!PDUSessionItem) {
             ogs_error("No PDUSessionResourceItemHORqd");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         transfer = &PDUSessionItem->handoverRequiredTransfer;
         if (!transfer) {
             ogs_error("No handoverRequiredTransfer");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         if (PDUSessionItem->pDUSessionID ==
                 OGS_NAS_PDU_SESSION_IDENTITY_UNASSIGNED) {
             ogs_error("PDU Session Identity is unassigned");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -2843,20 +3190,22 @@
         if (!sess) {
             ogs_error("Cannot find PDU Session ID %d",
                     (int)PDUSessionItem->pDUSessionID);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
+            r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_radioNetwork,
-                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         if (!SESSION_CONTEXT_IN_SMF(sess)) {
             ogs_error("Session Context is not in SMF %d",
                     (int)PDUSessionItem->pDUSessionID);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
+            r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_radioNetwork,
-                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -2883,7 +3232,7 @@
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *source_ue = NULL, *target_ue = NULL;
@@ -2941,26 +3290,29 @@
 
     if (!RAN_UE_NGAP_ID) {
         ogs_error("No RAN_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, NULL, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, NULL, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2968,19 +3320,21 @@
     if (!target_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!RAN_UE_NGAP_ID) {
         ogs_error("No RAN_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, NULL, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, NULL, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2990,22 +3344,24 @@
     if (!source_ue) {
         ogs_error("Cannot find Source-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &target_ue->ran_ue_ngap_id, &target_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_inconsistent_remote_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_inconsistent_remote_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     amf_ue = target_ue->amf_ue;
     if (!amf_ue) {
         ogs_error("Cannot find AMF-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &target_ue->ran_ue_ngap_id, &target_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3016,17 +3372,19 @@
 
     if (!PDUSessionList) {
         ogs_error("No PDUSessionList");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!TargetToSource_TransparentContainer) {
         ogs_error("No TargetToSource_TransparentContainer");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3041,27 +3399,30 @@
 
         if (!PDUSessionItem) {
             ogs_error("No PDUSessionResourceAdmittedItem");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         transfer = &PDUSessionItem->handoverRequestAcknowledgeTransfer;
         if (!transfer) {
             ogs_error("No handoverRequestAcknowledgeTransfer");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         if (PDUSessionItem->pDUSessionID ==
                 OGS_NAS_PDU_SESSION_IDENTITY_UNASSIGNED) {
             ogs_error("PDU Session Identity is unassigned");
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -3069,20 +3430,22 @@
         if (!sess) {
             ogs_error("Cannot find PDU Session ID %d",
                     (int)PDUSessionItem->pDUSessionID);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
+            r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_radioNetwork,
-                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         if (!SESSION_CONTEXT_IN_SMF(sess)) {
             ogs_error("Session Context is not in SMF %d",
                     (int)PDUSessionItem->pDUSessionID);
-            ogs_assert(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
+            r = ngap_send_error_indication2(amf_ue,
                     NGAP_Cause_PR_radioNetwork,
-                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID));
+                    NGAP_CauseRadioNetwork_unknown_PDU_session_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -3108,7 +3471,7 @@
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     ran_ue_t *source_ue = NULL, *target_ue = NULL;
     uint64_t amf_ue_ngap_id;
@@ -3151,18 +3514,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, NULL, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, NULL, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, NULL, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, NULL, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3170,11 +3535,12 @@
     if (!target_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, NULL, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3182,11 +3548,12 @@
     if (!source_ue) {
         ogs_error("Cannot find Source-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &target_ue->ran_ue_ngap_id, &target_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_inconsistent_remote_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_inconsistent_remote_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3197,29 +3564,32 @@
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &target_ue->ran_ue_ngap_id, &target_ue->amf_ue_ngap_id,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     ogs_debug("    CauseGroup:%d Cause:%d",
             Cause->present, (int)Cause->choice.radioNetwork);
 
-    ogs_assert(OGS_OK ==
-        ngap_send_handover_preparation_failure(source_ue, Cause));
+    r = ngap_send_handover_preparation_failure(source_ue, Cause);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
-    ogs_assert(OGS_OK ==
-        ngap_send_ran_ue_context_release_command(target_ue,
+    r = ngap_send_ran_ue_context_release_command(target_ue,
             NGAP_Cause_PR_radioNetwork, NGAP_CauseRadioNetwork_ho_failure_in_target_5GC_ngran_node_or_target_system,
-            NGAP_UE_CTX_REL_NG_HANDOVER_FAILURE, 0));
+            NGAP_UE_CTX_REL_NG_HANDOVER_FAILURE, 0);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void ngap_handle_handover_cancel(
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     amf_ue_t *amf_ue = NULL;
     amf_sess_t *sess = NULL;
@@ -3268,18 +3638,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3287,11 +3659,12 @@
     if (!source_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3299,22 +3672,24 @@
     if (!target_ue) {
         ogs_error("Cannot find Source-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &source_ue->ran_ue_ngap_id, &source_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_inconsistent_remote_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_inconsistent_remote_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     amf_ue = source_ue->amf_ue;
     if (!amf_ue) {
         ogs_error("Cannot find AMF-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &source_ue->ran_ue_ngap_id, &source_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3325,10 +3700,11 @@
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &source_ue->ran_ue_ngap_id, &source_ue->amf_ue_ngap_id,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     ogs_debug("    CauseGroup:%d Cause:%d",
@@ -3352,7 +3728,7 @@
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *source_ue = NULL, *target_ue = NULL;
@@ -3402,18 +3778,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3421,11 +3799,12 @@
     if (!source_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3433,22 +3812,24 @@
     if (!target_ue) {
         ogs_error("Cannot find Source-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &source_ue->ran_ue_ngap_id, &source_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_inconsistent_remote_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_inconsistent_remote_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     amf_ue = source_ue->amf_ue;
     if (!amf_ue) {
         ogs_error("Cannot find AMF-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &source_ue->ran_ue_ngap_id, &source_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3457,16 +3838,18 @@
     ogs_debug("    Target : RAN_UE_NGAP_ID%d AMF_UE_NGAP_ID%lld ",
         target_ue->ran_ue_ngap_id, (long long)target_ue->amf_ue_ngap_id);
 
-    ogs_assert(OGS_OK ==
-        ngap_send_downlink_ran_status_transfer(
-            target_ue, RANStatusTransfer_TransparentContainer));
+    r = ngap_send_downlink_ran_status_transfer(
+            target_ue, RANStatusTransfer_TransparentContainer);
+    ogs_expect(r == OGS_OK);
+    /* ogs_asn_copy_ie() could be failed from received packet.
+     * So we should not use ogs_assert(r != OGS_ERROR).*/
 }
 
 void ngap_handle_handover_notification(
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     amf_ue_t *amf_ue = NULL;
     amf_sess_t *sess = NULL;
@@ -3516,18 +3899,20 @@
 
     if (!AMF_UE_NGAP_ID) {
         ogs_error("No AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (asn_INTEGER2ulong(AMF_UE_NGAP_ID,
                 (unsigned long *)&amf_ue_ngap_id) != 0) {
         ogs_error("Invalid AMF_UE_NGAP_ID");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, (uint32_t *)RAN_UE_NGAP_ID, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3535,11 +3920,12 @@
     if (!target_ue) {
         ogs_error("No RAN UE Context : AMF_UE_NGAP_ID%lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, (uint32_t *)RAN_UE_NGAP_ID, &amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3547,22 +3933,24 @@
     if (!source_ue) {
         ogs_error("Cannot find Source-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &target_ue->ran_ue_ngap_id, &target_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_inconsistent_remote_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_inconsistent_remote_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     amf_ue = target_ue->amf_ue;
     if (!amf_ue) {
         ogs_error("Cannot find AMF-UE Context %lld",
                 (long long)amf_ue_ngap_id);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(
+        r = ngap_send_error_indication(
                 gnb, &target_ue->ran_ue_ngap_id, &target_ue->amf_ue_ngap_id,
                 NGAP_Cause_PR_radioNetwork,
-                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID));
+                NGAP_CauseRadioNetwork_unknown_local_UE_NGAP_ID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3570,9 +3958,10 @@
 
     if (!UserLocationInformation) {
         ogs_error("No UserLocationInformation");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, &target_ue->ran_ue_ngap_id, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, &target_ue->ran_ue_ngap_id, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3580,9 +3969,10 @@
             NGAP_UserLocationInformation_PR_userLocationInformationNR) {
         ogs_error("Not implemented UserLocationInformation%d",
                 UserLocationInformation->present);
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, &target_ue->ran_ue_ngap_id, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_unspecified));
+        r = ngap_send_error_indication(gnb, &target_ue->ran_ue_ngap_id, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_unspecified);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3610,12 +4000,13 @@
     memcpy(&amf_ue->nr_tai, &target_ue->saved.nr_tai, sizeof(ogs_5gs_tai_t));
     memcpy(&amf_ue->nr_cgi, &target_ue->saved.nr_cgi, sizeof(ogs_nr_cgi_t));
 
-    ogs_assert(OGS_OK ==
-        ngap_send_ran_ue_context_release_command(source_ue,
+    r = ngap_send_ran_ue_context_release_command(source_ue,
             NGAP_Cause_PR_radioNetwork,
             NGAP_CauseRadioNetwork_successful_handover,
             NGAP_UE_CTX_REL_NG_HANDOVER_COMPLETE,
-            ogs_app()->time.handover.duration));
+            ogs_app()->time.handover.duration);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
     ogs_list_for_each(&amf_ue->sess_list, sess) {
         memset(&param, 0, sizeof(param));
@@ -3633,7 +4024,7 @@
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i, j, k;
+    int i, j, k, r;
 
     NGAP_InitiatingMessage_t *initiatingMessage = NULL;
     NGAP_RANConfigurationUpdate_t *RANConfigurationUpdate = NULL;
@@ -3683,8 +4074,9 @@
             ogs_error("No globalGNB_ID");
             group = NGAP_Cause_PR_protocol;
             cause = NGAP_CauseProtocol_semantic_error;
-            ogs_assert(OGS_OK ==
-                ngap_send_ran_configuration_update_failure(gnb, group, cause));
+            r = ngap_send_ran_configuration_update_failure(gnb, group, cause);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -3709,9 +4101,10 @@
                 ogs_error("No SupportedTAItem");
                 group = NGAP_Cause_PR_protocol;
                 cause = NGAP_CauseProtocol_semantic_error;
-                ogs_assert(OGS_OK ==
-                    ngap_send_ran_configuration_update_failure(
-                        gnb, group, cause));
+                r = ngap_send_ran_configuration_update_failure(
+                        gnb, group, cause);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -3735,9 +4128,10 @@
                     ogs_error("No BroadcastPLMNItem");
                     group = NGAP_Cause_PR_protocol;
                     cause = NGAP_CauseProtocol_semantic_error;
-                    ogs_assert(OGS_OK ==
-                        ngap_send_ran_configuration_update_failure(
-                            gnb, group, cause));
+                    r = ngap_send_ran_configuration_update_failure(
+                            gnb, group, cause);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     return;
                 }
 
@@ -3768,9 +4162,10 @@
                         ogs_error("No SliceSupportItem");
                         group = NGAP_Cause_PR_protocol;
                         cause = NGAP_CauseProtocol_semantic_error;
-                        ogs_assert(OGS_OK ==
-                            ngap_send_ran_configuration_update_failure(
-                                gnb, group, cause));
+                        r = ngap_send_ran_configuration_update_failure(
+                                gnb, group, cause);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
                         return;
                     }
 
@@ -3809,8 +4204,9 @@
             cause =
                 NGAP_CauseProtocol_message_not_compatible_with_receiver_state;
 
-            ogs_assert(OGS_OK ==
-                ngap_send_ran_configuration_update_failure(gnb, group, cause));
+            r = ngap_send_ran_configuration_update_failure(gnb, group, cause);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -3821,8 +4217,9 @@
             group = NGAP_Cause_PR_misc;
             cause = NGAP_CauseMisc_unknown_PLMN_or_SNPN;
 
-            ogs_assert(OGS_OK ==
-                ngap_send_ran_configuration_update_failure(gnb, group, cause));
+            r = ngap_send_ran_configuration_update_failure(gnb, group, cause);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -3833,8 +4230,9 @@
             group = NGAP_Cause_PR_radioNetwork;
             cause = NGAP_CauseRadioNetwork_slice_not_supported;
 
-            ogs_assert(OGS_OK ==
-                ngap_send_ran_configuration_update_failure(gnb, group, cause));
+            r = ngap_send_ran_configuration_update_failure(gnb, group, cause);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
     }
@@ -3842,15 +4240,14 @@
     if (PagingDRX)
         ogs_debug("    PagingDRX%ld", *PagingDRX);
 
-    ogs_assert(OGS_OK ==
-        ngap_send_ran_configuration_update_ack(gnb));
+    ogs_expect(OGS_OK == ngap_send_ran_configuration_update_ack(gnb));
 }
 
 void ngap_handle_ng_reset(
         amf_gnb_t *gnb, ogs_ngap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i, old_xact_count = 0, new_xact_count = 0;
+    int i, r, old_xact_count = 0, new_xact_count = 0;
 
     NGAP_InitiatingMessage_t *initiatingMessage = NULL;
     NGAP_NGReset_t *NGReset = NULL;
@@ -3892,9 +4289,10 @@
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, NULL, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, NULL, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3903,9 +4301,10 @@
 
     if (!ResetType) {
         ogs_error("No ResetType");
-        ogs_assert(OGS_OK ==
-            ngap_send_error_indication(gnb, NULL, NULL,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication(gnb, NULL, NULL,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3945,9 +4344,11 @@
      * for new UE-associated logical NG-connections over the NG interface,
      * the AMF shall respond with the NG RESET ACKNOWLEDGE message.
      */
-        if (ogs_list_count(&gnb->ran_ue_list) == 0)
-            ogs_assert(OGS_OK ==
-                ngap_send_ng_reset_ack(gnb, NULL));
+        if (ogs_list_count(&gnb->ran_ue_list) == 0) {
+            r = ngap_send_ng_reset_ack(gnb, NULL);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
+        }
 
         break;
 
@@ -3961,7 +4362,10 @@
             ogs_pkbuf_free(gnb->ng_reset_ack);
 
         gnb->ng_reset_ack = ogs_ngap_build_ng_reset_ack(partOfNG_Interface);
-        ogs_expect_or_return(gnb->ng_reset_ack);
+        if (!gnb->ng_reset_ack) {
+            ogs_error("ogs_ngap_build_ng_reset_ack() failed");
+            return;
+        }
 
         for (i = 0; i < partOfNG_Interface->list.count; i++) {
             NGAP_UE_associatedLogicalNG_connectionItem_t *item = NULL;
@@ -4054,8 +4458,9 @@
          * where PartOfNG_interface was requested
          * REMOVED */
         ogs_assert(gnb->ng_reset_ack);
-        ogs_expect(OGS_OK ==
-            ngap_send_to_gnb(gnb, gnb->ng_reset_ack, NGAP_NON_UE_SIGNALLING));
+        r = ngap_send_to_gnb(gnb, gnb->ng_reset_ack, NGAP_NON_UE_SIGNALLING);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         /* Clear NG-Reset Ack Buffer */
         gnb->ng_reset_ack = NULL;

open5gs_2.5.8.tar.xz/src/amf/ngap-path.c -> open5gs_2.6.0.tar.xz/src/amf/ngap-path.c Changed

@@ -54,16 +54,16 @@
 
     gnb = amf_gnb_cycle(gnb);
     if (!gnb) {
-        ogs_warn("gNB has already been removed");
+        ogs_error("gNB has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     ogs_assert(gnb->sctp.sock);
     if (gnb->sctp.sock->fd == INVALID_SOCKET) {
-        ogs_fatal("gNB SCTP socket has already been destroyed");
+        ogs_error("gNB SCTP socket has already been destroyed");
         ogs_log_hexdump(OGS_LOG_FATAL, pkbuf->data, pkbuf->len);
-        ogs_assert_if_reached();
+        ogs_pkbuf_free(pkbuf);
         return OGS_ERROR;
     }
 
@@ -83,16 +83,20 @@
 
 int ngap_send_to_ran_ue(ran_ue_t *ran_ue, ogs_pkbuf_t *pkbuf)
 {
+    int rv;
     ogs_assert(pkbuf);
 
     ran_ue = ran_ue_cycle(ran_ue);
     if (!ran_ue) {
-        ogs_warn("NG context has already been removed");
+        ogs_error("NG context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
-    return ngap_send_to_gnb(ran_ue->gnb, pkbuf, ran_ue->gnb_ostream_id);
+    rv = ngap_send_to_gnb(ran_ue->gnb, pkbuf, ran_ue->gnb_ostream_id);
+    ogs_expect(rv == OGS_OK);
+
+    return rv;
 }
 
 int ngap_delayed_send_to_ran_ue(
@@ -117,10 +121,10 @@
 
         return OGS_OK;
     } else {
-        amf_gnb_t *gnb = NULL;
-        gnb = ran_ue->gnb;
-        ogs_assert(gnb);
-        return ngap_send_to_ran_ue(ran_ue, pkbuf);
+        int rv = ngap_send_to_ran_ue(ran_ue, pkbuf);
+        ogs_expect(rv == OGS_OK);
+
+        return rv;
     }
 }
 
@@ -149,6 +153,8 @@
 int ngap_send_to_nas(ran_ue_t *ran_ue,
         NGAP_ProcedureCode_t procedureCode, NGAP_NAS_PDU_t *nasPdu)
 {
+    int rv;
+
     ogs_nas_5gs_security_header_t *sh = NULL;
     ogs_nas_security_header_type_t security_header_type;
 
@@ -211,7 +217,6 @@
     ogs_assert(h);
     if (h->extended_protocol_discriminator ==
             OGS_NAS_EXTENDED_PROTOCOL_DISCRIMINATOR_5GMM) {
-        int rv;
         e = amf_event_new(AMF_EVENT_5GMM_MESSAGE);
         if (!e) {
             ogs_error("ngap_send_to_nas() failed");
@@ -237,7 +242,10 @@
             ogs_pkbuf_free(nasbuf);
             return OGS_ERROR;
         }
-        return ngap_send_to_5gsm(amf_ue, nasbuf);
+        rv = ngap_send_to_5gsm(amf_ue, nasbuf);
+        ogs_expect(rv == OGS_OK);
+
+        return rv;
     } else {
         ogs_error("Unknown NAS Protocol discriminator 0x%02x",
                   h->extended_protocol_discriminator);
@@ -253,7 +261,10 @@
 
     ogs_debug("NG-Setup response");
     ngap_buffer = ngap_build_ng_setup_response();
-    ogs_expect_or_return_val(ngap_buffer, OGS_ERROR);
+    if (!ngap_buffer) {
+        ogs_error("ngap_build_ng_setup_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_gnb(gnb, ngap_buffer, NGAP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -270,7 +281,10 @@
     ogs_debug("NG-Setup failure");
     ngap_buffer = ngap_build_ng_setup_failure(
             group, cause, NGAP_TimeToWait_v10s);
-    ogs_expect_or_return_val(ngap_buffer, OGS_ERROR);
+    if (!ngap_buffer) {
+        ogs_error("ngap_build_ng_setup_failure() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_gnb(gnb, ngap_buffer, NGAP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -285,7 +299,10 @@
 
     ogs_debug("RANConfigurationUpdateAcknowledge");
     ngap_buffer = ngap_build_ran_configuration_update_ack();
-    ogs_expect_or_return_val(ngap_buffer, OGS_ERROR);
+    if (!ngap_buffer) {
+        ogs_error("ngap_build_ran_configuration_update_ack() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_gnb(gnb, ngap_buffer, NGAP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -302,7 +319,10 @@
     ogs_debug("RANConfigurationUpdateFailure");
     ngap_buffer = ngap_build_ran_configuration_update_failure(
             group, cause, NGAP_TimeToWait_v10s);
-    ogs_expect_or_return_val(ngap_buffer, OGS_ERROR);
+    if (!ngap_buffer) {
+        ogs_error("ngap_build_ran_configuration_update_failure() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_gnb(gnb, ngap_buffer, NGAP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -330,7 +350,10 @@
             group, (int)cause, action, (int)duration);
 
     ngapbuf = ngap_build_ue_context_release_command(ran_ue, group, cause);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    if (!ngapbuf) {
+        ogs_error("ngap_build_ue_context_release_command() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_delayed_send_to_ran_ue(ran_ue, ngapbuf, duration);
     ogs_expect(rv == OGS_OK);
@@ -345,21 +368,15 @@
     amf_ue_t *amf_ue, NGAP_Cause_PR group, long cause,
     uint8_t action, ogs_time_t duration)
 {
+    int rv;
     ogs_assert(amf_ue);
 
-    ran_ue_t *ran_ue = ran_ue_cycle(amf_ue->ran_ue);
-    if (ran_ue) {
-        ogs_assert(OGS_OK ==
-            ngap_send_ran_ue_context_release_command(ran_ue,
-                group, cause, action, duration));
-        ogs_debug("    SUPI%s", amf_ue->supi);
-    } else {
-        ogs_error("%s No NG Context - "
-                "Group%d Cause%d Action%d Duration%d",
-                amf_ue->supi, group, (int)cause, action, (int)duration);
-    }
+    rv = ngap_send_ran_ue_context_release_command(
+            amf_ue->ran_ue, group, cause, action, duration);
+    ogs_expect(rv == OGS_OK);
+    ogs_debug("    SUPI%s", amf_ue->supi);
 
-    return OGS_OK;
+    return rv;
 }
 
 int ngap_send_paging(amf_ue_t *amf_ue)
@@ -369,6 +386,9 @@
     int i, j;
     int rv;
 
+    ogs_assert(ogs_timer_running(
+                amf_ue->implicit_deregistration.timer) == false);
+
     ogs_list_for_each(&amf_self()->gnb_list, gnb) {
         for (i = 0; i < gnb->num_of_supported_ta_list; i++) {
             for (j = 0; j < gnb->supported_ta_listi.num_of_bplmn_list; j++) {
@@ -380,14 +400,24 @@
                         ngapbuf = amf_ue->t3513.pkbuf;
                     } else {
                         ngapbuf = ngap_build_paging(amf_ue);
-                        ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+                        if (!ngapbuf) {
+                            ogs_error("ngap_build_paging() failed");
+                            return OGS_ERROR;
+                        }
                     }
 
                     amf_ue->t3513.pkbuf = ogs_pkbuf_copy(ngapbuf);
-                    ogs_expect_or_return_val(amf_ue->t3513.pkbuf, OGS_ERROR);
+                    if (!amf_ue->t3513.pkbuf) {
+                        ogs_error("ogs_pkbuf_copy() failed");
+                        ogs_pkbuf_free(ngapbuf);
+                        return OGS_ERROR;
+                    }
 
                     rv = ngap_send_to_gnb(gnb, ngapbuf, NGAP_NON_UE_SIGNALLING);
-                    ogs_expect_or_return_val(rv == OGS_OK, rv);
+                    if (rv != OGS_OK) {
+                        ogs_error("ngap_send_to_gnb() failed");
+                        return rv;
+                    }
                 }
             }
         }
@@ -410,7 +440,10 @@
     ogs_assert(transfer);
 
     ngapbuf = ngap_build_downlink_ran_configuration_transfer(transfer);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    if (!ngapbuf) {
+        ogs_error("ngap_build_downlink_ran_configuration_transfer() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_gnb(target_gnb, ngapbuf, NGAP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -430,7 +463,10 @@
     ogs_assert(amf_ue);
 
     ngapbuf = ngap_build_path_switch_ack(amf_ue);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    if (!ngapbuf) {
+        ogs_error("ngap_build_path_switch_ack() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_5gs_send_to_gnb(amf_ue, ngapbuf);
     ogs_expect(rv == OGS_OK);
@@ -453,7 +489,10 @@
     ogs_assert(target_ue);
 
     ngapbuf = ngap_build_handover_request(target_ue);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    if (!ngapbuf) {
+        ogs_error("ngap_build_handover_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_ran_ue(target_ue, ngapbuf);
     ogs_expect(rv == OGS_OK);
@@ -471,7 +510,10 @@
     ogs_assert(cause);
 
     ngapbuf = ngap_build_handover_preparation_failure(source_ue, cause);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    if (!ngapbuf) {
+        ogs_error("ngap_build_handover_preparation_failure() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_ran_ue(source_ue, ngapbuf);
     ogs_expect(rv == OGS_OK);
@@ -491,7 +533,10 @@
     ogs_assert(source_ue);
 
     ngapbuf = ngap_build_handover_command(source_ue);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    if (!ngapbuf) {
+        ogs_error("ngap_build_handover_command() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_ran_ue(source_ue, ngapbuf);
     ogs_expect(rv == OGS_OK);
@@ -507,7 +552,10 @@
     ogs_assert(source_ue);
 
     ngapbuf = ngap_build_handover_cancel_ack(source_ue);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    if (!ngapbuf) {
+        ogs_error("ngap_build_handover_cancel_ack() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_ran_ue(source_ue, ngapbuf);
     ogs_expect(rv == OGS_OK);
@@ -525,8 +573,11 @@
     ogs_assert(target_ue);
     ogs_assert(transfer);
 
-    ngapbuf = ngap_build_uplink_ran_status_transfer(target_ue, transfer);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    ngapbuf = ngap_build_downlink_ran_status_transfer(target_ue, transfer);
+    if (!ngapbuf) {
+        ogs_error("ngap_build_uplink_ran_status_transfer() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_ran_ue(target_ue, ngapbuf);
     ogs_expect(rv == OGS_OK);
@@ -547,7 +598,10 @@
 
     ngapbuf = ogs_ngap_build_error_indication(
             ran_ue_ngap_id, amf_ue_ngap_id, group, cause);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    if (!ngapbuf) {
+        ogs_error("ogs_ngap_build_error_indication() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_gnb(gnb, ngapbuf, NGAP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -559,17 +613,18 @@
         amf_ue_t *amf_ue, NGAP_Cause_PR group, long cause)
 {
     int rv;
-    amf_gnb_t *gnb;
     ran_ue_t *ran_ue;
 
     ogs_assert(amf_ue);
     ran_ue = ran_ue_cycle(amf_ue->ran_ue);
-    ogs_expect_or_return_val(ran_ue, OGS_ERROR);
-    gnb = ran_ue->gnb;
-    ogs_expect_or_return_val(gnb, OGS_ERROR);
+    if (!ran_ue) {
+        ogs_error("NG context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     rv = ngap_send_error_indication(
-        gnb, &ran_ue->ran_ue_ngap_id, &ran_ue->amf_ue_ngap_id, group, cause);
+        ran_ue->gnb, &ran_ue->ran_ue_ngap_id, &ran_ue->amf_ue_ngap_id,
+        group, cause);
     ogs_expect(rv == OGS_OK);
 
     return rv;
@@ -585,7 +640,10 @@
     ogs_assert(gnb);
 
     ngapbuf = ogs_ngap_build_ng_reset_ack(partOfNG_Interface);
-    ogs_expect_or_return_val(ngapbuf, OGS_ERROR);
+    if (!ngapbuf) {
+        ogs_error("ogs_ngap_build_ng_reset_ack() failed");
+        return OGS_ERROR;
+    }
 
     rv = ngap_send_to_gnb(gnb, ngapbuf, NGAP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);

open5gs_2.5.8.tar.xz/src/amf/ngap-path.h -> open5gs_2.6.0.tar.xz/src/amf/ngap-path.h Changed

open5gs_2.5.8.tar.xz/src/amf/ngap-sm.c -> open5gs_2.6.0.tar.xz/src/amf/ngap-sm.c Changed

@@ -39,6 +39,8 @@
 
 void ngap_state_operational(ogs_fsm_t *s, amf_event_t *e)
 {
+    int r;
+
     amf_gnb_t *gnb = NULL;
     ogs_pkbuf_t *pkbuf = NULL;
 
@@ -145,11 +147,9 @@
             case NGAP_ProcedureCode_id_PDUSessionResourceRelease:
                 ngap_handle_pdu_session_resource_release_response(gnb, pdu);
                 break;
-#if 0
             case NGAP_ProcedureCode_id_UEContextModification:
                 ngap_handle_ue_context_modification_response(gnb, pdu);
                 break;
-#endif
             case NGAP_ProcedureCode_id_UEContextRelease:
                 ngap_handle_ue_context_release_complete(gnb, pdu);
                 break;
@@ -170,11 +170,9 @@
             case NGAP_ProcedureCode_id_InitialContextSetup :
                 ngap_handle_initial_context_setup_failure(gnb, pdu);
                 break;
-#if 0
             case NGAP_ProcedureCode_id_UEContextModification:
                 ngap_handle_ue_context_modification_failure(gnb, pdu);
                 break;
-#endif
             case NGAP_ProcedureCode_id_HandoverResourceAllocation :
                 ngap_handle_handover_failure(gnb, pdu);
                 break;
@@ -196,7 +194,10 @@
             ogs_assert(e->ran_ue);
             ogs_assert(e->pkbuf);
 
-            ogs_expect(OGS_OK == ngap_send_to_ran_ue(e->ran_ue, e->pkbuf));
+            r = ngap_send_to_ran_ue(e->ran_ue, e->pkbuf);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
+
             ogs_timer_delete(e->timer);
             break;
         default:

open5gs_2.5.8.tar.xz/src/amf/nnrf-handler.c -> open5gs_2.6.0.tar.xz/src/amf/nnrf-handler.c Changed

@@ -25,6 +25,8 @@
 void amf_nnrf_handle_nf_discover(
         ogs_sbi_xact_t *xact, ogs_sbi_message_t *recvmsg)
 {
+    int r;
+
     ogs_sbi_nf_instance_t *nf_instance = NULL;
     ogs_sbi_object_t *sbi_object = NULL;
     ogs_sbi_service_type_e service_type = OGS_SBI_SERVICE_TYPE_NULL;
@@ -68,9 +70,10 @@
             ogs_assert(amf_ue);
             ogs_error("%s (NF discover) No %s", amf_ue->suci,
                         ogs_sbi_service_type_to_name(service_type));
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_gmm_reject_from_sbi(amf_ue,
-                    OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT));
+            r = nas_5gs_send_gmm_reject_from_sbi(amf_ue,
+                    OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             break;
         case OGS_SBI_OBJ_SESS_TYPE:
             sess = (amf_sess_t *)sbi_object;
@@ -82,15 +85,17 @@
             ogs_error("%d:%d (NF discover) No %s", sess->psi, sess->pti,
                         ogs_sbi_service_type_to_name(service_type));
             if (sess->payload_container_type) {
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_back_gsm_message(sess,
+                r = nas_5gs_send_back_gsm_message(sess,
                         OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                        AMF_NAS_BACKOFF_TIME));
+                        AMF_NAS_BACKOFF_TIME);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else {
-                ogs_assert(OGS_OK ==
-                    ngap_send_error_indication2(amf_ue,
+                r = ngap_send_error_indication2(amf_ue,
                         NGAP_Cause_PR_transport,
-                        NGAP_CauseTransport_transport_resource_unavailable));
+                        NGAP_CauseTransport_transport_resource_unavailable);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
         default:

open5gs_2.5.8.tar.xz/src/amf/nnssf-handler.c -> open5gs_2.6.0.tar.xz/src/amf/nnssf-handler.c Changed

@@ -24,14 +24,17 @@
 int amf_nnssf_nsselection_handle_get(
         amf_sess_t *sess, ogs_sbi_message_t *recvmsg)
 {
-    amf_ue_t *amf_ue = NULL;
-
+    bool rc;
+    int r;
+    OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
     ogs_sbi_client_t *client = NULL, *scp_client = NULL;
     ogs_sockaddr_t *addr = NULL;
 
     OpenAPI_authorized_network_slice_info_t *AuthorizedNetworkSliceInfo = NULL;
     OpenAPI_nsi_information_t *NsiInformation = NULL;
 
+    amf_ue_t *amf_ue = NULL;
+
     ogs_assert(sess);
     amf_ue = sess->amf_ue;
     ogs_assert(amf_ue);
@@ -42,34 +45,38 @@
     if (recvmsg->res_status != OGS_SBI_HTTP_STATUS_OK) {
         ogs_error("%s HTTP response error %d",
                 amf_ue->supi, recvmsg->res_status);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_status(amf_ue, recvmsg->res_status));
+        r = nas_5gs_send_gmm_status(amf_ue, recvmsg->res_status);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     AuthorizedNetworkSliceInfo = recvmsg->AuthorizedNetworkSliceInfo;
     if (!AuthorizedNetworkSliceInfo) {
         ogs_error("No AuthorizedNetworkSliceInfo");
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     NsiInformation = AuthorizedNetworkSliceInfo->nsi_information;
     if (!NsiInformation) {
         ogs_error("No NsiInformation");
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     if (!NsiInformation->nrf_id) {
         ogs_error("No nrfId");
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -91,24 +98,24 @@
                 amf_nsmf_pdusession_build_create_sm_context,
                 sess, AMF_CREATE_SM_CONTEXT_NO_STATE, &param);
     } else {
-        addr = ogs_sbi_getaddr_from_uri(NsiInformation->nrf_id);
-        if (!addr) {
+        rc = ogs_sbi_getaddr_from_uri(&scheme, &addr, NsiInformation->nrf_id);
+        if (rc == false || scheme == OpenAPI_uri_scheme_NULL) {
             ogs_error("%s:%d Invalid URI %s",
                     amf_ue->supi, sess->psi, NsiInformation->nrf_id);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_gmm_reject_from_sbi(
-                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+            r = nas_5gs_send_gmm_reject_from_sbi(
+                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return OGS_ERROR;;
         }
 
-        client = ogs_sbi_client_find(addr);
+        client = ogs_sbi_client_find(scheme, addr);
         if (!client) {
-            client = ogs_sbi_client_add(addr);
+            client = ogs_sbi_client_add(scheme, addr);
             ogs_assert(client);
         }
 
         OGS_SBI_SETUP_CLIENT(&sess->nssf.nrf, client);
-
         ogs_freeaddrinfo(addr);
 
         ogs_assert(true == amf_sess_sbi_discover_by_nsi(

open5gs_2.5.8.tar.xz/src/amf/npcf-handler.c -> open5gs_2.6.0.tar.xz/src/amf/npcf-handler.c Changed

@@ -25,7 +25,7 @@
 int amf_npcf_am_policy_control_handle_create(
         amf_ue_t *amf_ue, ogs_sbi_message_t *recvmsg)
 {
-    int rv;
+    int r, rv;
 
     uint64_t supported_features;
 
@@ -38,33 +38,37 @@
     if (recvmsg->res_status != OGS_SBI_HTTP_STATUS_CREATED) {
         ogs_error("%s HTTP response error %d",
                 amf_ue->supi, recvmsg->res_status);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(amf_ue, recvmsg->res_status));
+        r = nas_5gs_send_gmm_reject_from_sbi(amf_ue, recvmsg->res_status);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     if (!recvmsg->http.location) {
         ogs_error("%s No http.location", amf_ue->supi);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     PolicyAssociation = recvmsg->PolicyAssociation;
     if (!PolicyAssociation) {
         ogs_error("No PolicyAssociation");
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
     if (!PolicyAssociation->supp_feat) {
         ogs_error("No suppFeat");
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -75,9 +79,10 @@
     if (rv != OGS_OK) {
         ogs_error("%s Cannot parse http.location %s",
                 amf_ue->supi, recvmsg->http.location);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -86,9 +91,10 @@
                 amf_ue->supi, recvmsg->http.location);
 
         ogs_sbi_header_free(&header);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }

open5gs_2.5.8.tar.xz/src/amf/nsmf-handler.c -> open5gs_2.6.0.tar.xz/src/amf/nsmf-handler.c Changed

@@ -27,7 +27,7 @@
 int amf_nsmf_pdusession_handle_create_sm_context(
         amf_sess_t *sess, ogs_sbi_message_t *recvmsg)
 {
-    int rv;
+    int rv, r;
 
     ogs_assert(sess);
     ogs_assert(recvmsg);
@@ -38,10 +38,11 @@
 
         if (!recvmsg->http.location) {
             ogs_error("%d:%d No http.location", sess->psi, sess->pti);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_back_gsm_message(sess,
+            r = nas_5gs_send_back_gsm_message(sess,
                     OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                    AMF_NAS_BACKOFF_TIME));
+                    AMF_NAS_BACKOFF_TIME);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
@@ -53,10 +54,11 @@
         if (rv != OGS_OK) {
             ogs_error("%d:%d Cannot parse http.location %s",
                     sess->psi, sess->pti, recvmsg->http.location);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_back_gsm_message(sess,
+            r = nas_5gs_send_back_gsm_message(sess,
                     OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                    AMF_NAS_BACKOFF_TIME));
+                    AMF_NAS_BACKOFF_TIME);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
@@ -66,10 +68,11 @@
                     sess->psi, sess->pti, recvmsg->http.location);
 
             ogs_sbi_header_free(&header);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_back_gsm_message(sess,
+            r = nas_5gs_send_back_gsm_message(sess,
                     OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                    AMF_NAS_BACKOFF_TIME));
+                    AMF_NAS_BACKOFF_TIME);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
@@ -86,7 +89,7 @@
             amf_ue_t *amf_ue = sess->amf_ue;
             ogs_assert(amf_ue);
 
-            rv = nas_5gs_send_to_gnb(amf_ue,
+            r = nas_5gs_send_to_gnb(amf_ue,
                     sess->pdu_session_establishment_accept);
 
             sess->pdu_session_establishment_accept = NULL;
@@ -96,10 +99,11 @@
                         sess->psi, sess->pti);
 
                 ogs_sbi_header_free(&header);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_back_gsm_message(sess,
+                r = nas_5gs_send_back_gsm_message(sess,
                         OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                        AMF_NAS_BACKOFF_TIME));
+                        AMF_NAS_BACKOFF_TIME);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
                 return OGS_ERROR;
             }
@@ -120,19 +124,21 @@
         SmContextCreateError = recvmsg->SmContextCreateError;
         if (!SmContextCreateError) {
             ogs_error("%d:%d No SmContextCreateError", sess->psi, sess->pti);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_back_gsm_message(sess,
+            r = nas_5gs_send_back_gsm_message(sess,
                     OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                    AMF_NAS_BACKOFF_TIME));
+                    AMF_NAS_BACKOFF_TIME);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
         if (!SmContextCreateError->error) {
             ogs_error("%d:%d No Error", sess->psi, sess->pti);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_back_gsm_message(sess,
+            r = nas_5gs_send_back_gsm_message(sess,
                     OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                    AMF_NAS_BACKOFF_TIME));
+                    AMF_NAS_BACKOFF_TIME);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
@@ -150,19 +156,21 @@
                         sess->psi, sess->pti);
                 n1smbuf = ogs_pkbuf_copy(n1smbuf);
                 ogs_assert(n1smbuf);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_gsm_reject(sess,
-                        OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, n1smbuf));
+                r = nas_5gs_send_gsm_reject(sess,
+                        OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, n1smbuf);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
                 return OGS_ERROR;
             }
         }
 
         ogs_error("%d:%d 5GMM was not forwarded", sess->psi, sess->pti);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_back_gsm_message(sess,
+        r = nas_5gs_send_back_gsm_message(sess,
                 OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                AMF_NAS_BACKOFF_TIME));
+                AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         return OGS_ERROR;
     }
@@ -173,6 +181,8 @@
 int amf_nsmf_pdusession_handle_update_sm_context(
         amf_sess_t *sess, int state, ogs_sbi_message_t *recvmsg)
 {
+    int r;
+
     amf_ue_t *amf_ue = NULL;
     ran_ue_t *ran_ue = NULL;
 
@@ -236,11 +246,12 @@
                                     OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL,
                                     NULL,
                                     amf_npcf_am_policy_control_build_create,
-                                    amf_ue, NULL));
+                                    amf_ue, 0, NULL));
                         } else {
                             CLEAR_AMF_UE_TIMER(amf_ue->t3550);
-                            ogs_assert(OGS_OK ==
-                                nas_5gs_send_registration_accept(amf_ue));
+                            r = nas_5gs_send_registration_accept(amf_ue);
+                            ogs_expect(r == OGS_OK);
+                            ogs_assert(r != OGS_ERROR);
 
                             AMF_UE_CLEAR_N2_TRANSFER(
                                     amf_ue, pdu_session_resource_setup_request);
@@ -255,8 +266,9 @@
                                 AMF_RELEASE_SM_CONTEXT_SERVICE_ACCEPT) &&
                         AMF_SESSION_SYNC_DONE(amf_ue,
                                 AMF_UPDATE_SM_CONTEXT_SERVICE_REQUEST)) {
-                        ogs_assert(OGS_OK ==
-                            nas_5gs_send_service_accept(amf_ue));
+                        r = nas_5gs_send_service_accept(amf_ue);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
 
                         AMF_UE_CLEAR_N2_TRANSFER(
                                 amf_ue, pdu_session_resource_setup_request);
@@ -267,8 +279,9 @@
 
                     if (AMF_SESSION_SYNC_DONE(amf_ue,
                                 AMF_UPDATE_SM_CONTEXT_HANDOVER_REQUIRED)) {
-                        ogs_assert(OGS_OK ==
-                            ngap_send_handover_request(amf_ue));
+                        r = ngap_send_handover_request(amf_ue);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
 
                         AMF_UE_CLEAR_N2_TRANSFER(amf_ue, handover_request);
                     }
@@ -282,10 +295,11 @@
                 if (!n1smbuf) {
                     ogs_error("%s:%d No N1 SM Content %s",
                             amf_ue->supi, sess->psi, n1SmMsg->content_id);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_back_gsm_message(sess,
+                    r = nas_5gs_send_back_gsm_message(sess,
                             OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                            AMF_NAS_BACKOFF_TIME));
+                            AMF_NAS_BACKOFF_TIME);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                     return OGS_ERROR;
                 }
@@ -293,10 +307,11 @@
                 if (!n2smbuf) {
                     ogs_error("%s:%d No N2 SM Content",
                             amf_ue->supi, sess->psi);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_back_gsm_message(sess,
+                    r = nas_5gs_send_back_gsm_message(sess,
                             OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                            AMF_NAS_BACKOFF_TIME));
+                            AMF_NAS_BACKOFF_TIME);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                     return OGS_ERROR;
                 }
@@ -311,9 +326,10 @@
                 n2smbuf = ogs_pkbuf_copy(n2smbuf);
                 ogs_assert(n2smbuf);
 
-                ogs_assert(OGS_OK ==
-                    nas_send_pdu_session_modification_command(
-                        sess, n1smbuf, n2smbuf));
+                r = nas_send_pdu_session_modification_command(
+                        sess, n1smbuf, n2smbuf);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 break;
 
 
@@ -321,10 +337,11 @@
                 if (!n1smbuf) {
                     ogs_error("%s:%d No N1 SM Content %s",
                             amf_ue->supi, sess->psi, n1SmMsg->content_id);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_back_gsm_message(sess,
+                    r = nas_5gs_send_back_gsm_message(sess,
                             OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                            AMF_NAS_BACKOFF_TIME));
+                            AMF_NAS_BACKOFF_TIME);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                     return OGS_ERROR;
                 }
@@ -332,10 +349,11 @@
                 if (!n2smbuf) {
                     ogs_error("%s:%d No N2 SM Content",
                             amf_ue->supi, sess->psi);
-                    ogs_assert(OGS_OK ==
-                        nas_5gs_send_back_gsm_message(sess,
+                    r = nas_5gs_send_back_gsm_message(sess,
                             OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                            AMF_NAS_BACKOFF_TIME));
+                            AMF_NAS_BACKOFF_TIME);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                     return OGS_ERROR;
                 }
@@ -350,19 +368,21 @@
                 n2smbuf = ogs_pkbuf_copy(n2smbuf);
                 ogs_assert(n2smbuf);
 
-                ogs_assert(OGS_OK ==
-                    nas_send_pdu_session_release_command(
-                        sess, n1smbuf, n2smbuf));
+                r = nas_send_pdu_session_release_command(
+                        sess, n1smbuf, n2smbuf);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 break;
 
             case OpenAPI_n2_sm_info_type_PATH_SWITCH_REQ_ACK:
                 if (!n2smbuf) {
                     ogs_error("%s:%d No N2 SM Content",
                             amf_ue->supi, sess->psi);
-                    ogs_expect(OGS_OK ==
-                        ngap_send_error_indication2(amf_ue,
+                    r = ngap_send_error_indication2(amf_ue,
                             NGAP_Cause_PR_protocol,
-                            NGAP_CauseProtocol_semantic_error));
+                            NGAP_CauseProtocol_semantic_error);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                     return OGS_ERROR;
                 }
@@ -372,8 +392,9 @@
                         ogs_pkbuf_copy(n2smbuf));
 
                 if (AMF_SESSION_SYNC_DONE(amf_ue, state)) {
-                    ogs_assert(OGS_OK ==
-                        ngap_send_path_switch_ack(sess));
+                    r = ngap_send_path_switch_ack(sess);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                     AMF_UE_CLEAR_N2_TRANSFER(amf_ue, path_switch_request_ack);
                 }
@@ -383,10 +404,11 @@
                 if (!n2smbuf) {
                     ogs_error("%s:%d No N2 SM Content",
                             amf_ue->supi, sess->psi);
-                    ogs_expect(OGS_OK ==
-                        ngap_send_error_indication2(amf_ue,
+                    r = ngap_send_error_indication2(amf_ue,
                             NGAP_Cause_PR_protocol,
-                            NGAP_CauseProtocol_semantic_error));
+                            NGAP_CauseProtocol_semantic_error);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                     return OGS_ERROR;
                 }
@@ -395,8 +417,9 @@
                         sess, handover_command, ogs_pkbuf_copy(n2smbuf));
 
                 if (AMF_SESSION_SYNC_DONE(amf_ue, state)) {
-                    ogs_assert(OGS_OK ==
-                        ngap_send_handover_command(amf_ue));
+                    r = ngap_send_handover_command(amf_ue);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                     AMF_UE_CLEAR_N2_TRANSFER(amf_ue, handover_command);
                 }
@@ -405,10 +428,11 @@
             default:
                 ogs_error("Not implemented %d",
                         SmContextUpdatedData->n2_sm_info_type);
-                ogs_expect(OGS_OK ==
-                    ngap_send_error_indication2(amf_ue,
+                r = ngap_send_error_indication2(amf_ue,
                         NGAP_Cause_PR_protocol,
-                        NGAP_CauseProtocol_semantic_error));
+                        NGAP_CauseProtocol_semantic_error);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
 
         } else {
@@ -478,11 +502,12 @@
                 ogs_warn("PDUSessionResourceSetupResponse(Unsuccessful)");
                 ogs_assert(amf_ue->deactivation.group);
 
-                ogs_assert(OGS_OK ==
-                    ngap_send_amf_ue_context_release_command(amf_ue,
+                r = ngap_send_amf_ue_context_release_command(amf_ue,
                         amf_ue->deactivation.group,
                         amf_ue->deactivation.cause,
-                        NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK, 0));
+                        NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
             } else if (state == AMF_UPDATE_SM_CONTEXT_MODIFIED) {
                 /*
@@ -515,11 +540,12 @@
                 if (AMF_SESSION_SYNC_DONE(amf_ue, state)) {
                     ogs_assert(amf_ue->deactivation.group);
 
-                    ogs_assert(OGS_OK ==
-                        ngap_send_amf_ue_context_release_command(amf_ue,
+                    r = ngap_send_amf_ue_context_release_command(amf_ue,
                             amf_ue->deactivation.group,
                             amf_ue->deactivation.cause,
-                            NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK, 0));
+                            NGAP_UE_CTX_REL_NG_REMOVE_AND_UNLINK, 0);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
 
             } else if (state == AMF_UPDATE_SM_CONTEXT_REGISTRATION_REQUEST) {
@@ -597,11 +623,12 @@
                     target_ue = source_ue->target_ue;
                     ogs_assert(target_ue);
 
-                    ogs_assert(OGS_OK ==
-                        ngap_send_ran_ue_context_release_command(target_ue,
+                    r = ngap_send_ran_ue_context_release_command(target_ue,
                             NGAP_Cause_PR_radioNetwork,
                             NGAP_CauseRadioNetwork_handover_cancelled,
-                            NGAP_UE_CTX_REL_NG_HANDOVER_CANCEL, 0));
+                            NGAP_UE_CTX_REL_NG_HANDOVER_CANCEL, 0);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
 
             } else if (state == AMF_UPDATE_SM_CONTEXT_HANDOVER_NOTIFY) {
@@ -636,9 +663,11 @@
                         ogs_debug("    SUPI%s", amf_ue->supi);
                         ran_ue_remove(ran_ue);
 
-                        if (ogs_list_count(&gnb->ran_ue_list) == 0)
-                            ogs_assert(OGS_OK ==
-                                ngap_send_ng_reset_ack(gnb, NULL));
+                        if (ogs_list_count(&gnb->ran_ue_list) == 0) {
+                            r = ngap_send_ng_reset_ack(gnb, NULL);
+                            ogs_expect(r == OGS_OK);
+                            ogs_assert(r != OGS_ERROR);
+                        }
 
                     } else {
                         ogs_warn("%s RAN-NG Context has already been removed",
@@ -673,9 +702,10 @@
                          * where PartOfNG_interface was requested
                          * REMOVED */
                         ogs_assert(gnb->ng_reset_ack);
-                        ogs_expect(OGS_OK ==
-                            ngap_send_to_gnb(gnb,
-                                gnb->ng_reset_ack, NGAP_NON_UE_SIGNALLING));
+                        r = ngap_send_to_gnb(
+                            gnb, gnb->ng_reset_ack, NGAP_NON_UE_SIGNALLING);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
 
                         /* Clear NG-Reset Ack Buffer */
                         gnb->ng_reset_ack = NULL;
@@ -722,18 +752,20 @@
         if (!SmContextUpdateError) {
             ogs_error("%d:%d No SmContextUpdateError %d",
                     sess->psi, sess->pti, recvmsg->res_status);
-            ogs_expect(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
         if (!SmContextUpdateError->error) {
             ogs_error("%d:%d No Error %d",
                     sess->psi, sess->pti, recvmsg->res_status);
-            ogs_expect(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
@@ -752,9 +784,10 @@
 
                 n1smbuf = ogs_pkbuf_copy(n1smbuf);
                 ogs_assert(n1smbuf);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_gsm_reject(sess,
-                        OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, n1smbuf));
+                r = nas_5gs_send_gsm_reject(sess,
+                        OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, n1smbuf);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
                 return OGS_ERROR;
             }
@@ -764,9 +797,10 @@
         n2SmInfo = SmContextUpdateError->n2_sm_info;
         if (!n2SmInfo || !n2SmInfo->content_id) {
             ogs_error("%d:%d No N2 SM Message", sess->psi, sess->pti);
-            ogs_expect(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
@@ -776,9 +810,10 @@
         if (!n2smbuf) {
             ogs_error("%d:%d No N2 SM Content %s",
                     sess->psi, sess->pti, n2SmInfo->content_id);
-            ogs_expect(OGS_OK ==
-                ngap_send_error_indication2(amf_ue,
-                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+            r = ngap_send_error_indication2(amf_ue,
+                    NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             return OGS_ERROR;
         }
@@ -786,9 +821,10 @@
 
         ogs_error("%d:%d Error Indication", sess->psi, sess->pti);
 
-        ogs_expect(OGS_OK ==
-            ngap_send_error_indication2(amf_ue,
-                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error));
+        r = ngap_send_error_indication2(amf_ue,
+                NGAP_Cause_PR_protocol, NGAP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         return OGS_ERROR;
     }
@@ -798,6 +834,7 @@
 
 int amf_nsmf_pdusession_handle_release_sm_context(amf_sess_t *sess, int state)
 {
+    int r;
     amf_ue_t *amf_ue = NULL;
 
     ogs_assert(sess);
@@ -821,11 +858,13 @@
                 ogs_assert(true ==
                     amf_ue_sbi_discover_and_send(
                         OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL, NULL,
-                        amf_npcf_am_policy_control_build_create, amf_ue, NULL));
+                        amf_npcf_am_policy_control_build_create,
+                        amf_ue, 0, NULL));
             } else {
                 CLEAR_AMF_UE_TIMER(amf_ue->t3550);
-                ogs_assert(OGS_OK ==
-                    nas_5gs_send_registration_accept(amf_ue));
+                r = nas_5gs_send_registration_accept(amf_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
         }
 
@@ -835,10 +874,14 @@
          * 2. Release All SM contexts
          * 3. Service accept
          */
-        if (AMF_SESSION_SYNC_DONE(amf_ue, AMF_RELEASE_SM_CONTEXT_SERVICE_ACCEPT) &&
-            AMF_SESSION_SYNC_DONE(amf_ue, AMF_UPDATE_SM_CONTEXT_SERVICE_REQUEST))
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_service_accept(amf_ue));
+        if (AMF_SESSION_SYNC_DONE(amf_ue,
+                AMF_RELEASE_SM_CONTEXT_SERVICE_ACCEPT) &&
+            AMF_SESSION_SYNC_DONE(amf_ue,
+                AMF_UPDATE_SM_CONTEXT_SERVICE_REQUEST)) {
+            r = nas_5gs_send_service_accept(amf_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
+        }
 
     } else {
 
@@ -851,10 +894,11 @@
                  * 3. UE Context release command
                  * 4. UE Context release complete
                  */
-                ogs_assert(OGS_OK ==
-                    ngap_send_amf_ue_context_release_command(amf_ue,
+                r = ngap_send_amf_ue_context_release_command(amf_ue,
                         NGAP_Cause_PR_nas, NGAP_CauseNas_normal_release,
-                        NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0));
+                        NGAP_UE_CTX_REL_NG_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
             } else if (state == AMF_RELEASE_SM_CONTEXT_REGISTRATION_ACCEPT) {
 
@@ -866,7 +910,8 @@
                 /* Not reached here */
                 ogs_assert_if_reached();
 
-            } else if (state == AMF_RELEASE_SM_CONTEXT_NO_STATE) {
+            } else if (state == AMF_RELEASE_SM_CONTEXT_NO_STATE ||
+                        state == AMF_NETWORK_INITIATED_DE_REGISTERED) {
                 /* NO_STATE */
 
                 if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_authentication)) {
@@ -874,7 +919,8 @@
                     ogs_assert(true ==
                         amf_ue_sbi_discover_and_send(
                             OGS_SBI_SERVICE_TYPE_NAUSF_AUTH, NULL,
-                            amf_nausf_auth_build_authenticate, amf_ue, NULL));
+                            amf_nausf_auth_build_authenticate,
+                            amf_ue, 0, NULL));
 
                 } else if (OGS_FSM_CHECK(&amf_ue->sm,
                             gmm_state_de_registered)) {
@@ -893,7 +939,7 @@
                         amf_ue_sbi_discover_and_send(
                             OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL, NULL,
                             amf_npcf_am_policy_control_build_delete,
-                            amf_ue, NULL));
+                            amf_ue, state, NULL));
 
                 } else if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_registered)) {
                     /*
@@ -914,10 +960,11 @@
                      * 3. UE Context release command
                      * 4. UE Context release complete
                      */
-                    ogs_assert(OGS_OK ==
-                        ngap_send_amf_ue_context_release_command(amf_ue,
+                    r = ngap_send_amf_ue_context_release_command(amf_ue,
                             NGAP_Cause_PR_nas, NGAP_CauseNas_normal_release,
-                            NGAP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                            NGAP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
 
                 } else if (OGS_FSM_CHECK(&amf_ue->sm,
                                 gmm_state_initial_context_setup)) {

open5gs_2.5.8.tar.xz/src/amf/nudm-build.c -> open5gs_2.6.0.tar.xz/src/amf/nudm-build.c Changed

open5gs_2.5.8.tar.xz/src/amf/nudm-build.h -> open5gs_2.6.0.tar.xz/src/amf/nudm-build.h Changed

open5gs_2.5.8.tar.xz/src/amf/nudm-handler.c -> open5gs_2.6.0.tar.xz/src/amf/nudm-handler.c Changed

@@ -23,9 +23,9 @@
 #include "nas-path.h"
 
 int amf_nudm_sdm_handle_provisioned(
-        amf_ue_t *amf_ue, ogs_sbi_message_t *recvmsg)
+        amf_ue_t *amf_ue, int state, ogs_sbi_message_t *recvmsg)
 {
-    int i;
+    int i, r;
 
     ogs_assert(amf_ue);
     ogs_assert(recvmsg);
@@ -39,6 +39,8 @@
                 recvmsg->AccessAndMobilitySubscriptionData->subscribed_ue_ambr;
             OpenAPI_nssai_t *NSSAI =
                 recvmsg->AccessAndMobilitySubscriptionData->nssai;
+            OpenAPI_list_t *RatRestrictions =
+                recvmsg->AccessAndMobilitySubscriptionData->rat_restrictions;
 
             OpenAPI_lnode_t *node = NULL;
 
@@ -55,21 +57,18 @@
                         char *gpsi = NULL;
 
                         gpsi = ogs_id_get_type(node->data);
-                        ogs_assert(gpsi);
+                        if (gpsi) {
+                            if (strncmp(gpsi, OGS_ID_GPSI_TYPE_MSISDN,
+                                    strlen(OGS_ID_GPSI_TYPE_MSISDN)) == 0) {
+                                amf_ue->msisdnamf_ue->num_of_msisdn =
+                                    ogs_id_get_value(node->data);
+                                ogs_assert(amf_ue->
+                                        msisdnamf_ue->num_of_msisdn);
 
-                        if (strncmp(gpsi, OGS_ID_GPSI_TYPE_MSISDN,
-                                    strlen(OGS_ID_GPSI_TYPE_MSISDN)) != 0) {
-                            ogs_error("Unknown GPSI Type %s", gpsi);
-
-                        } else {
-                            amf_ue->msisdnamf_ue->num_of_msisdn =
-                                ogs_id_get_value(node->data);
-                            ogs_assert(amf_ue->msisdnamf_ue->num_of_msisdn);
-
-                            amf_ue->num_of_msisdn++;
+                                amf_ue->num_of_msisdn++;
+                            }
+                            ogs_free(gpsi);
                         }
-
-                        ogs_free(gpsi);
                     }
                 }
             }
@@ -132,6 +131,13 @@
                     }
                 }
             }
+
+            OpenAPI_list_clear(amf_ue->rat_restrictions);
+            if (RatRestrictions) {
+                OpenAPI_list_for_each(RatRestrictions, node) {
+                    OpenAPI_list_add(amf_ue->rat_restrictions, node->data);
+                }
+            }
         }
 
         if (amf_update_allowed_nssai(amf_ue) == false) {
@@ -139,11 +145,16 @@
             return OGS_ERROR;
         }
 
+        if (amf_ue_is_rat_restricted(amf_ue)) {
+            ogs_error("Registration rejected due to RAT restrictions");
+            return OGS_ERROR;
+        }
+
         ogs_assert(true ==
             amf_ue_sbi_discover_and_send(
                 OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
                 amf_nudm_sdm_build_get,
-                amf_ue, (char *)OGS_SBI_RESOURCE_NAME_SMF_SELECT_DATA));
+                amf_ue, state, (char *)OGS_SBI_RESOURCE_NAME_SMF_SELECT_DATA));
         break;
 
     CASE(OGS_SBI_RESOURCE_NAME_SMF_SELECT_DATA)
@@ -216,7 +227,8 @@
             amf_ue_sbi_discover_and_send(
                 OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
                 amf_nudm_sdm_build_get,
-                amf_ue, (char *)OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA));
+                amf_ue, state,
+                (char *)OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA));
         break;
 
     CASE(OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA)
@@ -227,14 +239,15 @@
             ogs_assert(true ==
                 amf_ue_sbi_discover_and_send(
                     OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL, NULL,
-                    amf_npcf_am_policy_control_build_create, amf_ue, NULL));
+                    amf_npcf_am_policy_control_build_create,
+                    amf_ue, state, NULL));
         }
         else {
             ogs_assert(true ==
                 amf_ue_sbi_discover_and_send(
                     OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL,
-                    amf_nudm_sdm_build_subscription, amf_ue,
-                    (char *)OGS_SBI_RESOURCE_NAME_AM_DATA));
+                    amf_nudm_sdm_build_subscription,
+                    amf_ue, state, (char *)OGS_SBI_RESOURCE_NAME_AM_DATA));
         }
         break;
 
@@ -246,9 +259,10 @@
 
         if (!recvmsg->http.location) {
             ogs_error("%s No http.location", amf_ue->supi);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_gmm_reject_from_sbi(
-                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+            r = nas_5gs_send_gmm_reject_from_sbi(
+                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return OGS_ERROR;
         }
 
@@ -259,9 +273,10 @@
         if (rv != OGS_OK) {
             ogs_error("%s Cannot parse http.location %s",
                 amf_ue->supi, recvmsg->http.location);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_gmm_reject_from_sbi(
-                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+            r = nas_5gs_send_gmm_reject_from_sbi(
+                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return OGS_ERROR;
         }
 
@@ -270,9 +285,10 @@
                 amf_ue->supi, recvmsg->http.location);
 
             ogs_sbi_header_free(&header);
-            ogs_assert(OGS_OK ==
-                nas_5gs_send_gmm_reject_from_sbi(
-                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR));
+            r = nas_5gs_send_gmm_reject_from_sbi(
+                    amf_ue, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return OGS_ERROR;
         }
 
@@ -286,7 +302,7 @@
         ogs_assert(true ==
             amf_ue_sbi_discover_and_send(
                 OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL, NULL,
-                amf_npcf_am_policy_control_build_create, amf_ue, NULL));
+                amf_npcf_am_policy_control_build_create, amf_ue, state, NULL));
         break;
 
     DEFAULT

open5gs_2.5.8.tar.xz/src/amf/nudm-handler.h -> open5gs_2.6.0.tar.xz/src/amf/nudm-handler.h Changed

open5gs_2.5.8.tar.xz/src/amf/sbi-path.c -> open5gs_2.6.0.tar.xz/src/amf/sbi-path.c Changed

@@ -90,8 +90,9 @@
         ogs_sbi_service_type_e service_type,
         ogs_sbi_discovery_option_t *discovery_option,
         ogs_sbi_request_t *(*build)(amf_ue_t *amf_ue, void *data),
-        amf_ue_t *amf_ue, void *data)
+        amf_ue_t *amf_ue, int state, void *data)
 {
+    int r;
     ogs_sbi_xact_t *xact = NULL;
 
     ogs_assert(service_type);
@@ -103,18 +104,22 @@
             (ogs_sbi_build_f)build, amf_ue, data);
     if (!xact) {
         ogs_error("amf_ue_sbi_discover_and_send() failed");
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return false;
     }
 
+    xact->state = state;
+
     if (ogs_sbi_discover_and_send(xact) != true) {
         ogs_error("amf_ue_sbi_discover_and_send() failed");
         ogs_sbi_xact_remove(xact);
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_gmm_reject_from_sbi(
-                amf_ue, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT));
+        r = nas_5gs_send_gmm_reject_from_sbi(
+                amf_ue, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return false;
     }
 
@@ -127,6 +132,7 @@
         ogs_sbi_request_t *(*build)(amf_sess_t *sess, void *data),
         amf_sess_t *sess, int state, void *data)
 {
+    int r;
     ogs_sbi_xact_t *xact = NULL;
 
     ogs_assert(service_type);
@@ -138,8 +144,10 @@
             (ogs_sbi_build_f)build, sess, data);
     if (!xact) {
         ogs_error("amf_sess_sbi_discover_and_send() failed");
-        ogs_assert(OGS_OK == nas_5gs_send_back_gsm_message(sess,
-            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME));
+        r = nas_5gs_send_back_gsm_message(sess,
+            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return false;
     }
 
@@ -148,8 +156,10 @@
     if (ogs_sbi_discover_and_send(xact) != true) {
         ogs_error("amf_sess_sbi_discover_and_send() failed");
         ogs_sbi_xact_remove(xact);
-        ogs_assert(OGS_OK == nas_5gs_send_back_gsm_message(sess,
-            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME));
+        r = nas_5gs_send_back_gsm_message(sess,
+            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return false;
     }
 
@@ -158,7 +168,7 @@
 static int client_discover_cb(
         int status, ogs_sbi_response_t *response, void *data)
 {
-    int rv;
+    int r, rv;
     ogs_sbi_message_t message;
 
     ogs_sbi_xact_t *xact = NULL;
@@ -214,24 +224,30 @@
     rv = ogs_sbi_parse_response(&message, response);
     if (rv != OGS_OK) {
         ogs_error("cannot parse HTTP response");
-        ogs_assert(OGS_OK == nas_5gs_send_back_gsm_message(sess,
-            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME));
+        r = nas_5gs_send_back_gsm_message(sess,
+            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         goto cleanup;
     }
 
     if (message.res_status != OGS_SBI_HTTP_STATUS_OK) {
         ogs_error("NF-Discover failed %d", message.res_status);
-        ogs_assert(OGS_OK == nas_5gs_send_back_gsm_message(sess,
-            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME));
+        r = nas_5gs_send_back_gsm_message(sess,
+            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         goto cleanup;
     }
 
     if (!message.SearchResult) {
         ogs_error("No SearchResult");
-        ogs_assert(OGS_OK == nas_5gs_send_back_gsm_message(sess,
-            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME));
+        r = nas_5gs_send_back_gsm_message(sess,
+            OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED, AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         goto cleanup;
     }
@@ -245,10 +261,11 @@
         ogs_error("%s:%d (NF discover) No %s",
                     amf_ue->supi, sess->psi,
                     ogs_sbi_service_type_to_name(service_type));
-        ogs_assert(OGS_OK ==
-            nas_5gs_send_back_gsm_message(sess,
+        r = nas_5gs_send_back_gsm_message(sess,
                 OGS_5GMM_CAUSE_PAYLOAD_WAS_NOT_FORWARDED,
-                AMF_NAS_BACKOFF_TIME));
+                AMF_NAS_BACKOFF_TIME);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         goto cleanup;
     }
@@ -292,11 +309,18 @@
 
     xact = ogs_sbi_xact_add(
             &sess->sbi, service_type, discovery_option, NULL, NULL, NULL);
-    ogs_expect_or_return_val(xact, false);
+    if (!xact) {
+        ogs_error("ogs_sbi_xact_add() failed");
+        return false;
+    }
 
     xact->request = amf_nnrf_disc_build_discover(
                 sess->nssf.nrf.id, xact->service_type, xact->discovery_option);
-    ogs_expect_or_return_val(xact->request, false);
+    if (!xact->request) {
+        ogs_error("amf_nnrf_disc_build_discover() failed");
+        ogs_sbi_xact_remove(xact);
+        return false;
+    }
 
     return ogs_sbi_client_send_request(
             client, client_discover_cb, xact->request, xact);
@@ -458,7 +482,10 @@
     ogs_assert(client);
 
     request = amf_nsmf_callback_build_n1_n2_failure_notify(sess, cause);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("amf_nsmf_callback_build_n1_n2_failure_notify() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);

open5gs_2.5.8.tar.xz/src/amf/sbi-path.h -> open5gs_2.6.0.tar.xz/src/amf/sbi-path.h Changed

@@ -36,13 +36,11 @@
 
 bool amf_sbi_send_request(
         ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact);
-bool amf_ue_sbi_discover_and_send(
-        ogs_sbi_service_type_e service_type,
-        ogs_sbi_discovery_option_t *discovery_option,
-        ogs_sbi_request_t *(*build)(amf_ue_t *amf_ue, void *data),
-        amf_ue_t *amf_ue, void *data);
 
 #define AMF_CREATE_SM_CONTEXT_NO_STATE              0
+
+#define AMF_NETWORK_INITIATED_DE_REGISTERED         1
+
 #define AMF_UPDATE_SM_CONTEXT_ACTIVATED             11
 #define AMF_UPDATE_SM_CONTEXT_SETUP_FAIL            12
 #define AMF_UPDATE_SM_CONTEXT_DEACTIVATED           13
@@ -64,6 +62,12 @@
 #define AMF_REMOVE_S1_CONTEXT_BY_LO_CONNREFUSED     51
 #define AMF_REMOVE_S1_CONTEXT_BY_RESET_ALL          52
 #define AMF_REMOVE_S1_CONTEXT_BY_RESET_PARTIAL      53
+
+bool amf_ue_sbi_discover_and_send(
+        ogs_sbi_service_type_e service_type,
+        ogs_sbi_discovery_option_t *discovery_option,
+        ogs_sbi_request_t *(*build)(amf_ue_t *amf_ue, void *data),
+        amf_ue_t *amf_ue, int state, void *data);
 bool amf_sess_sbi_discover_and_send(
         ogs_sbi_service_type_e service_type,
         ogs_sbi_discovery_option_t *discovery_option,

open5gs_2.5.8.tar.xz/src/amf/timer.c -> open5gs_2.6.0.tar.xz/src/amf/timer.c Changed

open5gs_2.5.8.tar.xz/src/amf/timer.h -> open5gs_2.6.0.tar.xz/src/amf/timer.h Changed

open5gs_2.5.8.tar.xz/src/ausf/ausf-sm.c -> open5gs_2.6.0.tar.xz/src/ausf/ausf-sm.c Changed

open5gs_2.5.8.tar.xz/src/ausf/context.c -> open5gs_2.6.0.tar.xz/src/ausf/context.c Changed

@@ -137,10 +137,6 @@
     ogs_assert(ausf_ue->suci);
     ogs_hash_set(self.suci_hash, ausf_ue->suci, strlen(ausf_ue->suci), ausf_ue);
 
-    ausf_ue->supi = ogs_supi_from_supi_or_suci(ausf_ue->suci);
-    ogs_assert(ausf_ue->supi);
-    ogs_hash_set(self.supi_hash, ausf_ue->supi, strlen(ausf_ue->supi), ausf_ue);
-
     memset(&e, 0, sizeof(e));
     e.ausf_ue = ausf_ue;
     ogs_fsm_init(&ausf_ue->sm, ausf_ue_state_initial, ausf_ue_state_final, &e);
@@ -172,9 +168,11 @@
     ogs_hash_set(self.suci_hash, ausf_ue->suci, strlen(ausf_ue->suci), NULL);
     ogs_free(ausf_ue->suci);
 
-    ogs_assert(ausf_ue->supi);
-    ogs_hash_set(self.supi_hash, ausf_ue->supi, strlen(ausf_ue->supi), NULL);
-    ogs_free(ausf_ue->supi);
+    if (ausf_ue->supi) {
+        ogs_hash_set(self.supi_hash,
+                ausf_ue->supi, strlen(ausf_ue->supi), NULL);
+        ogs_free(ausf_ue->supi);
+    }
 
     if (ausf_ue->auth_events_url)
         ogs_free(ausf_ue->auth_events_url);
@@ -224,3 +222,10 @@
 {
     return ogs_pool_cycle(&ausf_ue_pool, ausf_ue);
 }
+
+int get_ue_load()
+{
+    return (((ogs_pool_size(&ausf_ue_pool) -
+            ogs_pool_avail(&ausf_ue_pool)) * 100) /
+            ogs_pool_size(&ausf_ue_pool));
+}

open5gs_2.5.8.tar.xz/src/ausf/context.h -> open5gs_2.6.0.tar.xz/src/ausf/context.h Changed

open5gs_2.5.8.tar.xz/src/ausf/nausf-handler.c -> open5gs_2.6.0.tar.xz/src/ausf/nausf-handler.c Changed

@@ -36,7 +36,7 @@
         ogs_error("%s No AuthenticationInfo", ausf_ue->suci);
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                recvmsg, "%s No AuthenticationInfo", ausf_ue->suci));
+                recvmsg, "No AuthenticationInfo", ausf_ue->suci));
         return false;
     }
 
@@ -45,7 +45,7 @@
         ogs_error("%s No servingNetworkName", ausf_ue->suci);
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                recvmsg, "%s No servingNetworkName", ausf_ue->suci));
+                recvmsg, "No servingNetworkName", ausf_ue->suci));
         return false;
     }
 
@@ -79,7 +79,7 @@
         ogs_error("%s No ConfirmationData", ausf_ue->suci);
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                recvmsg, "%s No ConfirmationData", ausf_ue->suci));
+                recvmsg, "No ConfirmationData", ausf_ue->suci));
         return false;
     }
 
@@ -88,7 +88,7 @@
         ogs_error("%s No ConfirmationData.resStar", ausf_ue->suci);
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
-                recvmsg, "%s No ConfirmationData.resStar", ausf_ue->suci));
+                recvmsg, "No ConfirmationData.resStar", ausf_ue->suci));
         return false;
     }
 
@@ -111,4 +111,20 @@
             ausf_ue, stream, NULL));
 
     return true;
+}
+
+bool ausf_nausf_auth_handle_authenticate_delete(ausf_ue_t *ausf_ue,
+        ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
+{
+    ogs_assert(ausf_ue);
+    ogs_assert(stream);
+    ogs_assert(recvmsg);
+
+    ogs_assert(true ==
+        ausf_sbi_discover_and_send(
+            OGS_SBI_SERVICE_TYPE_NUDM_UEAU, NULL,
+            ausf_nudm_ueau_build_auth_removal_ind,
+            ausf_ue, stream, NULL));
+
+    return true;
 }

open5gs_2.5.8.tar.xz/src/ausf/nausf-handler.h -> open5gs_2.6.0.tar.xz/src/ausf/nausf-handler.h Changed

open5gs_2.5.8.tar.xz/src/ausf/nudm-build.c -> open5gs_2.6.0.tar.xz/src/ausf/nudm-build.c Changed

@@ -74,6 +74,7 @@
     OpenAPI_auth_event_t *AuthEvent = NULL;
 
     ogs_assert(ausf_ue);
+    ogs_assert(ausf_ue->supi);
 
     memset(&message, 0, sizeof(message));
     message.h.method = (char *)OGS_SBI_HTTP_METHOD_POST;
@@ -104,6 +105,60 @@
 
     message.AuthEvent = AuthEvent;
 
+    request = ogs_sbi_build_request(&message);
+    ogs_expect(request);
+
+end:
+
+    if (AuthEvent) {
+        if (AuthEvent->time_stamp)
+            ogs_free(AuthEvent->time_stamp);
+        ogs_free(AuthEvent);
+    }
+
+    return request;
+}
+
+ogs_sbi_request_t *ausf_nudm_ueau_build_auth_removal_ind(
+        ausf_ue_t *ausf_ue, void *data)
+{
+    ogs_sbi_message_t message;
+    ogs_sbi_request_t *request = NULL;
+
+    OpenAPI_auth_event_t *AuthEvent = NULL;
+
+    ogs_assert(ausf_ue);
+    ogs_assert(ausf_ue->supi);
+
+    memset(&message, 0, sizeof(message));
+    message.h.method = (char *)OGS_SBI_HTTP_METHOD_PUT;
+    message.h.service.name = (char *)OGS_SBI_SERVICE_NAME_NUDM_UEAU;
+    message.h.api.version = (char *)OGS_SBI_API_V1;
+    message.h.resource.component0 = ausf_ue->supi;
+    message.h.resource.component1 = (char *)OGS_SBI_RESOURCE_NAME_AUTH_EVENTS;
+
+    AuthEvent = ogs_calloc(1, sizeof(*AuthEvent));
+    if (!AuthEvent) {
+        ogs_error("No AuthEvent");
+        goto end;
+    }
+
+    AuthEvent->time_stamp = ogs_sbi_localtime_string(ogs_time_now());
+    if (!AuthEvent->time_stamp) {
+        ogs_error("No time_stamp");
+        goto end;
+    }
+
+    AuthEvent->nf_instance_id = NF_INSTANCE_ID(ogs_sbi_self()->nf_instance);
+    AuthEvent->success = true;
+    AuthEvent->auth_type = ausf_ue->auth_type;
+    AuthEvent->serving_network_name = ausf_ue->serving_network_name;
+
+    AuthEvent->is_auth_removal_ind = true;
+    AuthEvent->auth_removal_ind = true;
+
+    message.AuthEvent = AuthEvent;
+
     request = ogs_sbi_build_request(&message);
     ogs_expect(request);

open5gs_2.5.8.tar.xz/src/ausf/nudm-build.h -> open5gs_2.6.0.tar.xz/src/ausf/nudm-build.h Changed

open5gs_2.5.8.tar.xz/src/ausf/nudm-handler.c -> open5gs_2.6.0.tar.xz/src/ausf/nudm-handler.c Changed

@@ -62,7 +62,7 @@
         ogs_error("%s No AuthenticationInfoResult", ausf_ue->suci);
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream,
-                OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
                 recvmsg, "No AuthenticationInfoResult", ausf_ue->suci));
         return false;
     }
@@ -85,7 +85,7 @@
         ogs_error("%s No AuthenticationVector", ausf_ue->suci);
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream,
-                OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
                 recvmsg, "No AuthenticationVector", ausf_ue->suci));
         return false;
     }
@@ -104,7 +104,7 @@
         ogs_error("%s No AuthenticationVector.rand", ausf_ue->suci);
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream,
-                OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
                 recvmsg, "No AuthenticationVector.rand", ausf_ue->suci));
         return false;
     }
@@ -114,7 +114,7 @@
                 ausf_ue->suci);
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream,
-                OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
                 recvmsg, "No AuthenticationVector.xresStar", ausf_ue->suci));
         return false;
     }
@@ -123,7 +123,7 @@
         ogs_error("%s No AuthenticationVector.autn", ausf_ue->suci);
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream,
-                OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
                 recvmsg, "No AuthenticationVector.autn", ausf_ue->suci));
         return false;
     }
@@ -132,11 +132,31 @@
         ogs_error("%s No AuthenticationVector.kausf", ausf_ue->suci);
         ogs_assert(true ==
             ogs_sbi_server_send_error(stream,
-                OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
                 recvmsg, "No AuthenticationVector.kausf", ausf_ue->suci));
         return false;
     }
 
+    if (!AuthenticationInfoResult->supi) {
+        ogs_error("%s No AuthenticationVector.supi", ausf_ue->suci);
+        ogs_assert(true ==
+            ogs_sbi_server_send_error(stream,
+                OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                recvmsg, "No AuthenticationVector.supi", ausf_ue->suci));
+        return false;
+    }
+
+    /* SUPI */
+    if (ausf_ue->supi) {
+        ogs_hash_set(ausf_self()->supi_hash,
+                ausf_ue->supi, strlen(ausf_ue->supi), NULL);
+        ogs_free(ausf_ue->supi);
+    }
+    ausf_ue->supi = ogs_strdup(AuthenticationInfoResult->supi);
+    ogs_assert(ausf_ue->supi);
+    ogs_hash_set(ausf_self()->supi_hash,
+            ausf_ue->supi, strlen(ausf_ue->supi), ausf_ue);
+
     ausf_ue->auth_type = AuthenticationInfoResult->auth_type;
 
     ogs_ascii_to_hex(
@@ -213,6 +233,25 @@
 
     return true;
 }
+
+bool ausf_nudm_ueau_handle_auth_removal_ind(ausf_ue_t *ausf_ue,
+        ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
+{
+    ogs_sbi_message_t sendmsg;
+    ogs_sbi_response_t *response = NULL;
+
+    ogs_assert(ausf_ue);
+    ogs_assert(stream);
+
+    ausf_ue_remove(ausf_ue);
+
+    memset(&sendmsg, 0, sizeof(sendmsg));
+    response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT);
+    ogs_assert(response);
+    ogs_assert(true == ogs_sbi_server_send_response(stream, response));
+
+    return true;
+}
 
 bool ausf_nudm_ueau_handle_result_confirmation_inform(ausf_ue_t *ausf_ue,
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)

open5gs_2.5.8.tar.xz/src/ausf/nudm-handler.h -> open5gs_2.6.0.tar.xz/src/ausf/nudm-handler.h Changed

open5gs_2.5.8.tar.xz/src/ausf/ue-sm.c -> open5gs_2.6.0.tar.xz/src/ausf/ue-sm.c Changed

@@ -90,6 +90,16 @@
             }
             break;
         CASE(OGS_SBI_HTTP_METHOD_PUT)
+            if (!ausf_ue->supi) {
+                ogs_error("%s No SUPI", ausf_ue->suci);
+                ogs_assert(true ==
+                    ogs_sbi_server_send_error(stream,
+                        OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                        message, "%s No SUPI", ausf_ue->suci));
+                OGS_FSM_TRAN(s, ausf_ue_state_exception);
+                break;
+            }
+
             handled = ausf_nausf_auth_handle_authenticate_confirmation(
                     ausf_ue, stream, message);
             if (!handled) {
@@ -98,6 +108,25 @@
                 OGS_FSM_TRAN(s, ausf_ue_state_exception);
             }
             break;
+        CASE(OGS_SBI_HTTP_METHOD_DELETE)
+            if (!ausf_ue->supi) {
+                ogs_error("%s No SUPI", ausf_ue->suci);
+                ogs_assert(true ==
+                    ogs_sbi_server_send_error(stream,
+                        OGS_SBI_HTTP_STATUS_BAD_REQUEST,
+                        message, "%s No SUPI", ausf_ue->suci));
+                OGS_FSM_TRAN(s, ausf_ue_state_exception);
+                break;
+            }
+
+            handled = ausf_nausf_auth_handle_authenticate_delete(
+                    ausf_ue, stream, message);
+            if (!handled) {
+                ogs_error("%s Cannot handle SBI message",
+                        ausf_ue->suci);
+                OGS_FSM_TRAN(s, ausf_ue_state_exception);
+            }
+            break;
         DEFAULT
             ogs_error("%s Invalid HTTP method %s",
                     ausf_ue->suci, message->h.method);
@@ -136,20 +165,37 @@
                 break;
             }
 
-            SWITCH(message->h.resource.component1)
-            CASE(OGS_SBI_RESOURCE_NAME_SECURITY_INFORMATION)
-                ausf_nudm_ueau_handle_get(ausf_ue, stream, message);
-                break;
-
-            CASE(OGS_SBI_RESOURCE_NAME_AUTH_EVENTS)
-                ausf_nudm_ueau_handle_result_confirmation_inform(
-                        ausf_ue, stream, message);
+            SWITCH(message->h.method)
+            CASE(OGS_SBI_HTTP_METHOD_PUT)
+                SWITCH(message->h.resource.component1)
+                CASE(OGS_SBI_RESOURCE_NAME_AUTH_EVENTS)
+                    ausf_nudm_ueau_handle_auth_removal_ind(
+                            ausf_ue, stream, message);
+                    break;
+
+                DEFAULT
+                    ogs_error("%s Invalid HTTP method %s",
+                            ausf_ue->suci, message->h.method);
+                    ogs_assert_if_reached();
+                END
                 break;
-
             DEFAULT
-                ogs_error("%s Invalid HTTP method %s",
-                        ausf_ue->suci, message->h.method);
-                ogs_assert_if_reached();
+                SWITCH(message->h.resource.component1)
+                CASE(OGS_SBI_RESOURCE_NAME_SECURITY_INFORMATION)
+                    ausf_nudm_ueau_handle_get(ausf_ue, stream, message);
+                    break;
+
+                CASE(OGS_SBI_RESOURCE_NAME_AUTH_EVENTS)
+                    ausf_nudm_ueau_handle_result_confirmation_inform(
+                            ausf_ue, stream, message);
+                    break;
+
+                DEFAULT
+                    ogs_error("%s Invalid HTTP method %s",
+                            ausf_ue->suci, message->h.method);
+                    ogs_assert_if_reached();
+                END
+                break;
             END
             break;

open5gs_2.5.8.tar.xz/src/bsf/bsf-sm.c -> open5gs_2.6.0.tar.xz/src/bsf/bsf-sm.c Changed

open5gs_2.5.8.tar.xz/src/bsf/context.c -> open5gs_2.6.0.tar.xz/src/bsf/context.c Changed

@@ -188,6 +188,9 @@
         ogs_free(sess->ipv6prefix_string);
     }
 
+    OpenAPI_clear_and_free_string_list(sess->ipv4_frame_route_list);
+    OpenAPI_clear_and_free_string_list(sess->ipv6_frame_route_list);
+
     ogs_assert(sess->dnn);
     ogs_free(sess->dnn);
 
@@ -226,10 +229,16 @@
         ogs_free(sess->ipv4addr_string);
     }
     rv = ogs_ipv4_from_string(&sess->ipv4addr, ipv4addr_string);
-    ogs_expect_or_return_val(rv == OGS_OK, false);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_ipv4_from_string() failed");
+        return false;
+    }
 
     sess->ipv4addr_string = ogs_strdup(ipv4addr_string);
-    ogs_expect_or_return_val(sess->ipv4addr_string, false);
+    if (!sess->ipv4addr_string) {
+        ogs_error("ogs_strdup() failed");
+        return false;
+    }
 
     ogs_hash_set(self.ipv4addr_hash,
             &sess->ipv4addr, sizeof(sess->ipv4addr), sess);
@@ -251,12 +260,18 @@
     }
     rv = ogs_ipv6prefix_from_string(
             sess->ipv6prefix.addr6, &sess->ipv6prefix.len, ipv6prefix_string);
-    ogs_expect_or_return_val(rv == OGS_OK, false);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_ipv6prefix_from_string() failed");
+        return false;
+    }
 
     ogs_assert(sess->ipv6prefix.len == OGS_IPV6_128_PREFIX_LEN);
 
     sess->ipv6prefix_string = ogs_strdup(ipv6prefix_string);
-    ogs_expect_or_return_val(sess->ipv6prefix_string, false);
+    if (!sess->ipv6prefix_string) {
+        ogs_error("ogs_strdup() failed");
+        return false;
+    }
 
     ogs_hash_set(self.ipv6prefix_hash,
             &sess->ipv6prefix, (sess->ipv6prefix.len >> 3) + 1, sess);
@@ -298,7 +313,10 @@
     ogs_assert(ipv4addr_string);
 
     rv = ogs_ipv4_from_string(&ipv4addr, ipv4addr_string);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_ipv4_from_string() failed");
+        return NULL;
+    }
 
     return ogs_hash_get(self.ipv4addr_hash, &ipv4addr, sizeof(ipv4addr));
 }
@@ -322,3 +340,10 @@
     return ogs_hash_get(self.ipv6prefix_hash,
             &ipv6prefix, (ipv6prefix.len >> 3) + 1);
 }
+
+int get_sess_load()
+{
+    return (((ogs_pool_size(&bsf_sess_pool) -
+            ogs_pool_avail(&bsf_sess_pool)) * 100) /
+            ogs_pool_size(&bsf_sess_pool));
+}

open5gs_2.5.8.tar.xz/src/bsf/context.h -> open5gs_2.6.0.tar.xz/src/bsf/context.h Changed

open5gs_2.5.8.tar.xz/src/bsf/nbsf-handler.c -> open5gs_2.6.0.tar.xz/src/bsf/nbsf-handler.c Changed

@@ -103,6 +103,31 @@
                 ogs_assert(sess->pcf_fqdn);
             }
 
+
+            if (RecvPcfBinding->ipv4_frame_route_list) {
+                OpenAPI_lnode_t *node = NULL;
+
+                OpenAPI_clear_and_free_string_list(sess->ipv4_frame_route_list);
+                sess->ipv4_frame_route_list = OpenAPI_list_create();
+                OpenAPI_list_for_each(RecvPcfBinding->ipv4_frame_route_list, node) {
+                    if (!node->data)
+                        continue;
+                    OpenAPI_list_add(sess->ipv4_frame_route_list, ogs_strdup(node->data));
+                }
+            }
+
+            if (RecvPcfBinding->ipv6_frame_route_list) {
+                OpenAPI_lnode_t *node = NULL;
+
+                OpenAPI_clear_and_free_string_list(sess->ipv6_frame_route_list);
+                sess->ipv6_frame_route_list = OpenAPI_list_create();
+                OpenAPI_list_for_each(RecvPcfBinding->ipv6_frame_route_list, node) {
+                    if (!node->data)
+                        continue;
+                    OpenAPI_list_add(sess->ipv6_frame_route_list, ogs_strdup(node->data));
+                }
+            }
+
             sess->s_nssai.sst = RecvPcfBinding->snssai->sst;
             sess->s_nssai.sd =
                 ogs_s_nssai_sd_from_string(RecvPcfBinding->snssai->sd);
@@ -230,7 +255,7 @@
                     ogs_assert(sess->pcf_ipi.addr || sess->pcf_ipi.addr6);
 
                     PcfIpEndPoint = ogs_calloc(1, sizeof(*PcfIpEndPoint));
-                    ogs_expect_or_return_val(PcfIpEndPoint, NULL);
+                    ogs_assert(PcfIpEndPoint);
                     PcfIpEndPoint->ipv4_address = sess->pcf_ipi.addr;
                     PcfIpEndPoint->ipv6_address = sess->pcf_ipi.addr6;

open5gs_2.5.8.tar.xz/src/hss/hss-s6a-path.c -> open5gs_2.6.0.tar.xz/src/hss/hss-s6a-path.c Changed

@@ -1285,13 +1285,28 @@
 
     /* Search the session, retrieve its data */
     ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(new == 0);
+    if (ret != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
+    if (new != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
 
     ret = fd_sess_state_retrieve(hss_s6a_reg, session, &sess_data);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(sess_data);
-    ogs_expect_or_return((void *)sess_data == data);
+    if (ret != 0) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if (!sess_data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if ((void *)sess_data != data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
 
     ret = fd_msg_free(*msg);
     ogs_assert(ret == 0);
@@ -1463,13 +1478,28 @@
 
     /* Search the session, retrieve its data */
     ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(new == 0);
+    if (ret != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
+    if (new != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
 
     ret = fd_sess_state_retrieve(hss_s6a_reg, session, &sess_data);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(sess_data);
-    ogs_expect_or_return((void *)sess_data == data);
+    if (ret != 0) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if (!sess_data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if ((void *)sess_data != data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
 
     ret = fd_msg_free(*msg);
     ogs_assert(ret == 0);

open5gs_2.5.8.tar.xz/src/meson.build -> open5gs_2.6.0.tar.xz/src/meson.build Changed

open5gs_2.5.8.tar.xz/src/mme/emm-build.c -> open5gs_2.6.0.tar.xz/src/mme/emm-build.c Changed

@@ -33,7 +33,9 @@
     ogs_nas_eps_attach_result_t *eps_attach_result = 
         &attach_accept->eps_attach_result;
     ogs_nas_gprs_timer_t *t3412_value = &attach_accept->t3412_value;
-    int served_tai_index = 0;
+    ogs_nas_gprs_timer_t *t3402_value = &attach_accept->t3402_value;
+    ogs_nas_gprs_timer_t *t3423_value = &attach_accept->t3423_value;
+    int rv, served_tai_index = 0;
     ogs_nas_eps_mobile_identity_t *nas_guti = &attach_accept->guti;
     ogs_nas_eps_network_feature_support_t *eps_network_feature_support =
         &attach_accept->eps_network_feature_support;
@@ -137,9 +139,15 @@
     }
 
     /* Set T3412 */
-    t3412_value->unit = OGS_NAS_GRPS_TIMER_UNIT_MULTIPLES_OF_DECI_HH;
+    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);
+    }
+
     ogs_debug("    TAIPLMN_ID:%06x,TAC:%d",
             ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id),
             mme_ue->tai.tac);
@@ -174,19 +182,23 @@
         nas_guti->guti.m_tmsi = mme_ue->next.guti.m_tmsi;
     }
 
-#if 0 /* Need not to include T3402 */
     /* Set T3402 */
-    attach_accept->presencemask |= OGS_NAS_EPS_ATTACH_ACCEPT_T3402_VALUE_PRESENT;
-    attach_accept->t3402_value.unit = OGS_NAS_GRPS_TIMER_UNIT_MULTIPLES_OF_1_MM;
-    attach_accept->t3402_value.value = 12;
-#endif
+    if (mme_self()->time.t3402.value) {
+        rv = ogs_nas_gprs_timer_from_sec(
+                t3402_value, mme_self()->time.t3402.value);
+        ogs_assert(rv == OGS_OK);
+        attach_accept->presencemask |=
+            OGS_NAS_EPS_ATTACH_ACCEPT_T3402_VALUE_PRESENT;
+    }
 
     /* Set T3423 */
-    attach_accept->presencemask |=
-        OGS_NAS_EPS_ATTACH_ACCEPT_T3423_VALUE_PRESENT;
-    attach_accept->t3423_value.unit =
-        OGS_NAS_GRPS_TIMER_UNIT_MULTIPLES_OF_DECI_HH;
-    attach_accept->t3423_value.value = 9;
+    if (mme_self()->time.t3423.value) {
+        rv = ogs_nas_gprs_timer_from_sec(
+                t3423_value, mme_self()->time.t3423.value);
+        ogs_assert(rv == OGS_OK);
+        attach_accept->presencemask |=
+            OGS_NAS_EPS_ATTACH_ACCEPT_T3423_VALUE_PRESENT;
+    }
 
     attach_accept->presencemask |= 
         OGS_NAS_EPS_ATTACH_ACCEPT_EPS_NETWORK_FEATURE_SUPPORT_PRESENT;
@@ -480,7 +492,10 @@
     ogs_nas_eps_tracking_area_update_accept_t *tau_accept = 
         &message.emm.tracking_area_update_accept;
     ogs_nas_eps_mobile_identity_t *nas_guti = &tau_accept->guti;
-    int served_tai_index = 0;
+    ogs_nas_gprs_timer_t *t3412_value = &tau_accept->t3412_value;
+    ogs_nas_gprs_timer_t *t3402_value = &tau_accept->t3402_value;
+    ogs_nas_gprs_timer_t *t3423_value = &tau_accept->t3423_value;
+    int rv, served_tai_index = 0;
 
     mme_sess_t *sess = NULL;
 
@@ -505,11 +520,13 @@
             OGS_NAS_EPS_UPDATE_RESULT_TA_UPDATED;
     }
 
-    /* Set T3412 */
-    tau_accept->presencemask |=
-        OGS_NAS_EPS_TRACKING_AREA_UPDATE_ACCEPT_T3412_VALUE_PRESENT ;
-    tau_accept->t3412_value.unit = OGS_NAS_GRPS_TIMER_UNIT_MULTIPLES_OF_DECI_HH;
-    tau_accept->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);
+        tau_accept->presencemask |=
+            OGS_NAS_EPS_TRACKING_AREA_UPDATE_ACCEPT_T3412_VALUE_PRESENT ;
+    }
 
     if (mme_ue->next.m_tmsi) {
         tau_accept->presencemask |=
@@ -575,19 +592,23 @@
         sess = mme_sess_next(sess);
     }
 
-#if 0 /* Need not to include T3402 */
     /* Set T3402 */
-    tau_accept->presencemask |=
-        OGS_NAS_EPS_TRACKING_AREA_UPDATE_ACCEPT_T3402_VALUE_PRESENT;
-    tau_accept->t3402_value.unit = OGS_NAS_GRPS_TIMER_UNIT_MULTIPLES_OF_1_MM;
-    tau_accept->t3402_value.value = 12;
-#endif
+    if (mme_self()->time.t3402.value) {
+        rv = ogs_nas_gprs_timer_from_sec(
+                t3402_value, mme_self()->time.t3402.value);
+        ogs_assert(rv == OGS_OK);
+        tau_accept->presencemask |=
+            OGS_NAS_EPS_TRACKING_AREA_UPDATE_ACCEPT_T3402_VALUE_PRESENT;
+    }
 
     /* Set T3423 */
-    tau_accept->presencemask |=
-        OGS_NAS_EPS_TRACKING_AREA_UPDATE_ACCEPT_T3423_VALUE_PRESENT;
-    tau_accept->t3423_value.unit = OGS_NAS_GRPS_TIMER_UNIT_MULTIPLES_OF_DECI_HH;
-    tau_accept->t3423_value.value = 9;
+    if (mme_self()->time.t3423.value) {
+        rv = ogs_nas_gprs_timer_from_sec(
+                t3423_value, mme_self()->time.t3423.value);
+        ogs_assert(rv == OGS_OK);
+        tau_accept->presencemask |=
+            OGS_NAS_EPS_TRACKING_AREA_UPDATE_ACCEPT_T3423_VALUE_PRESENT;
+    }
 
     /* Set EPS network feature support */
     tau_accept->presencemask |=

open5gs_2.5.8.tar.xz/src/mme/emm-handler.c -> open5gs_2.6.0.tar.xz/src/mme/emm-handler.c Changed

@@ -35,6 +35,7 @@
 int emm_handle_attach_request(mme_ue_t *mme_ue,
         ogs_nas_eps_attach_request_t *attach_request, ogs_pkbuf_t *pkbuf)
 {
+    int r;
     int served_tai_index = 0;
 
     ogs_nas_eps_mobile_identity_guti_t *eps_mobile_identity_guti = NULL;
@@ -129,10 +130,11 @@
         /* Send Attach Reject */
         ogs_warn("Cannot find Served TAIPLMN_ID:%06x,TAC:%d",
             ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac);
-        ogs_assert(OGS_OK ==
-            nas_eps_send_attach_reject(mme_ue,
+        r = nas_eps_send_attach_reject(mme_ue,
                 OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED,
-                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
     ogs_debug("    SERVED_TAI_INDEX%d", served_tai_index);
@@ -172,10 +174,11 @@
             "but Integrity0x%x cannot be bypassed with EIA0",
             mme_selected_enc_algorithm(mme_ue), 
             mme_selected_int_algorithm(mme_ue));
-        ogs_assert(OGS_OK ==
-            nas_eps_send_attach_reject(mme_ue,
+        r = nas_eps_send_attach_reject(mme_ue,
                 OGS_NAS_EMM_CAUSE_UE_SECURITY_CAPABILITIES_MISMATCH,
-                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -222,7 +225,7 @@
 int emm_handle_attach_complete(
     mme_ue_t *mme_ue, ogs_nas_eps_attach_complete_t *attach_complete)
 {
-    int rv;
+    int r, rv;
     ogs_pkbuf_t *emmbuf = NULL;
 
     ogs_nas_eps_message_t message;
@@ -315,15 +318,19 @@
     network_daylight_saving_time->length = 1;
 
     emmbuf = nas_eps_security_encode(mme_ue, &message);
-    ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+    if (!emmbuf) {
+        ogs_error("nas_eps_security_encode() failed");
+        return OGS_ERROR;
+    }
 
-    rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    r = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
     ogs_debug("EMM information");
     ogs_debug("    IMSI%s", mme_ue->imsi_bcd);
 
-    return rv;
+    return r;
 }
 
 int emm_handle_identity_response(
@@ -487,6 +494,7 @@
 int emm_handle_tau_request(mme_ue_t *mme_ue,
     ogs_nas_eps_tracking_area_update_request_t *tau_request, ogs_pkbuf_t *pkbuf)
 {
+    int r;
     int served_tai_index = 0;
 
     ogs_nas_eps_mobile_identity_guti_t *eps_mobile_identity_guti = NULL;
@@ -560,9 +568,10 @@
         /* Send TAU reject */
         ogs_warn("Cannot find Served TAIPLMN_ID:%06x,TAC:%d",
             ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac);
-        ogs_assert(OGS_OK ==
-            nas_eps_send_tau_reject(
-                mme_ue, OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED));
+        r = nas_eps_send_tau_reject(
+                mme_ue, OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
     ogs_debug("    SERVED_TAI_INDEX%d", served_tai_index);
@@ -625,6 +634,7 @@
 int emm_handle_extended_service_request(mme_ue_t *mme_ue,
         ogs_nas_eps_extended_service_request_t *extended_service_request)
 {
+    int r;
     int served_tai_index = 0;
 
     ogs_nas_service_type_t *service_type =
@@ -678,9 +688,10 @@
         /* Send TAU reject */
         ogs_warn("Cannot find Served TAIPLMN_ID:%06x,TAC:%d",
             ogs_plmn_id_hexdump(&mme_ue->tai.plmn_id), mme_ue->tai.tac);
-        ogs_assert(OGS_OK ==
-            nas_eps_send_tau_reject(
-                mme_ue, OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED));
+        r = nas_eps_send_tau_reject(
+                mme_ue, OGS_NAS_EMM_CAUSE_TRACKING_AREA_NOT_ALLOWED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
     ogs_debug("    SERVED_TAI_INDEX%d", served_tai_index);

open5gs_2.5.8.tar.xz/src/mme/emm-sm.c -> open5gs_2.6.0.tar.xz/src/mme/emm-sm.c Changed

@@ -56,11 +56,13 @@
 
 void emm_state_de_registered(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r;
     mme_ue_t *mme_ue = NULL;
 
     ogs_assert(e);
 
+    mme_sm_debug(e);
+
     mme_ue = e->mme_ue;
     ogs_assert(mme_ue);
 
@@ -85,14 +87,10 @@
                         "Stop retransmission");
                 OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
             } else {
-                ogs_assert(mme_ue->t3470.pkbuf);
-                rv = nas_eps_send_identity_request(mme_ue);
-                if (rv == OGS_OK) {
-                    mme_ue->t3470.retry_count++;
-                } else {
-                    ogs_error("nas_eps_send_identity_request() failed");
-                    OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
-                }
+                mme_ue->t3470.retry_count++;
+                r = nas_eps_send_identity_request(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -109,11 +107,13 @@
 
 void emm_state_registered(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r;
     mme_ue_t *mme_ue = NULL;
 
     ogs_assert(e);
 
+    mme_sm_debug(e);
+
     mme_ue = e->mme_ue;
     ogs_assert(mme_ue);
 
@@ -146,7 +146,9 @@
                  * We don't have to set CNDomain.
                  * So, we just set CNDomain to 0
                  */
-                ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, 0));
+                r = s1ap_send_paging(mme_ue, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -157,14 +159,10 @@
                         "Stop retransmission");
                 OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
             } else {
-                ogs_assert(mme_ue->t3470.pkbuf);
-                rv = nas_eps_send_identity_request(mme_ue);
-                if (rv == OGS_OK) {
-                    mme_ue->t3470.retry_count++;
-                } else {
-                    ogs_error("nas_eps_send_identity_request() failed");
-                    OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
-                }
+                mme_ue->t3470.retry_count++;
+                r = nas_eps_send_identity_request(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -175,17 +173,44 @@
                         "Stop retransmission");
                 OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
             } else {
-                ogs_assert(mme_ue->t3422.pkbuf);
-                rv = nas_eps_send_detach_request(mme_ue);
-                if (rv == OGS_OK) {
-                    mme_ue->t3422.retry_count++;
-                } else {
-                    ogs_error("nas_eps_send_detach_request() failed");
-                    OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
-                }
+                mme_ue->t3422.retry_count++;
+                r = nas_eps_send_detach_request(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
+        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.
+             */
+            ogs_debug("%s Starting Implicit Detach timer",
+                mme_ue->imsi_bcd);
+            ogs_timer_start(mme_ue->t_implicit_detach.timer,
+                ogs_time_from_sec(mme_self()->time.t3412.value + 240));
+            break;
+
+        case MME_TIMER_IMPLICIT_DETACH:
+            ogs_info("%s Implicit Detach timer expired, detaching UE",
+                mme_ue->imsi_bcd);
+            CLEAR_MME_UE_TIMER(mme_ue->t_implicit_detach);
+            /* TS 24.301 5.3.5
+             * If the implicit detach timer expires before the UE contacts
+             * the network, the network shall implicitly detach the UE.
+             */
+            mme_ue->detach_type = MME_DETACH_TYPE_MME_IMPLICIT;
+            if (MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
+                ogs_assert(OGS_OK == sgsap_send_detach_indication(mme_ue));
+            } else {
+                mme_send_delete_session_or_detach(mme_ue);
+            }
+
+            OGS_FSM_TRAN(s, &emm_state_de_registered);
+            break;
+
         default:
             ogs_error("Unknown timer%s:%d",
                     mme_timer_get_name(e->timer_id), e->timer_id);
@@ -199,15 +224,17 @@
 
 static void common_register_state(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r, rv;
 
     mme_ue_t *mme_ue = NULL;
     enb_ue_t *enb_ue = NULL;
     ogs_nas_eps_message_t *message = NULL;
     ogs_nas_security_header_type_t h;
-    
+
     ogs_assert(e);
-        
+
+    mme_sm_debug(e);
+
     mme_ue = e->mme_ue;
     ogs_assert(mme_ue);
 
@@ -234,42 +261,47 @@
 
             if (!MME_UE_HAVE_IMSI(mme_ue)) {
                 ogs_info("Service request : Unknown UE");
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_service_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                r = nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
 
             if (!SECURITY_CONTEXT_IS_VALID(mme_ue)) {
                 ogs_warn("No Security Context : IMSI%s", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_service_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                r = nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
 
             if (!SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
                 ogs_warn("No Session Context : IMSI%s", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_service_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                r = nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
 
             if (!ACTIVE_EPS_BEARERS_IS_AVAIABLE(mme_ue)) {
                 ogs_warn("No active EPS bearers : IMSI%s", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_service_reject(mme_ue,
-                        OGS_NAS_EMM_CAUSE_NO_EPS_BEARER_CONTEXT_ACTIVATED));
+                r = nas_eps_send_service_reject(mme_ue,
+                        OGS_NAS_EMM_CAUSE_NO_EPS_BEARER_CONTEXT_ACTIVATED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
 
-            ogs_assert(OGS_OK ==
-                s1ap_send_initial_context_setup_request(mme_ue));
+            r = s1ap_send_initial_context_setup_request(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             OGS_FSM_TRAN(s, &emm_state_registered);
             break;
         }
@@ -314,8 +346,9 @@
 
             if (!MME_UE_HAVE_IMSI(mme_ue)) {
                 CLEAR_MME_UE_TIMER(mme_ue->t3470);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_identity_request(mme_ue));
+                r = nas_eps_send_identity_request(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 break;
             }
 
@@ -328,10 +361,11 @@
                             &mme_ue->pdn_connectivity_request);
                     if (rv != OGS_OK) {
                         ogs_error("nas_eps_send_emm_to_esm() failed");
-                        ogs_assert(OGS_OK ==
-                            nas_eps_send_attach_reject(mme_ue,
+                        r = nas_eps_send_attach_reject(mme_ue,
                                 OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
                         OGS_FSM_TRAN(s, &emm_state_exception);
                         break;
                     }
@@ -360,27 +394,30 @@
 
             if (!MME_UE_HAVE_IMSI(mme_ue)) {
                 ogs_info("TAU request : Unknown UE");
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_tau_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                r = nas_eps_send_tau_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
 
             if (!SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
                 ogs_warn("No PDN Connection : UE%s", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_tau_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                r = nas_eps_send_tau_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, emm_state_exception);
                 break;
             }
 
             if (!ACTIVE_EPS_BEARERS_IS_AVAIABLE(mme_ue)) {
                 ogs_warn("No active EPS bearers : IMSI%s", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_tau_reject(mme_ue,
-                        OGS_NAS_EMM_CAUSE_NO_EPS_BEARER_CONTEXT_ACTIVATED));
+                r = nas_eps_send_tau_reject(mme_ue,
+                        OGS_NAS_EMM_CAUSE_NO_EPS_BEARER_CONTEXT_ACTIVATED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
@@ -459,20 +496,23 @@
             if (e->s1ap_code == S1AP_ProcedureCode_id_initialUEMessage) {
                 ogs_debug("    Iniital UE Message");
                 if (mme_ue->nas_eps.update.active_flag) {
-                    ogs_assert(OGS_OK ==
-                        nas_eps_send_tau_accept(mme_ue,
-                            S1AP_ProcedureCode_id_InitialContextSetup));
+                    r = nas_eps_send_tau_accept(mme_ue,
+                            S1AP_ProcedureCode_id_InitialContextSetup);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 } else {
-                    ogs_assert(OGS_OK ==
-                        nas_eps_send_tau_accept(mme_ue,
-                            S1AP_ProcedureCode_id_downlinkNASTransport));
+                    r = nas_eps_send_tau_accept(mme_ue,
+                            S1AP_ProcedureCode_id_downlinkNASTransport);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
             } else if (e->s1ap_code ==
                     S1AP_ProcedureCode_id_uplinkNASTransport) {
                 ogs_debug("    Uplink NAS Transport");
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_tau_accept(mme_ue,
-                        S1AP_ProcedureCode_id_downlinkNASTransport));
+                r = nas_eps_send_tau_accept(mme_ue,
+                        S1AP_ProcedureCode_id_downlinkNASTransport);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else {
                 ogs_fatal("Invalid Procedure Code%d", (int)e->s1ap_code);
             }
@@ -501,27 +541,30 @@
 
             if (!MME_UE_HAVE_IMSI(mme_ue)) {
                 ogs_warn("Extended Service request : Unknown UE");
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_service_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                r = nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
 
             if (!SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
                 ogs_warn("No PDN Connection : UE%s", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_service_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                r = nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, emm_state_exception);
                 break;
             }
 
             if (!SECURITY_CONTEXT_IS_VALID(mme_ue)) {
                 ogs_warn("No Security Context : IMSI%s", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_service_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                r = nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &emm_state_exception);
                 break;
             }
@@ -531,10 +574,10 @@
 
                 if (!MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
                     ogs_warn("No P-TMSI : UE%s", mme_ue->imsi_bcd);
-                    ogs_assert(OGS_OK ==
-                        nas_eps_send_service_reject(mme_ue,
-                        OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)
-                    );
+                    r = nas_eps_send_service_reject(mme_ue,
+                        OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     mme_send_release_access_bearer_or_ue_context_release(
                             enb_ue);
                     break;
@@ -558,16 +601,17 @@
                 } else {
                     ogs_warn(" Unknown CSFB Service Type%d",
                             mme_ue->nas_eps.service.value);
-                    ogs_assert(OGS_OK ==
-                        nas_eps_send_service_reject(mme_ue,
-                        OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)
-                    );
+                    r = nas_eps_send_service_reject(mme_ue,
+                        OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     OGS_FSM_TRAN(s, &emm_state_exception);
                     break;
                 }
 
-                ogs_assert(OGS_OK ==
-                    s1ap_send_initial_context_setup_request(mme_ue));
+                r = s1ap_send_initial_context_setup_request(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
             } else if (e->s1ap_code ==
                     S1AP_ProcedureCode_id_uplinkNASTransport) {
@@ -575,10 +619,10 @@
 
                 if (!MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
                     ogs_warn("No P-TMSI : UE%s", mme_ue->imsi_bcd);
-                    ogs_assert(OGS_OK ==
-                        nas_eps_send_service_reject(mme_ue,
-                        OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)
-                    );
+                    r = nas_eps_send_service_reject(mme_ue,
+                        OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     break;
                 }
 
@@ -600,16 +644,17 @@
                 } else {
                     ogs_warn(" Unknown CSFB Service Type%d",
                             mme_ue->nas_eps.service.value);
-                    ogs_assert(OGS_OK ==
-                        nas_eps_send_service_reject(mme_ue,
-                        OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK)
-                    );
+                    r = nas_eps_send_service_reject(mme_ue,
+                        OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     OGS_FSM_TRAN(s, &emm_state_exception);
                     break;
                 }
 
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_modification_request(mme_ue));
+                r = s1ap_send_ue_context_modification_request(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else {
                 ogs_error("Invalid Procedure Code%d", (int)e->s1ap_code);
             }
@@ -632,6 +677,24 @@
                 break;
             }
 
+            if (!MME_UE_HAVE_IMSI(mme_ue)) {
+                ogs_warn("Detach request : Unknown UE");
+                ogs_assert(OGS_OK ==
+                    nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                OGS_FSM_TRAN(s, &emm_state_exception);
+                break;
+            }
+
+            if (!SECURITY_CONTEXT_IS_VALID(mme_ue)) {
+                ogs_warn("No Security Context : IMSI%s", mme_ue->imsi_bcd);
+                ogs_assert(OGS_OK ==
+                    nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                OGS_FSM_TRAN(s, &emm_state_exception);
+                break;
+            }
+
             if (MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
                 ogs_assert(OGS_OK == sgsap_send_detach_indication(mme_ue));
             } else {
@@ -646,10 +709,11 @@
 
             CLEAR_MME_UE_TIMER(mme_ue->t3422);
 
-            rv = s1ap_send_ue_context_release_command(enb_ue,
+            r = s1ap_send_ue_context_release_command(enb_ue,
                     S1AP_Cause_PR_nas, S1AP_CauseNas_detach,
                     S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
-            ogs_expect(rv == OGS_OK);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             OGS_FSM_TRAN(s, &emm_state_de_registered);
             break;
@@ -669,11 +733,12 @@
                 MME_UE_S1AP_ID = enb_ue->mme_ue_s1ap_id;
                 ENB_UE_S1AP_ID = enb_ue->enb_ue_s1ap_id;
 
-                ogs_assert(OGS_OK ==
-                    s1ap_send_error_indication(enb_ue->enb, 
+                r = s1ap_send_error_indication(enb_ue->enb, 
                         &MME_UE_S1AP_ID, &ENB_UE_S1AP_ID,
                         S1AP_Cause_PR_transport,
-                        S1AP_CauseTransport_transport_resource_unavailable));
+                        S1AP_CauseTransport_transport_resource_unavailable);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
 
@@ -700,7 +765,7 @@
 
 void emm_state_authentication(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r, rv;
     mme_ue_t *mme_ue = NULL;
     ogs_nas_eps_message_t *message = NULL;
 
@@ -745,8 +810,9 @@
                         authentication_response_parameter->length);
                 ogs_log_hexdump(OGS_LOG_WARN,
                         mme_ue->xres, OGS_MAX_RES_LEN);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_authentication_reject(mme_ue));
+                r = nas_eps_send_authentication_reject(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
             } else {
                 OGS_FSM_TRAN(&mme_ue->sm, &emm_state_security_mode);
@@ -789,8 +855,9 @@
                 break;
             }
 
-            ogs_assert(OGS_OK ==
-                nas_eps_send_authentication_reject(mme_ue));
+            r = nas_eps_send_authentication_reject(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
 
             break;
@@ -815,7 +882,7 @@
             OGS_FSM_TRAN(s, &emm_state_exception);
             break;
         case OGS_NAS_EPS_DETACH_REQUEST:
-            ogs_warn("Detach request");
+            ogs_warn("%s Detach request", mme_ue->imsi_bcd);
             rv = emm_handle_detach_request(
                     mme_ue, &message->emm.detach_request_from_ue);
             if (rv != OGS_OK) {
@@ -824,7 +891,30 @@
                 break;
             }
 
-            mme_send_delete_session_or_detach(mme_ue);
+            if (!MME_UE_HAVE_IMSI(mme_ue)) {
+                ogs_warn("Detach request : Unknown UE");
+                ogs_assert(OGS_OK ==
+                    nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                OGS_FSM_TRAN(s, &emm_state_exception);
+                break;
+            }
+
+            if (!SECURITY_CONTEXT_IS_VALID(mme_ue)) {
+                ogs_warn("No Security Context : IMSI%s", mme_ue->imsi_bcd);
+                ogs_assert(OGS_OK ==
+                    nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                OGS_FSM_TRAN(s, &emm_state_exception);
+                break;
+            }
+
+            if (MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
+                ogs_assert(OGS_OK == sgsap_send_detach_indication(mme_ue));
+            } else {
+                mme_send_delete_session_or_detach(mme_ue);
+            }
+
             OGS_FSM_TRAN(s, &emm_state_de_registered);
             break;
         default:
@@ -841,16 +931,14 @@
                         "Stop retransmission", mme_ue->imsi_bcd);
                 OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
 
-                ogs_expect(OGS_OK ==
-                    nas_eps_send_authentication_reject(mme_ue));
+                r = nas_eps_send_authentication_reject(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else {
-                rv = nas_eps_send_authentication_request(mme_ue);
-                if (rv == OGS_OK) {
-                    mme_ue->t3460.retry_count++;
-                } else {
-                    ogs_error("nas_eps_send_authentication_request() failed");
-                    OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
-                }
+                mme_ue->t3460.retry_count++;
+                r = nas_eps_send_authentication_request(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
         default:
@@ -867,7 +955,7 @@
 
 void emm_state_security_mode(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r, rv;
     mme_ue_t *mme_ue = NULL;
     ogs_nas_eps_message_t *message = NULL;
     ogs_nas_security_header_type_t h;
@@ -883,8 +971,9 @@
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
         CLEAR_MME_UE_TIMER(mme_ue->t3460);
-        ogs_assert(OGS_OK ==
-            nas_eps_send_security_mode_command(mme_ue));
+        r = nas_eps_send_security_mode_command(mme_ue);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         break;
     case OGS_FSM_EXIT_SIG:
         break;
@@ -895,9 +984,10 @@
         if (message->emm.h.security_header_type
                 == OGS_NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE) {
             ogs_debug("Service request");
-            ogs_assert(OGS_OK ==
-                nas_eps_send_service_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED));
+            r = nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             OGS_FSM_TRAN(s, &emm_state_exception);
             break;
         }
@@ -979,9 +1069,10 @@
             break;
         case OGS_NAS_EPS_TRACKING_AREA_UPDATE_REQUEST:
             ogs_debug("Tracking area update request");
-            ogs_assert(OGS_OK ==
-                nas_eps_send_tau_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED));
+            r = nas_eps_send_tau_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             OGS_FSM_TRAN(s, &emm_state_exception);
             break;
         case OGS_NAS_EPS_EMM_STATUS:
@@ -991,7 +1082,7 @@
             OGS_FSM_TRAN(s, &emm_state_exception);
             break;
         case OGS_NAS_EPS_DETACH_REQUEST:
-            ogs_warn("Detach request");
+            ogs_warn("%s Detach request", mme_ue->imsi_bcd);
             rv = emm_handle_detach_request(
                     mme_ue, &message->emm.detach_request_from_ue);
             if (rv != OGS_OK) {
@@ -1000,7 +1091,30 @@
                 break;
             }
 
-            mme_send_delete_session_or_detach(mme_ue);
+            if (!MME_UE_HAVE_IMSI(mme_ue)) {
+                ogs_warn("Detach request : Unknown UE");
+                ogs_assert(OGS_OK ==
+                    nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                OGS_FSM_TRAN(s, &emm_state_exception);
+                break;
+            }
+
+            if (!SECURITY_CONTEXT_IS_VALID(mme_ue)) {
+                ogs_warn("No Security Context : IMSI%s", mme_ue->imsi_bcd);
+                ogs_assert(OGS_OK ==
+                    nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                OGS_FSM_TRAN(s, &emm_state_exception);
+                break;
+            }
+
+            if (MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
+                ogs_assert(OGS_OK == sgsap_send_detach_indication(mme_ue));
+            } else {
+                mme_send_delete_session_or_detach(mme_ue);
+            }
+
             OGS_FSM_TRAN(s, &emm_state_de_registered);
             break;
         default:
@@ -1017,18 +1131,16 @@
                         "Stop retransmission", mme_ue->imsi_bcd);
                 OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
 
-                ogs_expect(OGS_OK ==
-                    nas_eps_send_attach_reject(mme_ue,
+                r = nas_eps_send_attach_reject(mme_ue,
                         OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED,
-                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else {
-                rv = nas_eps_send_security_mode_command(mme_ue);
-                if (rv == OGS_OK) {
-                    mme_ue->t3460.retry_count++;
-                } else {
-                    ogs_error("nas_eps_send_security_mode_command() failed");
-                    OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
-                }
+                mme_ue->t3460.retry_count++;
+                r = nas_eps_send_security_mode_command(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
         default:
@@ -1045,7 +1157,7 @@
 
 void emm_state_initial_context_setup(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r, rv;
     mme_ue_t *mme_ue = NULL;
     ogs_nas_eps_message_t *message = NULL;
     ogs_nas_security_header_type_t h;
@@ -1070,9 +1182,10 @@
         if (message->emm.h.security_header_type
                 == OGS_NAS_SECURITY_HEADER_FOR_SERVICE_REQUEST_MESSAGE) {
             ogs_debug("Service request");
-            ogs_assert(OGS_OK ==
-                nas_eps_send_service_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+            r = nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             OGS_FSM_TRAN(s, &emm_state_exception);
             break;
         }
@@ -1190,7 +1303,7 @@
             OGS_FSM_TRAN(s, &emm_state_exception);
             break;
         case OGS_NAS_EPS_DETACH_REQUEST:
-            ogs_warn("Detach request");
+            ogs_warn("%s Detach request", mme_ue->imsi_bcd);
             rv = emm_handle_detach_request(
                     mme_ue, &message->emm.detach_request_from_ue);
             if (rv != OGS_OK) {
@@ -1199,7 +1312,30 @@
                 break;
             }
 
-            mme_send_delete_session_or_detach(mme_ue);
+            if (!MME_UE_HAVE_IMSI(mme_ue)) {
+                ogs_warn("Detach request : Unknown UE");
+                ogs_assert(OGS_OK ==
+                    nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                OGS_FSM_TRAN(s, &emm_state_exception);
+                break;
+            }
+
+            if (!SECURITY_CONTEXT_IS_VALID(mme_ue)) {
+                ogs_warn("No Security Context : IMSI%s", mme_ue->imsi_bcd);
+                ogs_assert(OGS_OK ==
+                    nas_eps_send_service_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_UE_IDENTITY_CANNOT_BE_DERIVED_BY_THE_NETWORK));
+                OGS_FSM_TRAN(s, &emm_state_exception);
+                break;
+            }
+
+            if (MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
+                ogs_assert(OGS_OK == sgsap_send_detach_indication(mme_ue));
+            } else {
+                mme_send_delete_session_or_detach(mme_ue);
+            }
+
             OGS_FSM_TRAN(s, &emm_state_de_registered);
             break;
         case OGS_NAS_EPS_SECURITY_MODE_COMPLETE:
@@ -1225,20 +1361,24 @@
                 mme_ue->t3450.retry_count++;
 
                 emmbuf = mme_ue->t3450.pkbuf;
-                ogs_expect_or_return(emmbuf);
+                if (!emmbuf) {
+                    ogs_error("No emmbuf");
+                    return;
+                }
 
                 mme_ue->t3450.pkbuf = ogs_pkbuf_copy(emmbuf);
-                ogs_assert(mme_ue->t3450.pkbuf);
+                if (!mme_ue->t3450.pkbuf) {
+                    ogs_error("ogs_pkbuf_copy() failed");
+                    ogs_pkbuf_free(emmbuf);
+                    return;
+                }
 
                 ogs_timer_start(mme_ue->t3450.timer,
                         mme_timer_cfg(MME_TIMER_T3450)->duration);
 
-                rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-                if (rv != OGS_OK) {
-                    ogs_error("nas_eps_send_to_downlink_nas_transport() "
-                            "failed");
-                    OGS_FSM_TRAN(&mme_ue->sm, &emm_state_exception);
-                }
+                r = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
         default:
@@ -1255,7 +1395,7 @@
 
 void emm_state_exception(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r, rv;
 
     mme_ue_t *mme_ue = NULL;
     enb_ue_t *enb_ue = NULL;
@@ -1298,8 +1438,9 @@
 
             if (!MME_UE_HAVE_IMSI(mme_ue)) {
                 CLEAR_MME_UE_TIMER(mme_ue->t3470);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_identity_request(mme_ue));
+                r = nas_eps_send_identity_request(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
                 OGS_FSM_TRAN(s, &emm_state_de_registered);
                 break;
@@ -1314,10 +1455,11 @@
                             &mme_ue->pdn_connectivity_request);
                     if (rv != OGS_OK) {
                         ogs_error("nas_eps_send_emm_to_esm() failed");
-                        ogs_assert(OGS_OK ==
-                            nas_eps_send_attach_reject(mme_ue,
+                        r = nas_eps_send_attach_reject(mme_ue,
                                 OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                        ogs_expect(r == OGS_OK);
+                        ogs_assert(r != OGS_ERROR);
                         OGS_FSM_TRAN(s, &emm_state_exception);
                         break;
                     }

open5gs_2.5.8.tar.xz/src/mme/esm-handler.c -> open5gs_2.6.0.tar.xz/src/mme/esm-handler.c Changed

@@ -31,6 +31,7 @@
 int esm_handle_pdn_connectivity_request(mme_bearer_t *bearer, 
         ogs_nas_eps_pdn_connectivity_request_t *req, int create_action)
 {
+    int r;
     mme_ue_t *mme_ue = NULL;
     mme_sess_t *sess = NULL;
     uint8_t security_protected_required = 0;
@@ -65,9 +66,11 @@
                             mme_ue, req->access_point_name.apn);
         if (!sess->session) {
             /* Invalid APN */
-            ogs_assert(OGS_OK ==
-                nas_eps_send_pdn_connectivity_reject(
-                    sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN, create_action));
+            r = nas_eps_send_pdn_connectivity_reject(
+                    sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN,
+                    create_action);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             ogs_warn("Invalid APN%s", req->access_point_name.apn);
             return OGS_ERROR;
         }
@@ -80,9 +83,11 @@
             if (derived_pdn_type == 0) {
                 ogs_error("Cannot derived PDN Type UE:%d,HSS:%d",
                     sess->request_type.type, sess->session->session_type);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_pdn_connectivity_reject(
-                        sess, OGS_NAS_ESM_CAUSE_UNKNOWN_PDN_TYPE, create_action));
+                r = nas_eps_send_pdn_connectivity_reject(
+                        sess, OGS_NAS_ESM_CAUSE_UNKNOWN_PDN_TYPE,
+                        create_action);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return OGS_ERROR;
             }
         } else {
@@ -102,7 +107,9 @@
 
     if (security_protected_required) {
         CLEAR_BEARER_TIMER(bearer->t3489);
-        ogs_assert(OGS_OK == nas_eps_send_esm_information_request(bearer));
+        r = nas_eps_send_esm_information_request(bearer);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         return OGS_OK;
     }
@@ -137,9 +144,10 @@
             mme_gtp_send_create_session_request(sess, create_action));
     } else {
         ogs_error("No APN");
-        ogs_assert(OGS_OK ==
-            nas_eps_send_pdn_connectivity_reject(
-                sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN, create_action));
+        r = nas_eps_send_pdn_connectivity_reject(
+                sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN, create_action);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -149,6 +157,7 @@
 int esm_handle_information_response(mme_sess_t *sess, 
         ogs_nas_eps_esm_information_response_t *rsp)
 {
+    int r;
     mme_ue_t *mme_ue = NULL;
 
     ogs_assert(sess);
@@ -183,10 +192,11 @@
             if (derived_pdn_type == 0) {
                 ogs_error("Cannot derived PDN Type UE:%d,HSS:%d",
                     sess->request_type.type, sess->session->session_type);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_pdn_connectivity_reject(
+                r = nas_eps_send_pdn_connectivity_reject(
                         sess, OGS_NAS_ESM_CAUSE_UNKNOWN_PDN_TYPE,
-                        OGS_GTP_CREATE_IN_ATTACH_REQUEST));
+                        OGS_GTP_CREATE_IN_ATTACH_REQUEST);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return OGS_ERROR;
             }
         } else {
@@ -203,8 +213,9 @@
                 ogs_assert(OGS_OK ==
                     sgsap_send_location_update_request(mme_ue));
             } else {
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_attach_accept(mme_ue));
+                r = nas_eps_send_attach_accept(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
         } else {
             ogs_assert(OGS_OK ==
@@ -217,10 +228,11 @@
         else
             ogs_error("No APN");
 
-        ogs_assert(OGS_OK ==
-            nas_eps_send_pdn_connectivity_reject(
+        r = nas_eps_send_pdn_connectivity_reject(
                 sess, OGS_NAS_ESM_CAUSE_MISSING_OR_UNKNOWN_APN,
-                OGS_GTP_CREATE_IN_ATTACH_REQUEST));
+                OGS_GTP_CREATE_IN_ATTACH_REQUEST);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return OGS_ERROR;
     }
 
@@ -230,6 +242,7 @@
 int esm_handle_bearer_resource_allocation_request(
         mme_bearer_t *bearer, ogs_nas_eps_message_t *message)
 {
+    int r;
     mme_ue_t *mme_ue = NULL;
     mme_sess_t *sess = NULL;
 
@@ -239,9 +252,10 @@
     mme_ue = sess->mme_ue;
     ogs_assert(mme_ue);
 
-    ogs_assert(OGS_OK ==
-        nas_eps_send_bearer_resource_allocation_reject(
-            mme_ue, sess->pti, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE));
+    r = nas_eps_send_bearer_resource_allocation_reject(
+            mme_ue, sess->pti, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
     return OGS_OK;
 }

open5gs_2.5.8.tar.xz/src/mme/esm-sm.c -> open5gs_2.6.0.tar.xz/src/mme/esm-sm.c Changed

@@ -68,7 +68,7 @@
 
 void esm_state_inactive(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r, rv;
     mme_ue_t *mme_ue = NULL;
     mme_sess_t *sess = NULL;
     mme_bearer_t *bearer = NULL;
@@ -122,8 +122,9 @@
                     mme_gtp_send_delete_session_request(mme_ue->sgw_ue, sess,
                     OGS_GTP_DELETE_SEND_DEACTIVATE_BEARER_CONTEXT_REQUEST));
             } else {
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_deactivate_bearer_context_request(bearer));
+                r = nas_eps_send_deactivate_bearer_context_request(bearer);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             OGS_FSM_TRAN(s, esm_state_pdn_will_disconnect);
             break;
@@ -137,30 +138,34 @@
             h.type = e->nas_type;
             if (h.integrity_protected == 0) {
                 ogs_error("%s No Integrity Protected", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_attach_reject(mme_ue,
+                r = nas_eps_send_attach_reject(mme_ue,
                         OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED,
-                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 ogs_assert(mme_ue->enb_ue);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(mme_ue->enb_ue,
+                r = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
                         S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &esm_state_exception);
                 break;
             }
 
             if (!SECURITY_CONTEXT_IS_VALID(mme_ue)) {
                 ogs_warn("%s No Security Context", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_attach_reject(mme_ue,
+                r = nas_eps_send_attach_reject(mme_ue,
                         OGS_NAS_EMM_CAUSE_SECURITY_MODE_REJECTED_UNSPECIFIED,
-                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 ogs_assert(mme_ue->enb_ue);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(mme_ue->enb_ue,
+                r = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
                         S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 OGS_FSM_TRAN(s, &esm_state_exception);
                 break;
             }
@@ -230,18 +235,16 @@
                         "Stop retransmission", mme_ue->imsi_bcd);
                 OGS_FSM_TRAN(&bearer->sm, &esm_state_exception);
 
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_pdn_connectivity_reject(sess,
+                r = nas_eps_send_pdn_connectivity_reject(sess,
                         OGS_NAS_ESM_CAUSE_ESM_INFORMATION_NOT_RECEIVED,
-                        e->create_action));
+                        e->create_action);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else {
-                rv = nas_eps_send_esm_information_request(bearer);
-                if (rv == OGS_OK) {
-                    bearer->t3489.retry_count++;
-                } else {
-                    ogs_error("nas_eps_send_esm_information_request() failed");
-                    OGS_FSM_TRAN(&bearer->sm, &esm_state_exception);
-                }
+                bearer->t3489.retry_count++;
+                r = nas_eps_send_esm_information_request(bearer);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
         default:
@@ -258,7 +261,7 @@
 
 void esm_state_active(ogs_fsm_t *s, mme_event_t *e)
 {
-    int rv;
+    int r, rv;
     mme_ue_t *mme_ue = NULL;
     mme_sess_t *sess = NULL;
     mme_bearer_t *bearer = NULL;
@@ -309,8 +312,9 @@
                     mme_gtp_send_delete_session_request(mme_ue->sgw_ue, sess,
                     OGS_GTP_DELETE_SEND_DEACTIVATE_BEARER_CONTEXT_REQUEST));
             } else {
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_deactivate_bearer_context_request(bearer));
+                r = nas_eps_send_deactivate_bearer_context_request(bearer);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             OGS_FSM_TRAN(s, esm_state_pdn_will_disconnect);
             break;

open5gs_2.5.8.tar.xz/src/mme/metrics.c -> open5gs_2.6.0.tar.xz/src/mme/metrics.c Changed

@@ -65,32 +65,28 @@
     .description = "eNodeBs",
 },
 };
-static int mme_metrics_init_inst_global(void)
+int mme_metrics_init_inst_global(void)
 {
     return mme_metrics_init_inst(mme_metrics_inst_global, mme_metrics_spec_global,
                 _MME_METR_GLOB_MAX, 0, NULL);
 }
-static int mme_metrics_free_inst_global(void)
+int mme_metrics_free_inst_global(void)
 {
     return mme_metrics_free_inst(mme_metrics_inst_global, _MME_METR_GLOB_MAX);
 }
 
-int mme_metrics_open(void)
+void mme_metrics_init(void)
 {
     ogs_metrics_context_t *ctx = ogs_metrics_self();
-    ogs_metrics_context_open(ctx);
+    ogs_metrics_context_init();
 
     mme_metrics_init_spec(ctx, mme_metrics_spec_global, mme_metrics_spec_def_global,
             _MME_METR_GLOB_MAX);
 
     mme_metrics_init_inst_global();
-    return 0;
 }
 
-int mme_metrics_close(void)
+void mme_metrics_final(void)
 {
-    ogs_metrics_context_t *ctx = ogs_metrics_self();
-    mme_metrics_free_inst_global();
-    ogs_metrics_context_close(ctx);
-    return OGS_OK;
+    ogs_metrics_context_final();
 }

open5gs_2.5.8.tar.xz/src/mme/metrics.h -> open5gs_2.6.0.tar.xz/src/mme/metrics.h Changed

open5gs_2.5.8.tar.xz/src/mme/mme-context.c -> open5gs_2.6.0.tar.xz/src/mme/mme-context.c Changed

@@ -178,6 +178,8 @@
 
 static int mme_context_validation(void)
 {
+    ogs_nas_gprs_timer_t gprs_timer;
+
     if (self.diam_conf_path == NULL &&
         (self.diam_config->cnf_diamid == NULL ||
         self.diam_config->cnf_diamrlm == NULL ||
@@ -249,6 +251,21 @@
                 ogs_app()->file);
         return OGS_ERROR;
     }
+    if (ogs_nas_gprs_timer_from_sec(&gprs_timer, self.time.t3402.value) !=
+        OGS_OK) {
+        ogs_error("Not support GPRS Timer %d", (int)self.time.t3402.value);
+        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);
+        return OGS_ERROR;
+    }
+    if (ogs_nas_gprs_timer_from_sec(&gprs_timer, self.time.t3423.value) !=
+        OGS_OK) {
+        ogs_error("Not support GPRS Timer %d", (int)self.time.t3423.value);
+        return OGS_ERROR;
+    }
 
     return OGS_OK;
 }
@@ -1544,6 +1561,73 @@
                             YAML_SEQUENCE_NODE);
                 }
             }
+        } else if (!strcmp(root_key, "time")) {
+            ogs_yaml_iter_t time_iter;
+            ogs_yaml_iter_recurse(&root_iter, &time_iter);
+            while (ogs_yaml_iter_next(&time_iter)) {
+                const char *time_key = ogs_yaml_iter_key(&time_iter);
+                ogs_assert(time_key);
+                if (!strcmp(time_key, "t3402")) {
+                    ogs_yaml_iter_t t3402_iter;
+                    ogs_yaml_iter_recurse(&time_iter, &t3402_iter);
+
+                    while (ogs_yaml_iter_next(&t3402_iter)) {
+                        const char *t3402_key =
+                            ogs_yaml_iter_key(&t3402_iter);
+                        ogs_assert(t3402_key);
+
+                        if (!strcmp(t3402_key, "value")) {
+                            const char *v = ogs_yaml_iter_value(&t3402_iter);
+                            if (v)
+                                self.time.t3402.value = atoll(v);
+                        } else
+                            ogs_warn("unknown key `%s`", t3402_key);
+                    }
+                } else if (!strcmp(time_key, "t3412")) {
+                    ogs_yaml_iter_t t3412_iter;
+                    ogs_yaml_iter_recurse(&time_iter, &t3412_iter);
+
+                    while (ogs_yaml_iter_next(&t3412_iter)) {
+                        const char *t3412_key =
+                            ogs_yaml_iter_key(&t3412_iter);
+                        ogs_assert(t3412_key);
+
+                        if (!strcmp(t3412_key, "value")) {
+                            const char *v = ogs_yaml_iter_value(&t3412_iter);
+                            if (v)
+                                self.time.t3412.value = atoll(v);
+                        } else
+                            ogs_warn("unknown key `%s`", t3412_key);
+                    }
+                } else if (!strcmp(time_key, "t3423")) {
+                    ogs_yaml_iter_t t3423_iter;
+                    ogs_yaml_iter_recurse(&time_iter, &t3423_iter);
+
+                    while (ogs_yaml_iter_next(&t3423_iter)) {
+                        const char *t3423_key =
+                            ogs_yaml_iter_key(&t3423_iter);
+                        ogs_assert(t3423_key);
+
+                        if (!strcmp(t3423_key, "value")) {
+                            const char *v = ogs_yaml_iter_value(&t3423_iter);
+                            if (v)
+                                self.time.t3423.value = atoll(v);
+                        } else
+                            ogs_warn("unknown key `%s`", t3423_key);
+                    }
+                } else if (!strcmp(time_key, "t3512")) {
+                    /* handle config in amf */
+                } else if (!strcmp(time_key, "nf_instance")) {
+                    /* handle config in app library */
+                } else if (!strcmp(time_key, "subscription")) {
+                    /* handle config in app library */
+                } else if (!strcmp(time_key, "message")) {
+                    /* handle config in app library */
+                } else if (!strcmp(time_key, "handover")) {
+                    /* handle config in app library */
+                } else
+                    ogs_warn("unknown key `%s`", time_key);
+            }
         }
     }
 
@@ -2318,6 +2402,22 @@
         return NULL;
     }
     mme_ue->t3470.pkbuf = NULL;
+    mme_ue->t_mobile_reachable.timer = ogs_timer_add(
+            ogs_app()->timer_mgr, mme_timer_mobile_reachable_expire, mme_ue);
+    if (!mme_ue->t_mobile_reachable.timer) {
+        ogs_error("ogs_timer_add() failed");
+        ogs_pool_free(&mme_ue_pool, mme_ue);
+        return NULL;
+    }
+    mme_ue->t_mobile_reachable.pkbuf = NULL;
+    mme_ue->t_implicit_detach.timer = ogs_timer_add(
+            ogs_app()->timer_mgr, mme_timer_implicit_detach_expire, mme_ue);
+    if (!mme_ue->t_implicit_detach.timer) {
+        ogs_error("ogs_timer_add() failed");
+        ogs_pool_free(&mme_ue_pool, mme_ue);
+        return NULL;
+    }
+    mme_ue->t_implicit_detach.pkbuf = NULL;
 
     mme_ebi_pool_init(mme_ue);
 
@@ -2409,6 +2509,8 @@
     ogs_timer_delete(mme_ue->t3450.timer);
     ogs_timer_delete(mme_ue->t3460.timer);
     ogs_timer_delete(mme_ue->t3470.timer);
+    ogs_timer_delete(mme_ue->t_mobile_reachable.timer);
+    ogs_timer_delete(mme_ue->t_implicit_detach.timer);
 
     enb_ue_unlink(mme_ue);
 
@@ -3139,6 +3241,7 @@
 mme_bearer_t *mme_bearer_find_or_add_by_message(
         mme_ue_t *mme_ue, ogs_nas_eps_message_t *message, int create_action)
 {
+    int r;
     uint8_t pti = OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED;
     uint8_t ebi = OGS_NAS_EPS_BEARER_IDENTITY_UNASSIGNED;
 
@@ -3158,10 +3261,11 @@
         bearer = mme_bearer_find_by_ue_ebi(mme_ue, ebi);
         if (!bearer) {
             ogs_error("No Bearer : EBI%d", ebi);
-            ogs_assert(OGS_OK ==
-                nas_eps_send_attach_reject(mme_ue,
+            r = nas_eps_send_attach_reject(mme_ue,
                     OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                    OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                    OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return NULL;
         }
 
@@ -3170,10 +3274,11 @@
 
     if (pti == OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED) {
         ogs_error("Both PTI%d and EBI%d are 0", pti, ebi);
-        ogs_assert(OGS_OK ==
-            nas_eps_send_attach_reject(mme_ue,
+        r = nas_eps_send_attach_reject(mme_ue,
                 OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return NULL;
     }
 
@@ -3188,10 +3293,11 @@
         if (!bearer) {
             ogs_error("No Bearer : Linked-EBI%d",
                     linked_eps_bearer_identity->eps_bearer_identity);
-            ogs_assert(OGS_OK ==
-                nas_eps_send_attach_reject(mme_ue,
+            r = nas_eps_send_attach_reject(mme_ue,
                     OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                    OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                    OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return NULL;
         }
     } else if (message->esm.h.message_type ==
@@ -3207,10 +3313,11 @@
         if (!bearer) {
             ogs_error("No Bearer : Linked-EBI%d",
                     linked_eps_bearer_identity->eps_bearer_identity);
-            ogs_assert(OGS_OK ==
-                nas_eps_send_bearer_resource_allocation_reject(
+            r = nas_eps_send_bearer_resource_allocation_reject(
                     mme_ue, pti,
-                    OGS_NAS_ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY));
+                    OGS_NAS_ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return NULL;
         }
 
@@ -3227,10 +3334,11 @@
         if (!bearer) {
             ogs_error("No Bearer : Linked-EBI%d",
                     linked_eps_bearer_identity->eps_bearer_identity);
-            ogs_assert(OGS_OK ==
-                nas_eps_send_bearer_resource_modification_reject(
+            r = nas_eps_send_bearer_resource_modification_reject(
                     mme_ue, pti,
-                    OGS_NAS_ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY));
+                    OGS_NAS_ESM_CAUSE_INVALID_EPS_BEARER_IDENTITY);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return NULL;
         }
     }
@@ -3251,11 +3359,12 @@
             sess = mme_sess_find_by_apn(mme_ue,
                     pdn_connectivity_request->access_point_name.apn);
             if (sess && create_action != OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_pdn_connectivity_reject(
+                r = nas_eps_send_pdn_connectivity_reject(
                         sess,
                         OGS_NAS_ESM_CAUSE_MULTIPLE_PDN_CONNECTIONS_FOR_A_GIVEN_APN_NOT_ALLOWED,
-                        create_action));
+                        create_action);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 ogs_warn("APN duplicated %s",
                     pdn_connectivity_request->access_point_name.apn);
                 return NULL;
@@ -3275,10 +3384,11 @@
         if (!sess) {
             ogs_error("No Session : ESM message type%d, PTI%d",
                     message->esm.h.message_type, pti);
-            ogs_assert(OGS_OK ==
-                nas_eps_send_attach_reject(mme_ue,
+            r = nas_eps_send_attach_reject(mme_ue,
                     OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                    OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                    OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return NULL;
         }
     }

open5gs_2.5.8.tar.xz/src/mme/mme-context.h -> open5gs_2.6.0.tar.xz/src/mme/mme-context.h Changed

@@ -146,6 +146,11 @@
     ogs_hash_t      *imsi_ue_hash;          /* hash table (IMSI : MME_UE) */
     ogs_hash_t      *guti_ue_hash;          /* hash table (GUTI : MME_UE) */
 
+    struct {
+        struct {
+            ogs_time_t value;       /* Timer Value(Seconds) */
+        } t3402, t3412, t3423;
+    } time;
 } mme_context_t;
 
 typedef struct mme_sgw_s {
@@ -391,6 +396,8 @@
     int             security_context_available;
     int             mac_failed;
 
+    bool            location_updated_but_not_canceled_yet;
+
     /* Security Context */
     ogs_nas_ue_network_capability_t ue_network_capability;
     ogs_nas_ms_network_capability_t ms_network_capability;
@@ -510,6 +517,8 @@
         CLEAR_MME_UE_TIMER((__mME)->t3450); \
         CLEAR_MME_UE_TIMER((__mME)->t3460); \
         CLEAR_MME_UE_TIMER((__mME)->t3470); \
+        CLEAR_MME_UE_TIMER((__mME)->t_mobile_reachable); \
+        CLEAR_MME_UE_TIMER((__mME)->t_implicit_detach); \
         \
         ogs_list_for_each(&mme_ue->sess_list, sess) { \
             ogs_list_for_each(&sess->bearer_list, bearer) { \
@@ -530,7 +539,8 @@
         ogs_pkbuf_t     *pkbuf;
         ogs_timer_t     *timer;
         uint32_t        retry_count;;
-    } t3413, t3422, t3450, t3460, t3470;
+    } t3413, t3422, t3450, t3460, t3470, t_mobile_reachable,
+        t_implicit_detach;
 
 #define CLEAR_SERVICE_INDICATOR(__mME) \
     do { \

open5gs_2.5.8.tar.xz/src/mme/mme-fd-path.c -> open5gs_2.6.0.tar.xz/src/mme/mme-fd-path.c Changed

@@ -40,6 +40,7 @@
 
 static void mme_s6a_aia_cb(void *data, struct msg **msg);
 static void mme_s6a_ula_cb(void *data, struct msg **msg);
+static void mme_s6a_pua_cb(void *data, struct msg **msg);
 
 static void state_cleanup(struct sess_state *sess_data, os0_t sid, void *opaque)
 {
@@ -138,9 +139,10 @@
     ogs_assert(ret == 0);
     if (avpch1) {
         ret = fd_msg_avp_hdr(avpch1, &hdr);
-        memcpy(mme_ue->charging_characteristics,
-            OGS_HEX(hdr->avp_value->os.data, (int)hdr->avp_value->os.len, buf), 
-                OGS_CHRGCHARS_LEN);
+        ogs_ascii_to_hex(
+            (char*)hdr->avp_value->os.data, (int)hdr->avp_value->os.len,
+            buf, sizeof(buf));
+        memcpy(mme_ue->charging_characteristics, buf, OGS_CHRGCHARS_LEN);
         mme_ue->charging_characteristics_presence = true;
         *subdatamask = (*subdatamask | OGS_DIAM_S6A_SUBDATA_CC);
     }
@@ -342,10 +344,12 @@
                 ogs_assert(ret == 0);
                 if (avpch3) {
                     ret = fd_msg_avp_hdr(avpch3, &hdr);
+                    ogs_ascii_to_hex(
+                        (char*)hdr->avp_value->os.data,
+                        (int)hdr->avp_value->os.len,
+                        buf, sizeof(buf));
                     memcpy(session->charging_characteristics,
-                        OGS_HEX(hdr->avp_value->os.data,
-                            (int)hdr->avp_value->os.len, buf),
-                            OGS_CHRGCHARS_LEN);
+                            buf, OGS_CHRGCHARS_LEN);
                     session->charging_characteristics_presence = true;
                 } else {
                     memcpy(session->charging_characteristics, 
@@ -838,13 +842,28 @@
 
     /* Search the session, retrieve its data */
     ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(new == 0);
+    if (ret != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
+    if (new != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
     
     ret = fd_sess_state_retrieve(mme_s6a_reg, session, &sess_data);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(sess_data);
-    ogs_expect_or_return((void *)sess_data == data);
+    if (ret != 0) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if (!sess_data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if ((void *)sess_data != data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
 
     mme_ue = sess_data->mme_ue;
     ogs_assert(mme_ue);
@@ -1215,6 +1234,98 @@
     ogs_assert(pthread_mutex_unlock(&ogs_diam_logger_self()->stats_lock) == 0);
 }
 
+/* MME Sends Purge UE Request to HSS */
+void mme_s6a_send_pur(mme_ue_t *mme_ue)
+{
+    int ret;
+
+    struct msg *req = NULL;
+    struct avp *avp;
+    union avp_value val;
+    struct sess_state *sess_data = NULL, *svg;
+    struct session *session = NULL;
+
+    ogs_assert(mme_ue);
+
+    ogs_debug("MME Purge-UE-Request");
+
+    /* Create the random value to store with the session */
+    sess_data = ogs_calloc(1, sizeof(*sess_data));
+    ogs_assert(sess_data);
+    sess_data->mme_ue = mme_ue;
+
+    /* Create the request */
+    ret = fd_msg_new(ogs_diam_s6a_cmd_pur, MSGFL_ALLOC_ETEID, &req);
+    ogs_assert(ret == 0);
+
+    /* Create a new session */
+    #define OGS_DIAM_S6A_APP_SID_OPT  "app_s6a"
+    ret = fd_msg_new_session(req, (os0_t)OGS_DIAM_S6A_APP_SID_OPT, 
+            CONSTSTRLEN(OGS_DIAM_S6A_APP_SID_OPT));
+    ogs_assert(ret == 0);
+    ret = fd_msg_sess_get(fd_g_config->cnf_dict, req, &session, NULL);
+    ogs_assert(ret == 0);
+
+    /* Set the Auth-Session-State AVP */
+    ret = fd_msg_avp_new(ogs_diam_auth_session_state, 0, &avp);
+    ogs_assert(ret == 0);
+    val.i32 = OGS_DIAM_AUTH_SESSION_NO_STATE_MAINTAINED;
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+    ogs_assert(ret == 0);
+
+    /* Set Origin-Host & Origin-Realm */
+    ret = fd_msg_add_origin(req, 0);
+    ogs_assert(ret == 0);
+
+    /* Set the Destination-Realm AVP */
+    ret = fd_msg_avp_new(ogs_diam_destination_realm, 0, &avp);
+    ogs_assert(ret == 0);
+    val.os.data = (unsigned char *)(fd_g_config->cnf_diamrlm);
+    val.os.len  = strlen(fd_g_config->cnf_diamrlm);
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+    ogs_assert(ret == 0);
+
+    /* Set the User-Name AVP */
+    ret = fd_msg_avp_new(ogs_diam_user_name, 0, &avp);
+    ogs_assert(ret == 0);
+    val.os.data = (uint8_t *)mme_ue->imsi_bcd;
+    val.os.len  = strlen(mme_ue->imsi_bcd);
+    ret = fd_msg_avp_setvalue(avp, &val);
+    ogs_assert(ret == 0);
+    ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avp);
+    ogs_assert(ret == 0);
+
+    /* Set Vendor-Specific-Application-Id AVP */
+    ret = ogs_diam_message_vendor_specific_appid_set(
+            req, OGS_DIAM_S6A_APPLICATION_ID);
+    ogs_assert(ret == 0);
+
+    ret = clock_gettime(CLOCK_REALTIME, &sess_data->ts);
+    ogs_assert(ret == 0);
+
+    /* Keep a pointer to the session data for debug purpose,
+     * in real life we would not need it */
+    svg = sess_data;
+
+    /* Store this value in the session */
+    ret = fd_sess_state_store(mme_s6a_reg, session, &sess_data);
+    ogs_assert(ret == 0);
+    ogs_assert(sess_data == 0);
+
+    /* Send the request */
+    ret = fd_msg_send(&req, mme_s6a_pua_cb, svg);
+    ogs_assert(ret == 0);
+
+    /* Increment the counter */
+    ogs_assert(pthread_mutex_lock(&ogs_diam_logger_self()->stats_lock) == 0);
+    ogs_diam_logger_self()->stats.nb_sent++;
+    ogs_assert(pthread_mutex_unlock(&ogs_diam_logger_self()->stats_lock) == 0);
+}
+
 /* MME received Update Location Answer from HSS */
 static void mme_s6a_ula_cb(void *data, struct msg **msg)
 {
@@ -1242,13 +1353,28 @@
 
     /* Search the session, retrieve its data */
     ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(new == 0);
+    if (ret != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
+    if (new != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
     
     ret = fd_sess_state_retrieve(mme_s6a_reg, session, &sess_data);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(sess_data);
-    ogs_expect_or_return((void *)sess_data == data);
+    if (ret != 0) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if (!sess_data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if ((void *)sess_data != data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
 
     mme_ue = sess_data->mme_ue;
     ogs_assert(mme_ue);
@@ -1453,6 +1579,212 @@
     return;
 }
 
+/* MME received Purge UE Answer from HSS */
+static void mme_s6a_pua_cb(void *data, struct msg **msg)
+{
+    int ret;
+
+    struct sess_state *sess_data = NULL;
+    struct timespec ts;
+    struct session *session;
+    struct avp *avp, *avpch;
+    struct avp_hdr *hdr;
+    unsigned long dur;
+    int error = 0;
+    int new;
+
+    mme_event_t *e = NULL;
+    mme_ue_t *mme_ue = NULL;
+    ogs_diam_s6a_message_t *s6a_message = NULL;
+    ogs_diam_s6a_pua_message_t *pua_message = NULL;
+
+    ogs_debug("MME Purge-UE-Answer");
+
+    ret = clock_gettime(CLOCK_REALTIME, &ts);
+    ogs_assert(ret == 0);
+
+    /* Search the session, retrieve its data */
+    ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
+    if (ret != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
+    if (new != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
+
+    ret = fd_sess_state_retrieve(mme_s6a_reg, session, &sess_data);
+    if (ret != 0) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if (!sess_data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if ((void *)sess_data != data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+
+    mme_ue = sess_data->mme_ue;
+    ogs_assert(mme_ue);
+
+    /* Set Purge-UE Command */
+    s6a_message = ogs_calloc(1, sizeof(ogs_diam_s6a_message_t));
+    ogs_assert(s6a_message);
+    s6a_message->cmd_code = OGS_DIAM_S6A_CMD_CODE_PURGE_UE;
+    pua_message = &s6a_message->pua_message;
+    ogs_assert(pua_message);
+
+    /* AVP: 'Result-Code'(268)
+     * The Result-Code AVP indicates whether a particular request was completed
+     * successfully or whether an error occurred. The Result-Code data field
+     * contains an IANA-managed 32-bit address space representing errors.
+     * Reference: RFC 6733
+     */
+    ret = fd_msg_search_avp(*msg, ogs_diam_result_code, &avp);
+    ogs_assert(ret == 0);
+    if (avp) {
+        ret = fd_msg_avp_hdr(avp, &hdr);
+        ogs_assert(ret == 0);
+        s6a_message->result_code = hdr->avp_value->i32;
+        s6a_message->err = &s6a_message->result_code;
+        ogs_debug("    Result Code: %d", hdr->avp_value->i32);
+    } else {
+        ret = fd_msg_search_avp(*msg, ogs_diam_experimental_result, &avp);
+        ogs_assert(ret == 0);
+        if (avp) {
+            ret = fd_avp_search_avp(avp,
+                    ogs_diam_experimental_result_code, &avpch);
+            ogs_assert(ret == 0);
+            if (avpch) {
+                ret = fd_msg_avp_hdr(avpch, &hdr);
+                ogs_assert(ret == 0);
+                s6a_message->result_code = hdr->avp_value->i32;
+                s6a_message->exp_err = &s6a_message->result_code;
+                ogs_debug("    Experimental Result Code: %d",
+                        s6a_message->result_code);
+            }
+        } else {
+            ogs_error("no Result-Code");
+            error++;
+        }
+    }
+
+    /* AVP: 'Origin-Host'(264)
+     * The Origin-Host AVP identifies the endpoint that originated the Diameter
+     * message. Relay agents MUST NOT modify this AVP. The value of the
+     * Origin-Host AVP is guaranteed to be unique within a single host.
+     * Reference: RFC 6733
+     */
+    ret = fd_msg_search_avp(*msg, ogs_diam_origin_host, &avp);
+    ogs_assert(ret == 0);
+    if (avp) {
+        ret = fd_msg_avp_hdr(avp, &hdr);
+        ogs_assert(ret == 0);
+        ogs_debug("    From '%.*s'",
+                (int)hdr->avp_value->os.len, hdr->avp_value->os.data);
+    } else {
+        ogs_error("no_Origin-Host");
+        error++;
+    }
+
+    /* AVP: 'Origin-Realm'(296)
+     * This AVP contains the Realm of the originator of any Diameter message
+     * and MUST be present in all messages. This AVP SHOULD be placed as close
+     * to the Diameter header as possible.
+     * Reference: RFC 6733
+     */
+    ret = fd_msg_search_avp(*msg, ogs_diam_origin_realm, &avp);
+    ogs_assert(ret == 0);
+    if (avp) {
+        ret = fd_msg_avp_hdr(avp, &hdr);
+        ogs_assert(ret == 0);
+        ogs_debug("         ('%.*s')",
+                (int)hdr->avp_value->os.len, hdr->avp_value->os.data);
+    } else {
+        ogs_error("no_Origin-Realm");
+        error++;
+    }
+
+    /* AVP: 'PUA-Flags'(1406)
+     * The PUA-Flags AVP contains a bit mask, whose meanings are defined in
+     * table in 29.272 7.3.8/1.
+     * Reference: 3GPP TS 29.272-f70
+     */
+    ret = fd_msg_search_avp(*msg, ogs_diam_s6a_pua_flags, &avp);
+    ogs_assert(ret == 0);
+    if (avp) {
+        ret = fd_msg_avp_hdr(avp, &hdr);
+        ogs_assert(ret == 0);
+        pua_message->pua_flags = hdr->avp_value->i32;
+    }
+
+    if (!error) {
+        int rv;
+        e = mme_event_new(MME_EVENT_S6A_MESSAGE);
+        ogs_assert(e);
+        e->mme_ue = mme_ue;
+        e->s6a_message = s6a_message;
+        rv = ogs_queue_push(ogs_app()->queue, e);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_queue_push() failed:%d", (int)rv);
+            ogs_free(s6a_message);
+            mme_event_free(e);
+        } else {
+            ogs_pollset_notify(ogs_app()->pollset);
+        }
+    } else {
+        ogs_free(s6a_message);
+    }
+
+    /* Free the message */
+    ogs_assert(pthread_mutex_lock(&ogs_diam_logger_self()->stats_lock) == 0);
+    dur = ((ts.tv_sec - sess_data->ts.tv_sec) * 1000000) +
+        ((ts.tv_nsec - sess_data->ts.tv_nsec) / 1000);
+    if (ogs_diam_logger_self()->stats.nb_recv) {
+        /* Ponderate in the avg */
+        ogs_diam_logger_self()->stats.avg =
+            (ogs_diam_logger_self()->stats.avg *
+            ogs_diam_logger_self()->stats.nb_recv + dur) /
+            (ogs_diam_logger_self()->stats.nb_recv + 1);
+        /* Min, max */
+        if (dur < ogs_diam_logger_self()->stats.shortest)
+            ogs_diam_logger_self()->stats.shortest = dur;
+        if (dur > ogs_diam_logger_self()->stats.longest)
+            ogs_diam_logger_self()->stats.longest = dur;
+    } else {
+        ogs_diam_logger_self()->stats.shortest = dur;
+        ogs_diam_logger_self()->stats.longest = dur;
+        ogs_diam_logger_self()->stats.avg = dur;
+    }
+    if (error)
+        ogs_diam_logger_self()->stats.nb_errs++;
+    else
+        ogs_diam_logger_self()->stats.nb_recv++;
+
+    ogs_assert(pthread_mutex_unlock(&ogs_diam_logger_self()->stats_lock) == 0);
+
+    /* Display how long it took */
+    if (ts.tv_nsec > sess_data->ts.tv_nsec)
+        ogs_trace("in %d.%06ld sec",
+                (int)(ts.tv_sec - sess_data->ts.tv_sec),
+                (long)(ts.tv_nsec - sess_data->ts.tv_nsec) / 1000);
+    else
+        ogs_trace("in %d.%06ld sec",
+                (int)(ts.tv_sec + 1 - sess_data->ts.tv_sec),
+                (long)(1000000000 + ts.tv_nsec - sess_data->ts.tv_nsec) / 1000);
+
+    ret = fd_msg_free(*msg);
+    ogs_assert(ret == 0);
+    *msg = NULL;
+
+    state_cleanup(sess_data, NULL, NULL);
+    return;
+}
+
 /* Callback for incoming Cancel-Location-Request messages */
 static int mme_ogs_diam_s6a_clr_cb( struct msg **msg, struct avp *avp,
         struct session *session, void *opaque, enum disp_action *act)
@@ -1701,12 +2033,13 @@
         memcpy(ida_ecgi,
                 ogs_nas_from_plmn_id(&ida_plmn_buf, &mme_ue->e_cgi.plmn_id), 3);
         memcpy(ida_ecgi + 3,
-                OGS_HEX(ida_cell_id_hex, sizeof(ida_cell_id_hex), buf), 5);
+                ogs_hex_from_string(ida_cell_id_hex, buf, sizeof(buf)), 5);
 
         ogs_snprintf(ida_tac_hex, sizeof(ida_tac_hex), "%04x", ida_tac);
         memcpy(ida_tai,
                 ogs_nas_from_plmn_id(&ida_plmn_buf, &mme_ue->tai.plmn_id), 3);
-        memcpy(ida_tai + 3, OGS_HEX(ida_tac_hex, sizeof(ida_tac_hex), buf), 2);
+        memcpy(ida_tai + 3,
+                ogs_hex_from_string(ida_tac_hex, buf, sizeof(buf)), 2);
 
         ida_age =
             (ogs_time_now() - mme_ue->ue_location_timestamp) / 1000000 / 60;

open5gs_2.5.8.tar.xz/src/mme/mme-fd-path.h -> open5gs_2.6.0.tar.xz/src/mme/mme-fd-path.h Changed

open5gs_2.5.8.tar.xz/src/mme/mme-gtp-path.c -> open5gs_2.6.0.tar.xz/src/mme/mme-gtp-path.c Changed

@@ -76,6 +76,7 @@
 
 static void timeout(ogs_gtp_xact_t *xact, void *data)
 {
+    int r;
     mme_ue_t *mme_ue = NULL;
     enb_ue_t *enb_ue = NULL;
     mme_sess_t *sess = NULL;
@@ -131,10 +132,11 @@
 
         enb_ue = enb_ue_cycle(mme_ue->enb_ue);
         if (enb_ue) {
-            ogs_assert(OGS_OK ==
-                s1ap_send_ue_context_release_command(enb_ue,
+            r = s1ap_send_ue_context_release_command(enb_ue,
                     S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                    S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                    S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         } else {
             ogs_warn("No S1 Context");
         }
@@ -223,10 +225,16 @@
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_create_session_request(h.type, sess, create_action);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("mme_s11_build_create_session_request() failed");
+        return OGS_ERROR;
+    }
 
     xact = ogs_gtp_xact_local_create(sgw_ue->gnode, &h, pkbuf, timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
     xact->create_action = create_action;
     xact->local_teid = mme_ue->mme_s11_teid;
 
@@ -256,10 +264,16 @@
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_modify_bearer_request(h.type, mme_ue, uli_presence);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("mme_s11_build_modify_bearer_request() failed");
+        return OGS_ERROR;
+    }
 
     xact = ogs_gtp_xact_local_create(sgw_ue->gnode, &h, pkbuf, timeout, mme_ue);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
     xact->modify_action = modify_action;
     xact->local_teid = mme_ue->mme_s11_teid;
 
@@ -289,10 +303,16 @@
     h.teid = sgw_ue->sgw_s11_teid;
 
     s11buf = mme_s11_build_delete_session_request(h.type, sess, action);
-    ogs_expect_or_return_val(s11buf, OGS_ERROR);
+    if (!s11buf) {
+        ogs_error("mme_s11_build_delete_session_request() failed");
+        return OGS_ERROR;
+    }
 
     xact = ogs_gtp_xact_local_create(sgw_ue->gnode, &h, s11buf, timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
     xact->delete_action = action;
     xact->local_teid = mme_ue->mme_s11_teid;
 
@@ -370,10 +390,16 @@
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_create_bearer_response(h.type, bearer, cause_value);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("mme_s11_build_create_bearer_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -409,10 +435,16 @@
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_update_bearer_response(h.type, bearer, cause_value);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("mme_s11_build_update_bearer_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -448,10 +480,16 @@
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_delete_bearer_response(h.type, bearer, cause_value);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("mme_s11_build_delete_bearer_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -477,10 +515,16 @@
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_release_access_bearers_request(h.type);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("mme_s11_build_release_access_bearers_request() failed");
+        return OGS_ERROR;
+    }
 
     xact = ogs_gtp_xact_local_create(sgw_ue->gnode, &h, pkbuf, timeout, mme_ue);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
     xact->release_action = action;
     xact->local_teid = mme_ue->mme_s11_teid;
 
@@ -568,10 +612,16 @@
     h.teid = sgw_ue->sgw_s11_teid;
 
     s11buf = mme_s11_build_downlink_data_notification_ack(h.type, cause_value);
-    ogs_expect_or_return_val(s11buf, OGS_ERROR);
+    if (!s11buf) {
+        ogs_error("mme_s11_build_downlink_data_notification_ack() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_update_tx(xact, &h, s11buf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -598,10 +648,17 @@
 
     pkbuf = mme_s11_build_create_indirect_data_forwarding_tunnel_request(
             h.type, mme_ue);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("mme_s11_build_create_indirect_data_forwarding_"
+                "tunnel_request() failed");
+        return OGS_ERROR;
+    }
 
     xact = ogs_gtp_xact_local_create(sgw_ue->gnode, &h, pkbuf, timeout, mme_ue);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
     xact->local_teid = mme_ue->mme_s11_teid;
 
     rv = ogs_gtp_xact_commit(xact);
@@ -629,11 +686,17 @@
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_TLV_MAX_HEADROOM);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("ogs_pkbuf_alloc() failed");
+        return OGS_ERROR;
+    }
     ogs_pkbuf_reserve(pkbuf, OGS_TLV_MAX_HEADROOM);
 
     xact = ogs_gtp_xact_local_create(sgw_ue->gnode, &h, pkbuf, timeout, mme_ue);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
     xact->delete_indirect_action = action;
     xact->local_teid = mme_ue->mme_s11_teid;
 
@@ -665,10 +728,16 @@
     h.teid = sgw_ue->sgw_s11_teid;
 
     pkbuf = mme_s11_build_bearer_resource_command(h.type, bearer, nas_message);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("mme_s11_build_bearer_resource_command() failed");
+        return OGS_ERROR;
+    }
 
     xact = ogs_gtp_xact_local_create(sgw_ue->gnode, &h, pkbuf, timeout, bearer);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
     xact->xid |= OGS_GTP_CMD_XACT_ID;
     xact->local_teid = mme_ue->mme_s11_teid;

open5gs_2.5.8.tar.xz/src/mme/mme-init.c -> open5gs_2.6.0.tar.xz/src/mme/mme-init.c Changed

@@ -39,7 +39,9 @@
 int mme_initialize()
 {
     int rv;
-    ogs_metrics_context_init();
+
+    mme_metrics_init();
+
     ogs_gtp_context_init(OGS_MAX_NUM_OF_GTPU_RESOURCE);
     mme_context_init();
 
@@ -55,9 +57,6 @@
     rv = mme_context_parse_config();
     if (rv != OGS_OK) return rv;
 
-    rv = mme_metrics_open();
-    if (rv != 0) return OGS_ERROR;
-
     rv = ogs_log_config_domain(
             ogs_app()->logger.domain, ogs_app()->logger.level);
     if (rv != OGS_OK) return rv;
@@ -65,6 +64,8 @@
     rv = mme_m_tmsi_pool_generate();
     if (rv != OGS_OK) return rv;
 
+    ogs_metrics_context_open(ogs_metrics_self());
+
     rv = mme_fd_init();
     if (rv != OGS_OK) return OGS_ERROR;
 
@@ -96,7 +97,8 @@
     mme_gtp_close();
     sgsap_close();
     s1ap_close();
-    mme_metrics_close();
+
+    ogs_metrics_context_close(ogs_metrics_self());
 
     mme_fd_final();
 
@@ -106,7 +108,7 @@
 
     ogs_gtp_xact_final();
 
-    ogs_metrics_context_final();
+    mme_metrics_final();
 }
 
 static void mme_main(void *data)

open5gs_2.5.8.tar.xz/src/mme/mme-path.c -> open5gs_2.6.0.tar.xz/src/mme/mme-path.c Changed

@@ -22,10 +22,12 @@
 #include "sgsap-path.h"
 #include "mme-gtp-path.h"
 #include "mme-path.h"
+#include "mme-fd-path.h"
 #include "mme-sm.h"
 
 void mme_send_delete_session_or_detach(mme_ue_t *mme_ue)
 {
+    int r;
     ogs_assert(mme_ue);
 
     switch (mme_ue->detach_type) {
@@ -35,7 +37,9 @@
             mme_gtp_send_delete_all_sessions(
                     mme_ue, OGS_GTP_DELETE_SEND_DETACH_ACCEPT);
         } else {
-            ogs_assert(OGS_OK == nas_eps_send_detach_accept(mme_ue));
+            r = nas_eps_send_detach_accept(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         break;
 
@@ -58,10 +62,31 @@
         }
         break;
 
-    /* MME Implicit Detach, ie: Lost Communication */
+    /* MME Implicit Detach, ie: Lost Communication
+     * TS23.401 - V16.10.0
+     * Ch 5.3.8.3 MME-initiated Detach procedure (Without Step 1)
+     */
     case MME_DETACH_TYPE_MME_IMPLICIT:
-        ogs_fatal("Not Implemented : MME_DETACH_TYPE_MME_IMPLICIT");
-        ogs_assert_if_reached();
+        ogs_debug("Implicit MME Detach");
+        if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
+            mme_gtp_send_delete_all_sessions(mme_ue,
+                OGS_GTP_DELETE_SEND_RELEASE_WITH_UE_CONTEXT_REMOVE);
+        } else {
+            enb_ue_t *enb_ue = enb_ue_cycle(mme_ue->enb_ue);
+            if (enb_ue) {
+                ogs_assert(OGS_OK ==
+                    s1ap_send_ue_context_release_command(enb_ue,
+                        S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
+                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+            } else {
+                if (mme_ue->location_updated_but_not_canceled_yet == true) {
+                    mme_s6a_send_pur(mme_ue);
+                } else {
+                    mme_ue_hash_remove(mme_ue);
+                    mme_ue_remove(mme_ue);
+                }
+            }
+        }
         break;
 
     /* HSS Implicit Detach, ie: MME-UPDATE-PROCEDURE
@@ -94,6 +119,7 @@
 
 void mme_send_delete_session_or_mme_ue_context_release(mme_ue_t *mme_ue)
 {
+    int r;
     ogs_assert(mme_ue);
 
     if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) {
@@ -102,10 +128,11 @@
     } else {
         enb_ue_t *enb_ue = enb_ue_cycle(mme_ue->enb_ue);
         if (enb_ue) {
-            ogs_assert(OGS_OK ==
-                s1ap_send_ue_context_release_command(enb_ue,
+            r = s1ap_send_ue_context_release_command(enb_ue,
                     S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                    S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                    S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         } else {
             ogs_warn("%s No S1 Context", mme_ue->imsi_bcd);
         }
@@ -114,6 +141,7 @@
 
 void mme_send_release_access_bearer_or_ue_context_release(enb_ue_t *enb_ue)
 {
+    int r;
     mme_ue_t *mme_ue = NULL;
     ogs_assert(enb_ue);
 
@@ -125,15 +153,17 @@
                 mme_ue, OGS_GTP_RELEASE_SEND_UE_CONTEXT_RELEASE_COMMAND));
     } else {
         ogs_debug("No UE Context");
-        ogs_assert(OGS_OK ==
-            s1ap_send_ue_context_release_command(enb_ue,
+        r = s1ap_send_ue_context_release_command(enb_ue,
                 S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0));
+                S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     }
 }
 
 void mme_send_after_paging(mme_ue_t *mme_ue, bool failed)
 {
+    int r;
     mme_bearer_t *bearer = NULL;
 
     ogs_assert(mme_ue);
@@ -168,8 +198,9 @@
                 mme_gtp_send_create_bearer_response(
                     bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
         } else {
-            ogs_assert(OGS_OK ==
-                nas_eps_send_activate_dedicated_bearer_context_request(bearer));
+            r = nas_eps_send_activate_dedicated_bearer_context_request(bearer);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         break;
     case MME_PAGING_TYPE_UPDATE_BEARER:
@@ -190,12 +221,13 @@
                 goto cleanup;
             }
 
-            ogs_assert(OGS_OK ==
-                nas_eps_send_modify_bearer_context_request(bearer,
+            r = nas_eps_send_modify_bearer_context_request(bearer,
                     (xact->update_flags &
                         OGS_GTP_MODIFY_QOS_UPDATE) ? 1 : 0,
                     (xact->update_flags &
-                        OGS_GTP_MODIFY_TFT_UPDATE) ? 1 : 0));
+                        OGS_GTP_MODIFY_TFT_UPDATE) ? 1 : 0);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         break;
     case MME_PAGING_TYPE_DELETE_BEARER:
@@ -210,8 +242,9 @@
                 mme_gtp_send_delete_bearer_response(
                     bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
         } else {
-            ogs_assert(OGS_OK ==
-                nas_eps_send_deactivate_bearer_context_request(bearer));
+            r = nas_eps_send_deactivate_bearer_context_request(bearer);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         break;
     case MME_PAGING_TYPE_CS_CALL_SERVICE:
@@ -239,7 +272,9 @@
             /* Nothing */
             ogs_warn("MME-initiated Detach cannot be invoked");
         } else {
-            ogs_assert(OGS_OK == nas_eps_send_detach_request(mme_ue));
+            r = nas_eps_send_detach_request(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             if (MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
                 ogs_assert(OGS_OK == sgsap_send_detach_indication(mme_ue));
             } else {

open5gs_2.5.8.tar.xz/src/mme/mme-s11-build.c -> open5gs_2.6.0.tar.xz/src/mme/mme-s11-build.c Changed

@@ -558,7 +558,10 @@
         enb_s1u_teid.interface_type = OGS_GTP2_F_TEID_S1_U_ENODEB_GTP_U;
         enb_s1u_teid.teid = htobe32(bearer->enb_s1u_teid);
         rv = ogs_gtp2_ip_to_f_teid(&bearer->enb_s1u_ip, &enb_s1u_teid, &len);
-        ogs_expect_or_return_val(rv == OGS_OK, NULL);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp2_ip_to_f_teid() failed");
+            return NULL;
+        }
         rsp->bearer_contexts.s1_u_enodeb_f_teid.presence = 1;
         rsp->bearer_contexts.s1_u_enodeb_f_teid.data = &enb_s1u_teid;
         rsp->bearer_contexts.s1_u_enodeb_f_teid.len = len;
@@ -568,7 +571,10 @@
         sgw_s1u_teid.interface_type = OGS_GTP2_F_TEID_S1_U_SGW_GTP_U;
         sgw_s1u_teid.teid = htobe32(bearer->sgw_s1u_teid);
         rv = ogs_gtp2_ip_to_f_teid(&bearer->sgw_s1u_ip, &sgw_s1u_teid, &len);
-        ogs_expect_or_return_val(rv == OGS_OK, NULL);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp2_ip_to_f_teid() failed");
+            return NULL;
+        }
         rsp->bearer_contexts.s4_u_sgsn_f_teid.presence = 1;
         rsp->bearer_contexts.s4_u_sgsn_f_teid.data = &sgw_s1u_teid;
         rsp->bearer_contexts.s4_u_sgsn_f_teid.len = OGS_GTP2_F_TEID_IPV4_LEN;
@@ -886,7 +892,10 @@
                 dl_teidi.teid = htobe32(bearer->enb_dl_teid);
                 rv = ogs_gtp2_ip_to_f_teid(
                         &bearer->enb_dl_ip, &dl_teidi, &len);
-                ogs_expect_or_return_val(rv == OGS_OK, NULL);
+                if (rv != OGS_OK) {
+                    ogs_error("ogs_gtp2_ip_to_f_teid() failed");
+                    return NULL;
+                }
                 req->bearer_contextsi.s1_u_enodeb_f_teid.presence = 1;
                 req->bearer_contextsi.s1_u_enodeb_f_teid.data = &dl_teidi;
                 req->bearer_contextsi.s1_u_enodeb_f_teid.len = len;
@@ -899,7 +908,10 @@
                 ul_teidi.teid = htobe32(bearer->enb_ul_teid);
                 rv = ogs_gtp2_ip_to_f_teid(
                         &bearer->enb_ul_ip, &ul_teidi, &len);
-                ogs_expect_or_return_val(rv == OGS_OK, NULL);
+                if (rv != OGS_OK) {
+                    ogs_error("ogs_gtp2_ip_to_f_teid() failed");
+                    return NULL;
+                }
                 req->bearer_contextsi.s12_rnc_f_teid.presence = 1;
                 req->bearer_contextsi.s12_rnc_f_teid.data = &ul_teidi;
                 req->bearer_contextsi.s12_rnc_f_teid.len = len;

open5gs_2.5.8.tar.xz/src/mme/mme-s11-handler.c -> open5gs_2.6.0.tar.xz/src/mme/mme-s11-handler.c Changed

@@ -81,9 +81,10 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue_from_teid,
         ogs_gtp2_create_session_response_t *rsp)
 {
-    int rv, i;
-    uint8_t cause_value = 0;
-    ogs_gtp2_cause_t *cause = NULL;
+    int i, r, rv;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
+    uint8_t session_cause = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
+    uint8_t bearer_cause = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     ogs_gtp2_f_teid_t *sgw_s11_teid = NULL;
     ogs_gtp2_f_teid_t *pgw_s5c_teid = NULL;
     ogs_gtp2_f_teid_t *sgw_s1u_teid = NULL;
@@ -124,7 +125,19 @@
     }
 
     rv = ogs_gtp_xact_commit(xact);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_commit() failed");
+        return;
+    }
+
+    /************************
+     * Getting Cause Value
+     ************************/
+    if (rsp->cause.presence && rsp->cause.data) {
+        ogs_gtp2_cause_t *cause = rsp->cause.data;
+        ogs_assert(cause);
+        session_cause = cause->value;
+    }
 
     /************************
      * Check MME-UE Context
@@ -132,15 +145,20 @@
     cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
 
     if (!mme_ue_from_teid) {
-        ogs_error("No Context in TEID");
+        ogs_error("%s No Context in TEID Cause:%d",
+                mme_ue->imsi_bcd, session_cause);
         cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
         if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
-            ogs_error("%s Attach reject", mme_ue->imsi_bcd);
-            ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_NETWORK_FAILURE, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE));
+            ogs_error("%s Attach reject Cause:%d",
+                    mme_ue->imsi_bcd, session_cause);
+            r = nas_eps_send_attach_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_NETWORK_FAILURE,
+                    OGS_NAS_ESM_CAUSE_NETWORK_FAILURE);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         mme_send_delete_session_or_mme_ue_context_release(mme_ue);
         return;
@@ -152,7 +170,8 @@
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
     if (rsp->sender_f_teid_for_control_plane.presence == 0) {
-        ogs_error("No S11 TEID");
+        ogs_error("%s No S11 TEID Cause:%d",
+                mme_ue->imsi_bcd, session_cause);
         cause_value = OGS_GTP2_CAUSE_CONDITIONAL_IE_MISSING;
     }
 
@@ -163,7 +182,8 @@
     } else {
 
         if (rsp->pgw_s5_s8__s2a_s2b_f_teid_for_pmip_based_interface_or_for_gtp_based_control_plane_interface.presence == 0) {
-            ogs_error("No S5C TEID");
+            ogs_error("%s No S5C TEID Cause:%d",
+                    mme_ue->imsi_bcd, session_cause);
             cause_value = OGS_GTP2_CAUSE_CONDITIONAL_IE_MISSING;
         }
 
@@ -182,25 +202,31 @@
                     rsp->pdn_address_allocation.len);
 
             if (!OGS_PDU_SESSION_TYPE_IS_VALID(paa.session_type)) {
-                ogs_error("Unknown PDN Type%u", paa.session_type);
+                ogs_error("%s Unknown PDN Type Session:%u, Cause:%d",
+                        mme_ue->imsi_bcd, paa.session_type, session_cause);
                 cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_INCORRECT;
             }
         } else {
-            ogs_error("No PDN Address Allocation");
+            ogs_error("%s No PDN Address Allocation Cause:%d",
+                    mme_ue->imsi_bcd, session_cause);
             cause_value = OGS_GTP2_CAUSE_CONDITIONAL_IE_MISSING;
         }
     }
 
     if (rsp->cause.presence == 0) {
-        ogs_error("No Cause");
+        ogs_error("%s No Cause VALUE:%d", mme_ue->imsi_bcd, session_cause);
         cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_MISSING;
     }
 
     if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
         if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
-            ogs_error("%s Attach reject", mme_ue->imsi_bcd);
-            ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_NETWORK_FAILURE, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE));
+            ogs_error("%s Attach reject Cause:%d",
+                    mme_ue->imsi_bcd, session_cause);
+            r = nas_eps_send_attach_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_NETWORK_FAILURE,
+                    OGS_NAS_ESM_CAUSE_NETWORK_FAILURE);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         mme_send_delete_session_or_mme_ue_context_release(mme_ue);
         return;
@@ -212,39 +238,47 @@
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
     for (i = 0; i < OGS_BEARER_PER_UE; i++) {
+        ogs_gtp2_cause_t *cause = NULL;
+
         if (rsp->bearer_contexts_createdi.cause.presence == 0) {
             break;
         }
-
         cause = rsp->bearer_contexts_createdi.cause.data;
-        ogs_assert(cause);
-        cause_value = cause->value;
-        if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-            ogs_error("GTP Bearer Cause VALUE:%d", cause_value);
+        if (cause == NULL) {
+            ogs_error("No Cause Data");
+            continue;
+        }
+        bearer_cause = cause->value;
+        if (bearer_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
+            ogs_error("%s GTP Bearer Cause VALUE:%d",
+                    mme_ue->imsi_bcd, bearer_cause);
             if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
                 ogs_error("%s Attach reject", mme_ue->imsi_bcd);
-                ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue,
-                        OGS_NAS_EMM_CAUSE_NETWORK_FAILURE, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE));
+                r = nas_eps_send_attach_reject(mme_ue,
+                        OGS_NAS_EMM_CAUSE_NETWORK_FAILURE,
+                        OGS_NAS_ESM_CAUSE_NETWORK_FAILURE);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             mme_send_delete_session_or_mme_ue_context_release(mme_ue);
             return;
         }
     }
 
-    cause = rsp->cause.data;
-    ogs_assert(cause);
-    cause_value = cause->value;
-    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED &&
-        cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED_PARTIALLY &&
-        cause_value !=
+    if (session_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED &&
+        session_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED_PARTIALLY &&
+        session_cause !=
             OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_NETWORK_PREFERENCE &&
-        cause_value !=
+        session_cause !=
             OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_SINGLE_ADDRESS_BEARER_ONLY) {
-        ogs_error("GTP Cause Value:%d", cause_value);
+        ogs_error("%s GTP Cause VALUE:%d", mme_ue->imsi_bcd, session_cause);
         if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
             ogs_error("%s Attach reject", mme_ue->imsi_bcd);
-            ogs_assert(OGS_OK == nas_eps_send_attach_reject(mme_ue,
-                    OGS_NAS_EMM_CAUSE_NETWORK_FAILURE, OGS_NAS_ESM_CAUSE_NETWORK_FAILURE));
+            r = nas_eps_send_attach_reject(mme_ue,
+                    OGS_NAS_EMM_CAUSE_NETWORK_FAILURE,
+                    OGS_NAS_ESM_CAUSE_NETWORK_FAILURE);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         mme_send_delete_session_or_mme_ue_context_release(mme_ue);
         return;
@@ -374,15 +408,17 @@
         } else {
             ogs_assert(OGS_PDU_SESSION_TYPE_IS_VALID(
                         session->paa.session_type));
-            ogs_assert(OGS_OK ==
-                nas_eps_send_attach_accept(mme_ue));
+            r = nas_eps_send_attach_accept(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
 
     } else if (create_action == OGS_GTP_CREATE_IN_UPLINK_NAS_TRANSPORT) {
         ogs_assert(OGS_PDU_SESSION_TYPE_IS_VALID(session->paa.session_type));
-        ogs_assert(OGS_OK ==
-            nas_eps_send_activate_default_bearer_context_request(
-                bearer, create_action));
+        r = nas_eps_send_activate_default_bearer_context_request(
+                bearer, create_action);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     } else if (create_action == OGS_GTP_CREATE_IN_PATH_SWITCH_REQUEST) {
 
         GTP_COUNTER_CHECK(mme_ue, GTP_COUNTER_CREATE_SESSION_BY_PATH_SWITCH,
@@ -390,7 +426,9 @@
                     mme_timer_cfg(MME_TIMER_S11_HOLDING)->duration);
 
             sgw_ue_associate_mme_ue(target_ue, mme_ue);
-            ogs_assert(OGS_OK == s1ap_send_path_switch_ack(mme_ue, true));
+            r = s1ap_send_path_switch_ack(mme_ue, true);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         );
 
     } else {
@@ -403,10 +441,10 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue_from_teid,
         ogs_gtp2_modify_bearer_response_t *rsp)
 {
-    int rv;
-    uint8_t cause_value = 0;
+    int r, rv;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
+    uint8_t session_cause = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     int modify_action = 0;
-    ogs_gtp2_cause_t *cause = NULL;
 
     mme_ue_t *mme_ue = NULL;
     sgw_ue_t *sgw_ue = NULL;
@@ -426,7 +464,19 @@
     ogs_assert(sgw_ue);
 
     rv = ogs_gtp_xact_commit(xact);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_commit() failed");
+        return;
+    }
+
+    /************************
+     * Getting Cause Value
+     ************************/
+    if (rsp->cause.presence && rsp->cause.data) {
+        ogs_gtp2_cause_t *cause = rsp->cause.data;
+        ogs_assert(cause);
+        session_cause = cause->value;
+    }
 
     /************************
      * Check MME-UE Context
@@ -434,7 +484,8 @@
     cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
 
     if (!mme_ue_from_teid) {
-        ogs_error("No Context in TEID");
+        ogs_error("%s No Context in TEID Cause:%d",
+                mme_ue->imsi_bcd, session_cause);
         cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
     }
 
@@ -449,7 +500,7 @@
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
     if (rsp->cause.presence == 0) {
-        ogs_error("No Cause");
+        ogs_error("%s No Cause %d", mme_ue->imsi_bcd, session_cause);
         cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_MISSING;
     }
 
@@ -463,11 +514,8 @@
      ********************/
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
-    cause = rsp->cause.data;
-    ogs_assert(cause);
-    cause_value = cause->value;
-    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Cause Value:%d", cause_value);
+    if (session_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
+        ogs_error("%s GTP Cause VALUE:%d", mme_ue->imsi_bcd, session_cause);
         mme_send_delete_session_or_mme_ue_context_release(mme_ue);
         return;
     }
@@ -483,10 +531,14 @@
 
     switch (modify_action) {
     case OGS_GTP_MODIFY_IN_PATH_SWITCH_REQUEST:
-        ogs_assert(OGS_OK == s1ap_send_path_switch_ack(mme_ue, false));
+        r = s1ap_send_path_switch_ack(mme_ue, false);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         break;
     case OGS_GTP_MODIFY_IN_E_RAB_MODIFICATION:
-        ogs_assert(OGS_OK == s1ap_send_e_rab_modification_confirm(mme_ue));
+        r = s1ap_send_e_rab_modification_confirm(mme_ue);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         break;
     default:
         break;
@@ -497,8 +549,8 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue_from_teid,
         ogs_gtp2_delete_session_response_t *rsp)
 {
-    int rv;
-    uint8_t cause_value = 0;
+    int r, rv;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     int action = 0;
     sgw_ue_t *source_ue = NULL, *target_ue = NULL;
     mme_sess_t *sess = NULL;
@@ -530,7 +582,10 @@
     }
 
     rv = ogs_gtp_xact_commit(xact);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_commit() failed");
+        return;
+    }
 
     /************************
      * Check MME-UE Context
@@ -548,7 +603,7 @@
 
         cause_value = cause->value;
         if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED)
-            ogs_error("GTP Cause Value:%d - Ignored", cause_value);
+            ogs_error("GTP Cause VALUE:%d - Ignored", cause_value);
     }
 
     /********************
@@ -573,16 +628,22 @@
 
     } else if (action == OGS_GTP_DELETE_SEND_DETACH_ACCEPT) {
         if (mme_sess_count(mme_ue) == 1) /* Last Session */ {
-            ogs_assert(OGS_OK == nas_eps_send_detach_accept(mme_ue));
+            r = nas_eps_send_detach_accept(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
 
     } else if (action ==
             OGS_GTP_DELETE_SEND_DEACTIVATE_BEARER_CONTEXT_REQUEST) {
         mme_bearer_t *bearer = mme_default_bearer_in_sess(sess);
-        ogs_expect_or_return(bearer);
+        if (!bearer) {
+            ogs_error("No Bearer");
+            return;
+        }
 
-        ogs_assert(OGS_OK ==
-            nas_eps_send_deactivate_bearer_context_request(bearer));
+        r = nas_eps_send_deactivate_bearer_context_request(bearer);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         /*
          * mme_sess_remove() should not be called here.
@@ -595,14 +656,19 @@
     } else if (action == OGS_GTP_DELETE_SEND_RELEASE_WITH_UE_CONTEXT_REMOVE) {
         if (mme_sess_count(mme_ue) == 1) /* Last Session */ {
             if (ECM_IDLE(mme_ue)) {
-                mme_ue_hash_remove(mme_ue);
-                mme_ue_remove(mme_ue);
+                if (mme_ue->location_updated_but_not_canceled_yet == true) {
+                    mme_s6a_send_pur(mme_ue);
+                } else {
+                    mme_ue_hash_remove(mme_ue);
+                    mme_ue_remove(mme_ue);
+                }
             } else {
                 ogs_assert(mme_ue->enb_ue);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(mme_ue->enb_ue,
+                r = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
                     S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                    S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                    S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
         }
 
@@ -613,10 +679,11 @@
 
             enb_ue = enb_ue_cycle(mme_ue->enb_ue);
             if (enb_ue) {
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(enb_ue,
+                r = s1ap_send_ue_context_release_command(enb_ue,
                         S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                        S1AP_UE_CTX_REL_S1_REMOVE_AND_UNLINK, 0));
+                        S1AP_UE_CTX_REL_S1_REMOVE_AND_UNLINK, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else
                 ogs_error("ENB-S1 Context has already been removed");
         }
@@ -627,10 +694,11 @@
                     &mme_ue->pdn_connectivity_request);
             if (rv != OGS_OK) {
                 ogs_error("nas_eps_send_emm_to_esm() failed");
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_attach_reject(mme_ue,
+                r = nas_eps_send_attach_reject(mme_ue,
                         OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
         }
 
@@ -669,7 +737,8 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue,
         ogs_gtp2_create_bearer_request_t *req)
 {
-    uint8_t cause_value = 0;
+    int r;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     mme_bearer_t *bearer = NULL, *default_bearer = NULL;
     mme_sess_t *sess = NULL;
     sgw_ue_t *sgw_ue = NULL;
@@ -785,9 +854,12 @@
             ogs_gtp2_f_teid_to_ip(pgw_s5u_teid, &bearer->pgw_s5u_ip));
 
     /* Bearer QoS */
-    ogs_expect_or_return(ogs_gtp2_parse_bearer_qos(&bearer_qos,
-        &req->bearer_contexts.bearer_level_qos) ==
-        req->bearer_contexts.bearer_level_qos.len);
+    if (ogs_gtp2_parse_bearer_qos(
+                &bearer_qos, &req->bearer_contexts.bearer_level_qos) !=
+            req->bearer_contexts.bearer_level_qos.len) {
+        ogs_error("ogs_gtp2_parse_bearer_qos() failed");
+        return;
+    }
     bearer->qos.index = bearer_qos.qci;
     bearer->qos.arp.priority_level = bearer_qos.priority_level;
     bearer->qos.arp.pre_emption_capability =
@@ -825,16 +897,38 @@
 
     /* Before Activate DEDICATED bearer, check DEFAULT bearer status */
     default_bearer = mme_default_bearer_in_sess(sess);
-    ogs_expect_or_return(default_bearer);
+    if (!default_bearer) {
+        ogs_error("No Default Bearer");
+        return;
+    }
 
     if (OGS_FSM_CHECK(&default_bearer->sm, esm_state_active)) {
         if (ECM_IDLE(mme_ue)) {
-            MME_STORE_PAGING_INFO(mme_ue,
+            if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
+                /*
+                * TS 24.301 5.3.7
+                * If ISR is not activated, the network behaviour upon expiry of
+                * the mobile reachable timer is network dependent, but typically
+                * the network stops sending paging messages to the UE on the
+                * first expiry, and may take other appropriate actions
+                */
+                ogs_debug("%s Paging stopped: Mobile Reachable timer expiry",
+                    mme_ue->imsi_bcd);
+
+                ogs_assert(OGS_OK ==
+                    mme_gtp_send_create_bearer_response(
+                        bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
+            } else {
+                MME_STORE_PAGING_INFO(mme_ue,
                     MME_PAGING_TYPE_CREATE_BEARER, bearer);
-            ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, S1AP_CNDomain_ps));
+                r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
+            }
         } else {
-            ogs_assert(OGS_OK ==
-                nas_eps_send_activate_dedicated_bearer_context_request(bearer));
+            r = nas_eps_send_activate_dedicated_bearer_context_request(bearer);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
     } else {
         /*
@@ -848,7 +942,8 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue,
         ogs_gtp2_update_bearer_request_t *req)
 {
-    uint8_t cause_value = 0;
+    int r;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     mme_bearer_t *bearer = NULL;
     mme_sess_t *sess = NULL;
     sgw_ue_t *sgw_ue = NULL;
@@ -927,9 +1022,12 @@
 
     if (req->bearer_contexts.bearer_level_qos.presence == 1) {
         /* Bearer QoS */
-        ogs_expect_or_return(ogs_gtp2_parse_bearer_qos(&bearer_qos,
-            &req->bearer_contexts.bearer_level_qos) ==
-            req->bearer_contexts.bearer_level_qos.len);
+        if (ogs_gtp2_parse_bearer_qos(
+                    &bearer_qos, &req->bearer_contexts.bearer_level_qos) !=
+                req->bearer_contexts.bearer_level_qos.len) {
+            ogs_error("ogs_gtp2_parse_bearer_qos() failed");
+            return;
+        }
         bearer->qos.index = bearer_qos.qci;
         bearer->qos.arp.priority_level = bearer_qos.priority_level;
         bearer->qos.arp.pre_emption_capability =
@@ -954,14 +1052,33 @@
     if (req->bearer_contexts.bearer_level_qos.presence == 1 ||
         req->bearer_contexts.tft.presence == 1) {
         if (ECM_IDLE(mme_ue)) {
-            MME_STORE_PAGING_INFO(mme_ue,
+            if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
+                /*
+                * TS 24.301 5.3.7
+                * If ISR is not activated, the network behaviour upon expiry of
+                * the mobile reachable timer is network dependent, but typically
+                * the network stops sending paging messages to the UE on the
+                * first expiry, and may take other appropriate actions
+                */
+                ogs_debug("%s Paging stopped: Mobile Reachable timer expiry",
+                    mme_ue->imsi_bcd);
+
+                ogs_assert(OGS_OK ==
+                    mme_gtp_send_update_bearer_response(
+                        bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
+            } else {
+                MME_STORE_PAGING_INFO(mme_ue,
                     MME_PAGING_TYPE_UPDATE_BEARER, bearer);
-            ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, S1AP_CNDomain_ps));
+                r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
+            }
         } else {
-            ogs_assert(OGS_OK ==
-                nas_eps_send_modify_bearer_context_request(bearer,
+            r = nas_eps_send_modify_bearer_context_request(bearer,
                     req->bearer_contexts.bearer_level_qos.presence,
-                    req->bearer_contexts.tft.presence));
+                    req->bearer_contexts.tft.presence);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
     } else {
         ogs_error("IGNORE Update Bearer Request : "
@@ -969,10 +1086,11 @@
 
         if (xact->xid & OGS_GTP_CMD_XACT_ID) {
             /* MME received Bearer Resource Modification Request */
-            ogs_assert(OGS_OK ==
-                nas_eps_send_bearer_resource_modification_reject(
+            r = nas_eps_send_bearer_resource_modification_reject(
                     mme_ue, sess->pti,
-                    OGS_NAS_ESM_CAUSE_SERVICE_OPTION_NOT_SUPPORTED));
+                    OGS_NAS_ESM_CAUSE_SERVICE_OPTION_NOT_SUPPORTED);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
 
         ogs_assert(OGS_OK ==
@@ -985,7 +1103,8 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue,
         ogs_gtp2_delete_bearer_request_t *req)
 {
-    uint8_t cause_value = 0;
+    int r;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
 
     mme_bearer_t *bearer = NULL;
     mme_sess_t *sess = NULL;
@@ -1088,11 +1207,31 @@
     bearer->delete.xact = xact;
 
     if (ECM_IDLE(mme_ue)) {
-        MME_STORE_PAGING_INFO(mme_ue, MME_PAGING_TYPE_DELETE_BEARER, bearer);
-        ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, S1AP_CNDomain_ps));
+        if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
+            /*
+            * TS 24.301 5.3.7
+            * If ISR is not activated, the network behaviour upon expiry of
+            * the mobile reachable timer is network dependent, but typically
+            * the network stops sending paging messages to the UE on the
+            * first expiry, and may take other appropriate actions
+            */
+            ogs_debug("%s Paging stopped: Mobile Reachable timer expiry",
+                mme_ue->imsi_bcd);
+
+            ogs_assert(OGS_OK ==
+                mme_gtp_send_delete_bearer_response(
+                    bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
+        } else {
+            MME_STORE_PAGING_INFO(mme_ue,
+                MME_PAGING_TYPE_DELETE_BEARER, bearer);
+            r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
+        }
     } else {
-        ogs_assert(OGS_OK ==
-            nas_eps_send_deactivate_bearer_context_request(bearer));
+        r = nas_eps_send_deactivate_bearer_context_request(bearer);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     }
 }
 
@@ -1100,8 +1239,8 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue_from_teid,
         ogs_gtp2_release_access_bearers_response_t *rsp)
 {
-    int rv;
-    uint8_t cause_value = 0;
+    int r, rv;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     int action = 0;
     enb_ue_t *enb_ue = NULL;
 
@@ -1126,7 +1265,10 @@
     ogs_assert(sgw_ue);
 
     rv = ogs_gtp_xact_commit(xact);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_commit() failed");
+        return;
+    }
 
     /***********************
      * Check MME-UE Context
@@ -1144,7 +1286,7 @@
 
         cause_value = cause->value;
         if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED)
-            ogs_error("GTP Cause Value:%d, ACTION:%d", cause_value, action);
+            ogs_error("GTP Cause VALUE:%d, ACTION:%d", cause_value, action);
     }
 
     /********************
@@ -1165,10 +1307,11 @@
     if (action == OGS_GTP_RELEASE_SEND_UE_CONTEXT_RELEASE_COMMAND) {
         enb_ue = enb_ue_cycle(mme_ue->enb_ue);
         if (enb_ue) {
-            ogs_assert(OGS_OK ==
-                s1ap_send_ue_context_release_command(enb_ue,
+            r = s1ap_send_ue_context_release_command(enb_ue,
                     S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                    S1AP_UE_CTX_REL_S1_REMOVE_AND_UNLINK, 0));
+                    S1AP_UE_CTX_REL_S1_REMOVE_AND_UNLINK, 0);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         } else {
             ogs_error("ENB-S1 Context has already been removed");
         }
@@ -1200,9 +1343,11 @@
 
             enb_ue_remove(enb_ue);
 
-            if (ogs_list_count(&enb->enb_ue_list) == 0)
-                ogs_assert(OGS_OK ==
-                    s1ap_send_s1_reset_ack(enb, NULL));
+            if (ogs_list_count(&enb->enb_ue_list) == 0) {
+                r = s1ap_send_s1_reset_ack(enb, NULL);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
+            }
         } else {
             ogs_error("ENB-S1 Context has already been removed");
         }
@@ -1233,7 +1378,9 @@
              * where PartOfS1_interface was requested
              * REMOVED */
             ogs_assert(enb->s1_reset_ack);
-            s1ap_send_to_enb(enb, enb->s1_reset_ack, S1AP_NON_UE_SIGNALLING);
+            r = s1ap_send_to_enb(enb, enb->s1_reset_ack, S1AP_NON_UE_SIGNALLING);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
 
             /* Clear S1-Reset Ack Buffer */
             enb->s1_reset_ack = NULL;
@@ -1251,7 +1398,8 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue,
         ogs_gtp2_downlink_data_notification_t *noti)
 {
-    uint8_t cause_value = 0;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
+    int r;
 
     mme_bearer_t *bearer = NULL;
     sgw_ue_t *sgw_ue = NULL;
@@ -1336,10 +1484,26 @@
  * before step 9, the MME shall not send S1 interface paging messages
  */
     if (ECM_IDLE(mme_ue)) {
-        MME_STORE_PAGING_INFO(mme_ue,
+        if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
+            /*
+            * TS 24.301 5.3.7
+            * If ISR is not activated, the network behaviour upon expiry of
+            * the mobile reachable timer is network dependent, but typically
+            * the network stops sending paging messages to the UE on the
+            * first expiry, and may take other appropriate actions
+            */
+            ogs_debug("%s Paging stopped: Mobile Reachable timer expiry",
+                mme_ue->imsi_bcd);
+            ogs_assert(OGS_OK ==
+                mme_gtp_send_downlink_data_notification_ack(
+                    bearer, OGS_GTP2_CAUSE_UNABLE_TO_PAGE_UE));
+        } else {
+            MME_STORE_PAGING_INFO(mme_ue,
                 MME_PAGING_TYPE_DOWNLINK_DATA_NOTIFICATION, bearer);
-        ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, S1AP_CNDomain_ps));
-
+            r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
+        }
     } else if (ECM_CONNECTED(mme_ue)) {
         if (cause_value == OGS_GTP2_CAUSE_ERROR_INDICATION_RECEIVED) {
 
@@ -1374,10 +1538,11 @@
             enb_ue_t *enb_ue = enb_ue_cycle(mme_ue->enb_ue);
             ogs_assert(enb_ue);
 
-            ogs_assert(OGS_OK ==
-                s1ap_send_ue_context_release_command(enb_ue,
+            r = s1ap_send_ue_context_release_command(enb_ue,
                     S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                    S1AP_UE_CTX_REL_S1_PAGING, 0));
+                    S1AP_UE_CTX_REL_S1_PAGING, 0);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         } else {
             ogs_assert(OGS_OK ==
                 mme_gtp_send_downlink_data_notification_ack(
@@ -1390,14 +1555,13 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue_from_teid,
         ogs_gtp2_create_indirect_data_forwarding_tunnel_response_t *rsp)
 {
-    int rv;
-    uint8_t cause_value = 0;
-    ogs_gtp2_cause_t *cause = NULL;
+    int i, r, rv;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
+    uint8_t session_cause = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     sgw_ue_t *sgw_ue = NULL;
     mme_bearer_t *bearer = NULL;
     mme_ue_t *mme_ue = NULL;
     enb_ue_t *source_ue = NULL;
-    int i;
 
     ogs_gtp2_f_teid_t *teid = NULL;
 
@@ -1415,7 +1579,19 @@
     ogs_assert(sgw_ue);
 
     rv = ogs_gtp_xact_commit(xact);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_commit() failed");
+        return;
+    }
+
+    /************************
+     * Getting Cause Value
+     ************************/
+    if (rsp->cause.presence && rsp->cause.data) {
+        ogs_gtp2_cause_t *cause = rsp->cause.data;
+        ogs_assert(cause);
+        session_cause = cause->value;
+    }
 
     /************************
      * Check MME-UE Context
@@ -1423,7 +1599,8 @@
     cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
 
     if (!mme_ue_from_teid) {
-        ogs_error("No Context in TEID");
+        ogs_error("%s No Context in TEID Cause:%d",
+                mme_ue->imsi_bcd, session_cause);
         cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
     }
 
@@ -1438,7 +1615,7 @@
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
     if (rsp->cause.presence == 0) {
-        ogs_error("No Cause");
+        ogs_error("%s No Cause VALUE:%d", mme_ue->imsi_bcd, session_cause);
         cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_MISSING;
     }
 
@@ -1452,11 +1629,8 @@
      ********************/
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
-    cause = rsp->cause.data;
-    ogs_assert(cause);
-    cause_value = cause->value;
-    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Cause Value:%d", cause_value);
+    if (session_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
+        ogs_error("%s GTP Cause VALUE:%d", mme_ue->imsi_bcd, session_cause);
         mme_send_delete_session_or_mme_ue_context_release(mme_ue);
         return;
     }
@@ -1478,7 +1652,10 @@
 
         bearer = mme_bearer_find_by_ue_ebi(mme_ue,
                     rsp->bearer_contextsi.eps_bearer_id.u8);
-        ogs_expect_or_return(bearer);
+        if (!bearer) {
+            ogs_error("No Bearer");
+            return;
+        }
 
         if (rsp->bearer_contextsi.s4_u_sgsn_f_teid.presence) {
             teid = rsp->bearer_contextsi.s4_u_sgsn_f_teid.data;
@@ -1501,16 +1678,18 @@
     source_ue = enb_ue_cycle(mme_ue->enb_ue);
     ogs_assert(source_ue);
 
-    ogs_assert(OGS_OK == s1ap_send_handover_command(source_ue));
+    r = s1ap_send_handover_command(source_ue);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void mme_s11_handle_delete_indirect_data_forwarding_tunnel_response(
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue_from_teid,
         ogs_gtp2_delete_indirect_data_forwarding_tunnel_response_t *rsp)
 {
-    int rv;
-    uint8_t cause_value = 0;
-    ogs_gtp2_cause_t *cause = NULL;
+    int r, rv;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
+    uint8_t session_cause = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     int action = 0;
     mme_ue_t *mme_ue = NULL;
     sgw_ue_t *sgw_ue = NULL;
@@ -1531,7 +1710,19 @@
     ogs_assert(sgw_ue);
 
     rv = ogs_gtp_xact_commit(xact);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_commit() failed");
+        return;
+    }
+
+    /************************
+     * Getting Cause Value
+     ************************/
+    if (rsp->cause.presence && rsp->cause.data) {
+        ogs_gtp2_cause_t *cause = rsp->cause.data;
+        ogs_assert(cause);
+        session_cause = cause->value;
+    }
 
     /************************
      * Check MME-UE Context
@@ -1539,7 +1730,8 @@
     cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
 
     if (!mme_ue_from_teid) {
-        ogs_error("No Context in TEID");
+        ogs_error("%s No Context in TEID Cause:%d",
+                mme_ue->imsi_bcd, session_cause);
         cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
     }
 
@@ -1554,7 +1746,7 @@
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
     if (rsp->cause.presence == 0) {
-        ogs_error("No Cause");
+        ogs_error("%s No Cause VALUE:%d", mme_ue->imsi_bcd, session_cause);
         cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_MISSING;
     }
 
@@ -1568,11 +1760,8 @@
      ********************/
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
-    cause = rsp->cause.data;
-    ogs_assert(cause);
-    cause_value = cause->value;
-    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Cause Value:%d", cause_value);
+    if (session_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
+        ogs_error("GTP Cause VALUE:%d", session_cause);
         mme_send_delete_session_or_mme_ue_context_release(mme_ue);
         return;
     }
@@ -1591,8 +1780,9 @@
     if (action == OGS_GTP_DELETE_INDIRECT_HANDOVER_COMPLETE) {
         /* Nothing to do */
     } else if (action == OGS_GTP_DELETE_INDIRECT_HANDOVER_CANCEL) {
-        ogs_assert(OGS_OK ==
-            s1ap_send_handover_cancel_ack(mme_ue->enb_ue));
+        r = s1ap_send_handover_cancel_ack(mme_ue->enb_ue);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     } else {
         ogs_fatal("Invalid action = %d", action);
         ogs_assert_if_reached();
@@ -1603,8 +1793,8 @@
         ogs_gtp_xact_t *xact, mme_ue_t *mme_ue_from_teid,
         ogs_gtp2_bearer_resource_failure_indication_t *ind)
 {
-    int rv;
-    uint8_t cause_value = 0;
+    int r, rv;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
 
     mme_bearer_t *bearer = NULL;
     mme_sess_t *sess = NULL;
@@ -1627,7 +1817,10 @@
     ogs_assert(sgw_ue);
 
     rv = ogs_gtp_xact_commit(xact);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_commit() failed");
+        return;
+    }
 
     if (!mme_ue_from_teid)
         ogs_error("No Context in TEID");
@@ -1640,7 +1833,7 @@
         ogs_assert(cause);
 
         cause_value = cause->value;
-        ogs_warn("GTP Cause Value:%d - Ignored", cause_value);
+        ogs_warn("GTP Cause VALUE:%d - Ignored", cause_value);
     } else {
         ogs_error("No Cause");
     }
@@ -1654,9 +1847,10 @@
     ogs_debug("    MME_S11_TEID%d SGW_S11_TEID%d",
             mme_ue->mme_s11_teid, sgw_ue->sgw_s11_teid);
 
-    ogs_assert(OGS_OK ==
-        nas_eps_send_bearer_resource_modification_reject(
-            mme_ue, sess->pti, esm_cause_from_gtp(cause_value)));
+    r = nas_eps_send_bearer_resource_modification_reject(
+            mme_ue, sess->pti, esm_cause_from_gtp(cause_value));
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
     if (!sgw_ue ||
         cause_value == OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND) {

open5gs_2.5.8.tar.xz/src/mme/mme-s6a-handler.c -> open5gs_2.6.0.tar.xz/src/mme/mme-s6a-handler.c Changed

@@ -39,6 +39,7 @@
 uint8_t mme_s6a_handle_aia(
         mme_ue_t *mme_ue, ogs_diam_s6a_message_t *s6a_message)
 {
+    int r;
     ogs_diam_s6a_aia_message_t *aia_message = NULL;
     ogs_diam_e_utran_vector_t *e_utran_vector = NULL;
 
@@ -66,7 +67,9 @@
     if (mme_ue->nas_eps.ksi == OGS_NAS_KSI_NO_KEY_IS_AVAILABLE)
         mme_ue->nas_eps.ksi = 0;
 
-    ogs_assert(OGS_OK == nas_eps_send_authentication_request(mme_ue));
+    r = nas_eps_send_authentication_request(mme_ue);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
     return OGS_NAS_EMM_CAUSE_REQUEST_ACCEPTED;
 }
@@ -77,7 +80,7 @@
     ogs_diam_s6a_ula_message_t *ula_message = NULL;
     ogs_subscription_data_t *subscription_data = NULL;
     ogs_slice_data_t *slice_data = NULL;
-    int rv, num_of_session;
+    int r, rv, num_of_session;
 
     ogs_assert(mme_ue);
     ogs_assert(s6a_message);
@@ -115,9 +118,10 @@
             return OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED;
         }
     } else if (mme_ue->nas_eps.type == MME_EPS_TYPE_TAU_REQUEST) {
-        ogs_assert(OGS_OK ==
-            nas_eps_send_tau_accept(mme_ue,
-                S1AP_ProcedureCode_id_InitialContextSetup));
+        r = nas_eps_send_tau_accept(mme_ue,
+                S1AP_ProcedureCode_id_InitialContextSetup);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     } else {
         ogs_error("Invalid Type%d", mme_ue->nas_eps.type);
         return OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED;
@@ -126,6 +130,33 @@
     return OGS_NAS_EMM_CAUSE_REQUEST_ACCEPTED;
 }
 
+uint8_t mme_s6a_handle_pua(
+        mme_ue_t *mme_ue, ogs_diam_s6a_message_t *s6a_message)
+{
+    ogs_diam_s6a_pua_message_t *pua_message = NULL;
+
+    ogs_assert(mme_ue);
+    ogs_assert(s6a_message);
+    pua_message = &s6a_message->pua_message;
+    ogs_assert(pua_message);
+
+    if (s6a_message->result_code != ER_DIAMETER_SUCCESS) {
+        ogs_error("Purge UE failed for IMSI%s %d", mme_ue->imsi_bcd,
+            s6a_message->result_code);
+        mme_ue_hash_remove(mme_ue);
+        mme_ue_remove(mme_ue);
+        return OGS_ERROR;
+    }
+
+    if (pua_message->pua_flags & OGS_DIAM_S6A_PUA_FLAGS_FREEZE_MTMSI)
+        ogs_debug("Freeze M-TMSI requested but not implemented.");
+
+    mme_ue_hash_remove(mme_ue);
+    mme_ue_remove(mme_ue);
+
+    return OGS_OK;
+}
+
 uint8_t mme_s6a_handle_idr(
         mme_ue_t *mme_ue, ogs_diam_s6a_message_t *s6a_message)
 {
@@ -172,6 +203,7 @@
 
 void mme_s6a_handle_clr(mme_ue_t *mme_ue, ogs_diam_s6a_message_t *s6a_message)
 {
+    int r;
     ogs_diam_s6a_clr_message_t *clr_message = NULL;
     ogs_assert(mme_ue);
     ogs_assert(s6a_message);
@@ -232,10 +264,32 @@
          * we need to check whether UE is IDLE or not.
          */
         if (ECM_IDLE(mme_ue)) {
-            MME_STORE_PAGING_INFO(mme_ue, MME_PAGING_TYPE_DETACH_TO_UE, NULL);
-            ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, S1AP_CNDomain_ps));
+            if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
+                /*
+                * TS 24.301 5.3.7
+                * If ISR is not activated, the network behaviour upon expiry of
+                * the mobile reachable timer is network dependent, but typically
+                * the network stops sending paging messages to the UE on the
+                * first expiry, and may take other appropriate actions
+                */
+                ogs_debug("%s Paging stopped: Mobile Reachable timer expiry",
+                    mme_ue->imsi_bcd);
+                if (MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
+                    ogs_assert(OGS_OK == sgsap_send_detach_indication(mme_ue));
+                } else {
+                    mme_send_delete_session_or_detach(mme_ue);
+                }
+            } else {
+                MME_STORE_PAGING_INFO(mme_ue,
+                    MME_PAGING_TYPE_DETACH_TO_UE, NULL);
+                r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
+            }
         } else {
-            ogs_assert(OGS_OK == nas_eps_send_detach_request(mme_ue));
+            r = nas_eps_send_detach_request(mme_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             if (MME_P_TMSI_IS_AVAILABLE(mme_ue)) {
                 ogs_assert(OGS_OK == sgsap_send_detach_indication(mme_ue));
             } else {

open5gs_2.5.8.tar.xz/src/mme/mme-s6a-handler.h -> open5gs_2.6.0.tar.xz/src/mme/mme-s6a-handler.h Changed

open5gs_2.5.8.tar.xz/src/mme/mme-sm.c -> open5gs_2.6.0.tar.xz/src/mme/mme-sm.c Changed

@@ -62,7 +62,7 @@
 
     ogs_s1ap_message_t s1ap_message;
     ogs_pkbuf_t *pkbuf = NULL;
-    int rc;
+    int rc, r;
 
     ogs_nas_eps_message_t nas_message;
     enb_ue_t *enb_ue = NULL;
@@ -196,10 +196,11 @@
             ogs_fsm_dispatch(&enb->sm, e);
         } else {
             ogs_warn("Cannot decode S1AP message");
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication(
+            r = s1ap_send_error_indication(
                     enb, NULL, NULL, S1AP_Cause_PR_protocol,
-                    S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message));
+                    S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
 
         ogs_s1ap_free(&s1ap_message);
@@ -217,7 +218,9 @@
             pkbuf = e->pkbuf;
             ogs_assert(pkbuf);
 
-            ogs_expect(OGS_OK == s1ap_send_to_enb_ue(enb_ue, pkbuf));
+            r = s1ap_send_to_enb_ue(enb_ue, pkbuf);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             ogs_timer_delete(e->timer);
             break;
         case MME_TIMER_S1_HOLDING:
@@ -251,11 +254,12 @@
             if (!mme_ue) {
                 mme_ue = mme_ue_add(enb_ue);
                 if (mme_ue == NULL) {
-                    ogs_expect(OGS_OK ==
-                        s1ap_send_ue_context_release_command(enb_ue,
+                    r = s1ap_send_ue_context_release_command(enb_ue,
                             S1AP_Cause_PR_misc,
                             S1AP_CauseMisc_control_processing_overload,
-                            S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0));
+                            S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                     ogs_pkbuf_free(pkbuf);
                     return;
                 }
@@ -296,12 +300,16 @@
                 /* De-associate S1 with NAS/EMM */
                 enb_ue_deassociate(mme_ue->enb_ue);
 
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(mme_ue->enb_ue,
+                r = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
                         S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                        S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0));
+                        S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             enb_ue_associate_mme_ue(enb_ue, mme_ue);
+            ogs_debug("Mobile Reachable timer stopped for IMSI%s",
+                mme_ue->imsi_bcd);
+            CLEAR_MME_UE_TIMER(mme_ue->t_mobile_reachable);
         }
 
         ogs_assert(mme_ue);
@@ -409,14 +417,16 @@
                     ogs_error("S1 context has already been removed");
                     break;
                 }
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_attach_reject(mme_ue, emm_cause,
-                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                r = nas_eps_send_attach_reject(mme_ue, emm_cause,
+                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(enb_ue,
+                r = s1ap_send_ue_context_release_command(enb_ue,
                         S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
             break;
         case OGS_DIAM_S6A_CMD_CODE_UPDATE_LOCATION:
@@ -429,17 +439,25 @@
                     ogs_error("S1 context has already been removed");
                     break;
                 }
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_attach_reject(mme_ue, emm_cause,
-                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+                r = nas_eps_send_attach_reject(mme_ue, emm_cause,
+                        OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
 
-                ogs_assert(OGS_OK ==
-                    s1ap_send_ue_context_release_command(enb_ue,
+                r = s1ap_send_ue_context_release_command(enb_ue,
                         S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
+                        S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             }
+
+            mme_ue->location_updated_but_not_canceled_yet = true;
+            break;
+        case OGS_DIAM_S6A_CMD_CODE_PURGE_UE:
+            mme_s6a_handle_pua(mme_ue, s6a_message);
             break;
         case OGS_DIAM_S6A_CMD_CODE_CANCEL_LOCATION:
+            mme_ue->location_updated_but_not_canceled_yet = false;
             mme_s6a_handle_clr(mme_ue, s6a_message);
             break;
         case OGS_DIAM_S6A_CMD_CODE_INSERT_SUBSCRIBER_DATA:

open5gs_2.5.8.tar.xz/src/mme/mme-timer.c -> open5gs_2.6.0.tar.xz/src/mme/mme-timer.c Changed

open5gs_2.5.8.tar.xz/src/mme/mme-timer.h -> open5gs_2.6.0.tar.xz/src/mme/mme-timer.h Changed

open5gs_2.5.8.tar.xz/src/mme/nas-path.c -> open5gs_2.6.0.tar.xz/src/mme/nas-path.c Changed

@@ -28,16 +28,21 @@
 
 int nas_eps_send_to_enb(mme_ue_t *mme_ue, ogs_pkbuf_t *pkbuf)
 {
+    int rv;
+
     ogs_assert(pkbuf);
 
     mme_ue = mme_ue_cycle(mme_ue);
     if (!mme_ue) {
-        ogs_warn("UE(mme-ue) context has already been removed");
+        ogs_error("UE(mme-ue) context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
-    return s1ap_send_to_enb_ue(mme_ue->enb_ue, pkbuf);
+    rv = s1ap_send_to_enb_ue(mme_ue->enb_ue, pkbuf);
+    ogs_expect(rv == OGS_OK);
+
+    return rv;
 }
 
 int nas_eps_send_emm_to_esm(mme_ue_t *mme_ue,
@@ -75,20 +80,23 @@
 
     mme_ue = mme_ue_cycle(mme_ue);
     if (!mme_ue) {
-        ogs_warn("UE(mme-ue) context has already been removed");
+        ogs_error("UE(mme-ue) context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     enb_ue = enb_ue_cycle(mme_ue->enb_ue);
     if (!enb_ue) {
-        ogs_warn("S1 context has already been removed");
+        ogs_error("S1 context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     s1apbuf = s1ap_build_downlink_nas_transport(enb_ue, pkbuf);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_downlink_nas_transport() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -116,19 +124,32 @@
 
     esmbuf = esm_build_activate_default_bearer_context_request(
                 sess, OGS_GTP_CREATE_IN_ATTACH_REQUEST);
-    ogs_expect_or_return_val(esmbuf, OGS_ERROR);
+    if (!esmbuf) {
+        ogs_error("esm_build_activate_default_bearer_context_request() failed");
+        return OGS_ERROR;
+    }
 
     emmbuf = emm_build_attach_accept(mme_ue, esmbuf);
-    ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+    if (!emmbuf) {
+        ogs_error("emm_build_attach_accept() failed");
+        return OGS_ERROR;
+    }
 
     CLEAR_MME_UE_TIMER(mme_ue->t3450);
     mme_ue->t3450.pkbuf = ogs_pkbuf_copy(emmbuf);
-    ogs_expect_or_return_val(mme_ue->t3450.pkbuf, OGS_ERROR);
+    if (!mme_ue->t3450.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(mme_ue->t3450.pkbuf) failed");
+        ogs_pkbuf_free(emmbuf);
+        return OGS_ERROR;
+    }
     ogs_timer_start(mme_ue->t3450.timer,
             mme_timer_cfg(MME_TIMER_T3450)->duration);
 
     s1apbuf = s1ap_build_initial_context_setup_request(mme_ue, emmbuf);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_initial_context_setup_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -143,7 +164,11 @@
     mme_sess_t *sess = NULL;
     ogs_pkbuf_t *esmbuf = NULL, *emmbuf = NULL;
 
-    ogs_expect_or_return_val(mme_ue, OGS_ERROR);
+    mme_ue = mme_ue_cycle(mme_ue);
+    if (!mme_ue) {
+        ogs_error("UE(mme-ue) context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Attach reject", mme_ue->imsi_bcd);
     ogs_debug("    Cause%d", emm_cause);
@@ -152,13 +177,19 @@
     if (sess) {
         esmbuf = esm_build_pdn_connectivity_reject(
                     sess, esm_cause, OGS_GTP_CREATE_IN_ATTACH_REQUEST);
-        ogs_expect_or_return_val(esmbuf, OGS_ERROR);
+        if (!esmbuf) {
+            ogs_error("esm_build_pdn_connectivity_reject() failed");
+            return OGS_ERROR;
+        }
     }
 
     emmbuf = emm_build_attach_reject(emm_cause, esmbuf);
-    ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+    if (!emmbuf) {
+        ogs_error("emm_build_attach_reject() failed");
+        return OGS_ERROR;
+    }
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -174,19 +205,25 @@
 
     if (mme_ue->t3470.pkbuf) {
         emmbuf = mme_ue->t3470.pkbuf;
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
     } else {
         emmbuf = emm_build_identity_request(mme_ue);
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+        if (!emmbuf) {
+            ogs_error("emm_build_identity_request() failed");
+            return OGS_ERROR;
+        }
     }
 
     mme_ue->t3470.pkbuf = ogs_pkbuf_copy(emmbuf);
-    ogs_expect_or_return_val(mme_ue->t3470.pkbuf, OGS_ERROR);
+    if (!mme_ue->t3470.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(mme_ue->t3470.pkbuf) failed");
+        ogs_pkbuf_free(emmbuf);
+        return OGS_ERROR;
+    }
     ogs_timer_start(mme_ue->t3470.timer, 
             mme_timer_cfg(MME_TIMER_T3470)->duration);
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -202,19 +239,25 @@
 
     if (mme_ue->t3460.pkbuf) {
         emmbuf = mme_ue->t3460.pkbuf;
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
     } else {
         emmbuf = emm_build_authentication_request(mme_ue);
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+        if (!emmbuf) {
+            ogs_error("emm_build_authentication_request() failed");
+            return OGS_ERROR;
+        }
     }
 
     mme_ue->t3460.pkbuf = ogs_pkbuf_copy(emmbuf);
-    ogs_expect_or_return_val(mme_ue->t3460.pkbuf, OGS_ERROR);
+    if (!mme_ue->t3460.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(mme_ue->t3460.pkbuf) failed");
+        ogs_pkbuf_free(emmbuf);
+        return OGS_ERROR;
+    }
     ogs_timer_start(mme_ue->t3460.timer, 
             mme_timer_cfg(MME_TIMER_T3460)->duration);
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -230,19 +273,25 @@
 
     if (mme_ue->t3460.pkbuf) {
         emmbuf = mme_ue->t3460.pkbuf;
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
     } else {
         emmbuf = emm_build_security_mode_command(mme_ue);
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+        if (!emmbuf) {
+            ogs_error("emm_build_security_mode_command() failed");
+            return OGS_ERROR;
+        }
     }
 
     mme_ue->t3460.pkbuf = ogs_pkbuf_copy(emmbuf);
-    ogs_expect_or_return_val(mme_ue->t3460.pkbuf, OGS_ERROR);
+    if (!mme_ue->t3460.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(mme_ue->t3460.pkbuf) failed");
+        ogs_pkbuf_free(emmbuf);
+        return OGS_ERROR;
+    }
     ogs_timer_start(mme_ue->t3460.timer, 
             mme_timer_cfg(MME_TIMER_T3460)->duration);
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -257,10 +306,13 @@
     ogs_debug("%s Authentication reject", mme_ue->imsi_bcd);
 
     emmbuf = emm_build_authentication_reject();
-    ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+    if (!emmbuf) {
+        ogs_error("emm_build_authentication_reject() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -274,19 +326,25 @@
 
     if (mme_ue->t3422.pkbuf) {
         emmbuf = mme_ue->t3422.pkbuf;
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
     } else {
         emmbuf = emm_build_detach_request(mme_ue);
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+        if (!emmbuf) {
+            ogs_error("emm_build_detach_request() failed");
+            return OGS_ERROR;
+        }
     }
 
     mme_ue->t3422.pkbuf = ogs_pkbuf_copy(emmbuf);
-    ogs_expect_or_return_val(mme_ue->t3422.pkbuf, OGS_ERROR);
+    if (!mme_ue->t3422.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(mme_ue->t3422.pkbuf) failed");
+        ogs_pkbuf_free(emmbuf);
+        return OGS_ERROR;
+    }
     ogs_timer_start(mme_ue->t3422.timer, 
             mme_timer_cfg(MME_TIMER_T3422)->duration);    
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -300,17 +358,26 @@
 
     ogs_assert(mme_ue);
     enb_ue = enb_ue_cycle(mme_ue->enb_ue);
-    ogs_expect_or_return_val(enb_ue, OGS_ERROR);
+    if (!enb_ue) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     ogs_debug("%s Detach accept", mme_ue->imsi_bcd);
 
     /* reply with detach accept */
     if (mme_ue->nas_eps.detach.switch_off == 0) {
         emmbuf = emm_build_detach_accept(mme_ue);
-        ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+        if (!emmbuf) {
+            ogs_error("emm_build_detach_accept() failed");
+            return OGS_ERROR;
+        }
 
         rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-        ogs_expect_or_return_val(rv == OGS_OK, rv);
+        if (rv != OGS_OK) {
+            ogs_error("nas_eps_send_to_downlink_nas_transport() failed");
+            return rv;
+        }
     }
 
     rv = s1ap_send_ue_context_release_command(enb_ue,
@@ -333,28 +400,29 @@
     ogs_assert(mme_ue);
 
     if (create_action == OGS_GTP_CREATE_IN_ATTACH_REQUEST) {
-        enb_ue_t *enb_ue = NULL;
-
         /* During the UE-attach process, we'll send Attach-Reject
          * with pyggybacking PDN-connectivity-Reject */
         rv = nas_eps_send_attach_reject(mme_ue,
             OGS_NAS_EMM_CAUSE_ESM_FAILURE, esm_cause);
-        ogs_expect(rv == OGS_OK);
+        if (rv != OGS_OK) {
+            ogs_error("nas_eps_send_attach_reject() failed");
+            return rv;
+        }
 
-        enb_ue = enb_ue_cycle(mme_ue->enb_ue);
-        if (enb_ue) {
-            ogs_assert(OGS_OK ==
-                s1ap_send_ue_context_release_command(mme_ue->enb_ue,
+        rv = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
                 S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0));
-        }
+                S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE, 0);
+        ogs_expect(rv == OGS_OK);
     } else {
         esmbuf = esm_build_pdn_connectivity_reject(
                     sess, esm_cause, create_action);
-        ogs_expect_or_return_val(esmbuf, OGS_ERROR);
+        if (!esmbuf) {
+            ogs_error("esm_build_pdn_connectivity_reject() failed");
+            return OGS_ERROR;
+        }
 
         rv = nas_eps_send_to_downlink_nas_transport(mme_ue, esmbuf);
-        ogs_expect_or_return_val(rv == OGS_OK, rv);
+        ogs_expect(rv == OGS_OK);
     }
 
     return rv;
@@ -372,19 +440,25 @@
 
     if (bearer->t3489.pkbuf) {
         esmbuf = bearer->t3489.pkbuf;
-        ogs_expect_or_return_val(esmbuf, OGS_ERROR);
     } else {
         esmbuf = esm_build_information_request(bearer);
-        ogs_expect_or_return_val(esmbuf, OGS_ERROR);
+        if (!esmbuf) {
+            ogs_error("esm_build_information_request() failed");
+            return OGS_ERROR;
+        }
     }
 
     bearer->t3489.pkbuf = ogs_pkbuf_copy(esmbuf);
-    ogs_expect_or_return_val(bearer->t3489.pkbuf, OGS_ERROR);
+    if (!bearer->t3489.pkbuf) {
+        ogs_error("ogs_pkbuf_copy(bearer->t3489) failed");
+        ogs_pkbuf_free(esmbuf);
+        return OGS_ERROR;
+    }
     ogs_timer_start(bearer->t3489.timer, 
             mme_timer_cfg(MME_TIMER_T3489)->duration);
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, esmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -406,10 +480,16 @@
 
     esmbuf = esm_build_activate_default_bearer_context_request(
                 sess, create_action);
-    ogs_expect_or_return_val(esmbuf, OGS_ERROR);
+    if (!esmbuf) {
+        ogs_error("esm_build_activate_default_bearer_context_request() failed");
+        return OGS_ERROR;
+    }
 
     s1apbuf = s1ap_build_e_rab_setup_request(bearer, esmbuf);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_e_rab_setup_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -430,10 +510,17 @@
     ogs_assert(mme_ue);
 
     esmbuf = esm_build_activate_dedicated_bearer_context_request(bearer);
-    ogs_expect_or_return_val(esmbuf, OGS_ERROR);
+    if (!esmbuf) {
+        ogs_error(
+            "esm_build_activate_dedicated_bearer_context_request() failed");
+        return OGS_ERROR;
+    }
 
     s1apbuf = s1ap_build_e_rab_setup_request(bearer, esmbuf);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_e_rab_setup_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -443,12 +530,15 @@
 
 void nas_eps_send_activate_all_dedicated_bearers(mme_bearer_t *default_bearer)
 {
+    int r;
     ogs_assert(default_bearer);
 
     mme_bearer_t *dedicated_bearer = mme_bearer_next(default_bearer);
     while (dedicated_bearer) {
-        nas_eps_send_activate_dedicated_bearer_context_request(
+        r = nas_eps_send_activate_dedicated_bearer_context_request(
                 dedicated_bearer);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         dedicated_bearer = mme_bearer_next(dedicated_bearer);
     }
 }
@@ -467,17 +557,23 @@
 
     esmbuf = esm_build_modify_bearer_context_request(
             bearer, qos_presence, tft_presence);
-    ogs_expect_or_return_val(esmbuf, OGS_ERROR);
+    if (!esmbuf) {
+        ogs_error("esm_build_modify_bearer_context_request() failed");
+        return OGS_ERROR;
+    }
 
     if (qos_presence == 1) {
         s1apbuf = s1ap_build_e_rab_modify_request(bearer, esmbuf);
-        ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+        if (!s1apbuf) {
+            ogs_error("s1ap_build_e_rab_modify_request() failed");
+            return OGS_ERROR;
+        }
 
         rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
-        ogs_expect_or_return_val(rv == OGS_OK, rv);
+        ogs_expect(rv == OGS_OK);
     } else {
         rv = nas_eps_send_to_downlink_nas_transport(mme_ue, esmbuf);
-        ogs_expect_or_return_val(rv == OGS_OK, rv);
+        ogs_expect(rv == OGS_OK);
     }
 
     return rv;
@@ -496,11 +592,17 @@
 
     esmbuf = esm_build_deactivate_bearer_context_request(
             bearer, OGS_NAS_ESM_CAUSE_REGULAR_DEACTIVATION);
-    ogs_expect_or_return_val(esmbuf, OGS_ERROR);
+    if (!esmbuf) {
+        ogs_error("esm_build_deactivate_bearer_context_request() failed");
+        return OGS_ERROR;
+    }
 
     s1apbuf = s1ap_build_e_rab_release_command(bearer, esmbuf,
             S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_e_rab_release_command() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -519,10 +621,13 @@
 
     esmbuf = esm_build_bearer_resource_allocation_reject(
             mme_ue, pti, esm_cause);
-    ogs_expect_or_return_val(esmbuf, OGS_ERROR);
+    if (!esmbuf) {
+        ogs_error("esm_build_bearer_resource_allocation_reject() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, esmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -538,10 +643,13 @@
 
     esmbuf = esm_build_bearer_resource_modification_reject(
             mme_ue, pti, esm_cause);
-    ogs_expect_or_return_val(esmbuf, OGS_ERROR);
+    if (!esmbuf) {
+        ogs_error("esm_build_bearer_resource_modification_reject() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, esmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -557,12 +665,19 @@
     ogs_debug("%s Tracking area update accept", mme_ue->imsi_bcd);
 
     emmbuf = emm_build_tau_accept(mme_ue);
-    ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+    if (!emmbuf) {
+        ogs_error("emm_build_tau_accept() failed");
+        return OGS_ERROR;
+    }
 
     if (mme_ue->next.m_tmsi) {
         CLEAR_MME_UE_TIMER(mme_ue->t3450);
         mme_ue->t3450.pkbuf = ogs_pkbuf_copy(emmbuf);
-        ogs_expect_or_return_val(mme_ue->t3450.pkbuf, OGS_ERROR);
+        if (!mme_ue->t3450.pkbuf) {
+            ogs_error("ogs_pkbuf_copy(mme_ue->t3450.pkbuf) failed");
+            ogs_pkbuf_free(emmbuf);
+            return OGS_ERROR;
+        }
         ogs_timer_start(mme_ue->t3450.timer,
                 mme_timer_cfg(MME_TIMER_T3450)->duration);
     }
@@ -570,13 +685,16 @@
     if (procedureCode == S1AP_ProcedureCode_id_InitialContextSetup) {
         ogs_pkbuf_t *s1apbuf = NULL;
         s1apbuf = s1ap_build_initial_context_setup_request(mme_ue, emmbuf);
-        ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+        if (!s1apbuf) {
+            ogs_error("s1ap_build_initial_context_setup_request() failed");
+            return OGS_ERROR;
+        }
 
         rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
-        ogs_expect_or_return_val(rv == OGS_OK, rv);
+        ogs_expect(rv == OGS_OK);
     } else if (procedureCode == S1AP_ProcedureCode_id_downlinkNASTransport) {
         rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-        ogs_expect_or_return_val(rv == OGS_OK, rv);
+        ogs_expect(rv == OGS_OK);
     } else
         ogs_assert_if_reached();
 
@@ -594,10 +712,13 @@
 
     /* Build TAU reject */
     emmbuf = emm_build_tau_reject(emm_cause, mme_ue);
-    ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+    if (!emmbuf) {
+        ogs_error("emm_build_tau_reject() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -614,10 +735,13 @@
 
     /* Build Service Reject */
     emmbuf = emm_build_service_reject(emm_cause, mme_ue);
-    ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+    if (!emmbuf) {
+        ogs_error("emm_build_service_reject() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -632,10 +756,13 @@
     ogs_debug("%s CS Service Notification", mme_ue->imsi_bcd);
 
     emmbuf = emm_build_cs_service_notification(mme_ue);
-    ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+    if (!emmbuf) {
+        ogs_error("emm_build_cs_service_notification() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }
@@ -653,10 +780,13 @@
     ogs_debug("%s Downlink NAS transport", mme_ue->imsi_bcd);
 
     emmbuf = emm_build_downlink_nas_transport(mme_ue, buffer, length);
-    ogs_expect_or_return_val(emmbuf, OGS_ERROR);
+    if (!emmbuf) {
+        ogs_error("emm_build_downlink_nas_transport() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_downlink_nas_transport(mme_ue, emmbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, rv);
+    ogs_expect(rv == OGS_OK);
 
     return rv;
 }

open5gs_2.5.8.tar.xz/src/mme/s1ap-build.c -> open5gs_2.6.0.tar.xz/src/mme/s1ap-build.c Changed

open5gs_2.5.8.tar.xz/src/mme/s1ap-handler.c -> open5gs_2.6.0.tar.xz/src/mme/s1ap-handler.c Changed

@@ -22,6 +22,7 @@
 
 #include "s1ap-path.h"
 #include "nas-path.h"
+#include "mme-fd-path.h"
 #include "mme-gtp-path.h"
 #include "sgsap-types.h"
 #include "sgsap-path.h"
@@ -67,7 +68,7 @@
 void s1ap_handle_s1_setup_request(mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i, j;
+    int i, j, r;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_S1SetupRequest_t *S1SetupRequest = NULL;
@@ -162,7 +163,9 @@
         group = S1AP_Cause_PR_misc;
         cause = S1AP_CauseMisc_unspecified;
 
-        ogs_assert(OGS_OK == s1ap_send_s1_setup_failure(enb, group, cause));
+        r = s1ap_send_s1_setup_failure(enb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -172,7 +175,9 @@
         group = S1AP_Cause_PR_misc;
         cause = S1AP_CauseMisc_unspecified;
 
-        ogs_assert(OGS_OK == s1ap_send_s1_setup_failure(enb, group, cause));
+        r = s1ap_send_s1_setup_failure(enb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -182,17 +187,21 @@
         group = S1AP_Cause_PR_misc;
         cause = S1AP_CauseMisc_unknown_PLMN;
 
-        ogs_assert(OGS_OK == s1ap_send_s1_setup_failure(enb, group, cause));
+        r = s1ap_send_s1_setup_failure(enb, group, cause);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     enb->state.s1_setup_success = true;
-    ogs_assert(OGS_OK == s1ap_send_s1_setup_response(enb));
+    r = s1ap_send_s1_setup_response(enb);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void s1ap_handle_initial_ue_message(mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
-    int i;
+    int i, r;
     char bufOGS_ADDRSTRLEN;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
@@ -250,19 +259,21 @@
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     enb_ue = enb_ue_find_by_enb_ue_s1ap_id(enb, *ENB_UE_S1AP_ID);
     if (!enb_ue) {
         enb_ue = enb_ue_add(enb, *ENB_UE_S1AP_ID);
         if (enb_ue == NULL) {
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication(enb, NULL, NULL,
+            r = s1ap_send_error_indication(enb, NULL, NULL,
                     S1AP_Cause_PR_misc,
-                    S1AP_CauseMisc_control_processing_overload));
+                    S1AP_CauseMisc_control_processing_overload);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -312,37 +323,44 @@
                     /* De-associate S1 with NAS/EMM */
                     enb_ue_deassociate(mme_ue->enb_ue);
 
-                    ogs_assert(OGS_OK ==
-                        s1ap_send_ue_context_release_command(mme_ue->enb_ue,
+                    r = s1ap_send_ue_context_release_command(mme_ue->enb_ue,
                             S1AP_Cause_PR_nas, S1AP_CauseNas_normal_release,
-                            S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0));
+                            S1AP_UE_CTX_REL_S1_CONTEXT_REMOVE, 0);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
                 }
                 enb_ue_associate_mme_ue(enb_ue, mme_ue);
+                ogs_debug("Mobile Reachable timer stopped for IMSI%s",
+                    mme_ue->imsi_bcd);
+                CLEAR_MME_UE_TIMER(mme_ue->t_mobile_reachable);
             }
         }
     }
 
     if (!NAS_PDU) {
         ogs_error("No NAS_PDU");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!TAI) {
         ogs_error("No TAI");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!EUTRAN_CGI) {
         ogs_error("No EUTRAN_CGI");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -370,15 +388,17 @@
         enb_ue->enb_ue_s1ap_id, enb_ue->mme_ue_s1ap_id,
         enb_ue->saved.tai.tac, enb_ue->saved.e_cgi.cell_id);
 
-    s1ap_send_to_nas(enb_ue,
+    r = s1ap_send_to_nas(enb_ue,
             S1AP_ProcedureCode_id_initialUEMessage, NAS_PDU);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void s1ap_handle_uplink_nas_transport(
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_UplinkNASTransport_t *UplinkNASTransport = NULL;
@@ -435,9 +455,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -445,18 +466,20 @@
     if (!enb_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -465,25 +488,28 @@
 
     if (!NAS_PDU) {
         ogs_error("No NAS_PDU");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!EUTRAN_CGI) {
         ogs_error("No EUTRAN_CGI");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!TAI) {
         ogs_error("No TAI");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -519,19 +545,20 @@
         memcpy(&mme_ue->e_cgi, &enb_ue->saved.e_cgi, sizeof(ogs_e_cgi_t));
         mme_ue->ue_location_timestamp = ogs_time_now();
     } else {
-        ogs_fatal("No UE Context in UplinkNASTransport");
-        ogs_assert_if_reached();
+        ogs_error("No UE Context in UplinkNASTransport");
     }
 
-    s1ap_send_to_nas(enb_ue,
+    r = s1ap_send_to_nas(enb_ue,
             S1AP_ProcedureCode_id_uplinkNASTransport, NAS_PDU);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void s1ap_handle_ue_capability_info_indication(
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_UECapabilityInfoIndication_t *UECapabilityInfoIndication = NULL;
@@ -577,9 +604,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -587,18 +615,20 @@
     if (!enb_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -615,9 +645,8 @@
 void s1ap_handle_initial_context_setup_response(
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
-    int rv;
+    int i, r, rv;
     char bufOGS_ADDRSTRLEN;
-    int i;
 
     S1AP_SuccessfulOutcome_t *successfulOutcome = NULL;
     S1AP_InitialContextSetupResponse_t *InitialContextSetupResponse = NULL;
@@ -665,9 +694,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -675,18 +705,20 @@
     if (!enb_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -694,7 +726,10 @@
             enb_ue->enb_ue_s1ap_id, enb_ue->mme_ue_s1ap_id);
 
     mme_ue = enb_ue->mme_ue;
-    ogs_expect_or_return(mme_ue);
+    if (!mme_ue) {
+        ogs_error("No UE(mme-ue) context");
+        return;
+    }
 
     if (E_RABSetupListCtxtSURes) {
         int uli_presence = 0;
@@ -711,28 +746,31 @@
                 E_RABSetupListCtxtSURes->list.arrayi;
             if (!item) {
                 ogs_error("No S1AP_E_RABSetupItemCtxtSUResIEs_t");
-                ogs_assert(OGS_OK ==
-                    s1ap_send_error_indication2(mme_ue,
-                    S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+                r = s1ap_send_error_indication2(mme_ue,
+                    S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
             e_rab = &item->value.choice.E_RABSetupItemCtxtSURes;
             if (!e_rab) {
                 ogs_error("No E_RABSetupItemCtxtSURes");
-                ogs_assert(OGS_OK ==
-                    s1ap_send_error_indication2(mme_ue,
-                    S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+                r = s1ap_send_error_indication2(mme_ue,
+                    S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
             bearer = mme_bearer_find_by_ue_ebi(mme_ue, e_rab->e_RAB_ID);
             if (!bearer) {
                 ogs_error("No Bearer %d", (int)e_rab->e_RAB_ID);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_error_indication2(mme_ue,
+                r = s1ap_send_error_indication2(mme_ue,
                         S1AP_Cause_PR_radioNetwork,
-                        S1AP_CauseRadioNetwork_unknown_E_RAB_ID));
+                        S1AP_CauseRadioNetwork_unknown_E_RAB_ID);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -744,10 +782,11 @@
             if (rv != OGS_OK) {
                 ogs_error("No transportLayerAddress %d",
                         (int)e_rab->e_RAB_ID);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_error_indication2(mme_ue,
+                r = s1ap_send_error_indication2(mme_ue,
                         S1AP_Cause_PR_protocol,
-                        S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message));
+                        S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -779,7 +818,7 @@
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_UnsuccessfulOutcome_t *unsuccessfulOutcome = NULL;
     S1AP_InitialContextSetupFailure_t *InitialContextSetupFailure = NULL;
@@ -826,9 +865,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -836,18 +876,20 @@
     if (!enb_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -856,9 +898,10 @@
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -893,7 +936,7 @@
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_SuccessfulOutcome_t *successfulOutcome = NULL;
     S1AP_UEContextModificationResponse_t *UEContextModificationResponse = NULL;
@@ -937,9 +980,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -947,18 +991,20 @@
     if (!enb_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -966,7 +1012,10 @@
             enb_ue->enb_ue_s1ap_id, enb_ue->mme_ue_s1ap_id);
 
     mme_ue = enb_ue->mme_ue;
-    ogs_expect_or_return(mme_ue);
+    if (!mme_ue) {
+        ogs_error("No UE(mme-ue) context");
+        return;
+    }
 
     CLEAR_SERVICE_INDICATOR(mme_ue);
 }
@@ -975,7 +1024,7 @@
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_UnsuccessfulOutcome_t *unsuccessfulOutcome = NULL;
     S1AP_UEContextModificationFailure_t *UEContextModificationFailure = NULL;
@@ -1022,9 +1071,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1032,18 +1082,20 @@
     if (!enb_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1052,9 +1104,10 @@
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1062,7 +1115,10 @@
             Cause->present, (int)Cause->choice.radioNetwork);
 
     mme_ue = enb_ue->mme_ue;
-    ogs_expect_or_return(mme_ue);
+    if (!mme_ue) {
+        ogs_error("No UE(mme-ue) context");
+        return;
+    }
     CLEAR_SERVICE_INDICATOR(mme_ue);
 }
 
@@ -1070,9 +1126,8 @@
 void s1ap_handle_e_rab_setup_response(
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
-    int rv;
+    int i, r, rv;
     char bufOGS_ADDRSTRLEN;
-    int i;
 
     S1AP_SuccessfulOutcome_t *successfulOutcome = NULL;
     S1AP_E_RABSetupResponse_t *E_RABSetupResponse = NULL;
@@ -1129,9 +1184,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1139,18 +1195,20 @@
     if (!enb_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1158,7 +1216,10 @@
         enb_ue->enb_ue_s1ap_id, enb_ue->mme_ue_s1ap_id);
 
     mme_ue = enb_ue->mme_ue;
-    ogs_expect_or_return(mme_ue);
+    if (!mme_ue) {
+        ogs_error("No UE(mme-ue) context");
+        return;
+    }
 
     if (E_RABSetupListBearerSURes) {
         for (i = 0; i < E_RABSetupListBearerSURes->list.count; i++) {
@@ -1171,30 +1232,33 @@
                 E_RABSetupListBearerSURes->list.arrayi;
             if (!item) {
                 ogs_error("No S1AP_E_RABSetupItemBearerSUResIEs_t");
-                ogs_assert(OGS_OK ==
-                    s1ap_send_error_indication2(mme_ue,
+                r = s1ap_send_error_indication2(mme_ue,
                         S1AP_Cause_PR_protocol,
-                        S1AP_CauseProtocol_semantic_error));
+                        S1AP_CauseProtocol_semantic_error);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
             e_rab = &item->value.choice.E_RABSetupItemBearerSURes;
             if (!e_rab) {
                 ogs_error("No E_RABSetupItemBearerSURes");
-                ogs_assert(OGS_OK ==
-                    s1ap_send_error_indication2(mme_ue,
+                r = s1ap_send_error_indication2(mme_ue,
                         S1AP_Cause_PR_protocol,
-                        S1AP_CauseProtocol_semantic_error));
+                        S1AP_CauseProtocol_semantic_error);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
             bearer = mme_bearer_find_by_ue_ebi(mme_ue, e_rab->e_RAB_ID);
             if (!bearer) {
                 ogs_error("No Bearer %d", (int)e_rab->e_RAB_ID);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_error_indication2(mme_ue,
+                r = s1ap_send_error_indication2(mme_ue,
                         S1AP_Cause_PR_radioNetwork,
-                        S1AP_CauseRadioNetwork_unknown_E_RAB_ID));
+                        S1AP_CauseRadioNetwork_unknown_E_RAB_ID);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -1206,10 +1270,11 @@
             if (rv != OGS_OK) {
                 ogs_error("No transportLayerAddress %d",
                         (int)e_rab->e_RAB_ID);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_error_indication2(mme_ue,
+                r = s1ap_send_error_indication2(mme_ue,
                         S1AP_Cause_PR_protocol,
-                        S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message));
+                        S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -1243,10 +1308,11 @@
 
             if (!item) {
                 ogs_error("No S1AP_E_RABItem_t");
-                ogs_assert(OGS_OK ==
-                    s1ap_send_error_indication2(mme_ue,
+                r = s1ap_send_error_indication2(mme_ue,
                         S1AP_Cause_PR_protocol,
-                        S1AP_CauseProtocol_semantic_error));
+                        S1AP_CauseProtocol_semantic_error);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
 
@@ -1264,18 +1330,13 @@
             CriticalityDiagnostics->triggeringMessage;
         S1AP_Criticality_t *procedureCriticality =
             CriticalityDiagnostics->procedureCriticality;
-        if (procedureCode) {
-            ogs_debug("procedureCode: %lld",
-                    (long long)procedureCode);
-        }
-        if (triggeringMessage) {
-            ogs_debug("triggeringMessage: %lld",
-                    (long long)triggeringMessage);
-        }
-        if (procedureCriticality) {
+        if (procedureCode)
+            ogs_debug("procedureCode: %lld", (long long)*procedureCode);
+        if (triggeringMessage)
+            ogs_debug("triggeringMessage: %lld", (long long)*triggeringMessage);
+        if (procedureCriticality)
             ogs_debug("procedureCriticality: %lld",
-                    (long long)procedureCriticality);
-        }
+                    (long long)*procedureCriticality);
     }
 }
 
@@ -1283,7 +1344,7 @@
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_UEContextReleaseRequest_t *UEContextReleaseRequest = NULL;
@@ -1329,20 +1390,22 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     enb_ue = enb_ue_find_by_mme_ue_s1ap_id(*MME_UE_S1AP_ID);
     if (!enb_ue) {
         ogs_warn("No ENB UE Context : MME_UE_S1AP_ID%d",
                 (int)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb,
+        r = s1ap_send_error_indication(enb,
                 MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1351,9 +1414,10 @@
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1381,7 +1445,7 @@
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_SuccessfulOutcome_t *successfulOutcome = NULL;
     S1AP_UEContextReleaseComplete_t *UEContextReleaseComplete = NULL;
@@ -1423,20 +1487,22 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     enb_ue = enb_ue_find_by_mme_ue_s1ap_id(*MME_UE_S1AP_ID);
     if (!enb_ue) {
         ogs_warn("No ENB UE Context : MME_UE_S1AP_ID%d",
                 (int)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb,
+        r = s1ap_send_error_indication(enb,
                 MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1445,6 +1511,7 @@
 
 void s1ap_handle_ue_context_release_action(enb_ue_t *enb_ue)
 {
+    int r;
     mme_ue_t *mme_ue = NULL;
 
     ogs_assert(enb_ue);
@@ -1471,6 +1538,13 @@
          * to prevent retransmission of NAS messages.
          */
         CLEAR_MME_UE_ALL_TIMERS(mme_ue);
+
+        if (OGS_FSM_CHECK(&mme_ue->sm, emm_state_registered)) {
+            ogs_debug("Mobile Reachable timer started for IMSI%s",
+                mme_ue->imsi_bcd);
+            ogs_timer_start(mme_ue->t_mobile_reachable.timer,
+                ogs_time_from_sec(mme_self()->time.t3412.value + 240));
+        }
     }
 
     switch (enb_ue->ue_ctx_rel_action) {
@@ -1481,16 +1555,26 @@
     case S1AP_UE_CTX_REL_S1_REMOVE_AND_UNLINK:
         ogs_debug("    Action: S1 normal release");
         enb_ue_remove(enb_ue);
-        ogs_expect_or_return(mme_ue);
+        if (!mme_ue) {
+            ogs_error("No UE(mme-ue) context");
+            return;
+        }
         enb_ue_unlink(mme_ue);
         break;
     case S1AP_UE_CTX_REL_UE_CONTEXT_REMOVE:
         ogs_debug("    Action: UE context remove");
         enb_ue_remove(enb_ue);
-        ogs_expect_or_return(mme_ue);
+        if (!mme_ue) {
+            ogs_error("No UE(mme-ue) context");
+            return;
+        }
 
-        mme_ue_hash_remove(mme_ue);
-        mme_ue_remove(mme_ue);
+        if (mme_ue->location_updated_but_not_canceled_yet == true) {
+            mme_s6a_send_pur(mme_ue);
+        } else {
+            mme_ue_hash_remove(mme_ue);
+            mme_ue_remove(mme_ue);
+        }
         break;
     case S1AP_UE_CTX_REL_S1_HANDOVER_COMPLETE:
         ogs_debug("    Action: S1 handover complete");
@@ -1498,7 +1582,10 @@
         enb_ue_source_deassociate_target(enb_ue);
         enb_ue_remove(enb_ue);
 
-        ogs_expect_or_return(mme_ue);
+        if (!mme_ue) {
+            ogs_error("No UE(mme-ue) context");
+            return;
+        }
         if (mme_ue_have_indirect_tunnel(mme_ue) == true) {
             ogs_assert(OGS_OK ==
                 mme_gtp_send_delete_indirect_data_forwarding_tunnel_request(
@@ -1516,7 +1603,10 @@
         enb_ue_source_deassociate_target(enb_ue);
         enb_ue_remove(enb_ue);
 
-        ogs_expect_or_return(mme_ue);
+        if (!mme_ue) {
+            ogs_error("No UE(mme-ue) context");
+            return;
+        }
         if (mme_ue_have_indirect_tunnel(mme_ue) == true) {
             ogs_assert(OGS_OK ==
                 mme_gtp_send_delete_indirect_data_forwarding_tunnel_request(
@@ -1527,9 +1617,13 @@
             ogs_warn("  Packet could be dropped during S1-Handover");
             mme_ue_clear_indirect_tunnel(mme_ue);
 
-            ogs_expect_or_return(mme_ue->enb_ue);
-            ogs_assert(OGS_OK ==
-                s1ap_send_handover_cancel_ack(mme_ue->enb_ue));
+            if (!mme_ue->enb_ue) {
+                ogs_error("No S1 context");
+                return;
+            }
+            r = s1ap_send_handover_cancel_ack(mme_ue->enb_ue);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
         break;
     case S1AP_UE_CTX_REL_S1_HANDOVER_FAILURE:
@@ -1538,7 +1632,10 @@
         enb_ue_source_deassociate_target(enb_ue);
         enb_ue_remove(enb_ue);
 
-        ogs_expect_or_return(mme_ue);
+        if (!mme_ue) {
+            ogs_error("No UE(mme-ue) context");
+            return;
+        }
         if (mme_ue_have_indirect_tunnel(mme_ue) == true) {
             ogs_error("Check your eNodeB");
             ogs_error("  We found INDIRECT TUNNEL in HandoverFailure");
@@ -1548,10 +1645,15 @@
     case S1AP_UE_CTX_REL_S1_PAGING:
         ogs_debug("    Action: S1 paging");
         enb_ue_remove(enb_ue);
-        ogs_expect_or_return(mme_ue);
+        if (!mme_ue) {
+            ogs_error("No UE(mme-ue) context");
+            return;
+        }
         enb_ue_unlink(mme_ue);
 
-        ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, S1AP_CNDomain_ps));
+        r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         break;
     default:
         ogs_error("Invalid Action%d", enb_ue->ue_ctx_rel_action);
@@ -1563,7 +1665,7 @@
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int rv, i;
+    int i, r, rv;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_E_RABModificationIndication_t *E_RABModificationIndication = NULL;
@@ -1611,28 +1713,31 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     enb_ue = enb_ue_find_by_mme_ue_s1ap_id(*MME_UE_S1AP_ID);
     if (!enb_ue) {
         ogs_warn("No ENB UE Context : MME_UE_S1AP_ID%d",
                 (int)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb,
+        r = s1ap_send_error_indication(enb,
                 MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1641,14 +1746,18 @@
 
     if (!E_RABToBeModifiedListBearerModInd) {
         ogs_error("No E_RABToBeModifiedListBearerModInd");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     mme_ue = enb_ue->mme_ue;
-    ogs_expect_or_return(mme_ue);
+    if (!mme_ue) {
+        ogs_error("No UE(mme-ue) context");
+        return;
+    }
 
     ogs_list_init(&mme_ue->bearer_to_modify_list);
 
@@ -1662,28 +1771,31 @@
                 E_RABToBeModifiedListBearerModInd->list.arrayi;
         if (!item) {
             ogs_error("No S1AP_E_RABToBeModifiedItemBearerModIndIEs_t");
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication2(mme_ue,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+            r = s1ap_send_error_indication2(mme_ue,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         e_rab = &item->value.choice.E_RABToBeModifiedItemBearerModInd;
         if (!e_rab) {
             ogs_error("No E_RABToBeModifiedItemBearerModInd");
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication2(mme_ue,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+            r = s1ap_send_error_indication2(mme_ue,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         bearer = mme_bearer_find_by_ue_ebi(mme_ue, e_rab->e_RAB_ID);
         if (!bearer) {
             ogs_error("No Bearer %d", (int)e_rab->e_RAB_ID);
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication2(mme_ue,
+            r = s1ap_send_error_indication2(mme_ue,
                     S1AP_Cause_PR_radioNetwork,
-                    S1AP_CauseRadioNetwork_unknown_E_RAB_ID));
+                    S1AP_CauseRadioNetwork_unknown_E_RAB_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -1695,10 +1807,11 @@
         if (rv != OGS_OK) {
             ogs_error("No transportLayerAddress %d",
                     (int)e_rab->e_RAB_ID);
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication2(mme_ue,
+            r = s1ap_send_error_indication2(mme_ue,
                     S1AP_Cause_PR_protocol,
-                    S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message));
+                    S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -1714,9 +1827,8 @@
 void s1ap_handle_path_switch_request(
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
-    int rv;
+    int i, r, rv;
     char bufOGS_ADDRSTRLEN;
-    int i;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_PathSwitchRequest_t *PathSwitchRequest = NULL;
@@ -1786,16 +1898,18 @@
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
     enb_ue = enb_ue_find_by_mme_ue_s1ap_id(*MME_UE_S1AP_ID);
@@ -1808,10 +1922,14 @@
                 *ENB_UE_S1AP_ID, *MME_UE_S1AP_ID,
                 S1AP_Cause_PR_radioNetwork,
                 S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
-        ogs_expect_or_return(s1apbuf);
+        if (!s1apbuf) {
+            ogs_error("s1ap_build_path_switch_failure() failed");
+            return;
+        }
 
-        ogs_expect(OGS_OK ==
-                s1ap_send_to_enb(enb, s1apbuf, S1AP_NON_UE_SIGNALLING));
+        r = s1ap_send_to_enb(enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1820,9 +1938,10 @@
 
     if (!EUTRAN_CGI) {
         ogs_error("No EUTRAN_CGI");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1833,9 +1952,10 @@
 
     if (!TAI) {
         ogs_error("No TAI");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1846,23 +1966,32 @@
 
     if (!E_RABToBeSwitchedDLList) {
         ogs_error("No E_RABToBeSwitchedDLList");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     mme_ue = enb_ue->mme_ue;
-    ogs_expect_or_return(mme_ue);
+    if (!mme_ue) {
+        ogs_error("No UE(mme-ue) context");
+        return;
+    }
 
     if (!SECURITY_CONTEXT_IS_VALID(mme_ue)) {
         ogs_error("No Security Context");
         s1apbuf = s1ap_build_path_switch_failure(
                 *ENB_UE_S1AP_ID, *MME_UE_S1AP_ID,
                 S1AP_Cause_PR_nas, S1AP_CauseNas_authentication_failure);
-        ogs_expect_or_return(s1apbuf);
+        if (!s1apbuf) {
+            ogs_error("s1ap_build_path_switch_failure() failed");
+            return;
+        }
 
-        s1ap_send_to_enb_ue(enb_ue, s1apbuf);
+        r = s1ap_send_to_enb_ue(enb_ue, s1apbuf);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -1940,28 +2069,31 @@
             E_RABToBeSwitchedDLList->list.arrayi;
         if (!item) {
             ogs_error("No S1AP_E_RABToBeSwitchedDLItemIEs_t");
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication2(mme_ue,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+            r = s1ap_send_error_indication2(mme_ue,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         e_rab = &item->value.choice.E_RABToBeSwitchedDLItem;
         if (!e_rab) {
             ogs_error("No E_RABToBeSwitchedDLItem");
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication2(mme_ue,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+            r = s1ap_send_error_indication2(mme_ue,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         bearer = mme_bearer_find_by_ue_ebi(mme_ue, e_rab->e_RAB_ID);
         if (!bearer) {
             ogs_error("No Bearer %d", (int)e_rab->e_RAB_ID);
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication2(mme_ue,
+            r = s1ap_send_error_indication2(mme_ue,
                     S1AP_Cause_PR_radioNetwork,
-                    S1AP_CauseRadioNetwork_unknown_E_RAB_ID));
+                    S1AP_CauseRadioNetwork_unknown_E_RAB_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -1973,10 +2105,11 @@
         if (rv != OGS_OK) {
             ogs_error("No transportLayerAddress %d",
                     (int)e_rab->e_RAB_ID);
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication2(mme_ue,
+            r = s1ap_send_error_indication2(mme_ue,
                     S1AP_Cause_PR_protocol,
-                    S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message));
+                    S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -2011,7 +2144,7 @@
         mme_enb_t *enb, ogs_s1ap_message_t *message, ogs_pkbuf_t *pkbuf)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_ENBConfigurationTransfer_t *ENBConfigurationTransfer = NULL;
@@ -2084,23 +2217,26 @@
         if (target_enb == NULL) {
             ogs_error("eNB configuration transfer : "
                         "cannot find target eNB-id0x%x", target_enb_id);
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication(enb, NULL, NULL,
+            r = s1ap_send_error_indication(enb, NULL, NULL,
                     S1AP_Cause_PR_radioNetwork,
-                    S1AP_CauseRadioNetwork_unknown_targetID));
+                    S1AP_CauseRadioNetwork_unknown_targetID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
-        ogs_assert(OGS_OK ==
-            s1ap_send_mme_configuration_transfer(
-                target_enb, SONConfigurationTransfer));
+        r = s1ap_send_mme_configuration_transfer(
+                target_enb, SONConfigurationTransfer);
+        ogs_expect(r == OGS_OK);
+        /* ogs_asn_copy_ie() could be failed from received packet.
+         * So we should not use ogs_assert(r != OGS_ERROR).*/
     }
 }
 
 void s1ap_handle_handover_required(mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_HandoverRequired_t *HandoverRequired = NULL;
@@ -2161,9 +2297,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2171,18 +2308,20 @@
     if (!source_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2191,33 +2330,37 @@
 
     if (!HandoverType) {
         ogs_error("No HandoverType");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!TargetID) {
         ogs_error("No TargetID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!Source_ToTarget_TransparentContainer) {
         ogs_error("No Source_ToTarget_TransparentContainer");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2229,9 +2372,10 @@
         break;
     default:
         ogs_error("Not implemented(%d)", TargetID->present);
-        ogs_assert(OGS_OK ==
-            s1ap_send_handover_preparation_failure(source_ue,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_handover_preparation_failure(source_ue,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2239,21 +2383,26 @@
     if (target_enb == NULL) {
         ogs_error("Handover required : cannot find target eNB-id0x%x",
                     target_enb_id);
-        ogs_assert(OGS_OK ==
-            s1ap_send_handover_preparation_failure(source_ue,
+        r = s1ap_send_handover_preparation_failure(source_ue,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_targetID));
+                S1AP_CauseRadioNetwork_unknown_targetID);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     mme_ue = source_ue->mme_ue;
-    ogs_expect_or_return(mme_ue);
+    if (!mme_ue) {
+        ogs_error("No UE(mme-ue) context");
+        return;
+    }
 
     if (!SECURITY_CONTEXT_IS_VALID(mme_ue)) {
         ogs_error("No Security Context");
-        ogs_assert(OGS_OK ==
-            s1ap_send_handover_preparation_failure(source_ue,
-                S1AP_Cause_PR_nas, S1AP_CauseNas_authentication_failure));
+        r = s1ap_send_handover_preparation_failure(source_ue,
+                S1AP_Cause_PR_nas, S1AP_CauseNas_authentication_failure);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2262,18 +2411,18 @@
     mme_ue->nhcc++;
     ogs_kdf_nh_enb(mme_ue->kasme, mme_ue->nh, mme_ue->nh);
 
-    ogs_assert(OGS_OK ==
-        s1ap_send_handover_request(
+    r = s1ap_send_handover_request(
             source_ue, target_enb, HandoverType, Cause,
-            Source_ToTarget_TransparentContainer));
+            Source_ToTarget_TransparentContainer);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void s1ap_handle_handover_request_ack(
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
-    int rv;
+    int i, r, rv;
     char bufOGS_ADDRSTRLEN;
-    int i;
 
     S1AP_SuccessfulOutcome_t *successfulOutcome = NULL;
     S1AP_HandoverRequestAcknowledge_t *HandoverRequestAcknowledge = NULL;
@@ -2326,9 +2475,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2336,48 +2486,56 @@
     if (!target_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!E_RABAdmittedList) {
         ogs_error("No E_RABAdmittedList");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!Target_ToSource_TransparentContainer) {
         ogs_error("No Target_ToSource_TransparentContainer");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     source_ue = target_ue->source_ue;
     if (!source_ue) {
         ogs_error("No Source UE");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     mme_ue = source_ue->mme_ue;
-    ogs_expect_or_return(mme_ue);
+    if (!mme_ue) {
+        ogs_error("No UE(mme-ue) context");
+        return;
+    }
 
     ogs_debug("    Source : ENB_UE_S1AP_ID%d MME_UE_S1AP_ID%d",
             source_ue->enb_ue_s1ap_id, source_ue->mme_ue_s1ap_id);
@@ -2395,28 +2553,31 @@
         item = (S1AP_E_RABAdmittedItemIEs_t *)E_RABAdmittedList->list.arrayi;
         if (!item) {
             ogs_error("No S1AP_E_RABAdmittedItemIEs_t");
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication2(mme_ue,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+            r = s1ap_send_error_indication2(mme_ue,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         e_rab = &item->value.choice.E_RABAdmittedItem;
         if (!e_rab) {
             ogs_error("No E_RABAdmittedItem");
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication2(mme_ue,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+            r = s1ap_send_error_indication2(mme_ue,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
         bearer = mme_bearer_find_by_ue_ebi(mme_ue, e_rab->e_RAB_ID);
         if (!bearer) {
             ogs_error("No Bearer %d", (int)e_rab->e_RAB_ID);
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication2(mme_ue,
+            r = s1ap_send_error_indication2(mme_ue,
                     S1AP_Cause_PR_radioNetwork,
-                    S1AP_CauseRadioNetwork_unknown_E_RAB_ID));
+                    S1AP_CauseRadioNetwork_unknown_E_RAB_ID);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -2428,10 +2589,11 @@
         if (rv != OGS_OK) {
             ogs_error("No transportLayerAddress %d",
                     (int)e_rab->e_RAB_ID);
-            ogs_assert(OGS_OK ==
-                s1ap_send_error_indication2(mme_ue,
+            r = s1ap_send_error_indication2(mme_ue,
                     S1AP_Cause_PR_protocol,
-                    S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message));
+                    S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
             return;
         }
 
@@ -2446,10 +2608,11 @@
             if (rv != OGS_OK) {
                 ogs_error("No dL_transportLayerAddress %d",
                         (int)e_rab->e_RAB_ID);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_error_indication2(mme_ue,
+                r = s1ap_send_error_indication2(mme_ue,
                         S1AP_Cause_PR_protocol,
-                        S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message));
+                        S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
         }
@@ -2465,10 +2628,11 @@
             if (rv != OGS_OK) {
                 ogs_error("No uL_transportLayerAddress %d",
                         (int)e_rab->e_RAB_ID);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_error_indication2(mme_ue,
+                r = s1ap_send_error_indication2(mme_ue,
                         S1AP_Cause_PR_protocol,
-                        S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message));
+                        S1AP_CauseProtocol_abstract_syntax_error_falsely_constructed_message);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
                 return;
             }
         }
@@ -2482,15 +2646,16 @@
             mme_gtp_send_create_indirect_data_forwarding_tunnel_request(mme_ue)\
         );
     } else {
-        ogs_assert(OGS_OK ==
-            s1ap_send_handover_command(source_ue));
+        r = s1ap_send_handover_command(source_ue);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
     }
 }
 
 void s1ap_handle_handover_failure(mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_UnsuccessfulOutcome_t *unsuccessfulOutcome = NULL;
     S1AP_HandoverFailure_t *HandoverFailure = NULL;
@@ -2531,9 +2696,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, NULL,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, NULL,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2541,27 +2707,30 @@
     if (!target_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     source_ue = target_ue->source_ue;
     if (!source_ue) {
         ogs_error("No Source UE");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2570,21 +2739,23 @@
     ogs_debug("    Target : ENB_UE_S1AP_ID%d MME_UE_S1AP_ID%d",
             target_ue->enb_ue_s1ap_id, target_ue->mme_ue_s1ap_id);
 
-    ogs_assert(OGS_OK ==
-        s1ap_send_handover_preparation_failure(
-            source_ue, Cause->present, Cause->choice.radioNetwork));
+    r = s1ap_send_handover_preparation_failure(
+            source_ue, Cause->present, Cause->choice.radioNetwork);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
-    ogs_assert(OGS_OK ==
-        s1ap_send_ue_context_release_command(
+    r = s1ap_send_ue_context_release_command(
         target_ue, S1AP_Cause_PR_radioNetwork,
         S1AP_CauseRadioNetwork_ho_failure_in_target_EPC_eNB_or_target_system,
-        S1AP_UE_CTX_REL_S1_HANDOVER_FAILURE, 0));
+        S1AP_UE_CTX_REL_S1_HANDOVER_FAILURE, 0);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void s1ap_handle_handover_cancel(mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_HandoverCancel_t *HandoverCancel = NULL;
@@ -2629,9 +2800,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2639,35 +2811,39 @@
     if (!source_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     target_ue = source_ue->target_ue;
     if (!target_ue) {
         ogs_error("No Target UE");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2676,11 +2852,12 @@
     ogs_debug("    Target : ENB_UE_S1AP_ID%d MME_UE_S1AP_ID%d",
             target_ue->enb_ue_s1ap_id, target_ue->mme_ue_s1ap_id);
 
-    ogs_assert(OGS_OK ==
-        s1ap_send_ue_context_release_command(
+    r = s1ap_send_ue_context_release_command(
             target_ue, S1AP_Cause_PR_radioNetwork,
             S1AP_CauseRadioNetwork_handover_cancelled,
-            S1AP_UE_CTX_REL_S1_HANDOVER_CANCEL, 0));
+            S1AP_UE_CTX_REL_S1_HANDOVER_CANCEL, 0);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
     ogs_debug("Handover Cancel : UEeNB-UE-S1AP-ID(%d) --> eNB%s:%d",
             source_ue->enb_ue_s1ap_id,
@@ -2691,7 +2868,7 @@
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_ENBStatusTransfer_t *ENBStatusTransfer = NULL;
@@ -2736,9 +2913,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2746,35 +2924,39 @@
     if (!source_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_StatusTransfer_TransparentContainer) {
         ogs_error("No ENB_StatusTransfer_TransparentContainer");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     target_ue = source_ue->target_ue;
     if (!target_ue) {
         ogs_error("No Target UE");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2783,16 +2965,18 @@
     ogs_debug("    Target : ENB_UE_S1AP_ID%d MME_UE_S1AP_ID%d",
             target_ue->enb_ue_s1ap_id, target_ue->mme_ue_s1ap_id);
 
-    ogs_assert(OGS_OK ==
-        s1ap_send_mme_status_transfer(target_ue,
-            ENB_StatusTransfer_TransparentContainer));
+    r = s1ap_send_mme_status_transfer(target_ue,
+            ENB_StatusTransfer_TransparentContainer);
+    ogs_expect(r == OGS_OK);
+    /* ogs_asn_copy_ie() could be failed from received packet.
+     * So we should not use ogs_assert(r != OGS_ERROR).*/
 }
 
 void s1ap_handle_handover_notification(
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_HandoverNotify_t *HandoverNotify = NULL;
@@ -2847,9 +3031,10 @@
 
     if (!MME_UE_S1AP_ID) {
         ogs_error("No MME_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2857,26 +3042,29 @@
     if (!target_ue) {
         ogs_error("No eNB UE Context : MME_UE_S1AP_ID%lld",
                 (long long)*MME_UE_S1AP_ID);
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, NULL,
                 S1AP_Cause_PR_radioNetwork,
-                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id));
+                S1AP_CauseRadioNetwork_unknown_mme_ue_s1ap_id);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!ENB_UE_S1AP_ID) {
         ogs_error("No ENB_UE_S1AP_ID");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     if (!EUTRAN_CGI) {
         ogs_error("No EUTRAN_CGI");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2887,9 +3075,10 @@
 
     if (!TAI) {
         ogs_error("No TAI");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -2901,14 +3090,18 @@
     source_ue = target_ue->source_ue;
     if (!source_ue) {
         ogs_error("No Source UE");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, MME_UE_S1AP_ID, ENB_UE_S1AP_ID,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
     mme_ue = source_ue->mme_ue;
-    ogs_expect_or_return(mme_ue);
+    if (!mme_ue) {
+        ogs_error("No UE(mme-ue) context");
+        return;
+    }
 
     ogs_debug("    Source : ENB_UE_S1AP_ID%d MME_UE_S1AP_ID%d",
             source_ue->enb_ue_s1ap_id, source_ue->mme_ue_s1ap_id);
@@ -2916,6 +3109,8 @@
             target_ue->enb_ue_s1ap_id, target_ue->mme_ue_s1ap_id);
 
     enb_ue_associate_mme_ue(target_ue, mme_ue);
+    ogs_debug("Mobile Reachable timer stopped for IMSI%s", mme_ue->imsi_bcd);
+    CLEAR_MME_UE_TIMER(mme_ue->t_mobile_reachable);
 
     memcpy(&target_ue->saved.tai.plmn_id, pLMNidentity->buf,
             sizeof(target_ue->saved.tai.plmn_id));
@@ -2949,12 +3144,13 @@
     memcpy(&mme_ue->e_cgi, &target_ue->saved.e_cgi, sizeof(ogs_e_cgi_t));
     mme_ue->ue_location_timestamp = ogs_time_now();
 
-    ogs_assert(OGS_OK ==
-        s1ap_send_ue_context_release_command(source_ue,
+    r = s1ap_send_ue_context_release_command(source_ue,
             S1AP_Cause_PR_radioNetwork,
             S1AP_CauseRadioNetwork_successful_handover,
             S1AP_UE_CTX_REL_S1_HANDOVER_COMPLETE,
-            ogs_app()->time.handover.duration));
+            ogs_app()->time.handover.duration);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
     ogs_list_init(&mme_ue->bearer_to_modify_list);
 
@@ -2979,7 +3175,7 @@
         mme_enb_t *enb, ogs_s1ap_message_t *message)
 {
     char bufOGS_ADDRSTRLEN;
-    int i;
+    int i, r;
 
     S1AP_InitiatingMessage_t *initiatingMessage = NULL;
     S1AP_Reset_t *Reset = NULL;
@@ -3021,9 +3217,10 @@
 
     if (!Cause) {
         ogs_error("No Cause");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, NULL,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, NULL,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3032,9 +3229,10 @@
 
     if (!ResetType) {
         ogs_error("No ResetType");
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(enb, NULL, NULL,
-                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error));
+        r = s1ap_send_error_indication(enb, NULL, NULL,
+                S1AP_Cause_PR_protocol, S1AP_CauseProtocol_semantic_error);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
         return;
     }
 
@@ -3058,9 +3256,11 @@
          * for new UE-associated logical S1-connections over the S1 interface,
          * the MME shall respond with the RESET ACKNOWLEDGE message.
          */
-        if (ogs_list_count(&enb->enb_ue_list) == 0)
-            ogs_assert(OGS_OK ==
-                s1ap_send_s1_reset_ack(enb, NULL));
+        if (ogs_list_count(&enb->enb_ue_list) == 0) {
+            r = s1ap_send_s1_reset_ack(enb, NULL);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
+        }
 
         break;
 
@@ -3074,7 +3274,10 @@
             ogs_pkbuf_free(enb->s1_reset_ack);
 
         enb->s1_reset_ack = ogs_s1ap_build_s1_reset_ack(partOfS1_Interface);
-        ogs_expect_or_return(enb->s1_reset_ack);
+        if (!enb->s1_reset_ack) {
+            ogs_error("ogs_s1ap_build_s1_reset_ack() failed");
+            return;
+        }
 
         for (i = 0; i < partOfS1_Interface->list.count; i++) {
             S1AP_UE_associatedLogicalS1_ConnectionItemRes_t *ie2 = NULL;
@@ -3153,7 +3356,9 @@
          * where PartOfS1_interface was requested
          * REMOVED */
         ogs_assert(enb->s1_reset_ack);
-        s1ap_send_to_enb(enb, enb->s1_reset_ack, S1AP_NON_UE_SIGNALLING);
+        r = s1ap_send_to_enb(enb, enb->s1_reset_ack, S1AP_NON_UE_SIGNALLING);
+        ogs_expect(r == OGS_OK);
+        ogs_assert(r != OGS_ERROR);
 
         /* Clear S1-Reset Ack Buffer */
         enb->s1_reset_ack = NULL;

open5gs_2.5.8.tar.xz/src/mme/s1ap-path.c -> open5gs_2.6.0.tar.xz/src/mme/s1ap-path.c Changed

@@ -55,16 +55,16 @@
 
     enb = mme_enb_cycle(enb);
     if (!enb) {
-        ogs_warn("eNB has already been removed");
+        ogs_error("eNB has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
     ogs_assert(enb->sctp.sock);
     if (enb->sctp.sock->fd == INVALID_SOCKET) {
         ogs_fatal("eNB SCTP socket has already been destroyed");
         ogs_log_hexdump(OGS_LOG_FATAL, pkbuf->data, pkbuf->len);
-        ogs_assert_if_reached();
+        ogs_pkbuf_free(pkbuf);
         return OGS_ERROR;
     }
 
@@ -84,16 +84,20 @@
 
 int s1ap_send_to_enb_ue(enb_ue_t *enb_ue, ogs_pkbuf_t *pkbuf)
 {
+    int rv;
     ogs_assert(pkbuf);
 
     enb_ue = enb_ue_cycle(enb_ue);
     if (!enb_ue) {
-        ogs_warn("S1 context has already been removed");
+        ogs_error("S1 context has already been removed");
         ogs_pkbuf_free(pkbuf);
-        return OGS_ERROR;
+        return OGS_NOTFOUND;
     }
 
-    return s1ap_send_to_enb(enb_ue->enb, pkbuf, enb_ue->enb_ostream_id);
+    rv = s1ap_send_to_enb(enb_ue->enb, pkbuf, enb_ue->enb_ostream_id);
+    ogs_expect(rv == OGS_OK);
+
+    return rv;
 }
 
 int s1ap_delayed_send_to_enb_ue(
@@ -118,10 +122,10 @@
 
         return OGS_OK;
     } else {
-        mme_enb_t *enb = NULL;
-        enb = enb_ue->enb;
-        ogs_assert(enb);
-        return s1ap_send_to_enb_ue(enb_ue, pkbuf);
+        int rv = s1ap_send_to_enb_ue(enb_ue, pkbuf);
+        ogs_expect(rv == OGS_OK);
+
+        return rv;
     }
 }
 
@@ -154,6 +158,7 @@
 int s1ap_send_to_nas(enb_ue_t *enb_ue,
         S1AP_ProcedureCode_t procedureCode, S1AP_NAS_PDU_t *nasPdu)
 {
+    int rv;
     ogs_nas_eps_security_header_t *sh = NULL;
     ogs_nas_security_header_type_t security_header_type;
 
@@ -244,9 +249,11 @@
             ogs_pkbuf_free(nasbuf);
             return OGS_ERROR;
         }
-        return s1ap_send_to_esm(
+        rv = s1ap_send_to_esm(
                 mme_ue, nasbuf, security_header_type.type,
                 OGS_GTP_CREATE_IN_UPLINK_NAS_TRANSPORT);
+        ogs_expect(rv == OGS_OK);
+        return rv;
     } else {
         ogs_error("Unknown/Unimplemented NAS Protocol discriminator 0x%02x",
                   h->protocol_discriminator);
@@ -262,7 +269,10 @@
 
     ogs_debug("S1-Setup response");
     s1ap_buffer = s1ap_build_setup_rsp();
-    ogs_expect_or_return_val(s1ap_buffer, OGS_ERROR);
+    if (!s1ap_buffer) {
+        ogs_error("s1ap_build_setup_rsp() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb(enb, s1ap_buffer, S1AP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -278,7 +288,10 @@
 
     ogs_debug("S1-Setup failure");
     s1ap_buffer = s1ap_build_setup_failure(group, cause, S1AP_TimeToWait_v10s);
-    ogs_expect_or_return_val(s1ap_buffer, OGS_ERROR);
+    if (!s1ap_buffer) {
+        ogs_error("s1ap_build_setup_failure() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb(enb, s1ap_buffer, S1AP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -295,7 +308,10 @@
 
     ogs_debug("InitialContextSetupRequest");
     s1apbuf = s1ap_build_initial_context_setup_request(mme_ue, NULL);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_initial_context_setup_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -312,7 +328,10 @@
 
     ogs_debug("UEContextModificationRequest");
     s1apbuf = s1ap_build_ue_context_modification_request(mme_ue);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_ue_context_modification_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -340,7 +359,10 @@
             group, (int)cause, action, (int)duration);
 
     s1apbuf = s1ap_build_ue_context_release_command(enb_ue, group, cause);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_ue_context_release_command() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_delayed_send_to_enb_ue(enb_ue, s1apbuf, duration);
     ogs_expect(rv == OGS_OK);
@@ -358,6 +380,8 @@
     int i;
     int rv;
 
+    ogs_assert(ogs_timer_running(mme_ue->t_implicit_detach.timer) == false);
+
     /* Find enB with matched TAI */
     ogs_list_for_each(&mme_self()->enb_list, enb) {
         for (i = 0; i < enb->num_of_supported_ta_list; i++) {
@@ -369,14 +393,24 @@
                     s1apbuf = mme_ue->t3413.pkbuf;
                 } else {
                     s1apbuf = s1ap_build_paging(mme_ue, cn_domain);
-                    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+                    if (!s1apbuf) {
+                        ogs_error("s1ap_build_paging() failed");
+                        return OGS_ERROR;
+                    }
                 }
 
                 mme_ue->t3413.pkbuf = ogs_pkbuf_copy(s1apbuf);
-                ogs_expect_or_return_val(mme_ue->t3413.pkbuf, OGS_ERROR);
+                if (!mme_ue->t3413.pkbuf) {
+                    ogs_error("ogs_pkbuf_copy() failed");
+                    ogs_pkbuf_free(s1apbuf);
+                    return OGS_ERROR;
+                }
 
                 rv = s1ap_send_to_enb(enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
-                ogs_expect_or_return_val(rv == OGS_OK, rv);
+                if (rv != OGS_OK) {
+                    ogs_error("s1ap_send_to_enb() failed");
+                    return rv;
+                }
             }
         }
     }
@@ -400,7 +434,10 @@
 
     ogs_debug("MMEConfigurationTransfer");
     s1apbuf = s1ap_build_mme_configuration_transfer(SONConfigurationTransfer);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_mme_configuration_transfer() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb(target_enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -417,7 +454,10 @@
 
     ogs_debug("E-RABModificationConfirm");
     s1apbuf = s1ap_build_e_rab_modification_confirm(mme_ue);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_e_rab_modification_confirm() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -436,7 +476,10 @@
     ogs_debug("PathSwitchAcknowledge");
     s1apbuf = s1ap_build_path_switch_ack(
                 mme_ue, e_rab_to_switched_in_uplink_list);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_path_switch_ack() failed");
+        return OGS_ERROR;
+    }
 
     rv = nas_eps_send_to_enb(mme_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -453,7 +496,10 @@
 
     ogs_debug("HandoverCommand");
     s1apbuf = s1ap_build_handover_command(source_ue);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_handover_command() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb_ue(source_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -472,7 +518,10 @@
 
     ogs_debug("HandoverPreparationFailure");
     s1apbuf = s1ap_build_handover_preparation_failure(source_ue, group, cause);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_handover_preparation_failure() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb_ue(source_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -489,7 +538,10 @@
 
     ogs_debug("HandoverCancelAcknowledge");
     s1apbuf = s1ap_build_handover_cancel_ack(source_ue);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_handover_cancel_ack() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb_ue(source_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -516,11 +568,12 @@
 
     target_ue = enb_ue_add(target_enb, INVALID_UE_S1AP_ID);
     if (target_ue == NULL) {
-        ogs_assert(OGS_OK ==
-            s1ap_send_error_indication(target_enb, NULL, NULL,
+        rv = s1ap_send_error_indication(target_enb, NULL, NULL,
                 S1AP_Cause_PR_misc,
-                S1AP_CauseMisc_control_processing_overload));
-        return OGS_ERROR;
+                S1AP_CauseMisc_control_processing_overload);
+        ogs_expect(rv == OGS_OK);
+
+        return rv;
     }
 
     ogs_info("    Source : ENB_UE_S1AP_ID%d MME_UE_S1AP_ID%d",
@@ -533,7 +586,10 @@
     s1apbuf = s1ap_build_handover_request(
             target_ue, handovertype, cause,
             source_totarget_transparentContainer);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_handover_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb_ue(target_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -554,7 +610,10 @@
     ogs_info("MMEStatusTransfer");
     s1apbuf = s1ap_build_mme_status_transfer(target_ue,
             enb_statustransfer_transparentContainer);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("s1ap_build_mme_status_transfer() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb_ue(target_ue, s1apbuf);
     ogs_expect(rv == OGS_OK);
@@ -576,7 +635,10 @@
     ogs_info("ErrorIndication");
     s1apbuf = ogs_s1ap_build_error_indication(
             mme_ue_s1ap_id, enb_ue_s1ap_id, group, cause);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("ogs_s1ap_build_error_indication() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb(enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);
@@ -596,9 +658,15 @@
 
     ogs_assert(mme_ue);
     enb_ue = enb_ue_cycle(mme_ue->enb_ue);
-    ogs_expect_or_return_val(enb_ue, OGS_ERROR);
-    enb = enb_ue->enb;
-    ogs_expect_or_return_val(enb, OGS_ERROR);
+    if (!enb_ue) {
+        ogs_error("S1 context has already been removed");
+        return OGS_NOTFOUND;
+    }
+    enb = mme_enb_cycle(enb_ue->enb);
+    if (!enb) {
+        ogs_error("eNB has already been removed");
+        return OGS_NOTFOUND;
+    }
 
     mme_ue_s1ap_id = enb_ue->mme_ue_s1ap_id,
     enb_ue_s1ap_id = enb_ue->enb_ue_s1ap_id,
@@ -621,7 +689,10 @@
 
     ogs_info("S1-Reset Acknowledge");
     s1apbuf = ogs_s1ap_build_s1_reset_ack(partOfS1_Interface);
-    ogs_expect_or_return_val(s1apbuf, OGS_ERROR);
+    if (!s1apbuf) {
+        ogs_error("ogs_s1ap_build_s1_reset_ack() failed");
+        return OGS_ERROR;
+    }
 
     rv = s1ap_send_to_enb(enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
     ogs_expect(rv == OGS_OK);

open5gs_2.5.8.tar.xz/src/mme/sbc-handler.c -> open5gs_2.6.0.tar.xz/src/mme/sbc-handler.c Changed

@@ -26,7 +26,7 @@
 {
     ogs_pkbuf_t *s1apbuf = NULL;
     mme_enb_t *enb = NULL;
-    int i, j, flag;
+    int i, j, flag, r;
 
     /* Find enB with matched TAI */
     ogs_list_for_each(&mme_self()->enb_list, enb) {
@@ -48,11 +48,15 @@
         if (flag) {
             /* Build S1AP Write Replace Warning Request message */
             s1apbuf = s1ap_build_write_replace_warning_request(sbc_pws);
-            ogs_expect_or_return(s1apbuf);
+            if (!s1apbuf) {
+                ogs_error("s1ap_build_kill_request() failed");
+                return;
+            }
 
             /* Send to enb */
-            ogs_expect(s1ap_send_to_enb(
-                    enb, s1apbuf, S1AP_NON_UE_SIGNALLING) == OGS_OK);
+            r = s1ap_send_to_enb(enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
     }
 }
@@ -61,7 +65,7 @@
 {
     ogs_pkbuf_t *s1apbuf = NULL;
     mme_enb_t *enb = NULL;
-    int i, j, flag;
+    int i, j, flag, r;
 
     /* Find enB with matched TAI */
     ogs_list_for_each(&mme_self()->enb_list, enb) {
@@ -83,11 +87,15 @@
         if (flag) {
             /* Build S1AP Kill request message */
             s1apbuf = s1ap_build_kill_request(sbc_pws);
-            ogs_expect_or_return(s1apbuf);
+            if (!s1apbuf) {
+                ogs_error("s1ap_build_kill_request() failed");
+                return;
+            }
 
             /* Send to enb */
-            ogs_expect(s1ap_send_to_enb(
-                    enb, s1apbuf, S1AP_NON_UE_SIGNALLING) == OGS_OK);
+            r = s1ap_send_to_enb(enb, s1apbuf, S1AP_NON_UE_SIGNALLING);
+            ogs_expect(r == OGS_OK);
+            ogs_assert(r != OGS_ERROR);
         }
     }
 }

open5gs_2.5.8.tar.xz/src/mme/sgsap-handler.c -> open5gs_2.6.0.tar.xz/src/mme/sgsap-handler.c Changed

@@ -30,6 +30,7 @@
 
 void sgsap_handle_location_update_accept(mme_vlr_t *vlr, ogs_pkbuf_t *pkbuf)
 {
+    int r;
     ogs_tlv_t *root = NULL, *iter = NULL;
     mme_ue_t *mme_ue = NULL;
 
@@ -49,7 +50,7 @@
 
     root = ogs_tlv_parse_block(pkbuf->len, pkbuf->data, OGS_TLV_MODE_T1_L1);
     if (!root) {
-        ogs_error("!root");
+        ogs_error("ogs_tlv_parse_block() failed");
         goto error;
     }
 
@@ -116,21 +117,24 @@
         ogs_debug("    P-TMSI0x%08x", mme_ue->p_tmsi);
     }
 
-    ogs_assert(OGS_OK ==
-        nas_eps_send_attach_accept(mme_ue));
+    r = nas_eps_send_attach_accept(mme_ue);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 
     return;
 
 error:
-    ogs_assert(OGS_OK ==
-        nas_eps_send_attach_reject(mme_ue,
+    r = nas_eps_send_attach_reject(mme_ue,
             OGS_NAS_EMM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED,
-            OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+            OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
     mme_send_delete_session_or_mme_ue_context_release(mme_ue);
 }
 
 void sgsap_handle_location_update_reject(mme_vlr_t *vlr, ogs_pkbuf_t *pkbuf)
 {
+    int r;
     ogs_tlv_t *root = NULL, *iter = NULL;
     mme_ue_t *mme_ue = NULL;
 
@@ -150,7 +154,7 @@
 
     root = ogs_tlv_parse_block(pkbuf->len, pkbuf->data, OGS_TLV_MODE_T1_L1);
     if (!root) {
-        ogs_error("!root");
+        ogs_error("ogs_tlv_parse_block() failed");
         goto error;
     }
 
@@ -195,7 +199,10 @@
         goto error;
     }
 
-    ogs_expect_or_return(mme_ue);
+    if (!mme_ue) {
+        ogs_error("No UE(mme-ue) context");
+        return;
+    }
 
     ogs_debug("    IMSI%s CAUSE%d", mme_ue->imsi_bcd, emm_cause);
     if (lai) {
@@ -203,9 +210,10 @@
                     ogs_plmn_id_hexdump(&lai->nas_plmn_id), lai->lac);
     }
 
-    ogs_assert(OGS_OK ==
-        nas_eps_send_attach_reject(mme_ue,
-            emm_cause, OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED));
+    r = nas_eps_send_attach_reject(mme_ue,
+            emm_cause, OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
     mme_send_delete_session_or_mme_ue_context_release(mme_ue);
 
     return;
@@ -234,13 +242,18 @@
         ogs_debug("SGSAP EPS-DETACH-ACK");
     else if (type == SGSAP_IMSI_DETACH_ACK)
         ogs_debug("SGSAP IMSI-DETACH-ACK");
-    else
-        ogs_expect_or_return(0);
+    else {
+        ogs_error("Unknown type %d", type);
+        return;
+    }
 
     ogs_pkbuf_pull(pkbuf, 1);
 
     root = ogs_tlv_parse_block(pkbuf->len, pkbuf->data, OGS_TLV_MODE_T1_L1);
-    ogs_expect_or_return(root);
+    if (!root) {
+        ogs_error("ogs_tlv_parse_block() failed");
+        return;
+    }
 
     iter = root;
     while (iter) {
@@ -258,17 +271,28 @@
 
     ogs_tlv_free_all(root);
 
-    ogs_expect_or_return(nas_mobile_identity_imsi);
-    ogs_expect_or_return(nas_mobile_identity_imsi_len == SGSAP_IE_IMSI_LEN);
+    if (!nas_mobile_identity_imsi) {
+        ogs_error("No IMSI");
+        return;
+    }
+    if (nas_mobile_identity_imsi_len != SGSAP_IE_IMSI_LEN) {
+        ogs_error("Invalid IMSI len %d", nas_mobile_identity_imsi_len);
+        return;
+    }
 
     if (nas_mobile_identity_imsi->type == OGS_NAS_MOBILE_IDENTITY_IMSI) {
         ogs_nas_eps_imsi_to_bcd(nas_mobile_identity_imsi,
                 nas_mobile_identity_imsi_len, imsi_bcd);
         mme_ue = mme_ue_find_by_imsi_bcd(imsi_bcd);
-    } else
-        ogs_expect_or_return(0);
+    } else {
+        ogs_error("Unknown type %d", nas_mobile_identity_imsi->type);
+        return;
+    }
 
-    ogs_expect_or_return(mme_ue);
+    if (!mme_ue) {
+        ogs_error("No UE(mme-ue) context");
+        return;
+    }
 
     ogs_debug("    IMSI%s", mme_ue->imsi_bcd);
 
@@ -277,6 +301,7 @@
 
 void sgsap_handle_paging_request(mme_vlr_t *vlr, ogs_pkbuf_t *pkbuf)
 {
+    int r;
     ogs_tlv_t *root = NULL, *iter = NULL;
     mme_ue_t *mme_ue = NULL;
 
@@ -296,7 +321,10 @@
     ogs_pkbuf_pull(pkbuf, 1);
 
     root = ogs_tlv_parse_block(pkbuf->len, pkbuf->data, OGS_TLV_MODE_T1_L1);
-    ogs_expect_or_return(root);
+    if (!root) {
+        ogs_error("ogs_tlv_parse_block() failed");
+        return;
+    }
 
     iter = root;
     while (iter) {
@@ -325,16 +353,24 @@
 
     ogs_tlv_free_all(root);
 
-    ogs_expect_or_return(nas_mobile_identity_imsi);
-    ogs_expect_or_return(nas_mobile_identity_imsi_len == SGSAP_IE_IMSI_LEN);
+    if (!nas_mobile_identity_imsi) {
+        ogs_error("No IMSI");
+        return;
+    }
+    if (nas_mobile_identity_imsi_len != SGSAP_IE_IMSI_LEN) {
+        ogs_error("Invalid IMSI len %d", nas_mobile_identity_imsi_len);
+        return;
+    }
 
     if (nas_mobile_identity_imsi->type == OGS_NAS_MOBILE_IDENTITY_IMSI) {
 
         ogs_nas_eps_imsi_to_bcd(nas_mobile_identity_imsi,
                 nas_mobile_identity_imsi_len, imsi_bcd);
         mme_ue = mme_ue_find_by_imsi_bcd(imsi_bcd);
-    } else
-        ogs_expect_or_return(0);
+    } else {
+        ogs_error("Unknown type %d", nas_mobile_identity_imsi->type);
+        return;
+    }
 
     if (mme_ue) {
         ogs_assert(service_indicator);
@@ -351,25 +387,61 @@
 
         if (ECM_IDLE(mme_ue)) {
             if (CS_CALL_SERVICE_INDICATOR(mme_ue)) {
-                /* UE will respond Extended Service Request in PS CNDomain*/
-                MME_STORE_PAGING_INFO(mme_ue,
+                if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
+                    /*
+                    * TS 24.301 5.3.7
+                    * If ISR is not activated, the network behaviour upon
+                    * expiry of the mobile reachable timer is network dependent,
+                    * but typically the network stops sending paging messages to
+                    * the UE on the first expiry, and may take other appropriate
+                    * actions
+                    */
+                    ogs_debug("%s Paging stopped: Mobile Reachable timeout",
+                        mme_ue->imsi_bcd);
+
+                    ogs_assert(OGS_OK ==
+                        sgsap_send_paging_reject(
+                            mme_ue, SGSAP_SGS_CAUSE_UE_UNREACHABLE));
+                } else {
+                    /* UE will respond Extended Service Request in PS CNDomain*/
+                    MME_STORE_PAGING_INFO(mme_ue,
                         MME_PAGING_TYPE_CS_CALL_SERVICE, NULL);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_paging(mme_ue, S1AP_CNDomain_cs));
-
+                    r = s1ap_send_paging(mme_ue, S1AP_CNDomain_cs);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
+                }
             } else if (SMS_SERVICE_INDICATOR(mme_ue)) {
-                /* UE will respond Service Request in PS CNDomain*/
-                MME_STORE_PAGING_INFO(mme_ue,
+                if (ogs_timer_running(mme_ue->t_implicit_detach.timer)) {
+                    /*
+                    * TS 24.301 5.3.7
+                    * If ISR is not activated, the network behaviour upon
+                    * expiry of the mobile reachable timer is network dependent,
+                    * but typically the network stops sending paging messages to
+                    * the UE on the first expiry, and may take other appropriate
+                    * actions
+                    */
+                    ogs_debug("%s Paging stopped: Mobile Reachable timer expiry",
+                        mme_ue->imsi_bcd);
+
+                    ogs_assert(OGS_OK ==
+                        sgsap_send_paging_reject(
+                            mme_ue, SGSAP_SGS_CAUSE_UE_UNREACHABLE));
+                } else {
+                    /* UE will respond Service Request in PS CNDomain*/
+                    MME_STORE_PAGING_INFO(mme_ue,
                         MME_PAGING_TYPE_SMS_SERVICE, NULL);
-                ogs_assert(OGS_OK ==
-                    s1ap_send_paging(mme_ue, S1AP_CNDomain_ps));
+                    r = s1ap_send_paging(mme_ue, S1AP_CNDomain_ps);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
+                }
             } else
                 goto paging_reject;
 
         } else {
             if (CS_CALL_SERVICE_INDICATOR(mme_ue)) {
-                ogs_assert(OGS_OK ==
-                    nas_eps_send_cs_service_notification(mme_ue));
+                r = nas_eps_send_cs_service_notification(mme_ue);
+                ogs_expect(r == OGS_OK);
+                ogs_assert(r != OGS_ERROR);
             } else if (SMS_SERVICE_INDICATOR(mme_ue)) {
                 ogs_assert(OGS_OK ==
                     sgsap_send_service_request(
@@ -395,6 +467,7 @@
 
 void sgsap_handle_downlink_unitdata(mme_vlr_t *vlr, ogs_pkbuf_t *pkbuf)
 {
+    int r;
     ogs_tlv_t *root = NULL, *iter = NULL;
     mme_ue_t *mme_ue = NULL;
 
@@ -413,7 +486,10 @@
     ogs_pkbuf_pull(pkbuf, 1);
 
     root = ogs_tlv_parse_block(pkbuf->len, pkbuf->data, OGS_TLV_MODE_T1_L1);
-    ogs_assert(root);
+    if (!root) {
+        ogs_error("ogs_tlv_parse_block() failed");
+        return;
+    }
 
     iter = root;
     while (iter) {
@@ -448,16 +524,20 @@
     } else
         ogs_assert_if_reached();
 
-    ogs_expect_or_return(mme_ue);
+    if (!mme_ue) {
+        ogs_error("No UE(mme-ue) context");
+        return;
+    }
 
     ogs_debug("    IMSI%s", mme_ue->imsi_bcd);
     ogs_log_hexdump(OGS_LOG_DEBUG,
             nas_message_container_buffer,
             nas_message_container_length);
 
-    ogs_assert(OGS_OK ==
-        nas_eps_send_downlink_nas_transport(mme_ue,
-            nas_message_container_buffer, nas_message_container_length));
+    r = nas_eps_send_downlink_nas_transport(mme_ue,
+            nas_message_container_buffer, nas_message_container_length);
+    ogs_expect(r == OGS_OK);
+    ogs_assert(r != OGS_ERROR);
 }
 
 void sgsap_handle_reset_indication(mme_vlr_t *vlr, ogs_pkbuf_t *pkbuf)
@@ -488,7 +568,10 @@
     ogs_pkbuf_pull(pkbuf, 1);
 
     root = ogs_tlv_parse_block(pkbuf->len, pkbuf->data, OGS_TLV_MODE_T1_L1);
-    ogs_expect_or_return(root);
+    if (!root) {
+        ogs_error("ogs_tlv_parse_block() failed");
+        return;
+    }
 
     iter = root;
     while (iter) {
@@ -506,16 +589,24 @@
 
     ogs_tlv_free_all(root);
 
-    ogs_expect_or_return(nas_mobile_identity_imsi);
-    ogs_expect_or_return(nas_mobile_identity_imsi_len == SGSAP_IE_IMSI_LEN);
+    if (!nas_mobile_identity_imsi) {
+        ogs_error("No IMSI");
+        return;
+    }
+    if (nas_mobile_identity_imsi_len != SGSAP_IE_IMSI_LEN) {
+        ogs_error("Invalid IMSI len %d", nas_mobile_identity_imsi_len);
+        return;
+    }
 
     if (nas_mobile_identity_imsi->type == OGS_NAS_MOBILE_IDENTITY_IMSI) {
 
         ogs_nas_eps_imsi_to_bcd(nas_mobile_identity_imsi,
                 nas_mobile_identity_imsi_len, imsi_bcd);
         mme_ue = mme_ue_find_by_imsi_bcd(imsi_bcd);
-    } else
-        ogs_expect_or_return(0);
+    } else {
+        ogs_error("Unknown type %d", nas_mobile_identity_imsi->type);
+        return;
+    }
 
     if (mme_ue)
         ogs_debug("    IMSI%s", mme_ue->imsi_bcd);
@@ -542,7 +633,10 @@
     ogs_pkbuf_pull(pkbuf, 1);
 
     root = ogs_tlv_parse_block(pkbuf->len, pkbuf->data, OGS_TLV_MODE_T1_L1);
-    ogs_expect_or_return(root);
+    if (!root) {
+        ogs_error("ogs_tlv_parse_block() failed");
+        return;
+    }
 
     iter = root;
     while (iter) {
@@ -563,16 +657,24 @@
 
     ogs_tlv_free_all(root);
 
-    ogs_expect_or_return(nas_mobile_identity_imsi);
-    ogs_expect_or_return(nas_mobile_identity_imsi_len == SGSAP_IE_IMSI_LEN);
+    if (!nas_mobile_identity_imsi) {
+        ogs_error("No IMSI");
+        return;
+    }
+    if (nas_mobile_identity_imsi_len != SGSAP_IE_IMSI_LEN) {
+        ogs_error("Invalid IMSI len %d", nas_mobile_identity_imsi_len);
+        return;
+    }
 
     if (nas_mobile_identity_imsi->type == OGS_NAS_MOBILE_IDENTITY_IMSI) {
 
         ogs_nas_eps_imsi_to_bcd(nas_mobile_identity_imsi,
                 nas_mobile_identity_imsi_len, imsi_bcd);
         mme_ue = mme_ue_find_by_imsi_bcd(imsi_bcd);
-    } else
-        ogs_expect_or_return(0);
+    } else {
+        ogs_error("Unknown type %d", nas_mobile_identity_imsi->type);
+        return;
+    }
 
     if (mme_ue)
         ogs_debug("    IMSI%s", mme_ue->imsi_bcd);

open5gs_2.5.8.tar.xz/src/mme/sgsap-path.c -> open5gs_2.6.0.tar.xz/src/mme/sgsap-path.c Changed

@@ -120,7 +120,10 @@
     ogs_debug("    IMSI%s", mme_ue->imsi_bcd);
 
     pkbuf = sgsap_build_location_update_request(mme_ue);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_location_update_request() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -137,7 +140,10 @@
     ogs_debug("    IMSI%s", mme_ue->imsi_bcd);
 
     pkbuf = sgsap_build_tmsi_reallocation_complete(mme_ue);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_tmsi_reallocation_complete() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -151,7 +157,10 @@
     ogs_assert(mme_ue);
 
     pkbuf = sgsap_build_detach_indication(mme_ue);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_detach_indication() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -168,7 +177,10 @@
     ogs_debug("    IMSI%s", mme_ue->imsi_bcd);
 
     pkbuf = sgsap_build_mo_csfb_indication(mme_ue);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_mo_csfb_indication() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -187,7 +199,10 @@
     pkbuf = sgsap_build_paging_reject(
                 &mme_ue->nas_mobile_identity_imsi,
                 SGSAP_IE_IMSI_LEN, sgs_cause);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_paging_reject() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -206,7 +221,10 @@
     ogs_debug("    EMM_MODE%d", emm_mode);
 
     pkbuf = sgsap_build_service_request(mme_ue, emm_mode);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_service_request() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -222,7 +240,10 @@
     ogs_debug("SGSAP RESET-ACK");
 
     pkbuf = sgsap_build_reset_ack(vlr);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_reset_ack() failed");
+        return OGS_ERROR;
+    }
     rv =  sgsap_send_to_vlr_with_sid(vlr, pkbuf, 0);
     ogs_expect(rv == OGS_OK);
 
@@ -243,7 +264,10 @@
             nas_message_container->buffer, nas_message_container->length);
 
     pkbuf = sgsap_build_uplink_unidata(mme_ue, nas_message_container);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_uplink_unidata() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);
 
@@ -261,7 +285,10 @@
     ogs_debug("    CAUSE%d", sgs_cause);
 
     pkbuf = sgsap_build_ue_unreachable(mme_ue, sgs_cause);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgsap_build_ue_unreachable() failed");
+        return OGS_ERROR;
+    }
     rv = sgsap_send_to_vlr(mme_ue, pkbuf);
     ogs_expect(rv == OGS_OK);

open5gs_2.5.8.tar.xz/src/mme/sgsap-sm.c -> open5gs_2.6.0.tar.xz/src/mme/sgsap-sm.c Changed

open5gs_2.5.8.tar.xz/src/nrf/nnrf-handler.c -> open5gs_2.6.0.tar.xz/src/nrf/nnrf-handler.c Changed

@@ -161,12 +161,14 @@
 bool nrf_nnrf_handle_nf_status_subscribe(
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
+    bool rc;
     int status;
     ogs_sbi_response_t *response = NULL;
     OpenAPI_subscription_data_t *SubscriptionData = NULL;
     OpenAPI_subscription_data_subscr_cond_t *SubscrCond = NULL;
     ogs_sbi_subscription_data_t *subscription_data = NULL;
     ogs_sbi_client_t *client = NULL;
+    OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
     ogs_sockaddr_t *addr = NULL;
 
     ogs_uuid_t uuid;
@@ -203,7 +205,11 @@
     if (SubscriptionData->req_nf_instance_id) {
         subscription_data->req_nf_instance_id =
             ogs_strdup(SubscriptionData->req_nf_instance_id);
-        ogs_expect_or_return_val(subscription_data->req_nf_instance_id, NULL);
+        if (!subscription_data->req_nf_instance_id) {
+            ogs_error("ogs_strdup() failed");
+            ogs_sbi_subscription_data_remove(subscription_data);
+            return NULL;
+        }
     }
 
     if (SubscriptionData->subscription_id) {
@@ -212,7 +218,11 @@
         ogs_free(SubscriptionData->subscription_id);
     }
     SubscriptionData->subscription_id = ogs_strdup(subscription_data->id);
-    ogs_expect_or_return_val(SubscriptionData->subscription_id, NULL);
+    if (!SubscriptionData->subscription_id) {
+        ogs_error("ogs_strdup() failed");
+        ogs_sbi_subscription_data_remove(subscription_data);
+        return NULL;
+    }
 
     if (SubscriptionData->requester_features) {
         subscription_data->requester_features =
@@ -229,7 +239,11 @@
             OGS_SBI_NNRF_NFM_SERVICE_MAP);
     SubscriptionData->nrf_supported_features =
         ogs_uint64_to_string(subscription_data->nrf_supported_features);
-    ogs_expect_or_return_val(SubscriptionData->nrf_supported_features, NULL);
+    if (!SubscriptionData->nrf_supported_features) {
+        ogs_error("ogs_strdup() failed");
+        ogs_sbi_subscription_data_remove(subscription_data);
+        return NULL;
+    }
 
     SubscrCond = SubscriptionData->subscr_cond;
     if (SubscrCond) {
@@ -243,8 +257,9 @@
             ogs_strdup(SubscriptionData->nf_status_notification_uri);
     ogs_assert(subscription_data->notification_uri);
 
-    addr = ogs_sbi_getaddr_from_uri(subscription_data->notification_uri);
-    if (!addr) {
+    rc = ogs_sbi_getaddr_from_uri(&scheme, &addr,
+            subscription_data->notification_uri);
+    if (rc == false || scheme == OpenAPI_uri_scheme_NULL) {
         ogs_assert(true ==
             ogs_sbi_server_send_error(
                 stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,
@@ -253,13 +268,12 @@
         return false;
     }
 
-    client = ogs_sbi_client_find(addr);
+    client = ogs_sbi_client_find(scheme, addr);
     if (!client) {
-        client = ogs_sbi_client_add(addr);
+        client = ogs_sbi_client_add(scheme, addr);
         ogs_assert(client);
     }
     OGS_SBI_SETUP_CLIENT(subscription_data, client);
-
     ogs_freeaddrinfo(addr);
 
     if (subscription_data->time.validity_duration) {
@@ -402,7 +416,10 @@
     OGS_SBI_FEATURES_SET(supported_features, OGS_SBI_NNRF_NFM_SERVICE_MAP);
     sendmsg.NFProfile = ogs_nnrf_nfm_build_nf_profile(
             nf_instance, NULL, NULL, supported_features);
-    ogs_expect_or_return_val(sendmsg.NFProfile, NULL);
+    if (!sendmsg.NFProfile) {
+        ogs_error("ogs_nnrf_nfm_build_nf_profile() failed");
+        return false;
+    }
 
     response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK);
     ogs_assert(response);

open5gs_2.5.8.tar.xz/src/nrf/sbi-path.c -> open5gs_2.6.0.tar.xz/src/nrf/sbi-path.c Changed

@@ -84,11 +84,17 @@
 
     ogs_assert(subscription_data);
     client = subscription_data->client;
-    ogs_expect_or_return_val(client, false);
+    if (!client) {
+        ogs_error("No Client");
+        return false;
+    }
 
     request = nrf_nnrf_nfm_build_nf_status_notify(
                 subscription_data, event, nf_instance);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("nrf_nnrf_nfm_build_nf_status_notify() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);
@@ -103,6 +109,7 @@
         OpenAPI_notification_event_type_e event,
         ogs_sbi_nf_instance_t *nf_instance)
 {
+    bool rc;
     ogs_sbi_subscription_data_t *subscription_data = NULL;
 
     ogs_assert(nf_instance);
@@ -135,10 +142,12 @@
                 continue;
         }
 
-        ogs_expect_or_return_val(true ==
-            nrf_nnrf_nfm_send_nf_status_notify(
-                subscription_data, event, nf_instance),
-            false);
+        rc = nrf_nnrf_nfm_send_nf_status_notify(
+                subscription_data, event, nf_instance);
+        if (rc == false) {
+            ogs_error("nrf_nnrf_nfm_send_nf_status_notify() failed");
+            return rc;
+        }
     }
 
     return true;

open5gs_2.5.8.tar.xz/src/nssf/context.c -> open5gs_2.6.0.tar.xz/src/nssf/context.c Changed

@@ -113,7 +113,6 @@
                         uint16_t port = ogs_sbi_self()->sbi_port;
                         const char *dev = NULL;
                         ogs_sockaddr_t *addr = NULL;
-                        const char *key = NULL, *pem = NULL;
                         const char *sst = NULL, *sd = NULL;
 
                         ogs_sockopt_t option;
@@ -183,22 +182,6 @@
                                         &nsi_iter, &option);
                                 if (rv != OGS_OK) return rv;
                                 is_option = true;
-                            } else if (!strcmp(nsi_key, "tls")) {
-                                ogs_yaml_iter_t tls_iter;
-                                ogs_yaml_iter_recurse(&nsi_iter, &tls_iter);
-
-                                while (ogs_yaml_iter_next(&tls_iter)) {
-                                    const char *tls_key =
-                                        ogs_yaml_iter_key(&tls_iter);
-                                    ogs_assert(tls_key);
-
-                                    if (!strcmp(tls_key, "key")) {
-                                        key = ogs_yaml_iter_value(&tls_iter);
-                                    } else if (!strcmp(tls_key, "pem")) {
-                                        pem = ogs_yaml_iter_value(&tls_iter);
-                                    } else
-                                        ogs_warn("unknown key `%s`", tls_key);
-                                }
                             } else if (!strcmp(nsi_key, "s_nssai")) {
                                 ogs_yaml_iter_t s_nssai_iter;
                                 ogs_yaml_iter_recurse(&nsi_iter, &s_nssai_iter);
@@ -259,9 +242,6 @@
                             nssf_nsi_t *nsi = nssf_nsi_add(node->addr,
                                     atoi(sst), ogs_s_nssai_sd_from_string(sd));
                             ogs_assert(nsi);
-
-                            if (key) nsi->tls.key = key;
-                            if (pem) nsi->tls.pem = pem;
                         }
                         node6 = ogs_list_first(&list6);
                         if (node6) {
@@ -270,9 +250,6 @@
                             nssf_nsi_t *nsi = nssf_nsi_add(node6->addr,
                                     atoi(sst), ogs_s_nssai_sd_from_string(sd));
                             ogs_assert(nsi);
-
-                            if (key) nsi->tls.key = key;
-                            if (pem) nsi->tls.pem = pem;
                         }
 
                         ogs_socknode_remove_all(&list);
@@ -358,18 +335,21 @@
 char *nssf_nsi_nrf_uri(nssf_nsi_t *nsi)
 {
     ogs_sbi_header_t h;
-    bool https = false;
 
     ogs_assert(nsi);
 
     memset(&h, 0, sizeof(h));
 
-    if (nsi->tls.key && nsi->tls.pem)
-        https = true;
-
     h.service.name = (char *)OGS_SBI_SERVICE_NAME_NNRF_DISC;
     h.api.version = (char *)OGS_SBI_API_V1;
     h.resource.component0 = (char *)OGS_SBI_RESOURCE_NAME_NF_INSTANCES;
 
-    return ogs_uridup(https, nsi->addr, &h);
+    return ogs_uridup(ogs_app_tls_server_enabled() == true, nsi->addr, &h);
+}
+
+int get_nsi_load()
+{
+    return (((ogs_pool_size(&nssf_nsi_pool) -
+            ogs_pool_avail(&nssf_nsi_pool)) * 100) /
+            ogs_pool_size(&nssf_nsi_pool));
 }

open5gs_2.5.8.tar.xz/src/nssf/context.h -> open5gs_2.6.0.tar.xz/src/nssf/context.h Changed

open5gs_2.5.8.tar.xz/src/nssf/nssf-sm.c -> open5gs_2.6.0.tar.xz/src/nssf/nssf-sm.c Changed

open5gs_2.5.8.tar.xz/src/pcf/context.c -> open5gs_2.6.0.tar.xz/src/pcf/context.c Changed

@@ -121,6 +121,8 @@
                     /* handle config in sbi library */
                 } else if (!strcmp(pcf_key, "discovery")) {
                     /* handle config in sbi library */
+                } else if (!strcmp(pcf_key, "metrics")) {
+                    /* handle config in metrics library */
                 } else
                     ogs_warn("unknown key `%s`", pcf_key);
             }
@@ -312,6 +314,9 @@
     clear_ipv4addr(sess);
     clear_ipv6prefix(sess);
 
+    OpenAPI_clear_and_free_string_list(sess->ipv4_frame_route_list);
+    OpenAPI_clear_and_free_string_list(sess->ipv6_frame_route_list);
+
     if (sess->subscribed_sess_ambr)
         OpenAPI_ambr_free(sess->subscribed_sess_ambr);
     if (sess->subscribed_default_qos)
@@ -362,10 +367,16 @@
     clear_ipv4addr(sess);
 
     rv = ogs_ipv4_from_string(&sess->ipv4addr, ipv4addr_string);
-    ogs_expect_or_return_val(rv == OGS_OK, false);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_ipv4_from_string() failed");
+        return false;
+    }
 
     sess->ipv4addr_string = ogs_strdup(ipv4addr_string);
-    ogs_expect_or_return_val(sess->ipv4addr_string, false);
+    if (!sess->ipv4addr_string) {
+        ogs_error("ogs_strdup() failed");
+        return false;
+    }
 
     ogs_hash_set(self.ipv4addr_hash,
             &sess->ipv4addr, sizeof(sess->ipv4addr), sess);
@@ -384,12 +395,18 @@
 
     rv = ogs_ipv6prefix_from_string(
             sess->ipv6prefix.addr6, &sess->ipv6prefix.len, ipv6prefix_string);
-    ogs_expect_or_return_val(rv == OGS_OK, false);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_ipv6prefix_from_string() failed");
+        return false;
+    }
 
     ogs_assert(sess->ipv6prefix.len == OGS_IPV6_128_PREFIX_LEN);
 
     sess->ipv6prefix_string = ogs_strdup(ipv6prefix_string);
-    ogs_expect_or_return_val(sess->ipv6prefix_string, false);
+    if (!sess->ipv6prefix_string) {
+        ogs_error("ogs_strdup() failed");
+        return false;
+    }
 
     ogs_hash_set(self.ipv6prefix_hash,
             &sess->ipv6prefix, (sess->ipv6prefix.len >> 3) + 1, sess);
@@ -426,7 +443,10 @@
     ogs_assert(ipv4addr_string);
 
     rv = ogs_ipv4_from_string(&ipv4addr, ipv4addr_string);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_ipv4_from_string() failed");
+        return NULL;
+    }
 
     return ogs_hash_get(self.ipv4addr_hash, &ipv4addr, sizeof(ipv4addr));
 }
@@ -460,7 +480,10 @@
     ogs_assert(ipv6addr_string);
 
     rv = ogs_inet_pton(AF_INET6, ipv6addr_string, &tmp);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_inet_pton() failed");
+        return NULL;
+    }
 
     memcpy(ipv6prefix.addr6, tmp.sin6.sin6_addr.s6_addr, OGS_IPV6_LEN);
     ipv6prefix.len = OGS_IPV6_128_PREFIX_LEN;
@@ -565,3 +588,18 @@
     ogs_assert(app_session_id);
     return pcf_app_find(atoll(app_session_id));
 }
+
+int get_pcf_load()
+{
+    if (ogs_pool_avail(&pcf_ue_pool) / ogs_pool_size(&pcf_ue_pool) <
+            ogs_pool_avail(&pcf_sess_pool) /
+            ogs_pool_avail(&pcf_sess_pool)) {
+        return (((ogs_pool_size(&pcf_ue_pool) -
+                ogs_pool_avail(&pcf_ue_pool)) * 100) /
+                ogs_pool_size(&pcf_ue_pool));
+    } else {
+        return (((ogs_pool_size(&pcf_sess_pool) -
+                ogs_pool_avail(&pcf_sess_pool)) * 100) /
+                ogs_pool_size(&pcf_sess_pool));
+    }
+}

open5gs_2.5.8.tar.xz/src/pcf/context.h -> open5gs_2.6.0.tar.xz/src/pcf/context.h Changed

open5gs_2.5.8.tar.xz/src/pcf/init.c -> open5gs_2.6.0.tar.xz/src/pcf/init.c Changed

@@ -18,6 +18,7 @@
  */
 
 #include "sbi-path.h"
+#include "metrics.h"
 
 static ogs_thread_t *thread;
 static void pcf_main(void *data);
@@ -27,13 +28,17 @@
 {
     int rv;
 
-    ogs_sbi_context_init();
+    pcf_metrics_init();
 
+    ogs_sbi_context_init();
     pcf_context_init();
 
     rv = ogs_sbi_context_parse_config("pcf", "nrf", "scp");
     if (rv != OGS_OK) return rv;
 
+    rv = ogs_metrics_context_parse_config("pcf");
+    if (rv != OGS_OK) return rv;
+
     rv = pcf_context_parse_config();
     if (rv != OGS_OK) return rv;
 
@@ -41,6 +46,8 @@
             ogs_app()->logger.domain, ogs_app()->logger.level);
     if (rv != OGS_OK) return rv;
 
+    ogs_metrics_context_open(ogs_metrics_self());
+
     rv = ogs_dbi_init(ogs_app()->db_uri);
     if (rv != OGS_OK) return rv;
 
@@ -87,10 +94,14 @@
 
     pcf_sbi_close();
 
+    ogs_metrics_context_close(ogs_metrics_self());
+
     ogs_dbi_final();
 
     pcf_context_final();
     ogs_sbi_context_final();
+
+    pcf_metrics_final();
 }
 
 static void pcf_main(void *data)

open5gs_2.5.8.tar.xz/src/pcf/meson.build -> open5gs_2.6.0.tar.xz/src/pcf/meson.build Changed

open5gs_2.6.0.tar.xz/src/pcf/metrics.c Added

@@ -0,0 +1,314 @@
+#include "ogs-app.h"
+#include "context.h"
+
+#include "metrics.h"
+
+typedef struct pcf_metrics_spec_def_s {
+    unsigned int type;
+    const char *name;
+    const char *description;
+    int initial_val;
+    unsigned int num_labels;
+    const char **labels;
+} pcf_metrics_spec_def_t;
+
+/* Helper generic functions: */
+static int pcf_metrics_init_inst(ogs_metrics_inst_t **inst,
+        ogs_metrics_spec_t **specs, unsigned int len,
+        unsigned int num_labels, const char **labels)
+{
+    unsigned int i;
+    for (i = 0; i < len; i++)
+        insti = ogs_metrics_inst_new(specsi, num_labels, labels);
+    return OGS_OK;
+}
+
+static int pcf_metrics_free_inst(ogs_metrics_inst_t **inst,
+        unsigned int len)
+{
+    unsigned int i;
+    for (i = 0; i < len; i++)
+        ogs_metrics_inst_free(insti);
+    memset(inst, 0, sizeof(inst0) * len);
+    return OGS_OK;
+}
+
+static int pcf_metrics_init_spec(ogs_metrics_context_t *ctx,
+        ogs_metrics_spec_t **dst, pcf_metrics_spec_def_t *src, unsigned int len)
+{
+    unsigned int i;
+    for (i = 0; i < len; i++) {
+        dsti = ogs_metrics_spec_new(ctx, srci.type,
+                srci.name, srci.description,
+                srci.initial_val, srci.num_labels, srci.labels);
+    }
+    return OGS_OK;
+}
+
+/* GLOBAL */
+ogs_metrics_spec_t *pcf_metrics_spec_global_PCF_METR_GLOB_MAX;
+ogs_metrics_inst_t *pcf_metrics_inst_global_PCF_METR_GLOB_MAX;
+pcf_metrics_spec_def_t pcf_metrics_spec_def_global_PCF_METR_GLOB_MAX = {
+/* Global Counters: */
+/* Global Gauges: */
+};
+int pcf_metrics_init_inst_global(void)
+{
+    return pcf_metrics_init_inst(pcf_metrics_inst_global,
+            pcf_metrics_spec_global, _PCF_METR_GLOB_MAX, 0, NULL);
+}
+int pcf_metrics_free_inst_global(void)
+{
+    return pcf_metrics_free_inst(pcf_metrics_inst_global, _PCF_METR_GLOB_MAX);
+}
+
+/* BY_PLMN */
+const char *labels_plmn = {
+    "plmnid"
+};
+#define PCF_METR_BY_PLMN_CTR_ENTRY(_id, _name, _desc) \
+    _id = { \
+        .type = OGS_METRICS_METRIC_TYPE_COUNTER, \
+        .name = _name, \
+        .description = _desc, \
+        .num_labels = OGS_ARRAY_SIZE(labels_plmn), \
+        .labels = labels_plmn, \
+    },
+ogs_metrics_spec_t *pcf_metrics_spec_by_plmn_PCF_METR_BY_PLMN_MAX;
+ogs_hash_t *metrics_hash_by_plmn = NULL;   /* hash table for PLMN label */
+pcf_metrics_spec_def_t pcf_metrics_spec_def_by_plmn_PCF_METR_BY_PLMN_MAX = {
+/* Counters: */
+PCF_METR_BY_PLMN_CTR_ENTRY(
+    PCF_METR_CTR_PA_POLICYAMASSOREQ,
+    "fivegs_pcffunction_pa_policyamassoreq",
+    "Number of AM policy association requests")
+PCF_METR_BY_PLMN_CTR_ENTRY(
+    PCF_METR_CTR_PA_POLICYAMASSOSUCC,
+    "fivegs_pcffunction_pa_policyamassosucc",
+    "Number of successful AM policy associations")
+};
+void pcf_metrics_init_by_plmn(void);
+int pcf_metrics_free_inst_by_plmn(ogs_metrics_inst_t **inst);
+typedef struct pcf_metric_key_by_plmn_s {
+    ogs_plmn_id_t               plmn_id;
+    pcf_metric_type_by_plmn_t   t;
+} pcf_metric_key_by_plmn_t;
+
+void pcf_metrics_init_by_plmn(void)
+{
+    metrics_hash_by_plmn = ogs_hash_make();
+    ogs_assert(metrics_hash_by_plmn);
+}
+void pcf_metrics_inst_by_plmn_add(ogs_plmn_id_t *plmn,
+        pcf_metric_type_by_plmn_t t, int val)
+{
+    ogs_metrics_inst_t *metrics = NULL;
+    pcf_metric_key_by_plmn_t *plmn_key;
+
+    plmn_key = ogs_calloc(1, sizeof(*plmn_key));
+    ogs_assert(plmn_key);
+
+    if (plmn) {
+        plmn_key->plmn_id = *plmn;
+    }
+
+    plmn_key->t = t;
+
+    metrics = ogs_hash_get(metrics_hash_by_plmn,
+            plmn_key, sizeof(*plmn_key));
+
+    if (!metrics) {
+        char plmn_idOGS_PLMNIDSTRLEN = "";
+
+        if (plmn) {
+            ogs_plmn_id_to_string(plmn, plmn_id);
+        }
+
+        metrics = ogs_metrics_inst_new(pcf_metrics_spec_by_plmnt,
+                pcf_metrics_spec_def_by_plmn->num_labels,
+                (const char *){ plmn_id });
+
+        ogs_assert(metrics);
+        ogs_hash_set(metrics_hash_by_plmn,
+                plmn_key, sizeof(*plmn_key), metrics);
+    } else {
+        ogs_free(plmn_key);
+    }
+
+    ogs_metrics_inst_add(metrics, val);
+}
+
+int pcf_metrics_free_inst_by_plmn(ogs_metrics_inst_t **inst)
+{
+    return pcf_metrics_free_inst(inst, _PCF_METR_BY_PLMN_MAX);
+}
+
+/* BY_SLICE */
+const char *labels_slice = {
+    "plmnid",
+    "snssai"
+};
+
+#define PCF_METR_BY_SLICE_CTR_ENTRY(_id, _name, _desc) \
+    _id = { \
+        .type = OGS_METRICS_METRIC_TYPE_COUNTER, \
+        .name = _name, \
+        .description = _desc, \
+        .num_labels = OGS_ARRAY_SIZE(labels_slice), \
+        .labels = labels_slice, \
+    },
+#define PCF_METR_BY_SLICE_GAUGE_ENTRY(_id, _name, _desc) \
+    _id = { \
+        .type = OGS_METRICS_METRIC_TYPE_GAUGE, \
+        .name = _name, \
+        .description = _desc, \
+        .num_labels = OGS_ARRAY_SIZE(labels_slice), \
+        .labels = labels_slice, \
+    },
+ogs_metrics_spec_t *pcf_metrics_spec_by_slice_PCF_METR_BY_SLICE_MAX;
+ogs_hash_t *metrics_hash_by_slice = NULL;   /* hash table for SLICE labels */
+pcf_metrics_spec_def_t pcf_metrics_spec_def_by_slice_PCF_METR_BY_SLICE_MAX = {
+/* Counters: */
+PCF_METR_BY_SLICE_CTR_ENTRY(
+    PCF_METR_CTR_PA_POLICYSMASSOREQ,
+    "fivegs_pcffunction_pa_policysmassoreq",
+    "Number of SM policy association requests")
+PCF_METR_BY_SLICE_CTR_ENTRY(
+    PCF_METR_CTR_PA_POLICYSMASSOSUCC,
+    "fivegs_pcffunction_pa_policysmassosucc",
+    "Number of successful SM policy associations")
+/* Gauges: */
+PCF_METR_BY_SLICE_GAUGE_ENTRY(
+    PCF_METR_GAUGE_PA_SESSIONNBR,
+    "fivegs_pcffunction_pa_sessionnbr",
+    "Active Sessions")
+};
+void pcf_metrics_init_by_slice(void);
+int pcf_metrics_free_inst_by_slice(ogs_metrics_inst_t **inst);
+typedef struct pcf_metric_key_by_slice_s {
+    ogs_plmn_id_t               plmn_id;
+    ogs_s_nssai_t               snssai;
+    pcf_metric_type_by_slice_t  t;
+} pcf_metric_key_by_slice_t;
+
+void pcf_metrics_init_by_slice(void)
+{
+    metrics_hash_by_slice = ogs_hash_make();
+    ogs_assert(metrics_hash_by_slice);
+}
+
+void pcf_metrics_inst_by_slice_add(ogs_plmn_id_t *plmn,
+        ogs_s_nssai_t *snssai, pcf_metric_type_by_slice_t t, int val)
+{
+    ogs_metrics_inst_t *metrics = NULL;
+    pcf_metric_key_by_slice_t *slice_key;
+
+    slice_key = ogs_calloc(1, sizeof(*slice_key));
+    ogs_assert(slice_key);
+
+    if (plmn) {
+        slice_key->plmn_id = *plmn;
+    }
+
+    if (snssai) {
+        slice_key->snssai = *snssai;
+    } else {
+        slice_key->snssai.sst = 0;
+        slice_key->snssai.sd.v = OGS_S_NSSAI_NO_SD_VALUE;
+    }
+
+    slice_key->t = t;
+
+    metrics = ogs_hash_get(metrics_hash_by_slice,
+            slice_key, sizeof(*slice_key));
+
+    if (!metrics) {
+        char plmn_idOGS_PLMNIDSTRLEN = "";
+        char *s_nssai = NULL;
+
+        if (plmn) {
+            ogs_plmn_id_to_string(plmn, plmn_id);
+        }
+
+        if (snssai) {
+            s_nssai = ogs_sbi_s_nssai_to_string_plain(snssai);
+        } else {
+            s_nssai = ogs_strdup("");
+        }
+
+        metrics = ogs_metrics_inst_new(pcf_metrics_spec_by_slicet,
+                pcf_metrics_spec_def_by_slice->num_labels,
+                (const char *){ plmn_id, s_nssai });
+
+        ogs_assert(metrics);
+        ogs_hash_set(metrics_hash_by_slice,
+                slice_key, sizeof(*slice_key), metrics);
+
+        if (s_nssai)
+            ogs_free(s_nssai);
+    } else {
+        ogs_free(slice_key);
+    }
+
+    ogs_metrics_inst_add(metrics, val);
+}
+
+int pcf_metrics_free_inst_by_slice(ogs_metrics_inst_t **inst)
+{
+    return pcf_metrics_free_inst(inst, _PCF_METR_BY_SLICE_MAX);
+}
+
+void pcf_metrics_init(void)
+{
+    ogs_metrics_context_t *ctx = ogs_metrics_self();
+    ogs_metrics_context_init();
+
+    pcf_metrics_init_spec(ctx, pcf_metrics_spec_global,
+            pcf_metrics_spec_def_global, _PCF_METR_GLOB_MAX);
+    pcf_metrics_init_spec(ctx, pcf_metrics_spec_by_plmn,
+            pcf_metrics_spec_def_by_plmn, _PCF_METR_BY_PLMN_MAX);
+    pcf_metrics_init_spec(ctx, pcf_metrics_spec_by_slice,
+            pcf_metrics_spec_def_by_slice, _PCF_METR_BY_SLICE_MAX);
+
+    pcf_metrics_init_inst_global();
+    pcf_metrics_init_by_plmn();
+    pcf_metrics_init_by_slice();
+}
+
+void pcf_metrics_final(void)
+{
+    ogs_hash_index_t *hi;
+
+    if (metrics_hash_by_slice) {
+        for (hi = ogs_hash_first(metrics_hash_by_slice); hi; hi = ogs_hash_next(hi)) {
+            pcf_metric_key_by_slice_t *key =
+                (pcf_metric_key_by_slice_t *)ogs_hash_this_key(hi);
+            //void *val = ogs_hash_this_val(hi);
+
+            ogs_hash_set(metrics_hash_by_slice, key, sizeof(*key), NULL);
+
+            ogs_free(key);
+            /* don't free val (metric itself) -
+             * it will be free'd by ogs_metrics_context_final() */
+            //ogs_free(val);
+        }
+        ogs_hash_destroy(metrics_hash_by_slice);
+    }
+    if (metrics_hash_by_plmn) {
+        for (hi = ogs_hash_first(metrics_hash_by_plmn); hi; hi = ogs_hash_next(hi)) {
+            pcf_metric_key_by_plmn_t *key =
+                (pcf_metric_key_by_plmn_t *)ogs_hash_this_key(hi);
+            //void *val = ogs_hash_this_val(hi);
+
+            ogs_hash_set(metrics_hash_by_plmn, key, sizeof(*key), NULL);
+
+            ogs_free(key);
+            /* don't free val (metric ifself) -
+             * it will be free'd by ogs_metrics_context_final() */
+            //ogs_free(val);
+        }
+        ogs_hash_destroy(metrics_hash_by_plmn);
+    }
+
+    ogs_metrics_context_final();
+}

open5gs_2.6.0.tar.xz/src/pcf/metrics.h Added

@@ -0,0 +1,56 @@
+#ifndef PCF_METRICS_H
+#define PCF_METRICS_H
+
+#include "ogs-metrics.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum pcf_metric_type_global_s {
+    _PCF_METR_GLOB_MAX,
+} pcf_metric_type_global_t;
+extern ogs_metrics_inst_t *pcf_metrics_inst_global_PCF_METR_GLOB_MAX;
+
+int pcf_metrics_init_inst_global(void);
+int pcf_metrics_free_inst_global(void);
+
+static inline void pcf_metrics_inst_global_set(pcf_metric_type_global_t t, int val)
+{ ogs_metrics_inst_set(pcf_metrics_inst_globalt, val); }
+static inline void pcf_metrics_inst_global_add(pcf_metric_type_global_t t, int val)
+{ ogs_metrics_inst_add(pcf_metrics_inst_globalt, val); }
+static inline void pcf_metrics_inst_global_inc(pcf_metric_type_global_t t)
+{ ogs_metrics_inst_inc(pcf_metrics_inst_globalt); }
+static inline void pcf_metrics_inst_global_dec(pcf_metric_type_global_t t)
+{ ogs_metrics_inst_dec(pcf_metrics_inst_globalt); }
+
+/* BY_PLMN */
+typedef enum pcf_metric_type_by_plmn_s {
+    PCF_METR_CTR_PA_POLICYAMASSOREQ = 0,
+    PCF_METR_CTR_PA_POLICYAMASSOSUCC,
+    _PCF_METR_BY_PLMN_MAX,
+} pcf_metric_type_by_plmn_t;
+
+void pcf_metrics_inst_by_plmn_add(
+    ogs_plmn_id_t *plmn, pcf_metric_type_by_plmn_t t, int val);
+
+/* BY_SLICE */
+typedef enum pcf_metric_type_by_slice_s {
+    PCF_METR_CTR_PA_POLICYSMASSOREQ = 0,
+    PCF_METR_CTR_PA_POLICYSMASSOSUCC,
+    PCF_METR_GAUGE_PA_SESSIONNBR,
+    _PCF_METR_BY_SLICE_MAX,
+} pcf_metric_type_by_slice_t;
+
+void pcf_metrics_inst_by_slice_add(
+    ogs_plmn_id_t *plmn, ogs_s_nssai_t *snssai,
+    pcf_metric_type_by_slice_t t, int val);
+
+void pcf_metrics_init(void);
+void pcf_metrics_final(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PCF_METRICS_H */

open5gs_2.5.8.tar.xz/src/pcf/nbsf-build.c -> open5gs_2.6.0.tar.xz/src/pcf/nbsf-build.c Changed

open5gs_2.5.8.tar.xz/src/pcf/nbsf-handler.c -> open5gs_2.6.0.tar.xz/src/pcf/nbsf-handler.c Changed

open5gs_2.5.8.tar.xz/src/pcf/npcf-handler.c -> open5gs_2.6.0.tar.xz/src/pcf/npcf-handler.c Changed

@@ -24,14 +24,19 @@
 bool pcf_npcf_am_policy_contrtol_handle_create(pcf_ue_t *pcf_ue,
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *message)
 {
+    bool rc;
+
     OpenAPI_policy_association_request_t *PolicyAssociationRequest = NULL;
     OpenAPI_guami_t *Guami = NULL;
 
     uint64_t supported_features = 0;
 
     ogs_sbi_client_t *client = NULL;
+    OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
     ogs_sockaddr_t *addr = NULL;
 
+    pcf_metrics_inst_by_plmn_add(NULL, PCF_METR_CTR_PA_POLICYAMASSOREQ, 1);
+
     ogs_assert(pcf_ue);
     ogs_assert(stream);
     ogs_assert(message);
@@ -69,8 +74,9 @@
         return false;
     }
 
-    addr = ogs_sbi_getaddr_from_uri(PolicyAssociationRequest->notification_uri);
-    if (!addr) {
+    rc = ogs_sbi_getaddr_from_uri(&scheme, &addr,
+            PolicyAssociationRequest->notification_uri);
+    if (rc == false || scheme == OpenAPI_uri_scheme_NULL) {
         ogs_error("%s Invalid URI %s",
                 pcf_ue->supi, PolicyAssociationRequest->notification_uri);
         ogs_assert(true ==
@@ -85,13 +91,12 @@
             PolicyAssociationRequest->notification_uri);
     ogs_assert(pcf_ue->notification_uri);
 
-    client = ogs_sbi_client_find(addr);
+    client = ogs_sbi_client_find(scheme, addr);
     if (!client) {
-        client = ogs_sbi_client_add(addr);
+        client = ogs_sbi_client_add(scheme, addr);
         ogs_assert(client);
     }
     OGS_SBI_SETUP_CLIENT(&pcf_ue->namf, client);
-
     ogs_freeaddrinfo(addr);
 
     supported_features =
@@ -135,6 +140,9 @@
         ogs_sbi_parse_guami(&pcf_ue->guami, PolicyAssociationRequest->guami);
     }
 
+    pcf_metrics_inst_by_plmn_add(&pcf_ue->guami.plmn_id,
+            PCF_METR_CTR_PA_POLICYAMASSOREQ, 1);
+
     if (PolicyAssociationRequest->rat_type)
         pcf_ue->rat_type = PolicyAssociationRequest->rat_type;
 
@@ -157,6 +165,7 @@
 bool pcf_npcf_smpolicycontrol_handle_create(pcf_sess_t *sess,
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *message)
 {
+    bool rc;
     int status = 0;
     char *strerror = NULL;
     pcf_ue_t *pcf_ue = NULL;
@@ -165,8 +174,11 @@
     OpenAPI_snssai_t *sliceInfo = NULL;
 
     ogs_sbi_client_t *client = NULL;
+    OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
     ogs_sockaddr_t *addr = NULL;
 
+    pcf_metrics_inst_by_slice_add(NULL, NULL, PCF_METR_CTR_PA_POLICYSMASSOREQ, 1);
+
     ogs_assert(sess);
     pcf_ue = sess->pcf_ue;
     ogs_assert(stream);
@@ -239,8 +251,9 @@
         goto cleanup;
     }
 
-    addr = ogs_sbi_getaddr_from_uri(SmPolicyContextData->notification_uri);
-    if (!addr) {
+    rc = ogs_sbi_getaddr_from_uri(&scheme, &addr,
+            SmPolicyContextData->notification_uri);
+    if (rc == false || scheme == OpenAPI_uri_scheme_NULL) {
         strerror = ogs_msprintf("%s:%d Invalid URI %s",
                 pcf_ue->supi, sess->psi, SmPolicyContextData->notification_uri);
         status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
@@ -267,13 +280,12 @@
     sess->notification_uri = ogs_strdup(SmPolicyContextData->notification_uri);
     ogs_assert(sess->notification_uri);
 
-    client = ogs_sbi_client_find(addr);
+    client = ogs_sbi_client_find(scheme, addr);
     if (!client) {
-        client = ogs_sbi_client_add(addr);
+        client = ogs_sbi_client_add(scheme, addr);
         ogs_assert(client);
     }
     OGS_SBI_SETUP_CLIENT(&sess->nsmf, client);
-
     ogs_freeaddrinfo(addr);
 
     if (SmPolicyContextData->ipv4_address)
@@ -284,9 +296,38 @@
             pcf_sess_set_ipv6prefix(
                 sess, SmPolicyContextData->ipv6_address_prefix));
 
+    if (SmPolicyContextData->ipv4_frame_route_list) {
+        OpenAPI_lnode_t *node = NULL;
+
+        OpenAPI_clear_and_free_string_list(sess->ipv4_frame_route_list);
+        sess->ipv4_frame_route_list = OpenAPI_list_create();
+        OpenAPI_list_for_each(SmPolicyContextData->ipv4_frame_route_list, node) {
+            if (!node->data)
+                continue;
+            OpenAPI_list_add(sess->ipv4_frame_route_list, ogs_strdup(node->data));
+        }
+    }
+
+    if (SmPolicyContextData->ipv6_frame_route_list) {
+        OpenAPI_lnode_t *node = NULL;
+
+        OpenAPI_clear_and_free_string_list(sess->ipv4_frame_route_list);
+        sess->ipv6_frame_route_list = OpenAPI_list_create();
+        OpenAPI_list_for_each(SmPolicyContextData->ipv6_frame_route_list, node) {
+            if (!node->data)
+                continue;
+            OpenAPI_list_add(sess->ipv6_frame_route_list, ogs_strdup(node->data));
+        }
+    }
+
     sess->s_nssai.sst = sliceInfo->sst;
     sess->s_nssai.sd = ogs_s_nssai_sd_from_string(sliceInfo->sd);
 
+    pcf_metrics_inst_by_slice_add(&pcf_ue->guami.plmn_id,
+            &sess->s_nssai, PCF_METR_GAUGE_PA_SESSIONNBR, 1);
+    pcf_metrics_inst_by_slice_add(&pcf_ue->guami.plmn_id,
+            &sess->s_nssai, PCF_METR_CTR_PA_POLICYSMASSOREQ, 1);
+
     if (SmPolicyContextData->subs_sess_ambr)
         sess->subscribed_sess_ambr = OpenAPI_ambr_copy(
             sess->subscribed_sess_ambr, SmPolicyContextData->subs_sess_ambr);
@@ -372,12 +413,14 @@
 bool pcf_npcf_policyauthorization_handle_create(pcf_sess_t *sess,
         ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg)
 {
+    bool rc;
     int i, j, rv, status = 0;
     char *strerror = NULL;
     pcf_ue_t *pcf_ue = NULL;
     pcf_app_t *app_session = NULL;
 
     ogs_sbi_client_t *client = NULL;
+    OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
     ogs_sockaddr_t *addr = NULL;
 
     OpenAPI_app_session_context_t *AppSessionContext = NULL;
@@ -463,8 +506,8 @@
         goto cleanup;
     }
 
-    addr = ogs_sbi_getaddr_from_uri(AscReqData->notif_uri);
-    if (!addr) {
+    rc = ogs_sbi_getaddr_from_uri(&scheme, &addr, AscReqData->notif_uri);
+    if (rc == false || scheme == OpenAPI_uri_scheme_NULL) {
         strerror = ogs_msprintf("%s:%d Invalid URI %s",
                 pcf_ue->supi, sess->psi, AscReqData->notif_uri);
         status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
@@ -556,13 +599,12 @@
     app_session->notif_uri = ogs_strdup(AscReqData->notif_uri);
     ogs_assert(app_session->notif_uri);
 
-    client = ogs_sbi_client_find(addr);
+    client = ogs_sbi_client_find(scheme, addr);
     if (!client) {
-        client = ogs_sbi_client_add(addr);
+        client = ogs_sbi_client_add(scheme, addr);
         ogs_assert(client);
     }
     OGS_SBI_SETUP_CLIENT(&app_session->naf, client);
-
     ogs_freeaddrinfo(addr);
 
     memset(&session_data, 0, sizeof(ogs_session_data_t));
@@ -591,6 +633,13 @@
         uint8_t qos_index = 0;
         ogs_media_component_t *media_component = &ims_data.media_componenti;
 
+        if (media_component->media_type == OpenAPI_media_type_NULL) {
+            strerror = ogs_msprintf("%s:%d Media-Type is Required",
+                    pcf_ue->supi, sess->psi);
+            status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+            goto cleanup;
+        }
+
         switch(media_component->media_type) {
         case OpenAPI_media_type_AUDIO:
             qos_index = OGS_QOS_INDEX_1;
@@ -602,9 +651,9 @@
             qos_index = OGS_QOS_INDEX_5;
             break;
         default:
-            strerror = ogs_msprintf("%s:%d Not implemented : Media-Type:%d",
+            strerror = ogs_msprintf("%s:%d Unknown Media-Type %d",
                     pcf_ue->supi, sess->psi, media_component->media_type);
-            status = OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR;
+            status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
             goto cleanup;
         }
 
@@ -1004,6 +1053,13 @@
         uint8_t qos_index = 0;
         ogs_media_component_t *media_component = &ims_data.media_componenti;
 
+        if (media_component->media_type == OpenAPI_media_type_NULL) {
+            strerror = ogs_msprintf("%s:%d Media-Type is Required",
+                    pcf_ue->supi, sess->psi);
+            status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
+            goto cleanup;
+        }
+
         switch(media_component->media_type) {
         case OpenAPI_media_type_AUDIO:
             qos_index = OGS_QOS_INDEX_1;
@@ -1015,9 +1071,9 @@
             qos_index = OGS_QOS_INDEX_5;
             break;
         default:
-            strerror = ogs_msprintf("%s:%d Not implemented : Media-Type:%d",
+            strerror = ogs_msprintf("%s:%d Unknown Media-Type %d",
                     pcf_ue->supi, sess->psi, media_component->media_type);
-            status = OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR;
+            status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
             goto cleanup;
         }

open5gs_2.5.8.tar.xz/src/pcf/nudr-handler.c -> open5gs_2.6.0.tar.xz/src/pcf/nudr-handler.c Changed

open5gs_2.5.8.tar.xz/src/pcf/pcf-sm.c -> open5gs_2.6.0.tar.xz/src/pcf/pcf-sm.c Changed

open5gs_2.5.8.tar.xz/src/pcf/sbi-path.c -> open5gs_2.6.0.tar.xz/src/pcf/sbi-path.c Changed

@@ -139,7 +139,10 @@
     xact = ogs_sbi_xact_add(
             sbi_object, service_type, discovery_option,
             build, context, data);
-    ogs_expect_or_return_val(xact, false);
+    if (!xact) {
+        ogs_error("ogs_sbi_xact_add() failed");
+        return false;
+    }
 
     xact->assoc_stream = stream;
 
@@ -182,7 +185,10 @@
     ogs_assert(service_type);
 
     xact = ogs_sbi_xact_add(&sess->sbi, service_type, NULL, NULL, NULL, NULL);
-    ogs_expect_or_return_val(xact, false);
+    if (!xact) {
+        ogs_error("ogs_sbi_xact_add() failed");
+        return false;
+    }
 
     xact->assoc_stream = stream;
 
@@ -265,7 +271,10 @@
     ogs_assert(client);
 
     request = pcf_namf_callback_build_am_policy_control(pcf_ue, NULL);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("pcf_namf_callback_build_am_policy_control() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);
@@ -289,7 +298,10 @@
 
     request = pcf_nsmf_callback_build_smpolicycontrol_update(
                 sess, SmPolicyDecision);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("pcf_nsmf_callback_build_smpolicycontrol_update() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);
@@ -314,7 +326,10 @@
 
     request = pcf_nsmf_callback_build_smpolicycontrol_update(
                 sess, SmPolicyDecision);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("pcf_nsmf_callback_build_smpolicycontrol_update() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_delete_notify_cb, request, app_session);
@@ -336,7 +351,10 @@
     ogs_assert(client);
 
     request = pcf_nsmf_callback_build_smpolicycontrol_terminate(sess, NULL);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("pcf_nsmf_callback_build_smpolicycontrol_terminate() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);
@@ -358,7 +376,11 @@
     ogs_assert(client);
 
     request = pcf_naf_callback_build_policyauthorization_terminate(app, NULL);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("pcf_naf_callback_build_policyauthorization_terminate() "
+                "failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);

open5gs_2.5.8.tar.xz/src/pcf/sm-sm.c -> open5gs_2.6.0.tar.xz/src/pcf/sm-sm.c Changed

open5gs_2.5.8.tar.xz/src/pcrf/pcrf-gx-path.c -> open5gs_2.6.0.tar.xz/src/pcrf/pcrf-gx-path.c Changed

@@ -71,15 +71,25 @@
 
     ogs_thread_mutex_lock(&sess_state_mutex);
     ogs_pool_alloc(&sess_state_pool, &new);
-    ogs_expect_or_return_val(new, NULL);
+    if (!new) {
+        ogs_error("ogs_pool_alloc() failed");
+        ogs_thread_mutex_unlock(&sess_state_mutex);
+        return NULL;
+    }
     memset(new, 0, sizeof(*new));
-    ogs_thread_mutex_unlock(&sess_state_mutex);
 
     new->sid = (os0_t)ogs_strdup((char *)sid);
-    ogs_expect_or_return_val(new->sid, NULL);
+    if (!new->sid) {
+        ogs_error("ogs_strdup() failed");
+        ogs_pool_free(&sess_state_pool, new);
+        ogs_thread_mutex_unlock(&sess_state_mutex);
+        return NULL;
+    }
 
     ogs_list_init(&new->rx_list);
 
+    ogs_thread_mutex_unlock(&sess_state_mutex);
+
     return new;
 }
 
@@ -92,17 +102,27 @@
 
     ogs_thread_mutex_lock(&sess_state_mutex);
     ogs_pool_alloc(&rx_sess_state_pool, &new);
-    ogs_expect_or_return_val(new, NULL);
+    if (!new) {
+        ogs_error("ogs_pool_alloc() failed");
+        ogs_thread_mutex_unlock(&sess_state_mutex);
+        return NULL;
+    }
     memset(new, 0, sizeof(*new));
-    ogs_thread_mutex_unlock(&sess_state_mutex);
 
     new->sid = (os0_t)ogs_strdup((char *)sid);
-    ogs_expect_or_return_val(new->sid, NULL);
+    if (!new->sid) {
+        ogs_error("ogs_strdup() failed");
+        ogs_pool_free(&rx_sess_state_pool, new);
+        ogs_thread_mutex_unlock(&sess_state_mutex);
+        return NULL;
+    }
 
     new->gx = gx;
 
     ogs_list_add(&gx->rx_list, new);
 
+    ogs_thread_mutex_unlock(&sess_state_mutex);
+
     return new;
 }

open5gs_2.5.8.tar.xz/src/pcrf/pcrf-rx-path.c -> open5gs_2.6.0.tar.xz/src/pcrf/pcrf-rx-path.c Changed

open5gs_2.5.8.tar.xz/src/scp/sbi-path.c -> open5gs_2.6.0.tar.xz/src/scp/sbi-path.c Changed

@@ -277,11 +277,14 @@
             ogs_free(apiroot);
 
         } else if (headers.target_apiroot) {
+            bool rc;
+            OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
             ogs_sockaddr_t *addr = NULL;
 
             /* Find or Add Client Instance */
-            addr = ogs_sbi_getaddr_from_uri(headers.target_apiroot);
-            if (!addr) {
+            rc = ogs_sbi_getaddr_from_uri(
+                    &scheme, &addr, headers.target_apiroot);
+            if (rc == false || scheme == OpenAPI_uri_scheme_NULL) {
                 ogs_error("Invalid Target-apiRoot %s",
                         headers.target_apiroot);
 
@@ -291,13 +294,12 @@
                 return OGS_ERROR;
             }
 
-            client = ogs_sbi_client_find(addr);
+            client = ogs_sbi_client_find(scheme, addr);
             if (!client) {
-                client = ogs_sbi_client_add(addr);
+                client = ogs_sbi_client_add(scheme, addr);
                 ogs_assert(client);
             }
             OGS_SBI_SETUP_CLIENT(assoc, client);
-
             ogs_freeaddrinfo(addr);
 
             /* Setup New URI */
@@ -412,10 +414,12 @@
 
             /* Find or Add Client Instance */
             if (nnrf_disc) {
+                bool rc;
+                OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
                 ogs_sockaddr_t *addr = NULL;
 
-                addr = ogs_sbi_getaddr_from_uri(nnrf_disc);
-                if (!addr) {
+                rc = ogs_sbi_getaddr_from_uri(&scheme, &addr, nnrf_disc);
+                if (rc == false || scheme == OpenAPI_uri_scheme_NULL) {
                     ogs_error("Invalid nnrf-disc %s", nnrf_disc);
 
                     ogs_sbi_discovery_option_free(discovery_option);
@@ -424,13 +428,12 @@
                     return OGS_ERROR;
                 }
 
-                nrf_client = ogs_sbi_client_find(addr);
+                nrf_client = ogs_sbi_client_find(scheme, addr);
                 if (!nrf_client) {
-                    nrf_client = ogs_sbi_client_add(addr);
+                    nrf_client = ogs_sbi_client_add(scheme, addr);
                     ogs_assert(nrf_client);
                 }
                 OGS_SBI_SETUP_CLIENT(assoc, nrf_client);
-
                 ogs_freeaddrinfo(addr);
             }

open5gs_2.5.8.tar.xz/src/sgwc/gtp-path.c -> open5gs_2.6.0.tar.xz/src/sgwc/gtp-path.c Changed

@@ -185,10 +185,16 @@
     h.teid = sgwc_ue->mme_s11_teid;
 
     pkbuf = sgwc_s11_build_create_session_response(h.type, sess);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgwc_s11_build_create_session_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -226,11 +232,17 @@
     h.teid = sgwc_ue->mme_s11_teid;
 
     pkbuf = sgwc_s11_build_downlink_data_notification(cause_value, bearer);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("sgwc_s11_build_downlink_data_notification() failed");
+        return OGS_ERROR;
+    }
 
     gtp_xact = ogs_gtp_xact_local_create(
             sgwc_ue->gnode, &h, pkbuf, bearer_timeout, bearer);
-    ogs_expect_or_return_val(gtp_xact, OGS_ERROR);
+    if (!gtp_xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
     gtp_xact->local_teid = sgwc_ue->sgw_s11_teid;
 
     rv = ogs_gtp_xact_commit(gtp_xact);

open5gs_2.5.8.tar.xz/src/sgwc/pfcp-path.c -> open5gs_2.6.0.tar.xz/src/sgwc/pfcp-path.c Changed

@@ -217,10 +217,16 @@
     h.seid = sess->sgwu_sxa_seid;
 
     sxabuf = sgwc_sxa_build_bearer_to_modify_list(h.type, sess, xact);
-    ogs_expect_or_return_val(sxabuf, OGS_ERROR);
+    if (!sxabuf) {
+        ogs_error("sgwc_sxa_build_bearer_to_modify_list() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, sxabuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -239,12 +245,18 @@
     ogs_assert(sess);
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     xact->assoc_xact = gtp_xact;
     if (gtpbuf) {
         xact->gtpbuf = ogs_pkbuf_copy(gtpbuf);
-        ogs_expect_or_return_val(xact->gtpbuf, OGS_ERROR);
+        if (!xact->gtpbuf) {
+            ogs_error("ogs_pkbuf_copy() failed");
+            return OGS_ERROR;
+        }
     }
     xact->local_seid = sess->sgwc_sxa_seid;
 
@@ -253,10 +265,16 @@
     h.seid = sess->sgwu_sxa_seid;
 
     sxabuf = sgwc_sxa_build_session_establishment_request(h.type, sess);
-    ogs_expect_or_return_val(sxabuf, OGS_ERROR);
+    if (!sxabuf) {
+        ogs_error("sgwc_sxa_build_session_establishment_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, sxabuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -274,13 +292,19 @@
     ogs_assert(sess);
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     xact->assoc_xact = gtp_xact;
     xact->modify_flags = flags | OGS_PFCP_MODIFY_SESSION;
     if (gtpbuf) {
         xact->gtpbuf = ogs_pkbuf_copy(gtpbuf);
-        ogs_expect_or_return_val(xact->gtpbuf, OGS_ERROR);
+        if (!xact->gtpbuf) {
+            ogs_error("ogs_pkbuf_copy() failed");
+            return OGS_ERROR;
+        }
     }
     xact->local_seid = sess->sgwc_sxa_seid;
 
@@ -305,13 +329,19 @@
     ogs_assert(sess);
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, bearer_timeout, bearer);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     xact->assoc_xact = gtp_xact;
     xact->modify_flags = flags;
     if (gtpbuf) {
         xact->gtpbuf = ogs_pkbuf_copy(gtpbuf);
-        ogs_expect_or_return_val(xact->gtpbuf, OGS_ERROR);
+        if (!xact->gtpbuf) {
+            ogs_error("ogs_pkbuf_copy() failed");
+            return OGS_ERROR;
+        }
     }
     xact->local_seid = sess->sgwc_sxa_seid;
 
@@ -322,10 +352,16 @@
     h.seid = sess->sgwu_sxa_seid;
 
     sxabuf = sgwc_sxa_build_bearer_to_modify_list(h.type, sess, xact);
-    ogs_expect_or_return_val(sxabuf, OGS_ERROR);
+    if (!sxabuf) {
+        ogs_error("sgwc_sxa_build_bearer_to_modify_list() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, sxabuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -344,12 +380,18 @@
     ogs_assert(sess);
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     xact->assoc_xact = gtp_xact;
     if (gtpbuf) {
         xact->gtpbuf = ogs_pkbuf_copy(gtpbuf);
-        ogs_expect_or_return_val(xact->gtpbuf, OGS_ERROR);
+        if (!xact->gtpbuf) {
+            ogs_error("ogs_pkbuf_copy() failed");
+            return OGS_ERROR;
+        }
     }
     xact->local_seid = sess->sgwc_sxa_seid;
 
@@ -358,10 +400,16 @@
     h.seid = sess->sgwu_sxa_seid;
 
     sxabuf = sgwc_sxa_build_session_deletion_request(h.type, sess);
-    ogs_expect_or_return_val(sxabuf, OGS_ERROR);
+    if (!sxabuf) {
+        ogs_error("sgwc_sxa_build_session_deletion_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, sxabuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -381,10 +429,16 @@
     h.seid = sess->sgwu_sxa_seid;
 
     sxabuf = ogs_pfcp_build_session_report_response(h.type, cause);
-    ogs_expect_or_return_val(sxabuf, OGS_ERROR);
+    if (!sxabuf) {
+        ogs_error("ogs_pfcp_build_session_report_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, sxabuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);

open5gs_2.5.8.tar.xz/src/sgwc/s11-handler.c -> open5gs_2.6.0.tar.xz/src/sgwc/s11-handler.c Changed

@@ -656,11 +656,17 @@
         message->h.teid = sess->pgw_s5c_teid;
 
         gtpbuf = ogs_gtp2_build_msg(message);
-        ogs_expect_or_return(gtpbuf);
+        if (!gtpbuf) {
+            ogs_error("ogs_gtp2_build_msg() failed");
+            return;
+        }
 
         s5c_xact = ogs_gtp_xact_local_create(
                 sess->gnode, &message->h, gtpbuf, gtp_sess_timeout, sess);
-        ogs_expect_or_return(s5c_xact);
+        if (!s5c_xact) {
+            ogs_error("ogs_gtp_xact_local_create() failed");
+            return;
+        }
         s5c_xact->local_teid = sess->sgw_s5c_teid;
 
         ogs_gtp_xact_associate(s11_xact, s5c_xact);
@@ -951,10 +957,16 @@
     message->h.teid = sess->pgw_s5c_teid;
 
     pkbuf = ogs_gtp2_build_msg(message);
-    ogs_expect_or_return(pkbuf);
+    if (!pkbuf) {
+        ogs_error("ogs_gtp2_build_msg() failed");
+        return;
+    }
 
     rv = ogs_gtp_xact_update_tx(s5c_xact, &message->h, pkbuf);
-    ogs_expect_or_return(rv == OGS_OK);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return;
+    }
 
     rv = ogs_gtp_xact_commit(s5c_xact);
     ogs_expect(rv == OGS_OK);
@@ -1470,11 +1482,17 @@
     message->h.teid = sess->pgw_s5c_teid;
 
     pkbuf = ogs_gtp2_build_msg(message);
-    ogs_expect_or_return(pkbuf);
+    if (!pkbuf) {
+        ogs_error("ogs_gtp2_build_msg() failed");
+        return;
+    }
 
     s5c_xact = ogs_gtp_xact_local_create(
             sess->gnode, &message->h, pkbuf, gtp_bearer_timeout, bearer);
-    ogs_expect_or_return(s5c_xact);
+    if (!s5c_xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return;
+    }
     s5c_xact->local_teid = sess->sgw_s5c_teid;
 
     ogs_gtp_xact_associate(s11_xact, s5c_xact);

open5gs_2.5.8.tar.xz/src/sgwc/s5c-handler.c -> open5gs_2.6.0.tar.xz/src/sgwc/s5c-handler.c Changed

@@ -64,8 +64,9 @@
         ogs_pkbuf_t *gtpbuf, ogs_gtp2_message_t *message)
 {
     int rv, i;
-    uint8_t cause_value;
-    ogs_gtp2_cause_t *cause = NULL;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
+    uint8_t session_cause = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
+    uint8_t bearer_cause = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
 
     sgwc_ue_t *sgwc_ue = NULL;
     sgwc_bearer_t *bearer = NULL;
@@ -97,6 +98,15 @@
     ogs_expect(rv == OGS_OK);
 
     /************************
+     * Getting Cause Value
+     ************************/
+    if (rsp->cause.presence && rsp->cause.data) {
+        ogs_gtp2_cause_t *cause = rsp->cause.data;
+        ogs_assert(cause);
+        session_cause = cause->value;
+    }
+
+    /************************
      * Check Session Context
      *
      * - Session could be deleted before a message is received from SMF.
@@ -104,7 +114,7 @@
     cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
 
     if (!sess) {
-        ogs_error("No Context in TEID");
+        ogs_error("No Context in TEID Cause:%d", session_cause);
         cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
     } else {
         sgwc_ue = sess->sgwc_ue;
@@ -124,7 +134,7 @@
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
     if (rsp->pgw_s5_s8__s2a_s2b_f_teid_for_pmip_based_interface_or_for_gtp_based_control_plane_interface.presence == 0) {
-        ogs_error("No GTP TEID");
+        ogs_error("No GTP TEID Cause:%d", session_cause);
         cause_value = OGS_GTP2_CAUSE_CONDITIONAL_IE_MISSING;
     }
     if (rsp->pdn_address_allocation.presence) {
@@ -134,17 +144,18 @@
                 ogs_min(sizeof(paa), rsp->pdn_address_allocation.len));
 
         if (!OGS_PDU_SESSION_TYPE_IS_VALID(paa.session_type)) {
-            ogs_error("Unknown PDN Type %u", paa.session_type);
+            ogs_error("Unknown PDN Type %u, Cause:%d",
+                    paa.session_type, session_cause);
             cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_INCORRECT;
         }
 
     } else {
-        ogs_error("No PDN Address Allocation");
+        ogs_error("No PDN Address Allocation Cause:%d", session_cause);
         cause_value = OGS_GTP2_CAUSE_CONDITIONAL_IE_MISSING;
     }
 
     if (rsp->cause.presence == 0) {
-        ogs_error("No Cause");
+        ogs_error("No Cause VALUE:%d", session_cause);
         cause_value = OGS_GTP2_CAUSE_CONDITIONAL_IE_MISSING;
     }
 
@@ -161,35 +172,36 @@
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
     for (i = 0; i < OGS_BEARER_PER_UE; i++) {
+        ogs_gtp2_cause_t *cause = NULL;
         if (rsp->bearer_contexts_createdi.cause.presence == 0) {
             break;
         }
 
         cause = rsp->bearer_contexts_createdi.cause.data;
-        ogs_assert(cause);
-        cause_value = cause->value;
-        if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-            ogs_error("GTP Bearer Cause VALUE:%d", cause_value);
+        if (cause == NULL) {
+            ogs_error("No Cause Data");
+            continue;
+        }
+        bearer_cause = cause->value;
+        if (bearer_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
+            ogs_error("GTP Bearer Cause VALUE:%d", bearer_cause);
             ogs_gtp_send_error_message(
                     s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                    OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
+                    OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, bearer_cause);
             return;
         }
     }
 
-    cause = rsp->cause.data;
-    ogs_assert(cause);
-    cause_value = cause->value;
-    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED &&
-        cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED_PARTIALLY &&
-        cause_value !=
+    if (session_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED &&
+        session_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED_PARTIALLY &&
+        session_cause !=
             OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_NETWORK_PREFERENCE &&
-        cause_value !=
+        session_cause !=
             OGS_GTP2_CAUSE_NEW_PDN_TYPE_DUE_TO_SINGLE_ADDRESS_BEARER_ONLY) {
-        ogs_error("GTP Cause Value:%d", cause_value);
+        ogs_error("GTP Cause VALUE:%d", session_cause);
         ogs_gtp_send_error_message(
                 s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
+                OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, session_cause);
         return;
     }
 
@@ -289,8 +301,8 @@
         ogs_pkbuf_t *gtpbuf, ogs_gtp2_message_t *message)
 {
     int rv;
-    ogs_gtp2_cause_t *cause = NULL;
-    uint8_t cause_value;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
+    uint8_t session_cause = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
     int modify_action;
 
     sgwc_ue_t *sgwc_ue = NULL;
@@ -317,6 +329,15 @@
     ogs_expect(rv == OGS_OK);
 
     /************************
+     * Getting Cause Value
+     ************************/
+    if (rsp->cause.presence && rsp->cause.data) {
+        ogs_gtp2_cause_t *cause = rsp->cause.data;
+        ogs_assert(cause);
+        session_cause = cause->value;
+    }
+
+    /************************
      * Check Session Context
      *
      * - Session could be deleted before a message is received from SMF.
@@ -324,7 +345,7 @@
     cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
 
     if (!sess) {
-        ogs_error("No Context in TEID");
+        ogs_error("No Context in TEID Cause:%d", session_cause);
         cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
     } else {
         sgwc_ue = sess->sgwc_ue;
@@ -349,7 +370,7 @@
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
     if (rsp->cause.presence == 0) {
-        ogs_error("No Cause");
+        ogs_error("No Cause VALUE:%d", session_cause);
         cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_MISSING;
     }
 
@@ -370,19 +391,16 @@
      ********************/
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
-    cause = rsp->cause.data;
-    ogs_assert(cause);
-    cause_value = cause->value;
-    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Cause Value:%d", cause_value);
+    if (session_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
+        ogs_error("GTP Cause VALUE:%d", session_cause);
         if (modify_action == OGS_GTP_MODIFY_IN_PATH_SWITCH_REQUEST)
             ogs_gtp_send_error_message(
                     s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                    OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, cause_value);
+                    OGS_GTP2_CREATE_SESSION_RESPONSE_TYPE, session_cause);
         else
             ogs_gtp_send_error_message(
                     s11_xact, sgwc_ue ? sgwc_ue->mme_s11_teid : 0,
-                    OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, cause_value);
+                    OGS_GTP2_MODIFY_BEARER_RESPONSE_TYPE, session_cause);
         return;
     }
 
@@ -405,10 +423,16 @@
         message->h.teid = sgwc_ue->mme_s11_teid;
 
         pkbuf = ogs_gtp2_build_msg(message);
-        ogs_expect_or_return(pkbuf);
+        if (!pkbuf) {
+            ogs_error("ogs_gtp2_build_msg() failed");
+            return;
+        }
 
         rv = ogs_gtp_xact_update_tx(s11_xact, &message->h, pkbuf);
-        ogs_expect_or_return(rv == OGS_OK);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp_xact_update_tx() failed");
+            return;
+        }
 
         rv = ogs_gtp_xact_commit(s11_xact);
         ogs_expect(rv == OGS_OK);
@@ -420,7 +444,8 @@
         ogs_pkbuf_t *gtpbuf, ogs_gtp2_message_t *message)
 {
     int rv;
-    uint8_t cause_value;
+    uint8_t cause_value = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
+    uint8_t session_cause = OGS_GTP2_CAUSE_UNDEFINED_VALUE;
 
     sgwc_ue_t *sgwc_ue = NULL;
 
@@ -444,6 +469,15 @@
     ogs_expect(rv == OGS_OK);
 
     /************************
+     * Getting Cause Value
+     ************************/
+    if (rsp->cause.presence && rsp->cause.data) {
+        ogs_gtp2_cause_t *cause = rsp->cause.data;
+        ogs_assert(cause);
+        session_cause = cause->value;
+    }
+
+    /************************
      * Check Session Context
      *
      * - Session could be deleted before a message is received from SMF.
@@ -451,7 +485,7 @@
     cause_value = OGS_GTP2_CAUSE_REQUEST_ACCEPTED;
 
     if (!sess) {
-        ogs_error("No Context in TEID");
+        ogs_error("No Context in TEID Cause:%d", session_cause);
         cause_value = OGS_GTP2_CAUSE_CONTEXT_NOT_FOUND;
     } else {
         sgwc_ue = sess->sgwc_ue;
@@ -470,18 +504,13 @@
      ********************/
     ogs_assert(cause_value == OGS_GTP2_CAUSE_REQUEST_ACCEPTED);
 
-    if (rsp->cause.presence) {
-        ogs_gtp2_cause_t *cause = rsp->cause.data;
-        ogs_assert(cause);
-
-        cause_value = cause->value;
-    } else {
-        ogs_error("No Cause");
+    if (rsp->cause.presence == 0) {
+        ogs_error("No Cause VALUE:%d", session_cause);
         cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_MISSING;
     }
 
-    if (cause_value != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
-        ogs_error("GTP Cause Value:%d - Ignored", cause_value);
+    if (session_cause != OGS_GTP2_CAUSE_REQUEST_ACCEPTED) {
+        ogs_error("GTP Cause VALUE:%d - Ignored", session_cause);
     }
 
     /********************
@@ -703,19 +732,28 @@
     message->h.teid = sgwc_ue->mme_s11_teid;
 
     pkbuf = ogs_gtp2_build_msg(message);
-    ogs_expect_or_return(pkbuf);
+    if (!pkbuf) {
+        ogs_error("ogs_gtp2_build_msg() failed");
+        return;
+    }
 
     s11_xact = s5c_xact->assoc_xact;
     if (!s11_xact) {
         s11_xact = ogs_gtp_xact_local_create(
                 sgwc_ue->gnode, &message->h, pkbuf, bearer_timeout, bearer);
-        ogs_expect_or_return(s11_xact);
+        if (!s11_xact) {
+            ogs_error("ogs_gtp_xact_local_create() failed");
+            return;
+        }
         s11_xact->local_teid = sgwc_ue->sgw_s11_teid;
 
         ogs_gtp_xact_associate(s5c_xact, s11_xact);
     } else {
         rv = ogs_gtp_xact_update_tx(s11_xact, &message->h, pkbuf);
-        ogs_expect_or_return(rv == OGS_OK);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp_xact_update_tx() failed");
+            return;
+        }
     }
     s11_xact->local_teid = sgwc_ue->sgw_s11_teid;
 
@@ -835,7 +873,10 @@
     message->h.teid = sgwc_ue->mme_s11_teid;
 
     pkbuf = ogs_gtp2_build_msg(message);
-    ogs_expect_or_return(pkbuf);
+    if (!pkbuf) {
+        ogs_error("ogs_gtp2_build_msg() failed");
+        return;
+    }
 
     s11_xact = s5c_xact->assoc_xact;
     if (!s11_xact) {
@@ -855,7 +896,10 @@
         */
         s11_xact = ogs_gtp_xact_local_create(
                 sgwc_ue->gnode, &message->h, pkbuf, bearer_timeout, bearer);
-        ogs_expect_or_return(s11_xact);
+        if (!s11_xact) {
+            ogs_error("ogs_gtp_xact_local_create() failed");
+            return;
+        }
         s11_xact->local_teid = sgwc_ue->sgw_s11_teid;
 
         ogs_gtp_xact_associate(s5c_xact, s11_xact);
@@ -866,7 +910,10 @@
         * 3. MME sends Delete Bearer Response(DEDICATED BEARER) to SGW/SMF.
         */
         rv = ogs_gtp_xact_update_tx(s11_xact, &message->h, pkbuf);
-        ogs_expect_or_return(rv == OGS_OK);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp_xact_update_tx() failed");
+            return;
+        }
     }
     s11_xact->local_teid = sgwc_ue->sgw_s11_teid;

open5gs_2.5.8.tar.xz/src/sgwc/sxa-build.c -> open5gs_2.6.0.tar.xz/src/sgwc/sxa-build.c Changed

@@ -22,7 +22,7 @@
 ogs_pkbuf_t *sgwc_sxa_build_session_establishment_request(
         uint8_t type, sgwc_sess_t *sess)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_establishment_request_t *req = NULL;
     ogs_pkbuf_t *pkbuf = NULL;
 
@@ -39,15 +39,24 @@
     ogs_debug("Session Establishment Request");
     ogs_assert(sess);
 
-    req = &pfcp_message.pfcp_session_establishment_request;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    req = &pfcp_message->pfcp_session_establishment_request;
 
     /* Node ID */
     rv = ogs_pfcp_sockaddr_to_node_id(
             ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
             ogs_app()->parameter.prefer_ipv4,
             &node_id, &len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_sockaddr_to_node_id() failed");
+        ogs_free(pfcp_message);
+        return NULL;
+    }
     req->node_id.presence = 1;
     req->node_id.data = &node_id;
     req->node_id.len = len;
@@ -56,7 +65,11 @@
     rv = ogs_pfcp_sockaddr_to_f_seid(
             ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
             &f_seid, &len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_sockaddr_to_f_seid() failed");
+        ogs_free(pfcp_message);
+        return NULL;
+    }
     f_seid.seid = htobe64(sess->sgwc_sxa_seid);
     req->cp_f_seid.presence = 1;
     req->cp_f_seid.data = &f_seid;
@@ -97,10 +110,12 @@
         ogs_pfcp_build_create_bar(&req->create_bar, sess->pfcp.bar);
     }
 
-    pfcp_message.h.type = type;
-    pkbuf = ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
 
     ogs_pfcp_pdrbuf_clear();
+    ogs_free(pfcp_message);
 
     return pkbuf;
 }
@@ -108,7 +123,7 @@
 ogs_pkbuf_t *sgwc_sxa_build_bearer_to_modify_list(
         uint8_t type, sgwc_sess_t *sess, ogs_pfcp_xact_t *xact)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_modification_request_t *req = NULL;
     ogs_pkbuf_t *pkbuf = NULL;
 
@@ -132,8 +147,13 @@
     modify_flags = xact->modify_flags;
     ogs_assert(modify_flags);
 
-    req = &pfcp_message.pfcp_session_modification_request;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    req = &pfcp_message->pfcp_session_modification_request;
 
     if (modify_flags & OGS_PFCP_MODIFY_CREATE) {
         ogs_pfcp_pdrbuf_init();
@@ -248,24 +268,39 @@
         }
     }
 
-    pfcp_message.h.type = type;
-    pkbuf = ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
 
     if (modify_flags & OGS_PFCP_MODIFY_CREATE) {
         ogs_pfcp_pdrbuf_clear();
     }
 
+    ogs_free(pfcp_message);
+
     return pkbuf;
 }
 
 ogs_pkbuf_t *sgwc_sxa_build_session_deletion_request(
         uint8_t type, sgwc_sess_t *sess)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
+    ogs_pkbuf_t *pkbuf = NULL;
 
     ogs_debug("Session Deletion Request");
     ogs_assert(sess);
 
-    pfcp_message.h.type = type;
-    return ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
+
+    ogs_free(pfcp_message);
+
+    return pkbuf;
 }

open5gs_2.5.8.tar.xz/src/sgwc/sxa-handler.c -> open5gs_2.6.0.tar.xz/src/sgwc/sxa-handler.c Changed

@@ -376,12 +376,18 @@
         }
 
         pkbuf = ogs_gtp2_build_msg(&send_message);
-        ogs_expect_or_return(pkbuf);
+        if (!pkbuf) {
+            ogs_error("ogs_gtp2_build_msg() failed");
+            return;
+        }
 
         ogs_assert(sess->gnode);
         s5c_xact = ogs_gtp_xact_local_create(
                 sess->gnode, &send_message.h, pkbuf, sess_timeout, sess);
-        ogs_expect_or_return(s5c_xact);
+        if (!s5c_xact) {
+            ogs_error("ogs_gtp_xact_local_create() failed");
+            return;
+        }
         s5c_xact->local_teid = sess->sgw_s5c_teid;
 
         s5c_xact->modify_action = OGS_GTP_MODIFY_IN_PATH_SWITCH_REQUEST;
@@ -414,12 +420,18 @@
         }
 
         pkbuf = ogs_gtp2_build_msg(recv_message);
-        ogs_expect_or_return(pkbuf);
+        if (!pkbuf) {
+            ogs_error("ogs_gtp2_build_msg() failed");
+            return;
+        }
 
         ogs_assert(sess->gnode);
         s5c_xact = ogs_gtp_xact_local_create(
                 sess->gnode, &recv_message->h, pkbuf, sess_timeout, sess);
-        ogs_expect_or_return(s5c_xact);
+        if (!s5c_xact) {
+            ogs_error("ogs_gtp_xact_local_create() failed");
+            return;
+        }
         s5c_xact->local_teid = sess->sgw_s5c_teid;
     }
 
@@ -685,10 +697,16 @@
                 send_message.h.teid = sgwc_ue->mme_s11_teid;
 
                 pkbuf = ogs_gtp2_build_msg(&send_message);
-                ogs_expect_or_return(pkbuf);
+                if (!pkbuf) {
+                    ogs_error("ogs_gtp2_build_msg() failed");
+                    return;
+                }
 
                 rv = ogs_gtp_xact_update_tx(s11_xact, &send_message.h, pkbuf);
-                ogs_expect_or_return(rv == OGS_OK);
+                if (rv != OGS_OK) {
+                    ogs_error("ogs_gtp_xact_update_tx() failed");
+                    return;
+                }
 
                 rv = ogs_gtp_xact_commit(s11_xact);
                 ogs_expect(rv == OGS_OK);
@@ -705,10 +723,16 @@
                 recv_message->h.teid = sess->pgw_s5c_teid;
 
                 pkbuf = ogs_gtp2_build_msg(recv_message);
-                ogs_expect_or_return(pkbuf);
+                if (!pkbuf) {
+                    ogs_error("ogs_gtp2_build_msg() failed");
+                    return;
+                }
 
                 rv = ogs_gtp_xact_update_tx(s5c_xact, &recv_message->h, pkbuf);
-                ogs_expect_or_return(rv == OGS_OK);
+                if (rv != OGS_OK) {
+                    ogs_error("ogs_gtp_xact_update_tx() failed");
+                    return;
+                }
 
                 rv = ogs_gtp_xact_commit(s5c_xact);
                 ogs_expect(rv == OGS_OK);
@@ -748,13 +772,19 @@
             recv_message->h.teid = sgwc_ue->mme_s11_teid;
 
             pkbuf = ogs_gtp2_build_msg(recv_message);
-            ogs_expect_or_return(pkbuf);
+            if (!pkbuf) {
+                ogs_error("ogs_gtp2_build_msg() failed");
+                return;
+            }
 
             ogs_assert(sgwc_ue->gnode);
             ogs_assert(bearer);
             s11_xact = ogs_gtp_xact_local_create(sgwc_ue->gnode,
                     &recv_message->h, pkbuf, bearer_timeout, bearer);
-            ogs_expect_or_return(s11_xact);
+            if (!s11_xact) {
+                ogs_error("ogs_gtp_xact_local_create() failed");
+                return;
+            }
             s11_xact->local_teid = sgwc_ue->sgw_s11_teid;
 
             ogs_gtp_xact_associate(s5c_xact, s11_xact);
@@ -809,10 +839,16 @@
             recv_message->h.teid = sess->pgw_s5c_teid;
 
             pkbuf = ogs_gtp2_build_msg(recv_message);
-            ogs_expect_or_return(pkbuf);
+            if (!pkbuf) {
+                ogs_error("ogs_gtp2_build_msg() failed");
+                return;
+            }
 
             rv = ogs_gtp_xact_update_tx(s5c_xact, &recv_message->h, pkbuf);
-            ogs_expect_or_return(rv == OGS_OK);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp_xact_update_tx() failed");
+                return;
+            }
 
             rv = ogs_gtp_xact_commit(s5c_xact);
             ogs_expect(rv == OGS_OK);
@@ -929,10 +965,16 @@
                 send_message.h.teid = sgwc_ue->mme_s11_teid;
 
                 pkbuf = ogs_gtp2_build_msg(&send_message);
-                ogs_expect_or_return(pkbuf);
+                if (!pkbuf) {
+                    ogs_error("ogs_gtp2_build_msg() failed");
+                    return;
+                }
 
                 rv = ogs_gtp_xact_update_tx(s11_xact, &send_message.h, pkbuf);
-                ogs_expect_or_return(rv == OGS_OK);
+                if (rv != OGS_OK) {
+                    ogs_error("ogs_gtp_xact_update_tx() failed");
+                    return;
+                }
 
                 rv = ogs_gtp_xact_commit(s11_xact);
                 ogs_expect(rv == OGS_OK);
@@ -1007,10 +1049,16 @@
             recv_message->h.teid = sgwc_ue->mme_s11_teid;
 
             pkbuf = ogs_gtp2_build_msg(recv_message);
-            ogs_expect_or_return(pkbuf);
+            if (!pkbuf) {
+                ogs_error("ogs_gtp2_build_msg() failed");
+                return;
+            }
 
             rv = ogs_gtp_xact_update_tx(s11_xact, &recv_message->h, pkbuf);
-            ogs_expect_or_return(rv == OGS_OK);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp_xact_update_tx() failed");
+                return;
+            }
 
             rv = ogs_gtp_xact_commit(s11_xact);
             ogs_expect(rv == OGS_OK);
@@ -1038,13 +1086,19 @@
                     recv_message->h.teid = sess->pgw_s5c_teid;
 
                     pkbuf = ogs_gtp2_build_msg(recv_message);
-                    ogs_expect_or_return(pkbuf);
+                    if (!pkbuf) {
+                        ogs_error("ogs_gtp2_build_msg() failed");
+                        return;
+                    }
 
                     ogs_assert(sess->gnode);
                     s5c_xact = ogs_gtp_xact_local_create(
                             sess->gnode, &recv_message->h, pkbuf,
                             sess_timeout, sess);
-                    ogs_expect_or_return(s5c_xact);
+                    if (!s5c_xact) {
+                        ogs_error("ogs_gtp_xact_local_create() failed");
+                        return;
+                    }
                     s5c_xact->local_teid = sess->sgw_s5c_teid;
 
                     ogs_gtp_xact_associate(s11_xact, s5c_xact);
@@ -1117,11 +1171,17 @@
                     send_message.h.teid = sgwc_ue->mme_s11_teid;
 
                     pkbuf = ogs_gtp2_build_msg(&send_message);
-                    ogs_expect_or_return(pkbuf);
+                    if (!pkbuf) {
+                        ogs_error("ogs_gtp2_build_msg() failed");
+                        return;
+                    }
 
                     rv = ogs_gtp_xact_update_tx(
                             s11_xact, &send_message.h, pkbuf);
-                    ogs_expect_or_return(rv == OGS_OK);
+                    if (rv != OGS_OK) {
+                        ogs_error("ogs_gtp_xact_update_tx() failed");
+                        return;
+                    }
 
                     rv = ogs_gtp_xact_commit(s11_xact);
                     ogs_expect(rv == OGS_OK);
@@ -1176,10 +1236,16 @@
                 send_message.h.teid = sgwc_ue->mme_s11_teid;
 
                 pkbuf = ogs_gtp2_build_msg(&send_message);
-                ogs_expect_or_return(pkbuf);
+                if (!pkbuf) {
+                    ogs_error("ogs_gtp2_build_msg() failed");
+                    return;
+                }
 
                 rv = ogs_gtp_xact_update_tx(s11_xact, &send_message.h, pkbuf);
-                ogs_expect_or_return(rv == OGS_OK);
+                if (rv != OGS_OK) {
+                    ogs_error("ogs_gtp_xact_update_tx() failed");
+                    return;
+                }
 
                 rv = ogs_gtp_xact_commit(s11_xact);
                 ogs_expect(rv == OGS_OK);
@@ -1298,10 +1364,16 @@
         gtp_message->h.teid = teid;
 
         pkbuf = ogs_gtp2_build_msg(gtp_message);
-        ogs_expect_or_return(pkbuf);
+        if (!pkbuf) {
+            ogs_error("ogs_gtp2_build_msg() failed");
+            return;
+        }
 
         rv = ogs_gtp_xact_update_tx(gtp_xact, &gtp_message->h, pkbuf);
-        ogs_expect_or_return(rv == OGS_OK);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp_xact_update_tx() failed");
+            return;
+        }
 
         rv = ogs_gtp_xact_commit(gtp_xact);
         ogs_expect(rv == OGS_OK);

open5gs_2.5.8.tar.xz/src/sgwu/pfcp-path.c -> open5gs_2.6.0.tar.xz/src/sgwu/pfcp-path.c Changed

@@ -176,10 +176,16 @@
 
     sxabuf = sgwu_sxa_build_session_establishment_response(
             h.type, sess, created_pdr, num_of_created_pdr);
-    ogs_expect_or_return_val(sxabuf, OGS_ERROR);
+    if (!sxabuf) {
+        ogs_error("sgwu_sxa_build_session_establishment_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, sxabuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -204,10 +210,16 @@
 
     sxabuf = sgwu_sxa_build_session_modification_response(
             h.type, sess, created_pdr, num_of_created_pdr);
-    ogs_expect_or_return_val(sxabuf, OGS_ERROR);
+    if (!sxabuf) {
+        ogs_error("sgwu_sxa_build_session_modification_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, sxabuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -229,10 +241,16 @@
     h.seid = sess->sgwc_sxa_f_seid.seid;
 
     sxabuf = sgwu_sxa_build_session_deletion_response(h.type, sess);
-    ogs_expect_or_return_val(sxabuf, OGS_ERROR);
+    if (!sxabuf) {
+        ogs_error("sgwu_sxa_build_session_deletion_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, sxabuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -273,13 +291,22 @@
     h.seid = sess->sgwc_sxa_f_seid.seid;
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     sxabuf = ogs_pfcp_build_session_report_request(h.type, report);
-    ogs_expect_or_return_val(sxabuf, OGS_ERROR);
+    if (!sxabuf) {
+        ogs_error("ogs_pfcp_build_session_report_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, sxabuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);

open5gs_2.5.8.tar.xz/src/sgwu/sxa-build.c -> open5gs_2.6.0.tar.xz/src/sgwu/sxa-build.c Changed

@@ -22,7 +22,7 @@
 ogs_pkbuf_t *sgwu_sxa_build_session_establishment_response(uint8_t type,
     sgwu_sess_t *sess, ogs_pfcp_pdr_t *created_pdr, int num_of_created_pdr)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_establishment_response_t *rsp = NULL;
     ogs_pkbuf_t *pkbuf = NULL;
 
@@ -34,15 +34,24 @@
 
     ogs_debug("Session Establishment Response");
 
-    rsp = &pfcp_message.pfcp_session_establishment_response;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    rsp = &pfcp_message->pfcp_session_establishment_response;
 
     /* Node ID */
     rv = ogs_pfcp_sockaddr_to_node_id(
             ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
             ogs_app()->parameter.prefer_ipv4,
             &node_id, &len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_sockaddr_to_node_id() failed");
+        ogs_free(pfcp_message);
+        return NULL;
+    }
     rsp->node_id.presence = 1;
     rsp->node_id.data = &node_id;
     rsp->node_id.len = len;
@@ -55,7 +64,11 @@
     rv = ogs_pfcp_sockaddr_to_f_seid(
             ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
             &f_seid, &len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_sockaddr_to_f_seid() failed");
+        ogs_free(pfcp_message);
+        return NULL;
+    }
     f_seid.seid = htobe64(sess->sgwu_sxa_seid);
     rsp->up_f_seid.presence = 1;
     rsp->up_f_seid.data = &f_seid;
@@ -70,10 +83,12 @@
         if (pdr_presence == true) j++;
     }
 
-    pfcp_message.h.type = type;
-    pkbuf = ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
 
     ogs_pfcp_pdrbuf_clear();
+    ogs_free(pfcp_message);
 
     return pkbuf;
 }
@@ -81,7 +96,7 @@
 ogs_pkbuf_t *sgwu_sxa_build_session_modification_response(uint8_t type,
     sgwu_sess_t *sess, ogs_pfcp_pdr_t *created_pdr, int num_of_created_pdr)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_modification_response_t *rsp = NULL;
     ogs_pkbuf_t *pkbuf = NULL;
 
@@ -89,8 +104,13 @@
 
     ogs_debug("Session Modification Response");
 
-    rsp = &pfcp_message.pfcp_session_modification_response;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    rsp = &pfcp_message->pfcp_session_modification_response;
 
     /* Cause */
     rsp->cause.presence = 1;
@@ -105,10 +125,12 @@
         if (pdr_presence == true) j++;
     }
 
-    pfcp_message.h.type = type;
-    pkbuf = ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
 
     ogs_pfcp_pdrbuf_clear();
+    ogs_free(pfcp_message);
 
     return pkbuf;
 }
@@ -116,18 +138,29 @@
 ogs_pkbuf_t *sgwu_sxa_build_session_deletion_response(uint8_t type,
         sgwu_sess_t *sess)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_deletion_response_t *rsp = NULL;
+    ogs_pkbuf_t *pkbuf = NULL;
 
     ogs_debug("Session Deletion Response");
 
-    rsp = &pfcp_message.pfcp_session_deletion_response;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    rsp = &pfcp_message->pfcp_session_deletion_response;
 
     /* Cause */
     rsp->cause.presence = 1;
     rsp->cause.u8 = OGS_PFCP_CAUSE_REQUEST_ACCEPTED;
 
-    pfcp_message.h.type = type;
-    return ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
+
+    ogs_free(pfcp_message);
+
+    return pkbuf;
 }

open5gs_2.5.8.tar.xz/src/smf/binding.c -> open5gs_2.6.0.tar.xz/src/smf/binding.c Changed

@@ -262,8 +262,14 @@
                 smf_pf_t *pf = NULL;
                 ogs_flow_t *flow = &pcc_rule->flowj;
 
-                ogs_expect_or_return(flow);
-                ogs_expect_or_return(flow->description);
+                if (!flow) {
+                    ogs_error("No Flow");
+                    return;
+                }
+                if (!flow->description) {
+                    ogs_error("No Flow-Description");
+                    return;
+                }
 
                 /*
                  * To add a flow to an existing tft.
@@ -364,11 +370,17 @@
                         OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED,
                         (ogs_list_count(&bearer->pf_to_add_list) > 0) ?
                             &tft : NULL, qos_presence);
-                ogs_expect_or_return(pkbuf);
+                if (!pkbuf) {
+                    ogs_error("smf_s5c_build_update_bearer_request() failed");
+                    return;
+                }
 
                 xact = ogs_gtp_xact_local_create(
                         sess->gnode, &h, pkbuf, gtp_bearer_timeout, bearer);
-                ogs_expect_or_return(xact);
+                if (!xact) {
+                    ogs_error("ogs_gtp_xact_local_create() failed");
+                    return;
+                }
                 xact->local_teid = sess->smf_n4_teid;
 
                 if (ogs_list_count(&bearer->pf_to_add_list) > 0)
@@ -434,11 +446,17 @@
             &tft, bearer, OGS_GTP2_TFT_CODE_CREATE_NEW_TFT);
 
     pkbuf = smf_s5c_build_create_bearer_request(h.type, bearer, &tft);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("smf_s5c_build_create_bearer_request() failed");
+        return OGS_ERROR;
+    }
 
     xact = ogs_gtp_xact_local_create(
             sess->gnode, &h, pkbuf, gtp_bearer_timeout, bearer);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
     xact->local_teid = sess->smf_n4_teid;
 
     rv = ogs_gtp_xact_commit(xact);
@@ -573,8 +591,14 @@
             for (j = 0; j < pcc_rule->num_of_flow; j++) {
                 ogs_flow_t *flow = &pcc_rule->flowj;
 
-                ogs_expect_or_return(flow);
-                ogs_expect_or_return(flow->description);
+                if (!flow) {
+                    ogs_error("No Flow");
+                    return;
+                }
+                if (!flow->description) {
+                    ogs_error("No Flow-Description");
+                    return;
+                }
 
                 /*
                  * To add a flow to an existing tft.

open5gs_2.5.8.tar.xz/src/smf/context.c -> open5gs_2.6.0.tar.xz/src/smf/context.c Changed

@@ -39,7 +39,7 @@
 static int num_of_smf_sess = 0;
 
 static void stats_add_smf_session(void);
-static void stats_remove_smf_session(void);
+static void stats_remove_smf_session(smf_sess_t *sess);
 
 int smf_ctf_config_init(smf_ctf_config_t *ctf_config)
 {
@@ -966,7 +966,10 @@
     char addrOGS_ADDRSTRLEN;
 
     ogs_pool_alloc(&smf_gtp_node_pool, &smf_gnode);
-    ogs_expect_or_return_val(smf_gnode, NULL);
+    if (!smf_gnode) {
+        ogs_error("ogs_pool_alloc() failed");
+        return NULL;
+    }
     memset(smf_gnode, 0, sizeof(smf_gtp_node_t));
 
     addr0 = '\0';
@@ -1760,6 +1763,23 @@
     if (sess->session.name)
         ogs_free(sess->session.name);
 
+    if (sess->session.ipv4_framed_routes) {
+        for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+            if (!sess->session.ipv4_framed_routesi)
+                break;
+            ogs_free(sess->session.ipv4_framed_routesi);
+        }
+        ogs_free(sess->session.ipv4_framed_routes);
+    }
+    if (sess->session.ipv6_framed_routes) {
+        for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+            if (!sess->session.ipv6_framed_routesi)
+                break;
+            ogs_free(sess->session.ipv6_framed_routesi);
+        }
+        ogs_free(sess->session.ipv6_framed_routes);
+    }
+
     if (sess->upf_n3_addr)
         ogs_freeaddrinfo(sess->upf_n3_addr);
     if (sess->upf_n3_addr6)
@@ -1797,7 +1817,7 @@
         smf_metrics_inst_global_dec(SMF_METR_GLOB_GAUGE_GTP2_SESSIONS_ACTIVE);
         break;
     }
-    stats_remove_smf_session();
+    stats_remove_smf_session(sess);
     ogs_pool_free(&smf_sess_pool, sess);
 }
 
@@ -2028,6 +2048,9 @@
     qos_flow->sess = sess;
 
     ogs_list_add(&sess->bearer_list, qos_flow);
+    smf_metrics_inst_by_5qi_add(&sess->plmn_id, &sess->s_nssai,
+            sess->session.qos.index, SMF_METR_GAUGE_SM_QOSFLOWNBR, 1);
+    smf_metrics_inst_global_inc(SMF_METR_GLOB_GAUGE_BEARERS_ACTIVE);
 
     return qos_flow;
 }
@@ -2466,7 +2489,7 @@
 
     smf_pf_identifier_pool_final(bearer);
 
-    if (bearer->qfi_node)
+    if (SMF_IS_QOF_FLOW(bearer))
         ogs_pool_free(&bearer->sess->qfi_pool, bearer->qfi_node);
 
     ogs_pool_free(&smf_bearer_pool, bearer);
@@ -3081,18 +3104,25 @@
 
 static void stats_add_smf_session(void)
 {
-    smf_metrics_inst_global_inc(SMF_METR_GLOB_GAUGE_SESSIONS_ACTIVE);
     num_of_smf_sess = num_of_smf_sess + 1;
     ogs_info("Added Number of SMF-Sessions is now %d", num_of_smf_sess);
 }
 
-static void stats_remove_smf_session(void)
+static void stats_remove_smf_session(smf_sess_t *sess)
 {
-    smf_metrics_inst_global_dec(SMF_METR_GLOB_GAUGE_SESSIONS_ACTIVE);
+    ogs_assert(sess);
+
     num_of_smf_sess = num_of_smf_sess - 1;
     ogs_info("Removed Number of SMF-Sessions is now %d", num_of_smf_sess);
 }
 
+int get_sess_load()
+{
+    return (((ogs_pool_size(&smf_sess_pool) -
+            ogs_pool_avail(&smf_sess_pool)) * 100) /
+            ogs_pool_size(&smf_sess_pool));
+}
+
 int smf_integrity_protection_indication_value2enum(const char *value)
 {
     ogs_assert(value);

open5gs_2.5.8.tar.xz/src/smf/context.h -> open5gs_2.6.0.tar.xz/src/smf/context.h Changed

open5gs_2.5.8.tar.xz/src/smf/gn-build.c -> open5gs_2.6.0.tar.xz/src/smf/gn-build.c Changed

@@ -198,26 +198,41 @@
         if (sess->sgw_s5c_ip.ipv4) {
             rv = ogs_gtp1_sockaddr_to_gsn_addr(ogs_gtp_self()->gtpc_addr, NULL,
                         &smf_gnc_gsnaddr, &gsn_len);
-            ogs_expect_or_return_val(rv == OGS_OK, NULL);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
             rv = ogs_gtp1_sockaddr_to_gsn_addr(NULL, ogs_gtp_self()->gtpc_addr6,
                         &smf_gnc_altgsnaddr, &gsn_altlen);
-            ogs_expect_or_return_val(rv == OGS_OK, NULL);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
         } else {
             rv = ogs_gtp1_sockaddr_to_gsn_addr(NULL, ogs_gtp_self()->gtpc_addr6,
                         &smf_gnc_gsnaddr, &gsn_len);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
             rv = ogs_gtp1_sockaddr_to_gsn_addr(ogs_gtp_self()->gtpc_addr, NULL,
                         &smf_gnc_altgsnaddr, &gsn_altlen);
-            ogs_expect_or_return_val(rv == OGS_OK, NULL);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
         }
         rsp->alternative_ggsn_address_for_control_plane.presence = 1;
         rsp->alternative_ggsn_address_for_control_plane.data = &smf_gnc_altgsnaddr;
         rsp->alternative_ggsn_address_for_control_plane.len = gsn_altlen;
-        ogs_expect_or_return_val(rv == OGS_OK, NULL);
     } else {
         rv = ogs_gtp1_sockaddr_to_gsn_addr(
                     ogs_gtp_self()->gtpc_addr, ogs_gtp_self()->gtpc_addr6,
                     &smf_gnc_gsnaddr, &gsn_len);
-        ogs_expect_or_return_val(rv == OGS_OK, NULL);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+            return NULL;
+        }
     }
     rsp->ggsn_address_for_control_plane.presence = 1;
     rsp->ggsn_address_for_control_plane.data = &smf_gnc_gsnaddr;
@@ -229,16 +244,29 @@
         if (bearer->sgw_s5u_ip.ipv4) {
             rv = ogs_gtp1_sockaddr_to_gsn_addr(bearer->pgw_s5u_addr, NULL,
                         &pgw_gnu_gsnaddr, &gsn_len);
-            ogs_expect_or_return_val(rv == OGS_OK, NULL);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
             rv = ogs_gtp1_sockaddr_to_gsn_addr(NULL, bearer->pgw_s5u_addr6,
                         &pgw_gnu_altgsnaddr, &gsn_altlen);
-            ogs_expect_or_return_val(rv == OGS_OK, NULL);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
         } else {
             rv = ogs_gtp1_sockaddr_to_gsn_addr(NULL, bearer->pgw_s5u_addr6,
                         &pgw_gnu_gsnaddr, &gsn_len);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
             rv = ogs_gtp1_sockaddr_to_gsn_addr(bearer->pgw_s5u_addr, NULL,
                         &pgw_gnu_altgsnaddr, &gsn_altlen);
-            ogs_expect_or_return_val(rv == OGS_OK, NULL);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
         }
         rsp->alternative_ggsn_address_for_user_traffic.presence = 1;
         rsp->alternative_ggsn_address_for_user_traffic.data = &pgw_gnu_altgsnaddr;
@@ -247,7 +275,10 @@
         rv = ogs_gtp1_sockaddr_to_gsn_addr(
                 bearer->pgw_s5u_addr, bearer->pgw_s5u_addr6,
                 &pgw_gnu_gsnaddr, &gsn_len);
-        ogs_expect_or_return_val(rv == OGS_OK, NULL);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+            return NULL;
+        }
     }
     rsp->ggsn_address_for_user_traffic.presence = 1;
     rsp->ggsn_address_for_user_traffic.data = &pgw_gnu_gsnaddr;
@@ -398,26 +429,41 @@
         if (sess->sgw_s5c_ip.ipv4) {
             rv = ogs_gtp1_sockaddr_to_gsn_addr(ogs_gtp_self()->gtpc_addr, NULL,
                         &smf_gnc_gsnaddr, &gsn_len);
-            ogs_expect_or_return_val(rv == OGS_OK, NULL);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
             rv = ogs_gtp1_sockaddr_to_gsn_addr(NULL, ogs_gtp_self()->gtpc_addr6,
                         &smf_gnc_altgsnaddr, &gsn_altlen);
-            ogs_expect_or_return_val(rv == OGS_OK, NULL);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
         } else {
             rv = ogs_gtp1_sockaddr_to_gsn_addr(NULL, ogs_gtp_self()->gtpc_addr6,
                         &smf_gnc_gsnaddr, &gsn_len);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
             rv = ogs_gtp1_sockaddr_to_gsn_addr(ogs_gtp_self()->gtpc_addr, NULL,
                         &smf_gnc_altgsnaddr, &gsn_altlen);
-            ogs_expect_or_return_val(rv == OGS_OK, NULL);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
         }
         rsp->alternative_ggsn_address_for_control_plane.presence = 1;
         rsp->alternative_ggsn_address_for_control_plane.data = &smf_gnc_altgsnaddr;
         rsp->alternative_ggsn_address_for_control_plane.len = gsn_altlen;
-        ogs_expect_or_return_val(rv == OGS_OK, NULL);
     } else {
         rv = ogs_gtp1_sockaddr_to_gsn_addr(
                     ogs_gtp_self()->gtpc_addr, ogs_gtp_self()->gtpc_addr6,
                     &smf_gnc_gsnaddr, &gsn_len);
-        ogs_expect_or_return_val(rv == OGS_OK, NULL);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+            return NULL;
+        }
     }
     rsp->ggsn_address_for_control_plane.presence = 1;
     rsp->ggsn_address_for_control_plane.data = &smf_gnc_gsnaddr;
@@ -429,16 +475,29 @@
         if (bearer->sgw_s5u_ip.ipv4) {
             rv = ogs_gtp1_sockaddr_to_gsn_addr(bearer->pgw_s5u_addr, NULL,
                         &pgw_gnu_gsnaddr, &gsn_len);
-            ogs_expect_or_return_val(rv == OGS_OK, NULL);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
             rv = ogs_gtp1_sockaddr_to_gsn_addr(NULL, bearer->pgw_s5u_addr6,
                         &pgw_gnu_altgsnaddr, &gsn_altlen);
-            ogs_expect_or_return_val(rv == OGS_OK, NULL);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
         } else {
             rv = ogs_gtp1_sockaddr_to_gsn_addr(NULL, bearer->pgw_s5u_addr6,
                         &pgw_gnu_gsnaddr, &gsn_len);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
             rv = ogs_gtp1_sockaddr_to_gsn_addr(bearer->pgw_s5u_addr, NULL,
                         &pgw_gnu_altgsnaddr, &gsn_altlen);
-            ogs_expect_or_return_val(rv == OGS_OK, NULL);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+                return NULL;
+            }
         }
         rsp->alternative_ggsn_address_for_user_traffic.presence = 1;
         rsp->alternative_ggsn_address_for_user_traffic.data = &pgw_gnu_altgsnaddr;
@@ -447,7 +506,10 @@
         rv = ogs_gtp1_sockaddr_to_gsn_addr(
                 bearer->pgw_s5u_addr, bearer->pgw_s5u_addr6,
                 &pgw_gnu_gsnaddr, &gsn_len);
-        ogs_expect_or_return_val(rv == OGS_OK, NULL);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp1_sockaddr_to_gsn_addr() failed");
+            return NULL;
+        }
     }
     rsp->ggsn_address_for_user_traffic.presence = 1;
     rsp->ggsn_address_for_user_traffic.data = &pgw_gnu_gsnaddr;

open5gs_2.5.8.tar.xz/src/smf/gsm-build.c -> open5gs_2.6.0.tar.xz/src/smf/gsm-build.c Changed

@@ -132,8 +132,14 @@
     qos_rule0.flow.identifier = qos_flow->qfi;
 
     rv = ogs_nas_build_qos_rules(authorized_qos_rules, qos_rule, 1);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
-    ogs_expect_or_return_val(authorized_qos_rules->length, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_nas_build_qos_rules() failed");
+        return NULL;
+    }
+    if (!authorized_qos_rules->length) {
+        ogs_error("No length");
+        return NULL;
+    }
 
     /* Session-AMBR */
     session_ambr->length = 6;
@@ -203,8 +209,14 @@
         OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_AUTHORIZED_QOS_FLOW_DESCRIPTIONS_PRESENT;
     rv = ogs_nas_build_qos_flow_descriptions(
             authorized_qos_flow_descriptions, qos_flow_description, 1);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
-    ogs_expect_or_return_val(authorized_qos_flow_descriptions->length, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_nas_build_qos_flow_descriptions() failed");
+        return NULL;
+    }
+    if (!authorized_qos_flow_descriptions->length) {
+        ogs_error("No length");
+        return NULL;
+    }
 
     /* Extended protocol configuration options */
     if (sess->nas.ue_pco.buffer && sess->nas.ue_pco.length) {
@@ -363,8 +375,14 @@
         }
 
         rv = ogs_nas_build_qos_rules(authorized_qos_rules, qos_rule, i);
-        ogs_expect_or_return_val(rv == OGS_OK, NULL);
-        ogs_expect_or_return_val(authorized_qos_rules->length, NULL);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_nas_build_qos_rules() failed");
+            return NULL;
+        }
+        if (!authorized_qos_rules->length) {
+            ogs_error("No length");
+            return NULL;
+        }
 
         pdu_session_modification_command->presencemask |=
             OGS_NAS_5GS_PDU_SESSION_MODIFICATION_COMMAND_AUTHORIZED_QOS_RULES_PRESENT;
@@ -447,9 +465,14 @@
 
         rv = ogs_nas_build_qos_flow_descriptions(
                 authorized_qos_flow_descriptions, qos_flow_description, i);
-        ogs_expect_or_return_val(rv == OGS_OK, NULL);
-        ogs_expect_or_return_val(
-                authorized_qos_flow_descriptions->length, NULL);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_nas_build_qos_flow_descriptions() failed");
+            return NULL;
+        }
+        if (!authorized_qos_flow_descriptions->length) {
+            ogs_error("No length");
+            return NULL;
+        }
 
         pdu_session_modification_command->presencemask |=
             OGS_NAS_5GS_PDU_SESSION_MODIFICATION_COMMAND_AUTHORIZED_QOS_FLOW_DESCRIPTIONS_PRESENT;

open5gs_2.5.8.tar.xz/src/smf/gsm-sm.c -> open5gs_2.6.0.tar.xz/src/smf/gsm-sm.c Changed

open5gs_2.5.8.tar.xz/src/smf/gtp-path.c -> open5gs_2.6.0.tar.xz/src/smf/gtp-path.c Changed

@@ -331,10 +331,16 @@
     h.teid = sess->sgw_s5c_teid;
 
     pkbuf = smf_gn_build_create_pdp_context_response(h.type, sess);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("smf_gn_build_create_pdp_context_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp1_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp1_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -357,10 +363,16 @@
     h.teid = sess->sgw_s5c_teid;
 
     pkbuf = smf_gn_build_delete_pdp_context_response(h.type, sess);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("smf_gn_build_delete_pdp_context_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp1_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp1_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -390,11 +402,17 @@
 
     pkbuf = smf_gn_build_update_pdp_context_request(
                 h.type, bearer, pti, cause_value);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("smf_gn_build_update_pdp_context_request() failed");
+        return OGS_ERROR;
+    }
 
     xact = ogs_gtp1_xact_local_create(
             sess->gnode, &h, pkbuf, bearer_timeout, bearer);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_gtp1_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -424,10 +442,16 @@
 
     pkbuf = smf_gn_build_update_pdp_context_response(
                 h.type, sess, bearer);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("smf_gn_build_update_pdp_context_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp1_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp1_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -450,10 +474,16 @@
     h.teid = sess->sgw_s5c_teid;
 
     pkbuf = smf_s5c_build_create_session_response(h.type, sess);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("smf_s5c_build_create_session_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -479,10 +509,16 @@
 
     pkbuf = smf_s5c_build_modify_bearer_response(
                 h.type, sess, req, sgw_relocation);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("smf_s5c_build_modify_bearer_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -505,10 +541,16 @@
     h.teid = sess->sgw_s5c_teid;
 
     pkbuf = smf_s5c_build_delete_session_response(h.type, sess);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("smf_s5c_build_delete_session_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -537,11 +579,17 @@
 
     pkbuf = smf_s5c_build_delete_bearer_request(
                 h.type, bearer, pti, cause_value);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("smf_s5c_build_delete_bearer_request() failed");
+        return OGS_ERROR;
+    }
 
     xact = ogs_gtp_xact_local_create(
             sess->gnode, &h, pkbuf, bearer_timeout, bearer);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
     xact->local_teid = sess->smf_n4_teid;
 
     rv = ogs_gtp_xact_commit(xact);
@@ -603,7 +651,10 @@
     if (ogs_gtp_self()->link_local_addr) {
         OGS_ADDR(ogs_gtp_self()->link_local_addr, ipstr);
         rv = ogs_ipsubnet(&src_ipsub, ipstr, NULL);
-        ogs_expect_or_return(rv == OGS_OK);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_ipsubnet() failed");
+            return;
+        }
     } else {
         /* For the case of loopback used for GTPU link-local address is not
          * available, hence set the source IP to fe80::1

open5gs_2.5.8.tar.xz/src/smf/gx-path.c -> open5gs_2.6.0.tar.xz/src/smf/gx-path.c Changed

open5gs_2.5.8.tar.xz/src/smf/gy-path.c -> open5gs_2.6.0.tar.xz/src/smf/gy-path.c Changed

open5gs_2.5.8.tar.xz/src/smf/init.c -> open5gs_2.6.0.tar.xz/src/smf/init.c Changed

open5gs_2.5.8.tar.xz/src/smf/metrics.c -> open5gs_2.6.0.tar.xz/src/smf/metrics.c Changed

@@ -84,17 +84,27 @@
     .name = "s5c_rx_deletesession",
     .description = "Received GTPv2C DeleteSessionRequest messages",
 },
+SMF_METR_GLOB_CTR_SM_N4SESSIONESTABREQ = {
+    .type = OGS_METRICS_METRIC_TYPE_COUNTER,
+    .name = "fivegs_smffunction_sm_n4sessionestabreq",
+    .description = "Number of requested N4 session establishments evidented by SMF",
+},
+SMF_METR_GLOB_CTR_SM_N4SESSIONREPORT = {
+    .type = OGS_METRICS_METRIC_TYPE_COUNTER,
+    .name = "fivegs_smffunction_sm_n4sessionreport",
+    .description = "Number of requested N4 session reports evidented by SMF",
+},
+SMF_METR_GLOB_CTR_SM_N4SESSIONREPORTSUCC = {
+    .type = OGS_METRICS_METRIC_TYPE_COUNTER,
+    .name = "fivegs_smffunction_sm_n4sessionreportsucc",
+    .description = "Number of successful N4 session reports evidented by SMF",
+},
 /* Global Gauges: */
 SMF_METR_GLOB_GAUGE_UES_ACTIVE = {
     .type = OGS_METRICS_METRIC_TYPE_GAUGE,
     .name = "ues_active",
     .description = "Active User Equipments",
 },
-SMF_METR_GLOB_GAUGE_SESSIONS_ACTIVE = {
-    .type = OGS_METRICS_METRIC_TYPE_GAUGE,
-    .name = "sessions_active",
-    .description = "Active Sessions",
-},
 SMF_METR_GLOB_GAUGE_BEARERS_ACTIVE = {
     .type = OGS_METRICS_METRIC_TYPE_GAUGE,
     .name = "bearers_active",
@@ -116,12 +126,12 @@
     .description = "Active GTP peers",
 },
 };
-static int smf_metrics_init_inst_global(void)
+int smf_metrics_init_inst_global(void)
 {
     return smf_metrics_init_inst(smf_metrics_inst_global, smf_metrics_spec_global,
                 _SMF_METR_GLOB_MAX, 0, NULL);
 }
-static int smf_metrics_free_inst_global(void)
+int smf_metrics_free_inst_global(void)
 {
     return smf_metrics_free_inst(smf_metrics_inst_global, _SMF_METR_GLOB_MAX);
 }
@@ -177,10 +187,285 @@
     return smf_metrics_free_inst(inst, _SMF_METR_GTP_NODE_MAX);
 }
 
-int smf_metrics_open(void)
+/* BY SLICE */
+const char *labels_slice = {
+    "plmnid",
+    "snssai"
+};
+
+#define SMF_METR_BY_SLICE_GAUGE_ENTRY(_id, _name, _desc) \
+    _id = { \
+        .type = OGS_METRICS_METRIC_TYPE_GAUGE, \
+        .name = _name, \
+        .description = _desc, \
+        .num_labels = OGS_ARRAY_SIZE(labels_slice), \
+        .labels = labels_slice, \
+    },
+ogs_metrics_spec_t *smf_metrics_spec_by_slice_SMF_METR_BY_SLICE_MAX;
+ogs_hash_t *metrics_hash_by_slice = NULL;   /* hash table for SLICE labels */
+smf_metrics_spec_def_t smf_metrics_spec_def_by_slice_SMF_METR_BY_SLICE_MAX = {
+/* Gauges: */
+SMF_METR_BY_SLICE_GAUGE_ENTRY(
+    SMF_METR_GAUGE_SM_SESSIONNBR,
+    "fivegs_smffunction_sm_sessionnbr",
+    "Active Sessions")
+};
+void smf_metrics_init_by_slice(void);
+int smf_metrics_free_inst_by_slice(ogs_metrics_inst_t **inst);
+typedef struct smf_metric_key_by_slice_s {
+    ogs_plmn_id_t               plmn_id;
+    ogs_s_nssai_t               snssai;
+    smf_metric_type_by_slice_t  t;
+} smf_metric_key_by_slice_t;
+
+void smf_metrics_init_by_slice(void)
+{
+    metrics_hash_by_slice = ogs_hash_make();
+    ogs_assert(metrics_hash_by_slice);
+}
+
+void smf_metrics_inst_by_slice_add(ogs_plmn_id_t *plmn,
+        ogs_s_nssai_t *snssai, smf_metric_type_by_slice_t t, int val)
+{
+    ogs_metrics_inst_t *metrics = NULL;
+    smf_metric_key_by_slice_t *slice_key;
+
+    slice_key = ogs_calloc(1, sizeof(*slice_key));
+    ogs_assert(slice_key);
+
+    if (plmn) {
+        slice_key->plmn_id = *plmn;
+    }
+
+    if (snssai) {
+        slice_key->snssai = *snssai;
+    } else {
+        slice_key->snssai.sst = 0;
+        slice_key->snssai.sd.v = OGS_S_NSSAI_NO_SD_VALUE;
+    }
+
+    slice_key->t = t;
+
+    metrics = ogs_hash_get(metrics_hash_by_slice,
+            slice_key, sizeof(*slice_key));
+
+    if (!metrics) {
+        char plmn_idOGS_PLMNIDSTRLEN = "";
+        char *s_nssai = NULL;
+
+        if (plmn) {
+            ogs_plmn_id_to_string(plmn, plmn_id);
+        }
+
+        if (snssai) {
+            s_nssai = ogs_sbi_s_nssai_to_string_plain(snssai);
+        } else {
+            s_nssai = ogs_strdup("");
+        }
+
+        metrics = ogs_metrics_inst_new(smf_metrics_spec_by_slicet,
+                smf_metrics_spec_def_by_slice->num_labels,
+                (const char *){ plmn_id, s_nssai });
+
+        ogs_assert(metrics);
+        ogs_hash_set(metrics_hash_by_slice,
+                slice_key, sizeof(*slice_key), metrics);
+
+        if (s_nssai)
+            ogs_free(s_nssai);
+    } else {
+        ogs_free(slice_key);
+    }
+
+    ogs_metrics_inst_add(metrics, val);
+}
+
+int smf_metrics_free_inst_by_slice(ogs_metrics_inst_t **inst)
+{
+    return smf_metrics_free_inst(inst, _SMF_METR_BY_SLICE_MAX);
+}
+
+/* BY SLICE and 5QI */
+const char *labels_5qi = {
+    "plmnid",
+    "snssai",
+    "fiveqi"
+};
+
+#define SMF_METR_BY_5QI_GAUGE_ENTRY(_id, _name, _desc) \
+    _id = { \
+        .type = OGS_METRICS_METRIC_TYPE_GAUGE, \
+        .name = _name, \
+        .description = _desc, \
+        .num_labels = OGS_ARRAY_SIZE(labels_5qi), \
+        .labels = labels_5qi, \
+    },
+ogs_metrics_spec_t *smf_metrics_spec_by_5qi_SMF_METR_BY_5QI_MAX;
+ogs_hash_t *metrics_hash_by_5qi = NULL;   /* hash table for 5QI label */
+smf_metrics_spec_def_t smf_metrics_spec_def_by_5qi_SMF_METR_BY_5QI_MAX = {
+/* Gauges: */
+SMF_METR_BY_5QI_GAUGE_ENTRY(
+    SMF_METR_GAUGE_SM_QOSFLOWNBR,
+    "fivegs_smffunction_sm_qos_flow_nbr",
+    "Number of QoS flows at the SMF")
+};
+void smf_metrics_init_by_5qi(void);
+int smf_metrics_free_inst_by_5qi(ogs_metrics_inst_t **inst);
+typedef struct smf_metric_key_by_5qi_s {
+    ogs_plmn_id_t               plmn_id;
+    ogs_s_nssai_t               snssai;
+    uint8_t                     fiveqi;
+    smf_metric_type_by_5qi_t    t;
+} smf_metric_key_by_5qi_t;
+
+void smf_metrics_init_by_5qi(void)
+{
+    metrics_hash_by_5qi = ogs_hash_make();
+    ogs_assert(metrics_hash_by_5qi);
+}
+void smf_metrics_inst_by_5qi_add(ogs_plmn_id_t *plmn,
+        ogs_s_nssai_t *snssai, uint8_t fiveqi,
+        smf_metric_type_by_5qi_t t, int val)
+{
+    ogs_metrics_inst_t *metrics = NULL;
+    smf_metric_key_by_5qi_t *fiveqi_key;
+
+    fiveqi_key = ogs_calloc(1, sizeof(*fiveqi_key));
+    ogs_assert(fiveqi_key);
+
+    if (plmn) {
+        fiveqi_key->plmn_id = *plmn;
+    }
+
+    if (snssai) {
+        fiveqi_key->snssai = *snssai;
+    } else {
+        fiveqi_key->snssai.sst = 0;
+        fiveqi_key->snssai.sd.v = OGS_S_NSSAI_NO_SD_VALUE;
+    }
+
+    fiveqi_key->fiveqi = fiveqi;
+    fiveqi_key->t = t;
+
+    metrics = ogs_hash_get(metrics_hash_by_5qi,
+            fiveqi_key, sizeof(*fiveqi_key));
+
+    if (!metrics) {
+        char plmn_idOGS_PLMNIDSTRLEN = "";
+        char *s_nssai = NULL;
+        char fiveqi_str4;
+
+        if (plmn) {
+            ogs_plmn_id_to_string(plmn, plmn_id);
+        }
+
+        if (snssai) {
+            s_nssai = ogs_sbi_s_nssai_to_string_plain(snssai);
+        } else {
+            s_nssai = ogs_strdup("");
+        }
+
+        ogs_snprintf(fiveqi_str, sizeof(fiveqi_str), "%d", fiveqi);
+
+        metrics = ogs_metrics_inst_new(smf_metrics_spec_by_5qit,
+                smf_metrics_spec_def_by_5qi->num_labels,
+                (const char *){ plmn_id, s_nssai, fiveqi_str });
+
+        ogs_assert(metrics);
+        ogs_hash_set(metrics_hash_by_5qi,
+                fiveqi_key, sizeof(*fiveqi_key), metrics);
+
+        if (s_nssai)
+            ogs_free(s_nssai);
+    } else {
+        ogs_free(fiveqi_key);
+    }
+
+    ogs_metrics_inst_add(metrics, val);
+}
+
+int smf_metrics_free_inst_by_5qi(ogs_metrics_inst_t **inst)
+{
+    return smf_metrics_free_inst(inst, _SMF_METR_BY_5QI_MAX);
+}
+
+/* BY CAUSE */
+const char *labels_cause = {
+    "cause"
+};
+
+#define SMF_METR_BY_CAUSE_CTR_ENTRY(_id, _name, _desc) \
+    _id = { \
+        .type = OGS_METRICS_METRIC_TYPE_COUNTER, \
+        .name = _name, \
+        .description = _desc, \
+        .num_labels = OGS_ARRAY_SIZE(labels_cause), \
+        .labels = labels_cause, \
+    },
+ogs_metrics_spec_t *smf_metrics_spec_by_cause_SMF_METR_BY_CAUSE_MAX;
+ogs_hash_t *metrics_hash_by_cause = NULL;   /* hash table for CAUSE labels */
+smf_metrics_spec_def_t smf_metrics_spec_def_by_cause_SMF_METR_BY_CAUSE_MAX = {
+/* Counters: */
+SMF_METR_BY_CAUSE_CTR_ENTRY(
+    SMF_METR_CTR_SM_N4SESSIONESTABFAIL,
+    "fivegs_smffunction_sm_n4sessionestabfail",
+    "Number of failed N4 session establishments evidented by SMF")
+};
+void smf_metrics_init_by_cause(void);
+int smf_metrics_free_inst_by_cause(ogs_metrics_inst_t **inst);
+typedef struct smf_metric_key_by_cause_s {
+    uint8_t                     cause;
+    smf_metric_type_by_cause_t  t;
+} smf_metric_key_by_cause_t;
+
+void smf_metrics_init_by_cause(void)
+{
+    metrics_hash_by_cause = ogs_hash_make();
+    ogs_assert(metrics_hash_by_cause);
+}
+
+void smf_metrics_inst_by_cause_add(uint8_t cause,
+        smf_metric_type_by_cause_t t, int val)
+{
+    ogs_metrics_inst_t *metrics = NULL;
+    smf_metric_key_by_cause_t *cause_key;
+
+    cause_key = ogs_calloc(1, sizeof(*cause_key));
+    ogs_assert(cause_key);
+
+    cause_key->cause = cause;
+    cause_key->t = t;
+
+    metrics = ogs_hash_get(metrics_hash_by_cause,
+            cause_key, sizeof(*cause_key));
+
+    if (!metrics) {
+        char cause_str4;
+        ogs_snprintf(cause_str, sizeof(cause_str), "%d", cause);
+
+        metrics = ogs_metrics_inst_new(smf_metrics_spec_by_causet,
+                smf_metrics_spec_def_by_cause->num_labels,
+                (const char *){ cause_str });
+
+        ogs_assert(metrics);
+        ogs_hash_set(metrics_hash_by_cause,
+                cause_key, sizeof(*cause_key), metrics);
+    } else {
+        ogs_free(cause_key);
+    }
+
+    ogs_metrics_inst_add(metrics, val);
+}
+
+int smf_metrics_free_inst_by_cause(ogs_metrics_inst_t **inst)
+{
+    return smf_metrics_free_inst(inst, _SMF_METR_BY_CAUSE_MAX);
+}
+
+void smf_metrics_init(void)
 {
     ogs_metrics_context_t *ctx = ogs_metrics_self();
-    ogs_metrics_context_open(ctx);
+    ogs_metrics_context_init();
 
     smf_metrics_init_spec(ctx, smf_metrics_spec_global, smf_metrics_spec_def_global,
             _SMF_METR_GLOB_MAX);
@@ -188,14 +473,68 @@
     smf_metrics_init_spec(ctx, smf_metrics_spec_gtp_node, smf_metrics_spec_def_gtp_node,
             _SMF_METR_GTP_NODE_MAX);
 
+    smf_metrics_init_spec(ctx, smf_metrics_spec_by_slice,
+            smf_metrics_spec_def_by_slice, _SMF_METR_BY_SLICE_MAX);
+    smf_metrics_init_spec(ctx, smf_metrics_spec_by_5qi,
+            smf_metrics_spec_def_by_5qi, _SMF_METR_BY_5QI_MAX);
+    smf_metrics_init_spec(ctx, smf_metrics_spec_by_cause,
+            smf_metrics_spec_def_by_cause, _SMF_METR_BY_CAUSE_MAX);
+
     smf_metrics_init_inst_global();
-    return 0;
+    smf_metrics_init_by_slice();
+    smf_metrics_init_by_5qi();
+    smf_metrics_init_by_cause();
 }
 
-int smf_metrics_close(void)
+void smf_metrics_final(void)
 {
-    ogs_metrics_context_t *ctx = ogs_metrics_self();
-    smf_metrics_free_inst_global();
-    ogs_metrics_context_close(ctx);
-    return OGS_OK;
+    ogs_hash_index_t *hi;
+
+    if (metrics_hash_by_slice) {
+        for (hi = ogs_hash_first(metrics_hash_by_slice); hi; hi = ogs_hash_next(hi)) {
+            smf_metric_key_by_slice_t *key =
+                (smf_metric_key_by_slice_t *)ogs_hash_this_key(hi);
+            //void *val = ogs_hash_this_val(hi);
+
+            ogs_hash_set(metrics_hash_by_slice, key, sizeof(*key), NULL);
+
+            ogs_free(key);
+            /* don't free val (metric itself) -
+             * it will be free'd by ogs_metrics_context_final() */
+            //ogs_free(val);
+        }
+        ogs_hash_destroy(metrics_hash_by_slice);
+    }
+    if (metrics_hash_by_5qi) {
+        for (hi = ogs_hash_first(metrics_hash_by_5qi); hi; hi = ogs_hash_next(hi)) {
+            smf_metric_key_by_5qi_t *key =
+                (smf_metric_key_by_5qi_t *)ogs_hash_this_key(hi);
+            //void *val = ogs_hash_this_val(hi);
+
+            ogs_hash_set(metrics_hash_by_5qi, key, sizeof(*key), NULL);
+
+            ogs_free(key);
+            /* don't free val (metric itself) -
+             * it will be free'd by ogs_metrics_context_final() */
+            //ogs_free(val);
+        }
+        ogs_hash_destroy(metrics_hash_by_5qi);
+    }
+    if (metrics_hash_by_cause) {
+        for (hi = ogs_hash_first(metrics_hash_by_cause); hi; hi = ogs_hash_next(hi)) {
+            smf_metric_key_by_cause_t *key =
+                (smf_metric_key_by_cause_t *)ogs_hash_this_key(hi);
+            //void *val = ogs_hash_this_val(hi);
+
+            ogs_hash_set(metrics_hash_by_cause, key, sizeof(*key), NULL);
+
+            ogs_free(key);
+            /* don't free val (metric itself) -
+             * it will be free'd by ogs_metrics_context_final() */
+            //ogs_free(val);
+        }
+        ogs_hash_destroy(metrics_hash_by_cause);
+    }
+
+    ogs_metrics_context_final();
 }

open5gs_2.5.8.tar.xz/src/smf/metrics.h -> open5gs_2.6.0.tar.xz/src/smf/metrics.h Changed

@@ -16,8 +16,10 @@
     SMF_METR_GLOB_CTR_S5C_RX_PARSE_FAILED,
     SMF_METR_GLOB_CTR_S5C_RX_CREATESESSIONREQ,
     SMF_METR_GLOB_CTR_S5C_RX_DELETESESSIONREQ,
+    SMF_METR_GLOB_CTR_SM_N4SESSIONESTABREQ,
+    SMF_METR_GLOB_CTR_SM_N4SESSIONREPORT,
+    SMF_METR_GLOB_CTR_SM_N4SESSIONREPORTSUCC,
     SMF_METR_GLOB_GAUGE_UES_ACTIVE,
-    SMF_METR_GLOB_GAUGE_SESSIONS_ACTIVE,
     SMF_METR_GLOB_GAUGE_BEARERS_ACTIVE,
     SMF_METR_GLOB_GAUGE_GTP1_PDPCTXS_ACTIVE,
     SMF_METR_GLOB_GAUGE_GTP2_SESSIONS_ACTIVE,
@@ -25,6 +27,8 @@
     _SMF_METR_GLOB_MAX,
 } smf_metric_type_global_t;
 extern ogs_metrics_inst_t *smf_metrics_inst_global_SMF_METR_GLOB_MAX;
+int smf_metrics_init_inst_global(void);
+int smf_metrics_free_inst_global(void);
 
 static inline void smf_metrics_inst_global_set(smf_metric_type_global_t t, int val)
 { ogs_metrics_inst_set(smf_metrics_inst_globalt, val); }
@@ -61,8 +65,36 @@
     ogs_metrics_inst_t **inst, smf_metric_type_gtp_node_t t)
 { ogs_metrics_inst_dec(instt); }
 
-int smf_metrics_open(void);
-int smf_metrics_close(void);
+/* BY SLICE */
+typedef enum smf_metric_type_by_slice_s {
+    SMF_METR_GAUGE_SM_SESSIONNBR = 0,
+    _SMF_METR_BY_SLICE_MAX,
+} smf_metric_type_by_slice_t;
+
+void smf_metrics_inst_by_slice_add(
+    ogs_plmn_id_t *plmn, ogs_s_nssai_t *snssai,
+    smf_metric_type_by_slice_t t, int val);
+
+/* BY SLICE and 5QI */
+typedef enum smf_metric_type_by_5qi_s {
+    SMF_METR_GAUGE_SM_QOSFLOWNBR = 0,
+    _SMF_METR_BY_5QI_MAX,
+} smf_metric_type_by_5qi_t;
+
+void smf_metrics_inst_by_5qi_add(
+    ogs_plmn_id_t *plmn, ogs_s_nssai_t *snssai,
+    uint8_t fiveqi, smf_metric_type_by_5qi_t t, int val);
+
+/* BY CAUSE */
+typedef enum smf_metric_type_by_cause_s {
+    SMF_METR_CTR_SM_N4SESSIONESTABFAIL = 0,
+    _SMF_METR_BY_CAUSE_MAX,
+} smf_metric_type_by_cause_t;
+
+void smf_metrics_inst_by_cause_add(
+    uint8_t cause, smf_metric_type_by_cause_t t, int val);
+void smf_metrics_init(void);
+void smf_metrics_final(void);
 
 #ifdef __cplusplus
 }

open5gs_2.5.8.tar.xz/src/smf/n4-build.c -> open5gs_2.6.0.tar.xz/src/smf/n4-build.c Changed

@@ -23,7 +23,7 @@
 ogs_pkbuf_t *smf_n4_build_session_establishment_request(
         uint8_t type, smf_sess_t *sess)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_establishment_request_t *req = NULL;
     ogs_pkbuf_t *pkbuf = NULL;
 
@@ -35,20 +35,36 @@
 
     ogs_pfcp_node_id_t node_id;
     ogs_pfcp_f_seid_t f_seid;
+    char apn_dnnOGS_MAX_DNN_LEN+1;
     int len;
 
+    smf_ue_t *smf_ue = NULL;
+    ogs_pfcp_user_id_t user_id;
+    char user_id_bufsizeof(ogs_pfcp_user_id_t);
+
     ogs_debug("Session Establishment Request");
     ogs_assert(sess);
+    smf_ue = sess->smf_ue;
+    ogs_assert(smf_ue);
+
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
 
-    req = &pfcp_message.pfcp_session_establishment_request;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    req = &pfcp_message->pfcp_session_establishment_request;
 
     /* Node ID */
     rv = ogs_pfcp_sockaddr_to_node_id(
             ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
             ogs_app()->parameter.prefer_ipv4,
             &node_id, &len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_sockaddr_to_node_id() failed");
+        ogs_free(pfcp_message);
+        return NULL;
+    }
     req->node_id.presence = 1;
     req->node_id.data = &node_id;
     req->node_id.len = len;
@@ -57,7 +73,11 @@
     rv = ogs_pfcp_sockaddr_to_f_seid(
             ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
             &f_seid, &len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_sockaddr_to_f_seid() failed");
+        ogs_free(pfcp_message);
+        return NULL;
+    }
     f_seid.seid = htobe64(sess->smf_n4_seid);
     req->cp_f_seid.presence = 1;
     req->cp_f_seid.data = &f_seid;
@@ -102,10 +122,52 @@
     req->pdn_type.presence = 1;
     req->pdn_type.u8 = sess->session.session_type;
 
-    pfcp_message.h.type = type;
-    pkbuf = ogs_pfcp_build_msg(&pfcp_message);
+    /* User ID */
+    memset(&user_id, 0, sizeof(ogs_pfcp_user_id_t));
+    if (smf_ue->imsi_len) {
+        user_id.imsif = 1;
+        user_id.imsi_len = smf_ue->imsi_len;
+        ogs_assert(smf_ue->imsi_len <= OGS_MAX_IMSI_LEN);
+        memcpy(user_id.imsi, smf_ue->imsi, smf_ue->imsi_len);
+    }
+    if (smf_ue->imeisv_len) {
+        user_id.imeif = 1;
+        user_id.imeisv_len = smf_ue->imeisv_len;
+        ogs_assert(smf_ue->imeisv_len <= OGS_MAX_IMEISV_LEN);
+        memcpy(user_id.imeisv, smf_ue->imeisv, smf_ue->imeisv_len);
+    }
+    if (smf_ue->msisdn_len) {
+        user_id.msisdnf = 1;
+        user_id.msisdn_len = smf_ue->msisdn_len;
+        ogs_assert(smf_ue->msisdn_len <= OGS_MAX_MSISDN_LEN);
+        memcpy(user_id.msisdn, smf_ue->msisdn, smf_ue->msisdn_len);
+    }
+
+    if (user_id.flags) {
+        ogs_pfcp_build_user_id(
+            &req->user_id, &user_id, user_id_buf, sizeof(user_id_buf));
+        req->user_id.presence = 1;
+    }
+
+    /* APN/DNN */
+    len = ogs_fqdn_build(apn_dnn, sess->session.name, strlen(sess->session.name));
+    req->apn_dnn.presence = 1;
+    req->apn_dnn.len = len;
+    req->apn_dnn.data = apn_dnn;
+
+    /* S-NSSAI */
+    if (!sess->epc) {
+        req->s_nssai.presence = 1;
+        req->s_nssai.len = 4;
+        req->s_nssai.data = &sess->s_nssai;
+    }
+
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
 
     ogs_pfcp_pdrbuf_clear();
+    ogs_free(pfcp_message);
 
     return pkbuf;
 }
@@ -117,7 +179,7 @@
     ogs_pfcp_urr_t *urr = NULL;
     int i;
 
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_modification_request_t *req = NULL;
     ogs_pkbuf_t *pkbuf = NULL;
 
@@ -135,8 +197,13 @@
     modify_flags = xact->modify_flags;
     ogs_assert(modify_flags);
 
-    req = &pfcp_message.pfcp_session_modification_request;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    req = &pfcp_message->pfcp_session_modification_request;
 
     if (modify_flags & OGS_PFCP_MODIFY_CREATE) {
         ogs_pfcp_pdrbuf_init();
@@ -228,20 +295,23 @@
         i++;
     }
 
-    pfcp_message.h.type = type;
-    pkbuf = ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
 
     if (modify_flags & OGS_PFCP_MODIFY_CREATE) {
         ogs_pfcp_pdrbuf_clear();
     }
 
+    ogs_free(pfcp_message);
+
     return pkbuf;
 }
 
 ogs_pkbuf_t *smf_n4_build_qos_flow_to_modify_list(
         uint8_t type, smf_sess_t *sess, ogs_pfcp_xact_t *xact)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_modification_request_t *req = NULL;
     ogs_pkbuf_t *pkbuf = NULL;
 
@@ -266,8 +336,13 @@
     modify_flags = xact->modify_flags;
     ogs_assert(modify_flags);
 
-    req = &pfcp_message.pfcp_session_modification_request;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    req = &pfcp_message->pfcp_session_modification_request;
 
     if (modify_flags &
             (OGS_PFCP_MODIFY_CREATE|
@@ -438,8 +513,9 @@
         }
     }
 
-    pfcp_message.h.type = type;
-    pkbuf = ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
 
     if (modify_flags &
             (OGS_PFCP_MODIFY_CREATE|
@@ -449,17 +525,31 @@
         ogs_pfcp_pdrbuf_clear();
     }
 
+    ogs_free(pfcp_message);
+
     return pkbuf;
 }
 
 ogs_pkbuf_t *smf_n4_build_session_deletion_request(
         uint8_t type, smf_sess_t *sess)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
+    ogs_pkbuf_t *pkbuf = NULL;
 
     ogs_debug("Session Deletion Request");
     ogs_assert(sess);
 
-    pfcp_message.h.type = type;
-    return ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
+
+    ogs_free(pfcp_message);
+
+    return pkbuf;
 }

open5gs_2.5.8.tar.xz/src/smf/n4-handler.c -> open5gs_2.6.0.tar.xz/src/smf/n4-handler.c Changed

@@ -178,6 +178,8 @@
         if (rsp->cause.u8 != OGS_PFCP_CAUSE_REQUEST_ACCEPTED) {
             ogs_error("PFCP Cause %d : Not Accepted", rsp->cause.u8);
             cause_value = rsp->cause.u8;
+            smf_metrics_inst_by_cause_add(cause_value,
+                    SMF_METR_CTR_SM_N4SESSIONESTABFAIL, 1);
         }
     } else {
         ogs_error("No Cause");
@@ -493,8 +495,14 @@
             smf_namf_comm_send_n1_n2_message_transfer(sess, &param);
 
             ogs_list_for_each_entry_safe(&sess->qos_flow_to_modify_list,
-                    next, qos_flow, to_modify_node)
+                    next, qos_flow, to_modify_node) {
+                smf_metrics_inst_by_5qi_add(
+                        &qos_flow->sess->plmn_id,
+                        &qos_flow->sess->s_nssai,
+                        qos_flow->sess->session.qos.index,
+                        SMF_METR_GAUGE_SM_QOSFLOWNBR, -1);
                 smf_bearer_remove(qos_flow);
+            }
 
         } else if (flags & OGS_PFCP_MODIFY_UE_REQUESTED) {
             ogs_pkbuf_t *n1smbuf = NULL, *n2smbuf = NULL;
@@ -519,8 +527,14 @@
                         OpenAPI_n2_sm_info_type_PDU_RES_MOD_REQ, n2smbuf);
 
             ogs_list_for_each_entry_safe(&sess->qos_flow_to_modify_list,
-                    next, qos_flow, to_modify_node)
+                    next, qos_flow, to_modify_node) {
+                smf_metrics_inst_by_5qi_add(
+                        &qos_flow->sess->plmn_id,
+                        &qos_flow->sess->s_nssai,
+                        qos_flow->sess->session.qos.index,
+                        SMF_METR_GAUGE_SM_QOSFLOWNBR, -1);
                 smf_bearer_remove(qos_flow);
+            }
 
         } else {
             ogs_fatal("Unknown flags 0x%llx", (long long)flags);
@@ -967,10 +981,16 @@
 
             pkbuf = smf_s5c_build_delete_bearer_request(
                     h.type, bearer, gtp_pti, gtp_cause);
-            ogs_expect_or_return(pkbuf);
+            if (!pkbuf) {
+                ogs_error("smf_s5c_build_delete_bearer_request() failed");
+                return;
+            }
 
             rv = ogs_gtp_xact_update_tx(gtp_xact, &h, pkbuf);
-            ogs_expect_or_return(rv == OGS_OK);
+            if (rv != OGS_OK) {
+                ogs_error("ogs_gtp_xact_update_tx() failed");
+                return;
+            }
 
         /* IMPORTANT:
          *
@@ -1146,6 +1166,8 @@
     uint16_t pdr_id = 0;
     unsigned int i;
 
+    smf_metrics_inst_global_inc(SMF_METR_GLOB_CTR_SM_N4SESSIONREPORT);
+
     ogs_assert(pfcp_xact);
     ogs_assert(pfcp_req);
 
@@ -1321,6 +1343,7 @@
         ogs_assert(OGS_OK ==
             smf_pfcp_send_session_report_response(
                 pfcp_xact, sess, OGS_PFCP_CAUSE_REQUEST_ACCEPTED));
+        smf_metrics_inst_global_inc(SMF_METR_GLOB_CTR_SM_N4SESSIONREPORTSUCC);
     } else {
         ogs_error("Not supported Report Type%d", report_type.value);
         ogs_assert(OGS_OK ==

open5gs_2.5.8.tar.xz/src/smf/npcf-build.c -> open5gs_2.6.0.tar.xz/src/smf/npcf-build.c Changed

@@ -47,6 +47,8 @@
     message.h.resource.component0 = (char *)OGS_SBI_RESOURCE_NAME_SM_POLICIES;
 
     memset(&SmPolicyContextData, 0, sizeof(SmPolicyContextData));
+    memset(&sNssai, 0, sizeof(sNssai));
+    memset(&SubsSessAmbr, 0, sizeof(SubsSessAmbr));
 
     SmPolicyContextData.supi = smf_ue->supi;
     if (!SmPolicyContextData.supi) {
@@ -105,7 +107,30 @@
         }
     }
 
-    memset(&SubsSessAmbr, 0, sizeof(SubsSessAmbr));
+    if (sess->session.ipv4_framed_routes) {
+        int i;
+        OpenAPI_list_t *FrameRouteList = OpenAPI_list_create();
+
+        for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+            const char *route = sess->session.ipv4_framed_routesi;
+            if (!route) break;
+            OpenAPI_list_add(FrameRouteList, ogs_strdup(route));
+        }
+        SmPolicyContextData.ipv4_frame_route_list = FrameRouteList;
+    }
+
+    if (sess->session.ipv6_framed_routes) {
+        int i;
+        OpenAPI_list_t *FrameRouteList = OpenAPI_list_create();
+
+        for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+            const char *route = sess->session.ipv6_framed_routesi;
+            if (!route) break;
+            OpenAPI_list_add(FrameRouteList, ogs_strdup(route));
+        }
+        SmPolicyContextData.ipv6_frame_route_list = FrameRouteList;
+    }
+
     if (OGS_SBI_FEATURES_IS_SET(sess->smpolicycontrol_features,
                 OGS_SBI_NPCF_SMPOLICYCONTROL_DN_AUTHORIZATION)) {
         if (sess->session.ambr.uplink) {
@@ -161,7 +186,6 @@
         }
     }
 
-    memset(&sNssai, 0, sizeof(sNssai));
     sNssai.sst = sess->s_nssai.sst;
     sNssai.sd = ogs_s_nssai_sd_to_string(sess->s_nssai.sd);
     SmPolicyContextData.slice_info = &sNssai;
@@ -191,6 +215,9 @@
     if (SmPolicyContextData.ipv6_address_prefix)
         ogs_free(SmPolicyContextData.ipv6_address_prefix);
 
+    OpenAPI_clear_and_free_string_list(SmPolicyContextData.ipv4_frame_route_list);
+    OpenAPI_clear_and_free_string_list(SmPolicyContextData.ipv6_frame_route_list);
+
     return request;
 }

open5gs_2.5.8.tar.xz/src/smf/npcf-handler.c -> open5gs_2.6.0.tar.xz/src/smf/npcf-handler.c Changed

@@ -492,6 +492,38 @@
         ogs_pfcp_paa_to_ue_ip_addr(&sess->session.paa,
             &ul_pdr->ue_ip_addr, &ul_pdr->ue_ip_addr_len));
 
+    if (sess->session.ipv4_framed_routes &&
+        sess->pfcp_node->up_function_features.frrt) {
+        int i = 0;
+        for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+            const char *route = sess->session.ipv4_framed_routesi;
+            if (!route) break;
+            if (!dl_pdr->ipv4_framed_routes) {
+                dl_pdr->ipv4_framed_routes =
+                    ogs_calloc(OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI,
+                               sizeof(dl_pdr->ipv4_framed_routes0));
+                ogs_assert(dl_pdr->ipv4_framed_routes);
+            }
+            dl_pdr->ipv4_framed_routesi = ogs_strdup(route);
+        }
+    }
+
+    if (sess->session.ipv6_framed_routes &&
+        sess->pfcp_node->up_function_features.frrt) {
+        int i = 0;
+        for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+            const char *route = sess->session.ipv6_framed_routesi;
+            if (!route) break;
+            if (!dl_pdr->ipv6_framed_routes) {
+                dl_pdr->ipv6_framed_routes =
+                    ogs_calloc(OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI,
+                               sizeof(dl_pdr->ipv6_framed_routes0));
+                ogs_assert(dl_pdr->ipv6_framed_routes);
+            }
+            dl_pdr->ipv6_framed_routesi = ogs_strdup(route);
+        }
+    }
+
     ogs_info("UE SUPI%s DNN%s IPv4%s IPv6%s",
         smf_ue->supi, sess->session.name,
         sess->ipv4 ? OGS_INET_NTOP(&sess->ipv4->addr, buf1) : "",

open5gs_2.5.8.tar.xz/src/smf/nsmf-handler.c -> open5gs_2.6.0.tar.xz/src/smf/nsmf-handler.c Changed

@@ -26,12 +26,15 @@
 bool smf_nsmf_handle_create_sm_context(
     smf_sess_t *sess, ogs_sbi_stream_t *stream, ogs_sbi_message_t *message)
 {
+    bool rc;
     smf_ue_t *smf_ue = NULL;
+    char *type = NULL;
 
     ogs_nas_5gsm_header_t *gsm_header = NULL;
     ogs_pkbuf_t *n1smbuf = NULL;
 
     ogs_sbi_client_t *client = NULL;
+    OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
     ogs_sockaddr_t *addr = NULL;
 
     OpenAPI_sm_context_create_data_t *SmContextCreateData = NULL;
@@ -148,8 +151,9 @@
         return false;
     }
 
-    addr = ogs_sbi_getaddr_from_uri(SmContextCreateData->sm_context_status_uri);
-    if (!addr) {
+    rc = ogs_sbi_getaddr_from_uri(&scheme, &addr,
+            SmContextCreateData->sm_context_status_uri);
+    if (rc == false || scheme == OpenAPI_uri_scheme_NULL) {
         ogs_error("%s:%d Invalid URI %s",
                 smf_ue->supi, sess->psi,
                 SmContextCreateData->sm_context_status_uri);
@@ -161,6 +165,60 @@
         return false;
     }
 
+    if (SmContextCreateData->supi) {
+        type = ogs_id_get_type(SmContextCreateData->supi);
+        if (type) {
+            if (strncmp(type, OGS_ID_SUPI_TYPE_IMSI,
+                        strlen(OGS_ID_SUPI_TYPE_IMSI)) == 0) {
+                char *imsi_bcd = ogs_id_get_value(SmContextCreateData->supi);
+
+                ogs_cpystrn(smf_ue->imsi_bcd, imsi_bcd,
+                        ogs_min(strlen(imsi_bcd), OGS_MAX_IMSI_BCD_LEN)+1);
+                ogs_bcd_to_buffer(smf_ue->imsi_bcd,
+                        smf_ue->imsi, &smf_ue->imsi_len);
+
+                ogs_free(imsi_bcd);
+            }
+            ogs_free(type);
+        }
+    }
+
+    if (SmContextCreateData->pei) {
+        type = ogs_id_get_type(SmContextCreateData->pei);
+        if (type) {
+            if (strncmp(type, OGS_ID_SUPI_TYPE_IMEISV,
+                        strlen(OGS_ID_SUPI_TYPE_IMEISV)) == 0) {
+                char *imeisv_bcd = ogs_id_get_value(SmContextCreateData->pei);
+
+                ogs_cpystrn(smf_ue->imeisv_bcd, imeisv_bcd,
+                        ogs_min(strlen(imeisv_bcd), OGS_MAX_IMEISV_BCD_LEN)+1);
+                ogs_bcd_to_buffer(smf_ue->imeisv_bcd,
+                        smf_ue->imeisv, &smf_ue->imeisv_len);
+
+                ogs_free(imeisv_bcd);
+            }
+            ogs_free(type);
+        }
+    }
+
+    if (SmContextCreateData->gpsi) {
+        type = ogs_id_get_type(SmContextCreateData->gpsi);
+        if (type) {
+            if (strncmp(type, OGS_ID_GPSI_TYPE_MSISDN,
+                        strlen(OGS_ID_GPSI_TYPE_MSISDN)) == 0) {
+                char *msisdn_bcd = ogs_id_get_value(SmContextCreateData->gpsi);
+
+                ogs_cpystrn(smf_ue->msisdn_bcd, msisdn_bcd,
+                        ogs_min(strlen(msisdn_bcd), OGS_MAX_MSISDN_BCD_LEN)+1);
+                ogs_bcd_to_buffer(smf_ue->msisdn_bcd,
+                        smf_ue->msisdn, &smf_ue->msisdn_len);
+
+                ogs_free(msisdn_bcd);
+            }
+            ogs_free(type);
+        }
+    }
+
     ogs_sbi_parse_plmn_id_nid(&sess->plmn_id, servingNetwork);
 
     sess->sbi_rat_type = SmContextCreateData->rat_type;
@@ -178,19 +236,21 @@
                                     SmContextCreateData->hplmn_snssai->sd);
     }
 
+    smf_metrics_inst_by_slice_add(&sess->plmn_id, &sess->s_nssai,
+            SMF_METR_GAUGE_SM_SESSIONNBR, 1);
+
     if (sess->sm_context_status_uri)
         ogs_free(sess->sm_context_status_uri);
     sess->sm_context_status_uri =
         ogs_strdup(SmContextCreateData->sm_context_status_uri);
     ogs_assert(sess->sm_context_status_uri);
 
-    client = ogs_sbi_client_find(addr);
+    client = ogs_sbi_client_find(scheme, addr);
     if (!client) {
-        client = ogs_sbi_client_add(addr);
+        client = ogs_sbi_client_add(scheme, addr);
         ogs_assert(client);
     }
     OGS_SBI_SETUP_CLIENT(&sess->namf, client);
-
     ogs_freeaddrinfo(addr);
 
     if (SmContextCreateData->dnn) {
@@ -613,6 +673,20 @@
                     stream, OGS_SBI_HTTP_STATUS_NOT_FOUND,
                     "No PolicyAssociationId", NULL, NULL, NULL);
         }
+    } else if (SmContextUpdateData->serving_nf_id) {
+        if (sess->serving_nf_id) {
+            ogs_free(sess->serving_nf_id);
+        }
+        ogs_debug("Old serving_nf_id: %s, new serving_nf_id: %s",
+            sess->serving_nf_id, SmContextUpdateData->serving_nf_id);
+        sess->serving_nf_id = ogs_strdup(SmContextUpdateData->serving_nf_id);
+        ogs_assert(sess->serving_nf_id);
+
+        memset(&sendmsg, 0, sizeof(sendmsg));
+        response = ogs_sbi_build_response(
+            &sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT);
+        ogs_assert(response);
+        ogs_assert(true == ogs_sbi_server_send_response(stream, response));
     } else {
         ogs_error("%s:%d No UpdateData", smf_ue->supi, sess->psi);
         smf_sbi_send_sm_context_update_error(stream,

open5gs_2.5.8.tar.xz/src/smf/nudm-handler.c -> open5gs_2.6.0.tar.xz/src/smf/nudm-handler.c Changed

@@ -45,6 +45,8 @@
     OpenAPI_ambr_t *sessionAmbr = NULL;
     OpenAPI_list_t *staticIpAddress = NULL;
     OpenAPI_ip_address_t *ipAddress = NULL;
+    OpenAPI_list_t *ipv4FrameRouteList = NULL;
+    OpenAPI_list_t *ipv6FrameRouteList = NULL;
     OpenAPI_lnode_t *node = NULL, *node2 = NULL;
 
     ogs_assert(sess);
@@ -242,6 +244,50 @@
                 }
             }
 
+            ipv4FrameRouteList = dnnConfiguration->ipv4_frame_route_list;
+            if (ipv4FrameRouteList) {
+                int i;
+                for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+                    if (!sess->session.ipv4_framed_routes ||
+                        !sess->session.ipv4_framed_routesi)
+                        break;
+                    ogs_free(sess->session.ipv4_framed_routesi);
+                }
+                if (!sess->session.ipv4_framed_routes)
+                    sess->session.ipv4_framed_routes = ogs_calloc(
+                            OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI,
+                            sizeof(sess->session.ipv4_framed_routes0));
+                i = 0;
+                OpenAPI_list_for_each(ipv4FrameRouteList, node2) {
+                    OpenAPI_frame_route_info_t *route = node2->data;
+                    if (i >= OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI) break;
+                    if (!route) continue;
+                    sess->session.ipv4_framed_routesi++ = ogs_strdup(route->ipv4_mask);
+                }
+            }
+
+            ipv6FrameRouteList = dnnConfiguration->ipv6_frame_route_list;
+            if (ipv6FrameRouteList) {
+                int i;
+                for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+                    if (!sess->session.ipv6_framed_routes ||
+                        !sess->session.ipv6_framed_routesi)
+                        break;
+                    ogs_free(sess->session.ipv6_framed_routesi);
+                }
+                if (!sess->session.ipv6_framed_routes)
+                    sess->session.ipv6_framed_routes = ogs_calloc(
+                            OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI,
+                            sizeof(sess->session.ipv6_framed_routes0));
+                i = 0;
+                OpenAPI_list_for_each(ipv6FrameRouteList, node2) {
+                    OpenAPI_frame_route_info_t *route = node2->data;
+                    if (i >= OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI) break;
+                    if (!route) continue;
+                    sess->session.ipv6_framed_routesi++ = ogs_strdup(route->ipv6_prefix);
+                }
+            }
+
             /* Succeeded to get PDU Session */
             if (!sess->session.name)
                 sess->session.name = ogs_strdup(dnnConfigurationMap->key);

open5gs_2.5.8.tar.xz/src/smf/pfcp-path.c -> open5gs_2.6.0.tar.xz/src/smf/pfcp-path.c Changed

@@ -334,10 +334,16 @@
     h.seid = sess->upf_n4_seid;
 
     n4buf = (*modify_list)(h.type, sess, xact);
-    ogs_expect_or_return_val(n4buf, OGS_ERROR);
+    if (!n4buf) {
+        ogs_error("modify_list() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, n4buf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     if (duration) {
         ogs_pfcp_xact_delayed_commit(xact, duration);
@@ -363,7 +369,10 @@
     ogs_assert(stream);
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_5gc_timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     xact->assoc_stream = stream;
     xact->local_seid = sess->smf_n4_seid;
@@ -373,10 +382,16 @@
     h.seid = sess->upf_n4_seid;
 
     n4buf = smf_n4_build_session_establishment_request(h.type, sess);
-    ogs_expect_or_return_val(n4buf, OGS_ERROR);
+    if (!n4buf) {
+        ogs_error("smf_n4_build_session_establishment_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, n4buf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -397,7 +412,10 @@
         ogs_assert(stream);
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_5gc_timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     xact->assoc_stream = stream;
     xact->local_seid = sess->smf_n4_seid;
@@ -424,7 +442,10 @@
     ogs_assert(sess);
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_5gc_timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     xact->assoc_stream = stream;
     xact->local_seid = sess->smf_n4_seid;
@@ -449,7 +470,10 @@
     ogs_assert(trigger);
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_5gc_timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     xact->assoc_stream = stream;
     xact->delete_trigger = trigger;
@@ -460,10 +484,16 @@
     h.seid = sess->upf_n4_seid;
 
     n4buf = smf_n4_build_session_deletion_request(h.type, sess);
-    ogs_expect_or_return_val(n4buf, OGS_ERROR);
+    if (!n4buf) {
+        ogs_error("smf_n4_build_session_deletion_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, n4buf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -482,7 +512,10 @@
     ogs_assert(sess);
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_epc_timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     xact->epc = true; /* EPC PFCP transaction */
     xact->assoc_xact = gtp_xact;
@@ -493,10 +526,16 @@
     h.seid = sess->upf_n4_seid;
 
     n4buf = smf_n4_build_session_establishment_request(h.type, sess);
-    ogs_expect_or_return_val(n4buf, OGS_ERROR);
+    if (!n4buf) {
+        ogs_error("smf_n4_build_session_establishment_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, n4buf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -515,7 +554,10 @@
     ogs_assert(sess);
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_epc_timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     xact->epc = true; /* EPC PFCP transaction */
     xact->assoc_xact = gtp_xact;
@@ -526,7 +568,10 @@
     xact->gtp_cause = gtp_cause;
     if (gtpbuf) {
         xact->gtpbuf = ogs_pkbuf_copy(gtpbuf);
-        ogs_expect_or_return_val(xact->gtpbuf, OGS_ERROR);
+        if (!xact->gtpbuf) {
+            ogs_error("ogs_pkbuf_copy() failed");
+            return OGS_ERROR;
+        }
     }
 
     ogs_list_init(&sess->pdr_to_modify_list);
@@ -554,7 +599,10 @@
 
     xact = ogs_pfcp_xact_local_create(
             sess->pfcp_node, bearer_epc_timeout, bearer);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     xact->epc = true; /* EPC PFCP transaction */
     xact->assoc_xact = gtp_xact;
@@ -585,7 +633,10 @@
     ogs_assert(sess);
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_epc_timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     xact->epc = true; /* EPC PFCP transaction */
 
@@ -618,10 +669,16 @@
     h.seid = sess->upf_n4_seid;
 
     n4buf = smf_n4_build_session_deletion_request(h.type, sess);
-    ogs_expect_or_return_val(n4buf, OGS_ERROR);
+    if (!n4buf) {
+        ogs_error("smf_n4_build_session_deletion_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, n4buf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -644,9 +701,14 @@
         /* Handover from Non-3GPP to 3GPP */
         wlan_sess = smf_sess_find_by_apn(
                 smf_ue, sess->session.name, OGS_GTP2_RAT_TYPE_WLAN);
-        ogs_expect_or_return_val(wlan_sess, OGS_ERROR);
-        ogs_expect_or_return_val(
-                ogs_list_first(&wlan_sess->bearer_list), OGS_ERROR);
+        if (!wlan_sess) {
+            ogs_error("smf_sess_find_by_apn() failed");
+            return OGS_ERROR;
+        }
+        if (ogs_list_first(&wlan_sess->bearer_list) == NULL) {
+            ogs_error("No Bearer List in WLAN Session");
+            return OGS_ERROR;
+        }
 
         /* Deactivate WLAN Session */
         rv = smf_epc_pfcp_send_all_pdr_modification_request(
@@ -654,7 +716,11 @@
                 OGS_PFCP_MODIFY_DL_ONLY|OGS_PFCP_MODIFY_DEACTIVATE,
                 OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED,
                 OGS_GTP2_CAUSE_ACCESS_CHANGED_FROM_NON_3GPP_TO_3GPP);
-        ogs_expect_or_return_val(rv == OGS_OK, rv);
+        if (rv != OGS_OK) {
+            ogs_error("smf_epc_pfcp_send_all_pdr_modification_requestO() "
+                    "failed");
+            return OGS_ERROR;
+        }
         break;
 
     case OGS_GTP2_CAUSE_RAT_CHANGED_FROM_3GPP_TO_NON_3GPP:
@@ -662,8 +728,10 @@
         eutran_sess = smf_sess_find_by_apn(
                 smf_ue, sess->session.name, OGS_GTP2_RAT_TYPE_EUTRAN);
         if (eutran_sess) {
-            ogs_expect_or_return_val(
-                    ogs_list_first(&eutran_sess->bearer_list), OGS_ERROR);
+            if (ogs_list_first(&eutran_sess->bearer_list) == NULL) {
+                ogs_error("No Bearer List in E-URAN Session");
+                return OGS_ERROR;
+            }
 
             /* Deactivate EUTRAN Session */
             rv = smf_epc_pfcp_send_all_pdr_modification_request(
@@ -671,7 +739,11 @@
                     OGS_PFCP_MODIFY_DL_ONLY|OGS_PFCP_MODIFY_DEACTIVATE,
                     OGS_NAS_PROCEDURE_TRANSACTION_IDENTITY_UNASSIGNED,
                     OGS_GTP2_CAUSE_RAT_CHANGED_FROM_3GPP_TO_NON_3GPP);
-            ogs_expect_or_return_val(rv == OGS_OK, rv);
+            if (rv != OGS_OK) {
+                ogs_error("smf_epc_pfcp_send_all_pdr_modification_request() "
+                        "failed");
+                return OGS_ERROR;
+            }
         }
         break;
 
@@ -695,10 +767,16 @@
     h.seid = sess->upf_n4_seid;
 
     sxabuf = ogs_pfcp_build_session_report_response(h.type, cause);
-    ogs_expect_or_return_val(sxabuf, OGS_ERROR);
+    if (!sxabuf) {
+        ogs_error("ogs_pfcp_build_session_report_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, sxabuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);

open5gs_2.5.8.tar.xz/src/smf/s5c-build.c -> open5gs_2.6.0.tar.xz/src/smf/s5c-build.c Changed

@@ -83,7 +83,10 @@
     rv = ogs_gtp2_sockaddr_to_f_teid(
             ogs_gtp_self()->gtpc_addr, ogs_gtp_self()->gtpc_addr6,
             &smf_s5c_teid, &len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp2_sockaddr_to_f_teid() failed");
+        return NULL;
+    }
     rsp->pgw_s5_s8__s2a_s2b_f_teid_for_pmip_based_interface_or_for_gtp_based_control_plane_interface.
         presence = 1;
     rsp->pgw_s5_s8__s2a_s2b_f_teid_for_pmip_based_interface_or_for_gtp_based_control_plane_interface.
@@ -185,7 +188,10 @@
         rv = ogs_gtp2_sockaddr_to_f_teid(
             bearer->pgw_s5u_addr, bearer->pgw_s5u_addr6,
             &pgw_s5u_teidi, &pgw_s5u_leni);
-        ogs_expect_or_return_val(rv == OGS_OK, NULL);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp2_sockaddr_to_f_teid() failed");
+            return NULL;
+        }
 
         switch (sess->gtp_rat_type) {
         case OGS_GTP2_RAT_TYPE_EUTRAN:
@@ -374,7 +380,10 @@
     ogs_assert(bearer->pgw_s5u_addr || bearer->pgw_s5u_addr6);
     rv = ogs_gtp2_sockaddr_to_f_teid(
         bearer->pgw_s5u_addr, bearer->pgw_s5u_addr6, &pgw_s5u_teid, &len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp2_sockaddr_to_f_teid() failed");
+        return NULL;
+    }
     req->bearer_contexts.s4_u_sgsn_f_teid.presence = 1;
     req->bearer_contexts.s4_u_sgsn_f_teid.data = &pgw_s5u_teid;
     req->bearer_contexts.s4_u_sgsn_f_teid.len = len;

open5gs_2.5.8.tar.xz/src/smf/s5c-handler.c -> open5gs_2.6.0.tar.xz/src/smf/s5c-handler.c Changed

@@ -739,7 +739,10 @@
     /* Find the Bearer by PGW-S5U-TEID */
     ogs_assert(pgw_s5u_teid);
     bearer = smf_bearer_find_by_pgw_s5u_teid(sess, be32toh(pgw_s5u_teid->teid));
-    ogs_expect_or_return(bearer);
+    if (!bearer) {
+        ogs_error("smf_bearer_find_by_pgw_s5u_teid() failed");
+        return;
+    }
 
     /* Set EBI */
     bearer->ebi = rsp->bearer_contexts.eps_bearer_id.u8;
@@ -1380,10 +1383,16 @@
         pkbuf = smf_s5c_build_update_bearer_request(
                 h.type, bearer, cmd->procedure_transaction_id.u8,
                 tft_update ? &tft : NULL, qos_update);
-        ogs_expect_or_return(pkbuf);
+        if (!pkbuf) {
+            ogs_error("smf_s5c_build_update_bearer_request() failed");
+            return;
+        }
 
         rv = ogs_gtp_xact_update_tx(xact, &h, pkbuf);
-        ogs_expect_or_return(rv == OGS_OK);
+        if (rv != OGS_OK) {
+            ogs_error("ogs_gtp_xact_update_tx() failed");
+            return;
+        }
 
         if (tft_update)
             xact->update_flags |= OGS_GTP_MODIFY_TFT_UPDATE;

open5gs_2.5.8.tar.xz/src/smf/s6b-path.c -> open5gs_2.6.0.tar.xz/src/smf/s6b-path.c Changed

open5gs_2.5.8.tar.xz/src/smf/sbi-path.c -> open5gs_2.6.0.tar.xz/src/smf/sbi-path.c Changed

@@ -24,9 +24,17 @@
 int smf_sbi_open(void)
 {
     ogs_sbi_nf_instance_t *nf_instance = NULL;
-    ogs_sbi_nf_instance_t *nrf_instance = NULL, *scp_instance = NULL;
     ogs_sbi_nf_service_t *service = NULL;
 
+    /*
+     * SMF can only run to support 4G EPC mode.
+     *
+     * If the SMF is only running in 4G EPC mode,
+     * it should not send NFRegister/NFStatusSubscribe messages to the NRF.
+     */
+    if (ogs_list_count(&ogs_sbi_self()->server_list) == 0)
+        return OGS_OK;
+
     /* Initialize SELF NF instance */
     nf_instance = ogs_sbi_self()->nf_instance;
     ogs_assert(nf_instance);
@@ -47,30 +55,18 @@
         ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AMF);
     }
 
-    /*
-     * SMF can only run to support 4G EPC mode.
-     *
-     * If the SMF is only running in 4G EPC mode,
-     * it should not send NFRegister/NFStatusSubscribe messages to the NRF.
-     */
-    nrf_instance = ogs_sbi_self()->nrf_instance;
-    scp_instance = ogs_sbi_self()->scp_instance;
-
-    if (NF_INSTANCE_CLIENT(nrf_instance) || NF_INSTANCE_CLIENT(scp_instance)) {
-
-        /* Initialize NRF NF Instance */
-        nf_instance = ogs_sbi_self()->nrf_instance;
-        if (nf_instance)
-            ogs_sbi_nf_fsm_init(nf_instance);
-
-        /* Setup Subscription-Data */
-        ogs_sbi_subscription_spec_add(
-                OpenAPI_nf_type_AMF, OGS_SBI_SERVICE_NAME_NAMF_COMM);
-        ogs_sbi_subscription_spec_add(
-                OpenAPI_nf_type_PCF, OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL);
-        ogs_sbi_subscription_spec_add(
-                OpenAPI_nf_type_UDM, OGS_SBI_SERVICE_NAME_NUDM_SDM);
-    }
+    /* Initialize NRF NF Instance */
+    nf_instance = ogs_sbi_self()->nrf_instance;
+    if (nf_instance)
+        ogs_sbi_nf_fsm_init(nf_instance);
+
+    /* Setup Subscription-Data */
+    ogs_sbi_subscription_spec_add(
+            OpenAPI_nf_type_AMF, OGS_SBI_SERVICE_NAME_NAMF_COMM);
+    ogs_sbi_subscription_spec_add(
+            OpenAPI_nf_type_PCF, OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL);
+    ogs_sbi_subscription_spec_add(
+            OpenAPI_nf_type_UDM, OGS_SBI_SERVICE_NAME_NUDM_SDM);
 
     if (ogs_sbi_server_start_all(ogs_sbi_server_handler) != OGS_OK)
         return OGS_ERROR;
@@ -396,7 +392,10 @@
     ogs_assert(client);
 
     request = smf_namf_callback_build_sm_context_status(sess, NULL);
-    ogs_expect_or_return_val(request, false);
+    if (!request) {
+        ogs_error("smf_namf_callback_build_sm_context_status() failed");
+        return false;
+    }
 
     rc = ogs_sbi_send_request_to_client(
             client, client_notify_cb, request, NULL);

open5gs_2.5.8.tar.xz/src/smf/smf-sm.c -> open5gs_2.6.0.tar.xz/src/smf/smf-sm.c Changed

open5gs_2.5.8.tar.xz/src/udm/context.c -> open5gs_2.6.0.tar.xz/src/udm/context.c Changed

open5gs_2.5.8.tar.xz/src/udm/context.h -> open5gs_2.6.0.tar.xz/src/udm/context.h Changed

open5gs_2.5.8.tar.xz/src/udm/nudm-handler.c -> open5gs_2.6.0.tar.xz/src/udm/nudm-handler.c Changed

open5gs_2.5.8.tar.xz/src/udm/nudm-handler.h -> open5gs_2.6.0.tar.xz/src/udm/nudm-handler.h Changed

open5gs_2.5.8.tar.xz/src/udm/nudr-build.c -> open5gs_2.6.0.tar.xz/src/udm/nudr-build.c Changed

open5gs_2.5.8.tar.xz/src/udm/nudr-handler.c -> open5gs_2.6.0.tar.xz/src/udm/nudr-handler.c Changed

@@ -197,6 +197,7 @@
             memset(&AuthenticationInfoResult,
                     0, sizeof(AuthenticationInfoResult));
 
+            AuthenticationInfoResult.supi = udm_ue->supi;
             AuthenticationInfoResult.auth_type = udm_ue->auth_type;
 
             ogs_random(udm_ue->rand, OGS_RAND_LEN);
@@ -338,20 +339,27 @@
 
         memset(&sendmsg, 0, sizeof(sendmsg));
 
-        memset(&header, 0, sizeof(header));
-        header.service.name = (char *)OGS_SBI_SERVICE_NAME_NUDM_UEAU;
-        header.api.version = (char *)OGS_SBI_API_V1;
-        header.resource.component0 = udm_ue->supi;
-        header.resource.component1 =
-            (char *)OGS_SBI_RESOURCE_NAME_AUTH_EVENTS;
-        header.resource.component2 = udm_ue->ctx_id;
-
-        sendmsg.http.location = ogs_sbi_server_uri(server, &header);
-        sendmsg.AuthEvent = OpenAPI_auth_event_copy(
-                sendmsg.AuthEvent, udm_ue->auth_event);
+        if (AuthEvent->auth_removal_ind) {
+            OpenAPI_auth_event_free(AuthEvent);
+            udm_ue->auth_event = NULL;
+            response = ogs_sbi_build_response(&sendmsg,
+                    OGS_SBI_HTTP_STATUS_NO_CONTENT);
+        } else {
+            memset(&header, 0, sizeof(header));
+            header.service.name = (char *)OGS_SBI_SERVICE_NAME_NUDM_UEAU;
+            header.api.version = (char *)OGS_SBI_API_V1;
+            header.resource.component0 = udm_ue->supi;
+            header.resource.component1 =
+                (char *)OGS_SBI_RESOURCE_NAME_AUTH_EVENTS;
+            header.resource.component2 = udm_ue->ctx_id;
+
+            sendmsg.http.location = ogs_sbi_server_uri(server, &header);
+            sendmsg.AuthEvent = OpenAPI_auth_event_copy(
+                    sendmsg.AuthEvent, udm_ue->auth_event);
 
-        response = ogs_sbi_build_response(&sendmsg,
-                OGS_SBI_HTTP_STATUS_CREATED);
+            response = ogs_sbi_build_response(&sendmsg,
+                    OGS_SBI_HTTP_STATUS_CREATED);
+        }
         ogs_assert(response);
         ogs_assert(true == ogs_sbi_server_send_response(stream, response));

open5gs_2.5.8.tar.xz/src/udm/udm-sm.c -> open5gs_2.6.0.tar.xz/src/udm/udm-sm.c Changed

open5gs_2.5.8.tar.xz/src/udm/ue-sm.c -> open5gs_2.6.0.tar.xz/src/udm/ue-sm.c Changed

@@ -83,6 +83,22 @@
                 END
                 break;
 
+            CASE(OGS_SBI_HTTP_METHOD_PUT)
+                SWITCH(message->h.resource.component1)
+                CASE(OGS_SBI_RESOURCE_NAME_AUTH_EVENTS)
+                    udm_nudm_ueau_handle_result_confirmation_inform(
+                            udm_ue, stream, message);
+                    break;
+                DEFAULT
+                    ogs_error("%s Invalid resource name %s",
+                            udm_ue->suci, message->h.resource.component1);
+                    ogs_assert(true ==
+                        ogs_sbi_server_send_error(stream,
+                            OGS_SBI_HTTP_STATUS_BAD_REQUEST, message,
+                            "Invalid resource name", message->h.method));
+                END
+                break;
+
             DEFAULT
                 ogs_error("%s Invalid HTTP method %s",
                         udm_ue->suci, message->h.method);
@@ -171,6 +187,23 @@
                             udm_ue, stream, message);
                     break;
 
+                DEFAULT
+                    ogs_error("%s Invalid resource name %s",
+                            udm_ue->suci, message->h.resource.component1);
+                    ogs_assert(true ==
+                        ogs_sbi_server_send_error(stream,
+                            OGS_SBI_HTTP_STATUS_BAD_REQUEST, message,
+                            "Invalid resource name", message->h.method));
+                END
+                break;
+
+            CASE(OGS_SBI_HTTP_METHOD_DELETE)
+                SWITCH(message->h.resource.component1)
+                CASE(OGS_SBI_RESOURCE_NAME_SDM_SUBSCRIPTIONS)
+                    udm_nudm_sdm_handle_subscription_delete(
+                            udm_ue, stream, message);
+                    break;
+
                 DEFAULT
                     ogs_error("%s Invalid resource name %s",
                             udm_ue->suci, message->h.resource.component1);

open5gs_2.5.8.tar.xz/src/udr/nudr-handler.c -> open5gs_2.6.0.tar.xz/src/udr/nudr-handler.c Changed

@@ -136,10 +136,9 @@
                 if (node->data) {
                     OpenAPI_patch_item_t *patch_item = node->data;
                     if (OpenAPI_IsString(patch_item->value))
-                        sqn_string = patch_item->value->valuestring;
+                        sqn_string = cJSON_GetStringValue(patch_item->value->json);
                     else
-                        ogs_error("Invalid any-type %d",
-                                patch_item->value->type);
+                        ogs_error("Non-string value in patch not implemented");
                 }
             }
 
@@ -196,10 +195,12 @@
     CASE(OGS_SBI_RESOURCE_NAME_AUTHENTICATION_STATUS)
         SWITCH(recvmsg->h.method)
         CASE(OGS_SBI_HTTP_METHOD_PUT)
+        CASE(OGS_SBI_HTTP_METHOD_DELETE)
             OpenAPI_auth_event_t *AuthEvent = NULL;
 
             AuthEvent = recvmsg->AuthEvent;
-            if (!AuthEvent) {
+            if (!AuthEvent &&
+                !strcmp(recvmsg->h.method, OGS_SBI_HTTP_METHOD_PUT)) {
                 ogs_error("%s No AuthEvent", supi);
                 ogs_assert(true ==
                     ogs_sbi_server_send_error(
@@ -647,6 +648,7 @@
         OpenAPI_ambr_t *sessionAmbr = NULL;
         OpenAPI_list_t *staticIpAddress = NULL;
         OpenAPI_ip_address_t *ipAddress = NULL;
+        OpenAPI_list_t *FrameRouteList = NULL;
         OpenAPI_lnode_t *node = NULL, *node2 = NULL;
 
         if (!recvmsg->param.single_nssai_presence) {
@@ -827,6 +829,34 @@
                     session->name, dnnConfiguration);
             ogs_assert(dnnConfigurationMap);
             OpenAPI_list_add(dnnConfigurationList, dnnConfigurationMap);
+
+            if (session->ipv4_framed_routes) {
+                int i;
+                FrameRouteList = OpenAPI_list_create();
+
+                for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+                    const char *route = session->ipv4_framed_routesi;
+                    if (!route) break;
+                    OpenAPI_list_add(FrameRouteList,
+                                     OpenAPI_frame_route_info_create(
+                                             ogs_strdup(route), NULL));
+                }
+                dnnConfiguration->ipv4_frame_route_list = FrameRouteList;
+            }
+
+            if (session->ipv6_framed_routes) {
+                int i;
+                FrameRouteList = OpenAPI_list_create();
+
+                for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+                    const char *route = session->ipv6_framed_routesi;
+                    if (!route) break;
+                    OpenAPI_list_add(FrameRouteList,
+                                     OpenAPI_frame_route_info_create(
+                                             NULL, ogs_strdup(route)));
+                }
+                dnnConfiguration->ipv6_frame_route_list = FrameRouteList;
+            }
         }
 
         memset(&SessionManagementSubscriptionData, 0,
@@ -904,6 +934,22 @@
                         OpenAPI_list_free(staticIpAddress);
                     }
 
+                    FrameRouteList = dnnConfiguration->ipv4_frame_route_list;
+                    OpenAPI_list_for_each(FrameRouteList, node2) {
+                        OpenAPI_frame_route_info_t *frame = node2->data;
+                        if (frame)
+                            ogs_free(frame);
+                    }
+                    OpenAPI_list_free(FrameRouteList);
+
+                    FrameRouteList = dnnConfiguration->ipv6_frame_route_list;
+                    OpenAPI_list_for_each(FrameRouteList, node2) {
+                        OpenAPI_frame_route_info_t *frame = node2->data;
+                        if (frame)
+                            ogs_free(frame);
+                    }
+                    OpenAPI_list_free(FrameRouteList);
+
                     ogs_free(dnnConfiguration);
                 }
                 ogs_free(dnnConfigurationMap);

open5gs_2.5.8.tar.xz/src/upf/context.c -> open5gs_2.6.0.tar.xz/src/upf/context.c Changed

@@ -44,6 +44,7 @@
     ogs_pfcp_self()->up_function_features.empu = 1;
     ogs_pfcp_self()->up_function_features.mnop = 1;
     ogs_pfcp_self()->up_function_features.vtime = 1;
+    ogs_pfcp_self()->up_function_features.frrt = 1;
     ogs_pfcp_self()->up_function_features_len = 4;
 
     ogs_list_init(&self.sess_list);
@@ -61,6 +62,15 @@
     context_initialized = 1;
 }
 
+static void free_upf_route_trie_node(struct upf_route_trie_node *node)
+{
+    if (!node)
+        return;
+    free_upf_route_trie_node(node->left);
+    free_upf_route_trie_node(node->right);
+    ogs_free(node);
+}
+
 void upf_context_final(void)
 {
     ogs_assert(context_initialized == 1);
@@ -76,6 +86,9 @@
     ogs_assert(self.ipv6_hash);
     ogs_hash_destroy(self.ipv6_hash);
 
+    free_upf_route_trie_node(self.ipv4_framed_routes);
+    free_upf_route_trie_node(self.ipv6_framed_routes);
+
     ogs_pool_final(&upf_sess_pool);
 
     context_initialized = 0;
@@ -132,6 +145,8 @@
                     /* handle config in pfcp library */
                 } else if (!strcmp(upf_key, "subnet")) {
                     /* handle config in pfcp library */
+                } else if (!strcmp(upf_key, "metrics")) {
+                    /* handle config in metrics library */
                 } else
                     ogs_warn("unknown key `%s`", upf_key);
             }
@@ -174,6 +189,7 @@
             sizeof(sess->smf_n4_f_seid.seid), sess);
 
     ogs_list_add(&self.sess_list, sess);
+    upf_metrics_inst_global_inc(UPF_METR_GLOB_GAUGE_UPF_SESSIONNBR);
 
     ogs_info("Added Number of UPF-Sessions is now %d",
             ogs_list_count(&self.sess_list));
@@ -205,9 +221,13 @@
         ogs_pfcp_ue_ip_free(sess->ipv6);
     }
 
+    upf_sess_set_ue_ipv4_framed_routes(sess, NULL);
+    upf_sess_set_ue_ipv6_framed_routes(sess, NULL);
+
     ogs_pfcp_pool_final(&sess->pfcp);
 
     ogs_pool_free(&upf_sess_pool, sess);
+    upf_metrics_inst_global_dec(UPF_METR_GLOB_GAUGE_UPF_SESSIONNBR);
 
     ogs_info("Removed Number of UPF-sessions is now %d",
             ogs_list_count(&self.sess_list));
@@ -255,16 +275,66 @@
 
 upf_sess_t *upf_sess_find_by_ipv4(uint32_t addr)
 {
+    upf_sess_t *ret;
+    struct upf_route_trie_node *trie = self.ipv4_framed_routes;
+    const int nbits = sizeof(addr) << 3;
+    int i;
+
     ogs_assert(self.ipv4_hash);
-    return (upf_sess_t *)ogs_hash_get(self.ipv4_hash, &addr, OGS_IPV4_LEN);
+
+    ret = ogs_hash_get(self.ipv4_hash, &addr, OGS_IPV4_LEN);
+    if (ret)
+        return ret;
+
+    for (i =  0; i <= nbits; i++) {
+        int bit = nbits - i - 1;
+
+        if (!trie)
+            break;
+        if (trie->sess)
+            ret = trie->sess;
+        if (i == nbits)
+            break;
+
+        if ((1 << bit) & be32toh(addr))
+            trie = trie->right;
+        else
+            trie = trie->left;
+    }
+    return ret;
 }
 
 upf_sess_t *upf_sess_find_by_ipv6(uint32_t *addr6)
 {
+    upf_sess_t *ret = NULL;
+    struct upf_route_trie_node *trie = self.ipv6_framed_routes;
+    int i;
+    const int chunk_size = sizeof(*addr6) << 3;
+
     ogs_assert(self.ipv6_hash);
     ogs_assert(addr6);
-    return (upf_sess_t *)ogs_hash_get(
+    ret = ogs_hash_get(
             self.ipv6_hash, addr6, OGS_IPV6_DEFAULT_PREFIX_LEN >> 3);
+    if (ret)
+        return ret;
+
+    for (i = 0; i <= OGS_IPV6_128_PREFIX_LEN; i++) {
+        int part = i / chunk_size;
+        int bit = (OGS_IPV6_128_PREFIX_LEN - i - 1) % chunk_size;
+
+        if (!trie)
+            break;
+        if (trie->sess)
+            ret = trie->sess;
+        if (i == OGS_IPV6_128_PREFIX_LEN)
+            break;
+
+        if ((1 << bit) & be32toh(addr6part))
+            trie = trie->right;
+        else
+            trie = trie->left;
+    }
+    return ret;
 }
 
 upf_sess_t *upf_sess_add_by_message(ogs_pfcp_message_t *message)
@@ -404,6 +474,184 @@
     return cause_value;
 }
 
+/* Remove amd free framed ROUTE from TRIE. It isn't an error if the framed
+   route doesn't exist in TRIE. */
+static void free_framed_route_from_trie(ogs_ipsubnet_t *route)
+{
+    const int chunk_size = sizeof(route->sub0) << 3;
+    const int is_ipv4 = route->family == AF_INET;
+    const int nbits = is_ipv4 ? chunk_size : OGS_IPV6_128_PREFIX_LEN;
+    struct upf_route_trie_node **trie =
+        is_ipv4 ? &self.ipv4_framed_routes : &self.ipv6_framed_routes;
+
+    struct upf_route_trie_node **to_free_triesOGS_IPV6_128_PREFIX_LEN + 1;
+    int free_from = 0;
+    int i = 0;
+
+    for (i = 0; i <= nbits; i++) {
+        int part = i / chunk_size;
+        int bit = (nbits - i - 1) % chunk_size;
+
+        if (!*trie)
+            break;
+        to_free_triesi = trie;
+
+        if (i == nbits ||
+            ((1 << bit) & be32toh(route->maskpart)) == 0) {
+            (*trie)->sess = NULL;
+            if ((*trie)->left || (*trie)->right)
+                free_from = i + 1;
+            i++;
+            break;
+        }
+
+        if ((1 << bit) & be32toh(route->subpart)) {
+            if ((*trie)->left || (*trie)->sess)
+                free_from = i + 1;
+            trie = &(*trie)->right;
+        } else {
+            if ((*trie)->right || (*trie)->sess)
+                free_from = i + 1;
+            trie = &(*trie)->left;
+        }
+    }
+
+    for (i = i - 1; i >= free_from; i--) {
+        trie = to_free_triesi;
+        ogs_free(*trie);
+        *trie = NULL;
+    }
+}
+
+static void add_framed_route_to_trie(ogs_ipsubnet_t *route, upf_sess_t *sess)
+{
+    const int chunk_size = sizeof(route->sub0) << 3;
+    const int is_ipv4 = route->family == AF_INET;
+    const int nbits = is_ipv4 ? chunk_size : OGS_IPV6_128_PREFIX_LEN;
+    struct upf_route_trie_node **trie =
+        is_ipv4 ? &self.ipv4_framed_routes : &self.ipv6_framed_routes;
+    int i = 0;
+
+    for (i = 0; i <= nbits; i++) {
+        int part = i / chunk_size;
+        int bit = (- i - 1) % chunk_size;
+
+        if (!*trie)
+            *trie = ogs_calloc(1, sizeof(**trie));
+
+        if (i == nbits ||
+            ((1 << bit) & be32toh(route->maskpart)) == 0) {
+            (*trie)->sess = sess;
+            break;
+        }
+
+        if ((1 << bit) & be32toh(route->subpart)) {
+            trie = &(*trie)->right;
+        } else {
+            trie = &(*trie)->left;
+        }
+    }
+}
+
+static int parse_framed_route(ogs_ipsubnet_t *subnet, const char *framed_route)
+{
+    char *mask = ogs_strdup(framed_route);
+    char *addr = strsep(&mask, "/");
+    int rv;
+
+    rv = ogs_ipsubnet(subnet, addr, mask);
+    ogs_free(addr);
+    return rv;
+}
+
+uint8_t upf_sess_set_ue_ipv4_framed_routes(upf_sess_t *sess,
+        char *framed_routes)
+{
+    int i = 0, j = 0, rv;
+    uint8_t cause_value = OGS_PFCP_CAUSE_REQUEST_ACCEPTED;
+
+    ogs_assert(sess);
+
+    for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+        if (!sess->ipv4_framed_routes || !sess->ipv4_framed_routesi.family)
+            break;
+        free_framed_route_from_trie(&sess->ipv4_framed_routesi);
+        memset(&sess->ipv4_framed_routesi, 0,
+               sizeof(sess->ipv4_framed_routesi));
+    }
+
+    for (i = 0, j = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+        if (!framed_routes || !framed_routesi)
+            break;
+
+        if (sess->ipv4_framed_routes == NULL) {
+            sess->ipv4_framed_routes = ogs_calloc(
+                OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI, sizeof(ogs_ipsubnet_t));
+            ogs_assert(sess->ipv4_framed_routes);
+        }
+
+        rv = parse_framed_route(&sess->ipv4_framed_routesj, framed_routesi);
+
+        if (rv != OGS_OK) {
+            ogs_warn("Ignoring invalid framed route %s", framed_routesi);
+            memset(&sess->ipv4_framed_routesj, 0,
+                   sizeof(sess->ipv4_framed_routesj));
+            continue;
+        }
+        add_framed_route_to_trie(&sess->ipv4_framed_routesj, sess);
+        j++;
+    }
+    if (j == 0 && sess->ipv4_framed_routes) {
+        ogs_free(sess->ipv4_framed_routes);
+        sess->ipv4_framed_routes = NULL;
+    }
+
+    return cause_value;
+}
+
+uint8_t upf_sess_set_ue_ipv6_framed_routes(upf_sess_t *sess,
+        char *framed_routes)
+{
+    int i = 0, j = 0, rv;
+    uint8_t cause_value = OGS_PFCP_CAUSE_REQUEST_ACCEPTED;
+
+    ogs_assert(sess);
+
+    for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+        if (!sess->ipv6_framed_routes || !sess->ipv6_framed_routesi.family)
+            break;
+        free_framed_route_from_trie(&sess->ipv6_framed_routesi);
+    }
+
+    for (i = 0, j = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+        if (!framed_routes || !framed_routesi)
+            break;
+
+        if (sess->ipv6_framed_routes == NULL) {
+            sess->ipv6_framed_routes = ogs_calloc(
+                OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI, sizeof(ogs_ipsubnet_t));
+            ogs_assert(sess->ipv6_framed_routes);
+        }
+
+        rv = parse_framed_route(&sess->ipv6_framed_routesj, framed_routesi);
+
+        if (rv != OGS_OK) {
+            ogs_warn("Ignoring invalid framed route %s", framed_routesi);
+            memset(&sess->ipv6_framed_routesj, 0,
+                   sizeof(sess->ipv6_framed_routesj));
+            continue;
+        }
+        add_framed_route_to_trie(&sess->ipv6_framed_routesj, sess);
+        j++;
+    }
+    if (j == 0 && sess->ipv6_framed_routes) {
+        ogs_free(sess->ipv6_framed_routes);
+        sess->ipv6_framed_routes = NULL;
+    }
+
+    return cause_value;
+}
+
 void upf_sess_urr_acc_add(upf_sess_t *sess, ogs_pfcp_urr_t *urr, size_t size, bool is_uplink)
 {
     upf_sess_urr_acc_t *urr_acc = &sess->urr_accurr->id;
@@ -521,7 +769,7 @@
     ogs_pfcp_sess_t *pfcp_sess = urr->sess;
     upf_sess_t *sess = UPF_SESS(pfcp_sess);
 
-    ogs_warn("upf_time_threshold_cb() triggered! urr=%p", urr);
+    ogs_info("upf_time_threshold_cb() triggered! urr=%p", urr);
 
     if (urr->rep_triggers.quota_validity_time ||
         urr->rep_triggers.time_quota ||

open5gs_2.5.8.tar.xz/src/upf/context.h -> open5gs_2.6.0.tar.xz/src/upf/context.h Changed

@@ -34,6 +34,7 @@
 
 #include "timer.h"
 #include "upf-sm.h"
+#include "metrics.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,15 +45,26 @@
 #undef OGS_LOG_DOMAIN
 #define OGS_LOG_DOMAIN __upf_log_domain
 
+struct upf_route_trie_node;
+
 typedef struct upf_context_s {
-    ogs_hash_t      *seid_hash;     /* hash table (SEID) */
-    ogs_hash_t      *f_seid_hash;   /* hash table (F-SEID) */
-    ogs_hash_t      *ipv4_hash;     /* hash table (IPv4 Address) */
-    ogs_hash_t      *ipv6_hash;     /* hash table (IPv6 Address) */
+    ogs_hash_t                 *seid_hash;     /* hash table (SEID) */
+    ogs_hash_t                 *f_seid_hash;   /* hash table (F-SEID) */
+    ogs_hash_t                 *ipv4_hash;     /* hash table (IPv4 Address) */
+    ogs_hash_t                 *ipv6_hash;     /* hash table (IPv6 Address) */
+    struct upf_route_trie_node *ipv4_framed_routes; /* IPv4 framed routes trie */
+    struct upf_route_trie_node *ipv6_framed_routes; /* IPv6 framed routes trie */
 
-    ogs_list_t      sess_list;
+    ogs_list_t                  sess_list;
 } upf_context_t;
 
+/* trie mapping from IP framed routes to session. */
+struct upf_route_trie_node {
+    struct upf_route_trie_node *left;
+    struct upf_route_trie_node *right;
+    upf_sess_t *sess;
+};
+
 /* Accounting: */
 typedef struct upf_sess_urr_acc_s {
     bool reporting_enabled;
@@ -98,6 +110,9 @@
     ogs_pfcp_ue_ip_t *ipv4;
     ogs_pfcp_ue_ip_t *ipv6;
 
+    ogs_ipsubnet_t   *ipv4_framed_routes;
+    ogs_ipsubnet_t   *ipv6_framed_routes;
+
     char            *gx_sid;            /* Gx Session ID */
     ogs_pfcp_node_t *pfcp_node;
 
@@ -125,6 +140,10 @@
 
 uint8_t upf_sess_set_ue_ip(upf_sess_t *sess,
         uint8_t session_type, ogs_pfcp_pdr_t *pdr);
+uint8_t upf_sess_set_ue_ipv4_framed_routes(upf_sess_t *sess,
+        char *framed_routes);
+uint8_t upf_sess_set_ue_ipv6_framed_routes(upf_sess_t *sess,
+        char *framed_routes);
 
 void upf_sess_urr_acc_add(upf_sess_t *sess, ogs_pfcp_urr_t *urr, size_t size, bool is_uplink);
 void upf_sess_urr_acc_fill_usage_report(upf_sess_t *sess, const ogs_pfcp_urr_t *urr,

open5gs_2.5.8.tar.xz/src/upf/gtp-path.c -> open5gs_2.6.0.tar.xz/src/upf/gtp-path.c Changed

@@ -61,6 +61,36 @@
 
 static void upf_gtp_handle_multicast(ogs_pkbuf_t *recvbuf);
 
+static int check_framed_routes(upf_sess_t *sess, int family, uint32_t *addr)
+{
+    int i = 0;
+    ogs_ipsubnet_t *routes = family == AF_INET ?
+        sess->ipv4_framed_routes : sess->ipv6_framed_routes;
+
+    if (!routes)
+        return false;
+
+    for (i = 0; i < OGS_MAX_NUM_OF_FRAMED_ROUTES_IN_PDI; i++) {
+        uint32_t *sub = routesi.sub;
+        uint32_t *mask = routesi.mask;
+
+        if (!routesi.family)
+            break;
+
+        if (family == AF_INET) {
+            if (sub0 == (addr0 & mask0))
+                return true;
+        } else {
+            if (sub0 == (addr0 & mask0) &&
+                sub1 == (addr1 & mask1) &&
+                sub2 == (addr2 & mask2) &&
+                sub3 == (addr3 & mask3))
+                return true;
+        }
+    }
+    return false;
+}
+
 static uint16_t _get_eth_type(uint8_t *data, uint len) {
     if (len > ETHER_HDR_LEN) {
         struct ether_header *hdr = (struct ether_header*)data;
@@ -184,6 +214,10 @@
     ogs_assert(true == ogs_pfcp_up_handle_pdr(
                 pdr, OGS_GTPU_MSGTYPE_GPDU, recvbuf, &report));
 
+    upf_metrics_inst_global_inc(UPF_METR_GLOB_CTR_GTP_OUTDATAPKTN3UPF);
+    upf_metrics_inst_by_qfi_add(pdr->qer->qfi,
+        UPF_METR_CTR_GTP_OUTDATAVOLUMEQOSLEVELN3UPF, recvbuf->len);
+
     if (report.type.downlink_data_report) {
         ogs_assert(pdr->sess);
         sess = UPF_SESS(pdr->sess);
@@ -361,6 +395,10 @@
         ip_h = (struct ip *)pkbuf->data;
         ogs_assert(ip_h);
 
+        upf_metrics_inst_global_inc(UPF_METR_GLOB_CTR_GTP_INDATAPKTN3UPF);
+        upf_metrics_inst_by_qfi_add(qfi,
+                UPF_METR_CTR_GTP_INDATAVOLUMEQOSLEVELN3UPF, pkbuf->len);
+
         pfcp_object = ogs_pfcp_object_find_by_teid(teid);
         if (!pfcp_object) {
             /* TODO : Send Error Indication */
@@ -435,6 +473,8 @@
 
                 if (src_addr0 == sess->ipv4->addr0) {
                     /* Source IP address should be matched in uplink */
+                } else if (check_framed_routes(sess, AF_INET, src_addr)) {
+                    /* Or source IP address should match a framed route */
                 } else {
                     ogs_error("DROP Source IP-%d Spoofing APN:%s SrcIf:%d DstIf:%d TEID:0x%x",
                                 ip_h->ip_v, pdr->dnn, pdr->src_if, far->dst_if, teid);
@@ -511,6 +551,8 @@
                      * If Global address
                      * 64 bit prefix should be matched
                      */
+                } else if (check_framed_routes(sess, AF_INET6, src_addr)) {
+                    /* Or source IP address should match a framed route */
                 } else {
                     ogs_error("DROP Source IP-%d Spoofing APN:%s SrcIf:%d DstIf:%d TEID:0x%x",
                                 ip_h->ip_v, pdr->dnn, pdr->src_if, far->dst_if, teid);
@@ -648,7 +690,7 @@
     ogs_assert(fd);
     struct ifreq req;
     memset(&req, 0, sizeof(req));
-    strncpy(req.ifr_name, ifname, IF_NAMESIZE-1);
+    ogs_cpystrn(req.ifr_name, ifname, IF_NAMESIZE-1);
     ogs_assert(ioctl(fd, SIOCGIFHWADDR, &req) == 0);
     memcpy(mac_addr, req.ifr_hwaddr.sa_data, ETHER_ADDR_LEN);
 #else

open5gs_2.5.8.tar.xz/src/upf/init.c -> open5gs_2.6.0.tar.xz/src/upf/init.c Changed

@@ -20,6 +20,7 @@
 #include "context.h"
 #include "gtp-path.h"
 #include "pfcp-path.h"
+#include "metrics.h"
 
 static ogs_thread_t *thread;
 static void upf_main(void *data);
@@ -30,6 +31,8 @@
 {
     int rv;
 
+    upf_metrics_init();
+
     ogs_gtp_context_init(OGS_MAX_NUM_OF_GTPU_RESOURCE);
     ogs_pfcp_context_init();
 
@@ -46,6 +49,9 @@
     rv = ogs_pfcp_context_parse_config("upf", "smf");
     if (rv != OGS_OK) return rv;
 
+    rv = ogs_metrics_context_parse_config("upf");
+    if (rv != OGS_OK) return rv;
+
     rv = upf_context_parse_config();
     if (rv != OGS_OK) return rv;
 
@@ -56,6 +62,8 @@
     rv = ogs_pfcp_ue_pool_generate();
     if (rv != OGS_OK) return rv;
 
+    ogs_metrics_context_open(ogs_metrics_self());
+
     rv = upf_pfcp_open();
     if (rv != OGS_OK) return rv;
 
@@ -81,6 +89,8 @@
     upf_pfcp_close();
     upf_gtp_close();
 
+    ogs_metrics_context_close(ogs_metrics_self());
+
     upf_context_final();
 
     ogs_pfcp_context_final();
@@ -90,6 +100,8 @@
 
     upf_gtp_final();
     upf_event_final();
+
+    upf_metrics_final();
 }
 
 static void upf_main(void *data)

open5gs_2.5.8.tar.xz/src/upf/meson.build -> open5gs_2.6.0.tar.xz/src/upf/meson.build Changed

open5gs_2.6.0.tar.xz/src/upf/metrics.c Added

@@ -0,0 +1,389 @@
+#include "ogs-app.h"
+#include "context.h"
+
+#include "metrics.h"
+
+typedef struct upf_metrics_spec_def_s {
+    unsigned int type;
+    const char *name;
+    const char *description;
+    int initial_val;
+    unsigned int num_labels;
+    const char **labels;
+} upf_metrics_spec_def_t;
+
+/* Helper generic functions: */
+static int upf_metrics_init_inst(ogs_metrics_inst_t **inst,
+        ogs_metrics_spec_t **specs, unsigned int len,
+        unsigned int num_labels, const char **labels)
+{
+    unsigned int i;
+    for (i = 0; i < len; i++)
+        insti = ogs_metrics_inst_new(specsi, num_labels, labels);
+    return OGS_OK;
+}
+
+static int upf_metrics_free_inst(ogs_metrics_inst_t **inst,
+        unsigned int len)
+{
+    unsigned int i;
+    for (i = 0; i < len; i++)
+        ogs_metrics_inst_free(insti);
+    memset(inst, 0, sizeof(inst0) * len);
+    return OGS_OK;
+}
+
+static int upf_metrics_init_spec(ogs_metrics_context_t *ctx,
+        ogs_metrics_spec_t **dst, upf_metrics_spec_def_t *src, unsigned int len)
+{
+    unsigned int i;
+    for (i = 0; i < len; i++) {
+        dsti = ogs_metrics_spec_new(ctx, srci.type,
+                srci.name, srci.description,
+                srci.initial_val, srci.num_labels, srci.labels);
+    }
+    return OGS_OK;
+}
+
+/* GLOBAL */
+ogs_metrics_spec_t *upf_metrics_spec_global_UPF_METR_GLOB_MAX;
+ogs_metrics_inst_t *upf_metrics_inst_global_UPF_METR_GLOB_MAX;
+upf_metrics_spec_def_t upf_metrics_spec_def_global_UPF_METR_GLOB_MAX = {
+/* Global Counters: */
+UPF_METR_GLOB_CTR_GTP_INDATAPKTN3UPF = {
+    .type = OGS_METRICS_METRIC_TYPE_COUNTER,
+    .name = "fivegs_ep_n3_gtp_indatapktn3upf",
+    .description = "Number of incoming GTP data packets on the N3 interface",
+},
+UPF_METR_GLOB_CTR_GTP_OUTDATAPKTN3UPF = {
+    .type = OGS_METRICS_METRIC_TYPE_COUNTER,
+    .name = "fivegs_ep_n3_gtp_outdatapktn3upf",
+    .description = "Number of outgoing GTP data packets on the N3 interface",
+},
+UPF_METR_GLOB_CTR_SM_N4SESSIONESTABREQ = {
+    .type = OGS_METRICS_METRIC_TYPE_COUNTER,
+    .name = "fivegs_upffunction_sm_n4sessionestabreq",
+    .description = "Number of requested N4 session establishments",
+},
+UPF_METR_GLOB_CTR_SM_N4SESSIONREPORT = {
+    .type = OGS_METRICS_METRIC_TYPE_COUNTER,
+    .name = "fivegs_upffunction_sm_n4sessionreport",
+    .description = "Number of requested N4 session reports",
+},
+UPF_METR_GLOB_CTR_SM_N4SESSIONREPORTSUCC = {
+    .type = OGS_METRICS_METRIC_TYPE_COUNTER,
+    .name = "fivegs_upffunction_sm_n4sessionreportsucc",
+    .description = "Number of successful N4 session reports",
+},
+/* Global Gauges: */
+UPF_METR_GLOB_GAUGE_UPF_SESSIONNBR = {
+    .type = OGS_METRICS_METRIC_TYPE_GAUGE,
+    .name = "fivegs_upffunction_upf_sessionnbr",
+    .description = "Active Sessions",
+},
+};
+int upf_metrics_init_inst_global(void)
+{
+    return upf_metrics_init_inst(upf_metrics_inst_global, upf_metrics_spec_global,
+                _UPF_METR_GLOB_MAX, 0, NULL);
+}
+int upf_metrics_free_inst_global(void)
+{
+    return upf_metrics_free_inst(upf_metrics_inst_global, _UPF_METR_GLOB_MAX);
+}
+
+/* BY_QFI */
+const char *labels_qfi = {
+    "qfi"
+};
+#define UPF_METR_BY_QFI_CTR_ENTRY(_id, _name, _desc) \
+    _id = { \
+        .type = OGS_METRICS_METRIC_TYPE_COUNTER, \
+        .name = _name, \
+        .description = _desc, \
+        .num_labels = OGS_ARRAY_SIZE(labels_qfi), \
+        .labels = labels_qfi, \
+    },
+ogs_metrics_spec_t *upf_metrics_spec_by_qfi_UPF_METR_BY_QFI_MAX;
+ogs_hash_t *metrics_hash_by_qfi = NULL;   /* hash table for QFI label */
+upf_metrics_spec_def_t upf_metrics_spec_def_by_qfi_UPF_METR_BY_QFI_MAX = {
+/* Counters: */
+UPF_METR_BY_QFI_CTR_ENTRY(
+    UPF_METR_CTR_GTP_INDATAVOLUMEQOSLEVELN3UPF,
+    "fivegs_ep_n3_gtp_indatavolumeqosleveln3upf",
+    "Data volume of incoming GTP data packets per QoS level on the N3 interface")
+UPF_METR_BY_QFI_CTR_ENTRY(
+    UPF_METR_CTR_GTP_OUTDATAVOLUMEQOSLEVELN3UPF,
+    "fivegs_ep_n3_gtp_outdatavolumeqosleveln3upf",
+    "Data volume of outgoing GTP data packets per QoS level on the N3 interface")
+};
+void upf_metrics_init_by_qfi(void);
+int upf_metrics_free_inst_by_qfi(ogs_metrics_inst_t **inst);
+typedef struct upf_metric_key_by_qfi_s {
+    uint8_t                     qfi;
+    upf_metric_type_by_qfi_t    t;
+} upf_metric_key_by_qfi_t;
+
+void upf_metrics_init_by_qfi(void)
+{
+    metrics_hash_by_qfi = ogs_hash_make();
+    ogs_assert(metrics_hash_by_qfi);
+}
+void upf_metrics_inst_by_qfi_add(uint8_t qfi,
+        upf_metric_type_by_qfi_t t, int val)
+{
+    ogs_metrics_inst_t *metrics = NULL;
+    upf_metric_key_by_qfi_t *qfi_key;
+
+    qfi_key = ogs_calloc(1, sizeof(*qfi_key));
+    ogs_assert(qfi_key);
+
+    qfi_key->qfi = qfi;
+    qfi_key->t = t;
+
+    metrics = ogs_hash_get(metrics_hash_by_qfi,
+            qfi_key, sizeof(*qfi_key));
+
+    if (!metrics) {
+        char qfi_str4;
+        ogs_snprintf(qfi_str, sizeof(qfi_str), "%d", qfi);
+
+        metrics = ogs_metrics_inst_new(upf_metrics_spec_by_qfit,
+                upf_metrics_spec_def_by_qfi->num_labels,
+                (const char *){ qfi_str });
+
+        ogs_assert(metrics);
+        ogs_hash_set(metrics_hash_by_qfi,
+                qfi_key, sizeof(*qfi_key), metrics);
+    } else {
+        ogs_free(qfi_key);
+    }
+
+    ogs_metrics_inst_add(metrics, val);
+}
+
+int upf_metrics_free_inst_by_qfi(ogs_metrics_inst_t **inst)
+{
+    return upf_metrics_free_inst(inst, _UPF_METR_BY_QFI_MAX);
+}
+
+/* BY_CAUSE */
+const char *labels_cause = {
+    "cause"
+};
+
+#define UPF_METR_BY_CAUSE_CTR_ENTRY(_id, _name, _desc) \
+    _id = { \
+        .type = OGS_METRICS_METRIC_TYPE_COUNTER, \
+        .name = _name, \
+        .description = _desc, \
+        .num_labels = OGS_ARRAY_SIZE(labels_cause), \
+        .labels = labels_cause, \
+    },
+ogs_metrics_spec_t *upf_metrics_spec_by_cause_UPF_METR_BY_CAUSE_MAX;
+ogs_hash_t *metrics_hash_by_cause = NULL;   /* hash table for CAUSE labels */
+upf_metrics_spec_def_t upf_metrics_spec_def_by_cause_UPF_METR_BY_CAUSE_MAX = {
+/* Counters: */
+UPF_METR_BY_CAUSE_CTR_ENTRY(
+    UPF_METR_CTR_SM_N4SESSIONESTABFAIL,
+    "fivegs_upffunction_sm_n4sessionestabfail",
+    "Number of failed N4 session establishments")
+};
+void upf_metrics_init_by_cause(void);
+int upf_metrics_free_inst_by_cause(ogs_metrics_inst_t **inst);
+typedef struct upf_metric_key_by_cause_s {
+    uint8_t                     cause;
+    upf_metric_type_by_cause_t  t;
+} upf_metric_key_by_cause_t;
+
+void upf_metrics_init_by_cause(void)
+{
+    metrics_hash_by_cause = ogs_hash_make();
+    ogs_assert(metrics_hash_by_cause);
+}
+
+void upf_metrics_inst_by_cause_add(uint8_t cause,
+        upf_metric_type_by_cause_t t, int val)
+{
+    ogs_metrics_inst_t *metrics = NULL;
+    upf_metric_key_by_cause_t *cause_key;
+
+    cause_key = ogs_calloc(1, sizeof(*cause_key));
+    ogs_assert(cause_key);
+
+    cause_key->cause = cause;
+    cause_key->t = t;
+
+    metrics = ogs_hash_get(metrics_hash_by_cause,
+            cause_key, sizeof(*cause_key));
+
+    if (!metrics) {
+        char cause_str4;
+        ogs_snprintf(cause_str, sizeof(cause_str), "%d", cause);
+
+        metrics = ogs_metrics_inst_new(upf_metrics_spec_by_causet,
+                upf_metrics_spec_def_by_cause->num_labels,
+                (const char *){ cause_str });
+
+        ogs_assert(metrics);
+        ogs_hash_set(metrics_hash_by_cause,
+                cause_key, sizeof(*cause_key), metrics);
+    } else {
+        ogs_free(cause_key);
+    }
+
+    ogs_metrics_inst_add(metrics, val);
+}
+
+int upf_metrics_free_inst_by_cause(ogs_metrics_inst_t **inst)
+{
+    return upf_metrics_free_inst(inst, _UPF_METR_BY_CAUSE_MAX);
+}
+
+/* BY_DNN */
+const char *labels_dnn = {
+    "dnn"
+};
+
+#define UPF_METR_BY_DNN_GAUGE_ENTRY(_id, _name, _desc) \
+    _id = { \
+        .type = OGS_METRICS_METRIC_TYPE_GAUGE, \
+        .name = _name, \
+        .description = _desc, \
+        .num_labels = OGS_ARRAY_SIZE(labels_dnn), \
+        .labels = labels_dnn, \
+    },
+ogs_metrics_spec_t *upf_metrics_spec_by_dnn_UPF_METR_BY_DNN_MAX;
+ogs_hash_t *metrics_hash_by_dnn = NULL;   /* hash table for DNN labels */
+upf_metrics_spec_def_t upf_metrics_spec_def_by_dnn_UPF_METR_BY_DNN_MAX = {
+/* Gauges: */
+UPF_METR_BY_DNN_GAUGE_ENTRY(
+    UPF_METR_GAUGE_UPF_QOSFLOWS,
+    "fivegs_upffunction_upf_qosflows",
+    "Number of QoS flows of UPF")
+};
+void upf_metrics_init_by_dnn(void);
+int upf_metrics_free_inst_by_dnn(ogs_metrics_inst_t **inst);
+typedef struct upf_metric_key_by_dnn_s {
+    char                        dnnOGS_MAX_DNN_LEN+1;
+    upf_metric_type_by_dnn_t    t;
+} upf_metric_key_by_dnn_t;
+
+void upf_metrics_init_by_dnn(void)
+{
+    metrics_hash_by_dnn = ogs_hash_make();
+    ogs_assert(metrics_hash_by_dnn);
+}
+
+void upf_metrics_inst_by_dnn_add(char *dnn,
+        upf_metric_type_by_dnn_t t, int val)
+{
+    ogs_metrics_inst_t *metrics = NULL;
+    upf_metric_key_by_dnn_t *dnn_key;
+
+    dnn_key = ogs_calloc(1, sizeof(*dnn_key));
+    ogs_assert(dnn_key);
+
+    if (dnn) {
+        strcpy(dnn_key->dnn, dnn);
+    } else {
+        dnn_key->dnn0 = '\0';
+    }
+
+    dnn_key->t = t;
+
+    metrics = ogs_hash_get(metrics_hash_by_dnn,
+            dnn_key, sizeof(*dnn_key));
+
+    if (!metrics) {
+        metrics = ogs_metrics_inst_new(upf_metrics_spec_by_dnnt,
+                upf_metrics_spec_def_by_dnn->num_labels,
+                (const char *){ dnn_key->dnn });
+
+        ogs_assert(metrics);
+        ogs_hash_set(metrics_hash_by_dnn,
+                dnn_key, sizeof(*dnn_key), metrics);
+    } else {
+        ogs_free(dnn_key);
+    }
+
+    ogs_metrics_inst_add(metrics, val);
+}
+
+int upf_metrics_free_inst_by_dnn(ogs_metrics_inst_t **inst)
+{
+    return upf_metrics_free_inst(inst, _UPF_METR_BY_DNN_MAX);
+}
+
+void upf_metrics_init(void)
+{
+    ogs_metrics_context_t *ctx = ogs_metrics_self();
+    ogs_metrics_context_init();
+
+    upf_metrics_init_spec(ctx, upf_metrics_spec_global, upf_metrics_spec_def_global,
+            _UPF_METR_GLOB_MAX);
+    upf_metrics_init_spec(ctx, upf_metrics_spec_by_qfi,
+            upf_metrics_spec_def_by_qfi, _UPF_METR_BY_QFI_MAX);
+    upf_metrics_init_spec(ctx, upf_metrics_spec_by_cause,
+            upf_metrics_spec_def_by_cause, _UPF_METR_BY_CAUSE_MAX);
+    upf_metrics_init_spec(ctx, upf_metrics_spec_by_dnn,
+            upf_metrics_spec_def_by_dnn, _UPF_METR_BY_DNN_MAX);
+
+    upf_metrics_init_inst_global();
+    upf_metrics_init_by_qfi();
+    upf_metrics_init_by_cause();
+    upf_metrics_init_by_dnn();
+}
+
+void upf_metrics_final(void)
+{
+    ogs_hash_index_t *hi;
+
+    if (metrics_hash_by_qfi) {
+        for (hi = ogs_hash_first(metrics_hash_by_qfi); hi; hi = ogs_hash_next(hi)) {
+            upf_metric_key_by_qfi_t *key =
+                (upf_metric_key_by_qfi_t *)ogs_hash_this_key(hi);
+            //void *val = ogs_hash_this_val(hi);
+
+            ogs_hash_set(metrics_hash_by_qfi, key, sizeof(*key), NULL);
+
+            ogs_free(key);
+            /* don't free val (metric itself) -
+             * it will be free'd by ogs_metrics_context_final() */
+            //ogs_free(val);
+        }
+        ogs_hash_destroy(metrics_hash_by_qfi);
+    }
+    if (metrics_hash_by_cause) {
+        for (hi = ogs_hash_first(metrics_hash_by_cause); hi; hi = ogs_hash_next(hi)) {
+            upf_metric_key_by_cause_t *key =
+                (upf_metric_key_by_cause_t *)ogs_hash_this_key(hi);
+            //void *val = ogs_hash_this_val(hi);
+
+            ogs_hash_set(metrics_hash_by_cause, key, sizeof(*key), NULL);
+
+            ogs_free(key);
+            /* don't free val (metric itself) -
+             * it will be free'd by ogs_metrics_context_final() */
+            //ogs_free(val);
+        }
+        ogs_hash_destroy(metrics_hash_by_cause);
+    }
+    if (metrics_hash_by_dnn) {
+        for (hi = ogs_hash_first(metrics_hash_by_dnn); hi; hi = ogs_hash_next(hi)) {
+            upf_metric_key_by_dnn_t *key =
+                (upf_metric_key_by_dnn_t *)ogs_hash_this_key(hi);
+            //void *val = ogs_hash_this_val(hi);
+
+            ogs_hash_set(metrics_hash_by_dnn, key, sizeof(*key), NULL);
+
+            ogs_free(key);
+            /* don't free val (metric itself) -
+             * it will be free'd by ogs_metrics_context_final() */
+            //ogs_free(val);
+        }
+        ogs_hash_destroy(metrics_hash_by_dnn);
+    }
+
+    ogs_metrics_context_final();
+}

open5gs_2.6.0.tar.xz/src/upf/metrics.h Added

@@ -0,0 +1,69 @@
+#ifndef UPF_METRICS_H
+#define UPF_METRICS_H
+
+#include "ogs-metrics.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* GLOBAL */
+typedef enum upf_metric_type_global_s {
+    UPF_METR_GLOB_CTR_GTP_INDATAPKTN3UPF = 0,
+    UPF_METR_GLOB_CTR_GTP_OUTDATAPKTN3UPF,
+    UPF_METR_GLOB_CTR_SM_N4SESSIONESTABREQ,
+    UPF_METR_GLOB_CTR_SM_N4SESSIONREPORT,
+    UPF_METR_GLOB_CTR_SM_N4SESSIONREPORTSUCC,
+    UPF_METR_GLOB_GAUGE_UPF_SESSIONNBR,
+    _UPF_METR_GLOB_MAX,
+} upf_metric_type_global_t;
+extern ogs_metrics_inst_t *upf_metrics_inst_global_UPF_METR_GLOB_MAX;
+
+int upf_metrics_init_inst_global(void);
+int upf_metrics_free_inst_global(void);
+
+static inline void upf_metrics_inst_global_set(upf_metric_type_global_t t, int val)
+{ ogs_metrics_inst_set(upf_metrics_inst_globalt, val); }
+static inline void upf_metrics_inst_global_add(upf_metric_type_global_t t, int val)
+{ ogs_metrics_inst_add(upf_metrics_inst_globalt, val); }
+static inline void upf_metrics_inst_global_inc(upf_metric_type_global_t t)
+{ ogs_metrics_inst_inc(upf_metrics_inst_globalt); }
+static inline void upf_metrics_inst_global_dec(upf_metric_type_global_t t)
+{ ogs_metrics_inst_dec(upf_metrics_inst_globalt); }
+
+/* BY QFI */
+typedef enum upf_metric_type_by_qfi_s {
+    UPF_METR_CTR_GTP_INDATAVOLUMEQOSLEVELN3UPF = 0,
+    UPF_METR_CTR_GTP_OUTDATAVOLUMEQOSLEVELN3UPF,
+    _UPF_METR_BY_QFI_MAX,
+} upf_metric_type_by_qfi_t;
+
+void upf_metrics_inst_by_qfi_add(
+    uint8_t qfi, upf_metric_type_by_qfi_t t, int val);
+
+/* BY CAUSE */
+typedef enum upf_metric_type_by_cause_s {
+    UPF_METR_CTR_SM_N4SESSIONESTABFAIL = 0,
+    _UPF_METR_BY_CAUSE_MAX,
+} upf_metric_type_by_cause_t;
+
+void upf_metrics_inst_by_cause_add(
+    uint8_t cause, upf_metric_type_by_cause_t t, int val);
+
+/* BY DNN */
+typedef enum upf_metric_type_by_dnn_s {
+    UPF_METR_GAUGE_UPF_QOSFLOWS = 0,
+    _UPF_METR_BY_DNN_MAX,
+} upf_metric_type_by_dnn_t;
+
+void upf_metrics_inst_by_dnn_add(
+    char *dnn, upf_metric_type_by_dnn_t t, int val);
+
+void upf_metrics_init(void);
+void upf_metrics_final(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* UPF_METRICS_H */

open5gs_2.5.8.tar.xz/src/upf/n4-build.c -> open5gs_2.6.0.tar.xz/src/upf/n4-build.c Changed

@@ -23,7 +23,7 @@
 ogs_pkbuf_t *upf_n4_build_session_establishment_response(uint8_t type,
     upf_sess_t *sess, ogs_pfcp_pdr_t *created_pdr, int num_of_created_pdr)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_establishment_response_t *rsp = NULL;
     ogs_pkbuf_t *pkbuf = NULL;
 
@@ -35,8 +35,13 @@
 
     ogs_debug("Session Establishment Response");
 
-    rsp = &pfcp_message.pfcp_session_establishment_response;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    rsp = &pfcp_message->pfcp_session_establishment_response;
 
     /* Node ID */
     ogs_pfcp_sockaddr_to_node_id(
@@ -69,10 +74,12 @@
         if (pdr_presence == true) j++;
     }
 
-    pfcp_message.h.type = type;
-    pkbuf = ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
 
     ogs_pfcp_pdrbuf_clear();
+    ogs_free(pfcp_message);
 
     return pkbuf;
 }
@@ -80,7 +87,7 @@
 ogs_pkbuf_t *upf_n4_build_session_modification_response(uint8_t type,
     upf_sess_t *sess, ogs_pfcp_pdr_t *created_pdr, int num_of_created_pdr)
 {
-    ogs_pfcp_message_t pfcp_message;
+    ogs_pfcp_message_t *pfcp_message = NULL;
     ogs_pfcp_session_modification_response_t *rsp = NULL;
     ogs_pkbuf_t *pkbuf = NULL;
 
@@ -88,8 +95,13 @@
 
     ogs_debug("Session Modification Response");
 
-    rsp = &pfcp_message.pfcp_session_modification_response;
-    memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t));
+    pfcp_message = ogs_calloc(1, sizeof(*pfcp_message));
+    if (!pfcp_message) {
+        ogs_error("ogs_calloc() failed");
+        return NULL;
+    }
+
+    rsp = &pfcp_message->pfcp_session_modification_response;
 
     /* Cause */
     rsp->cause.presence = 1;
@@ -104,10 +116,12 @@
         if (pdr_presence == true) j++;
     }
 
-    pfcp_message.h.type = type;
-    pkbuf = ogs_pfcp_build_msg(&pfcp_message);
+    pfcp_message->h.type = type;
+    pkbuf = ogs_pfcp_build_msg(pfcp_message);
+    ogs_expect(pkbuf);
 
     ogs_pfcp_pdrbuf_clear();
+    ogs_free(pfcp_message);
 
     return pkbuf;
 }

open5gs_2.5.8.tar.xz/src/upf/n4-handler.c -> open5gs_2.6.0.tar.xz/src/upf/n4-handler.c Changed

@@ -55,6 +55,8 @@
     uint8_t offending_ie_value = 0;
     int i;
 
+    upf_metrics_inst_global_inc(UPF_METR_GLOB_CTR_SM_N4SESSIONESTABREQ);
+
     ogs_assert(xact);
     ogs_assert(req);
 
@@ -67,6 +69,8 @@
         ogs_pfcp_send_error_message(xact, 0,
                 OGS_PFCP_SESSION_ESTABLISHMENT_RESPONSE_TYPE,
                 OGS_PFCP_CAUSE_MANDATORY_IE_MISSING, 0);
+        upf_metrics_inst_by_cause_add(OGS_PFCP_CAUSE_MANDATORY_IE_MISSING,
+                UPF_METR_CTR_SM_N4SESSIONESTABFAIL, 1);
         return;
     }
 
@@ -96,6 +100,13 @@
         if (ogs_pfcp_handle_create_qer(&sess->pfcp, &req->create_qeri,
                     &cause_value, &offending_ie_value) == NULL)
             break;
+        if (req->apn_dnn.presence == 1) {
+            upf_metrics_inst_by_dnn_add(req->apn_dnn.data,
+                    UPF_METR_GAUGE_UPF_QOSFLOWS, 1);
+        } else {
+            upf_metrics_inst_by_dnn_add(NULL,
+                    UPF_METR_GAUGE_UPF_QOSFLOWS, 1);
+        }
     }
     if (cause_value != OGS_PFCP_CAUSE_REQUEST_ACCEPTED)
         goto cleanup;
@@ -127,6 +138,22 @@
             }
         }
 
+        if (pdr->ipv4_framed_routes) {
+            cause_value =
+                upf_sess_set_ue_ipv4_framed_routes(sess,
+                        pdr->ipv4_framed_routes);
+            if (cause_value != OGS_PFCP_CAUSE_REQUEST_ACCEPTED)
+                goto cleanup;
+        }
+
+        if (pdr->ipv6_framed_routes) {
+            cause_value =
+                upf_sess_set_ue_ipv6_framed_routes(sess,
+                        pdr->ipv6_framed_routes);
+            if (cause_value != OGS_PFCP_CAUSE_REQUEST_ACCEPTED)
+                goto cleanup;
+        }
+
         /* Setup UPF-N3-TEID & QFI Hash */
         if (pdr->f_teid_len) {
             ogs_pfcp_object_type_e type = OGS_PFCP_OBJ_SESS_TYPE;
@@ -202,6 +229,8 @@
     return;
 
 cleanup:
+    upf_metrics_inst_by_cause_add(cause_value,
+            UPF_METR_CTR_SM_N4SESSIONESTABFAIL, 1);
     ogs_pfcp_sess_clear(&sess->pfcp);
     ogs_pfcp_send_error_message(xact, sess ? sess->smf_n4_f_seid.seid : 0,
             OGS_PFCP_SESSION_ESTABLISHMENT_RESPONSE_TYPE,
@@ -329,6 +358,8 @@
         if (ogs_pfcp_handle_create_qer(&sess->pfcp, &req->create_qeri,
                     &cause_value, &offending_ie_value) == NULL)
             break;
+        upf_metrics_inst_by_dnn_add(NULL,
+                UPF_METR_GAUGE_UPF_QOSFLOWS, 1);
     }
     if (cause_value != OGS_PFCP_CAUSE_REQUEST_ACCEPTED)
         goto cleanup;
@@ -345,6 +376,8 @@
         if (ogs_pfcp_handle_remove_qer(&sess->pfcp, &req->remove_qeri,
                 &cause_value, &offending_ie_value) == false)
             break;
+        upf_metrics_inst_by_dnn_add(NULL,
+                UPF_METR_GAUGE_UPF_QOSFLOWS, -1);
     }
     if (cause_value != OGS_PFCP_CAUSE_REQUEST_ACCEPTED)
         goto cleanup;
@@ -455,6 +488,9 @@
         upf_sess_t *sess, ogs_pfcp_xact_t *xact,
         ogs_pfcp_session_deletion_request_t *req)
 {
+    ogs_pfcp_pdr_t *pdr = NULL;
+    ogs_pfcp_qer_t *qer = NULL;
+
     ogs_assert(xact);
     ogs_assert(req);
 
@@ -468,6 +504,14 @@
         return;
     }
     upf_pfcp_send_session_deletion_response(xact, sess);
+
+    ogs_list_for_each(&sess->pfcp.pdr_list, pdr) {
+        ogs_list_for_each(&sess->pfcp.qer_list, qer) {
+            upf_metrics_inst_by_dnn_add(NULL,
+                    UPF_METR_GAUGE_UPF_QOSFLOWS, -1);
+        }
+        break;
+    }
     upf_sess_remove(sess);
 }
 
@@ -504,5 +548,8 @@
     if (cause_value != OGS_PFCP_CAUSE_REQUEST_ACCEPTED) {
         ogs_error("Cause request not accepted%d", cause_value);
         return;
+    } else {
+        upf_metrics_inst_global_inc(UPF_METR_GLOB_CTR_SM_N4SESSIONREPORTSUCC);
     }
+
 }

open5gs_2.5.8.tar.xz/src/upf/pfcp-path.c -> open5gs_2.6.0.tar.xz/src/upf/pfcp-path.c Changed

@@ -179,10 +179,16 @@
 
     n4buf = upf_n4_build_session_establishment_response(
             h.type, sess, created_pdr, num_of_created_pdr);
-    ogs_expect_or_return_val(n4buf, OGS_ERROR);
+    if (!n4buf) {
+        ogs_error("upf_n4_build_session_establishment_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, n4buf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -207,10 +213,16 @@
 
     n4buf = upf_n4_build_session_modification_response(
             h.type, sess, created_pdr, num_of_created_pdr);
-    ogs_expect_or_return_val(n4buf, OGS_ERROR);
+    if (!n4buf) {
+        ogs_error("upf_n4_build_session_modification_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, n4buf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -232,10 +244,16 @@
     h.seid = sess->smf_n4_f_seid.seid;
 
     n4buf = upf_n4_build_session_deletion_response(h.type, sess);
-    ogs_expect_or_return_val(n4buf, OGS_ERROR);
+    if (!n4buf) {
+        ogs_error("upf_n4_build_session_deletion_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, n4buf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -268,6 +286,8 @@
     ogs_pfcp_header_t h;
     ogs_pfcp_xact_t *xact = NULL;
 
+    upf_metrics_inst_global_inc(UPF_METR_GLOB_CTR_SM_N4SESSIONREPORT);
+
     ogs_assert(sess);
     ogs_assert(report);
 
@@ -276,13 +296,23 @@
     h.seid = sess->smf_n4_f_seid.seid;
 
     xact = ogs_pfcp_xact_local_create(sess->pfcp_node, sess_timeout, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_pfcp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     n4buf = ogs_pfcp_build_session_report_request(h.type, report);
-    ogs_expect_or_return_val(n4buf, OGS_ERROR);
+    if (!n4buf) {
+        ogs_error("ogs_pfcp_build_session_report_request() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_pfcp_xact_update_tx(xact, &h, n4buf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_pfcp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
+
 
     rv = ogs_pfcp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);

open5gs_2.5.8.tar.xz/tests/310014/epc-test.c -> open5gs_2.6.0.tar.xz/tests/310014/epc-test.c Changed

open5gs_2.5.8.tar.xz/tests/af/context.c -> open5gs_2.6.0.tar.xz/tests/af/context.c Changed

@@ -135,7 +135,7 @@
     ogs_assert(ue_address->ipv4 || ue_address->ipv6);
 
     ogs_pool_alloc(&af_sess_pool, &sess);
-    ogs_expect_or_return_val(sess, NULL);
+    ogs_assert(sess);
     memset(sess, 0, sizeof *sess);
 
     sess->af_app_session_id = ogs_msprintf("%d",
@@ -144,15 +144,15 @@
 
     if (ue_address->ipv4) {
         sess->ipv4addr = ogs_ipv4_to_string(ue_address->addr);
-        ogs_expect_or_return_val(sess->ipv4addr, NULL);
+        ogs_assert(sess->ipv4addr);
     }
 
     if (ue_address->ipv6) {
         sess->ipv6addr = ogs_ipv6addr_to_string(ue_address->addr6);
-        ogs_expect_or_return_val(sess->ipv6addr, NULL);
+        ogs_assert(sess->ipv6addr);
         sess->ipv6prefix = ogs_ipv6prefix_to_string(
                 ue_address->addr6, OGS_IPV6_128_PREFIX_LEN);
-        ogs_expect_or_return_val(sess->ipv6prefix, NULL);
+        ogs_assert(sess->ipv6prefix);
     }
 
     OGS_SBI_FEATURES_SET(sess->policyauthorization_features,
@@ -240,7 +240,7 @@
     clear_pcf_app_session_id(sess);
 
     sess->pcf_app_session_id = ogs_strdup(pcf_app_session_id);
-    ogs_expect_or_return_val(sess->pcf_app_session_id, false);
+    ogs_assert(sess->pcf_app_session_id);
 
     ogs_hash_set(self.pcf_app_session_id_hash,
             &sess->pcf_app_session_id, strlen(sess->pcf_app_session_id), sess);
@@ -266,12 +266,16 @@
                         pcf_app_session_id, strlen(pcf_app_session_id));
 }
 
-static ogs_sbi_client_t *find_client_by_fqdn(char *fqdn, int port)
+static ogs_sbi_client_t *find_client_by_fqdn(
+        OpenAPI_uri_scheme_e scheme, char *fqdn, int port)
 {
     int rv;
     ogs_sockaddr_t *addr = NULL;
     ogs_sbi_client_t *client = NULL;
 
+    ogs_assert(scheme);
+    ogs_assert(fqdn);
+
     rv = ogs_getaddrinfo(&addr, AF_UNSPEC, fqdn,
             port ? port : ogs_sbi_self()->sbi_port, 0);
     if (rv != OGS_OK) {
@@ -279,9 +283,9 @@
         return NULL;
     }
 
-    client = ogs_sbi_client_find(addr);
+    client = ogs_sbi_client_find(scheme, addr);
     if (!client) {
-        client = ogs_sbi_client_add(addr);
+        client = ogs_sbi_client_add(scheme, addr);
         ogs_assert(client);
     }
 
@@ -294,11 +298,15 @@
 {
     ogs_sbi_client_t *client = NULL;
     ogs_sockaddr_t *addr = NULL;
+    OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL;
 
     ogs_assert(sess);
 
+    scheme = ogs_app_tls_client_enabled() == true ?
+                OpenAPI_uri_scheme_https : OpenAPI_uri_scheme_http;
+
     if (sess->pcf.fqdn && strlen(sess->pcf.fqdn))
-        client = find_client_by_fqdn(sess->pcf.fqdn, 0);
+        client = find_client_by_fqdn(scheme, sess->pcf.fqdn, 0);
 
     if (!client) {
         /* At this point, CLIENT selection method is very simple. */
@@ -309,9 +317,9 @@
         }
 
         if (addr) {
-            client = ogs_sbi_client_find(addr);
+            client = ogs_sbi_client_find(scheme, addr);
             if (!client) {
-                client = ogs_sbi_client_add(addr);
+                client = ogs_sbi_client_add(scheme, addr);
                 ogs_assert(client);
             }
         }

open5gs_2.5.8.tar.xz/tests/af/npcf-build.c -> open5gs_2.6.0.tar.xz/tests/af/npcf-build.c Changed

@@ -76,7 +76,7 @@
     memset(&AscReqData, 0, sizeof(AscReqData));
 
     server = ogs_list_first(&ogs_sbi_self()->server_list);
-    ogs_expect_or_return_val(server, NULL);
+    ogs_assert(server);
 
     memset(&header, 0, sizeof(header));
     header.service.name = (char *)OGS_SBI_SERVICE_NAME_NPCF_POLICYAUTHORIZATION;
@@ -84,7 +84,7 @@
     header.resource.component0 = (char *)OGS_SBI_RESOURCE_NAME_APP_SESSIONS;
     header.resource.component1 = (char *)sess->af_app_session_id;
     AscReqData.notif_uri = ogs_sbi_server_uri(server, &header);
-    ogs_expect_or_return_val(AscReqData.notif_uri, NULL);
+    ogs_assert(AscReqData.notif_uri);
 
     AscReqData.supp_feat =
         ogs_uint64_to_string(sess->policyauthorization_features);
@@ -101,12 +101,12 @@
     ogs_assert(EventList);
 
     Event = ogs_calloc(1, sizeof(*Event));
-    ogs_expect_or_return_val(Event, NULL);
+    ogs_assert(Event);
     Event->event = OpenAPI_af_event_CHARGING_CORRELATION;
     OpenAPI_list_add(EventList, Event);
 
     Event = ogs_calloc(1, sizeof(*Event));
-    ogs_expect_or_return_val(Event, NULL);
+    ogs_assert(Event);
     Event->event = OpenAPI_af_event_ANI_REPORT;
     Event->notif_method = OpenAPI_af_notif_method_ONE_TIME;
     OpenAPI_list_add(EventList, Event);
@@ -133,7 +133,7 @@
     ogs_assert(MediaComponentList);
 
     MediaComponent = ogs_calloc(1, sizeof(*MediaComponent));
-    ogs_expect_or_return_val(MediaComponent, NULL);
+    ogs_assert(MediaComponent);
 
     MediaComponent->med_comp_n = (i++);
     MediaComponent->f_status = OpenAPI_flow_status_ENABLED;
@@ -188,7 +188,7 @@
 
     /* Sub Component #1 */
     SubComponent = ogs_calloc(1, sizeof(*SubComponent));
-    ogs_expect_or_return_val(SubComponent, NULL);
+    ogs_assert(SubComponent);
 
     SubComponent->f_num = (j++);
     SubComponent->flow_usage = OpenAPI_flow_usage_NO_INFO;
@@ -230,7 +230,7 @@
 
     /* Sub Component #2 */
     SubComponent = ogs_calloc(1, sizeof(*SubComponent));
-    ogs_expect_or_return_val(SubComponent, NULL);
+    ogs_assert(SubComponent);
 
     SubComponent->f_num = (j++);
     SubComponent->flow_usage = OpenAPI_flow_usage_RTCP;
@@ -411,7 +411,7 @@
     ogs_assert(MediaComponentList);
 
     MediaComponent = ogs_calloc(1, sizeof(*MediaComponent));
-    ogs_expect_or_return_val(MediaComponent, NULL);
+    ogs_assert(MediaComponent);
 
     MediaComponent->med_comp_n = (i++);
     MediaComponent->f_status = OpenAPI_flow_status_ENABLED;
@@ -466,7 +466,7 @@
 
     /* Sub Component #1 */
     SubComponent = ogs_calloc(1, sizeof(*SubComponent));
-    ogs_expect_or_return_val(SubComponent, NULL);
+    ogs_assert(SubComponent);
 
     SubComponent->f_num = (j++);
     SubComponent->flow_usage = OpenAPI_flow_usage_NO_INFO;
@@ -503,7 +503,7 @@
 
     /* Sub Component #2 */
     SubComponent = ogs_calloc(1, sizeof(*SubComponent));
-    ogs_expect_or_return_val(SubComponent, NULL);
+    ogs_assert(SubComponent);
 
     SubComponent->f_num = (j++);
     SubComponent->flow_usage = OpenAPI_flow_usage_RTCP;
@@ -679,7 +679,7 @@
     memset(&AscReqData, 0, sizeof(AscReqData));
 
     server = ogs_list_first(&ogs_sbi_self()->server_list);
-    ogs_expect_or_return_val(server, NULL);
+    ogs_assert(server);
 
     memset(&header, 0, sizeof(header));
     header.service.name = (char *)OGS_SBI_SERVICE_NAME_NPCF_POLICYAUTHORIZATION;
@@ -687,7 +687,7 @@
     header.resource.component0 = (char *)OGS_SBI_RESOURCE_NAME_APP_SESSIONS;
     header.resource.component1 = (char *)sess->af_app_session_id;
     AscReqData.notif_uri = ogs_sbi_server_uri(server, &header);
-    ogs_expect_or_return_val(AscReqData.notif_uri, NULL);
+    ogs_assert(AscReqData.notif_uri);
 
     AscReqData.supp_feat =
         ogs_uint64_to_string(sess->policyauthorization_features);
@@ -704,12 +704,12 @@
     ogs_assert(EventList);
 
     Event = ogs_calloc(1, sizeof(*Event));
-    ogs_expect_or_return_val(Event, NULL);
+    ogs_assert(Event);
     Event->event = OpenAPI_af_event_CHARGING_CORRELATION;
     OpenAPI_list_add(EventList, Event);
 
     Event = ogs_calloc(1, sizeof(*Event));
-    ogs_expect_or_return_val(Event, NULL);
+    ogs_assert(Event);
     Event->event = OpenAPI_af_event_ANI_REPORT;
     Event->notif_method = OpenAPI_af_notif_method_ONE_TIME;
     OpenAPI_list_add(EventList, Event);
@@ -736,7 +736,7 @@
     ogs_assert(MediaComponentList);
 
     MediaComponent = ogs_calloc(1, sizeof(*MediaComponent));
-    ogs_expect_or_return_val(MediaComponent, NULL);
+    ogs_assert(MediaComponent);
 
     MediaComponent->med_comp_n = (i++);
     MediaComponent->f_status = OpenAPI_flow_status_ENABLED;
@@ -808,7 +808,7 @@
 
     /* Sub Component #1 */
     SubComponent = ogs_calloc(1, sizeof(*SubComponent));
-    ogs_expect_or_return_val(SubComponent, NULL);
+    ogs_assert(SubComponent);
 
     SubComponent->f_num = (j++);
     SubComponent->flow_usage = OpenAPI_flow_usage_NO_INFO;
@@ -834,7 +834,7 @@
 
     /* Sub Component #2 */
     SubComponent = ogs_calloc(1, sizeof(*SubComponent));
-    ogs_expect_or_return_val(SubComponent, NULL);
+    ogs_assert(SubComponent);
 
     SubComponent->f_num = (j++);
     SubComponent->flow_usage = OpenAPI_flow_usage_NO_INFO;
@@ -862,7 +862,7 @@
     MediaComponent->med_sub_comps = SubComponentList;
 
     MediaComponent = ogs_calloc(1, sizeof(*MediaComponent));
-    ogs_expect_or_return_val(MediaComponent, NULL);
+    ogs_assert(MediaComponent);
 
     MediaComponent->med_comp_n = (i++);
     MediaComponent->f_status = OpenAPI_flow_status_ENABLED;
@@ -937,7 +937,7 @@
 
     /* Sub Component #1 */
     SubComponent = ogs_calloc(1, sizeof(*SubComponent));
-    ogs_expect_or_return_val(SubComponent, NULL);
+    ogs_assert(SubComponent);
 
     SubComponent->f_num = (j++);
     SubComponent->flow_usage = OpenAPI_flow_usage_NO_INFO;
@@ -963,7 +963,7 @@
 
     /* Sub Component #2 */
     SubComponent = ogs_calloc(1, sizeof(*SubComponent));
-    ogs_expect_or_return_val(SubComponent, NULL);
+    ogs_assert(SubComponent);
 
     SubComponent->f_num = (j++);
     SubComponent->flow_usage = OpenAPI_flow_usage_NO_INFO;

open5gs_2.5.8.tar.xz/tests/app/5gc-init.c -> open5gs_2.6.0.tar.xz/tests/app/5gc-init.c Changed

open5gs_2.5.8.tar.xz/tests/app/app-init.c -> open5gs_2.6.0.tar.xz/tests/app/app-init.c Changed

open5gs_2.5.8.tar.xz/tests/app/meson.build -> open5gs_2.6.0.tar.xz/tests/app/meson.build Changed

@@ -18,7 +18,7 @@
 
 libtestapp_inc = include_directories('.')
 
-libtestepc_cc_args = '-DDEFAULT_CONFIG_FILENAME="@0@/configs/sample.yaml"'.format(meson.build_root())
+libtestepc_cc_args = '-DDEFAULT_CONFIG_FILENAME="@0@/configs/sample.yaml"'.format(open5gs_build_dir)
 
 libtestepc_sources = files('''
     epc-init.c
@@ -46,7 +46,7 @@
     include_directories : srcinc,
     dependencies : libtestepc_dep)
 
-libtest5gc_cc_args = '-DDEFAULT_CONFIG_FILENAME="@0@/configs/sample.yaml"'.format(meson.build_root())
+libtest5gc_cc_args = '-DDEFAULT_CONFIG_FILENAME="@0@/configs/sample.yaml"'.format(open5gs_build_dir)
 
 libtest5gc_sources = files('''
     5gc-init.c
@@ -74,7 +74,7 @@
     include_directories : srcinc,
     dependencies : libtest5gc_dep)
 
-libtestapp_cc_args = '-DDEFAULT_CONFIG_FILENAME="@0@/configs/sample.yaml"'.format(meson.build_root())
+libtestapp_cc_args = '-DDEFAULT_CONFIG_FILENAME="@0@/configs/sample.yaml"'.format(open5gs_build_dir)
 
 libtestapp_sources = files('''
     app-init.c

open5gs_2.5.8.tar.xz/tests/attach/auth-test.c -> open5gs_2.6.0.tar.xz/tests/attach/auth-test.c Changed

open5gs_2.5.8.tar.xz/tests/attach/emm-status-test.c -> open5gs_2.6.0.tar.xz/tests/attach/emm-status-test.c Changed

open5gs_2.5.8.tar.xz/tests/attach/guti-test.c -> open5gs_2.6.0.tar.xz/tests/attach/guti-test.c Changed

@@ -49,15 +49,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf0;
@@ -476,15 +471,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf0;
@@ -895,15 +885,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x54f6401;
@@ -1231,15 +1216,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x64010;

open5gs_2.5.8.tar.xz/tests/attach/idle-test.c -> open5gs_2.6.0.tar.xz/tests/attach/idle-test.c Changed

@@ -49,15 +49,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x54f6401;
@@ -383,15 +378,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x54f6401;
@@ -673,15 +663,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x54f6401;

open5gs_2.5.8.tar.xz/tests/attach/issues-test.c -> open5gs_2.6.0.tar.xz/tests/attach/issues-test.c Changed

open5gs_2.5.8.tar.xz/tests/attach/reset-test.c -> open5gs_2.6.0.tar.xz/tests/attach/reset-test.c Changed

@@ -48,15 +48,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x54f6401;
@@ -316,7 +311,13 @@
     tests1ap_recv(NULL, recvbuf);
 
     for (i = 0; i < NUM_OF_TEST_UE; i++) {
-        uint64_t imsi_index;
+        const char *scheme_output = {
+            "0000000001",
+            "0000000002",
+            "0000000003",
+            "0000000004",
+            "0000000005",
+        };
 
         /* Setup Test UE & Session Context */
         memset(&mobile_identity_suci, 0, sizeof(mobile_identity_suci));
@@ -327,13 +328,11 @@
         mobile_identity_suci.routing_indicator2 = 0xf;
         mobile_identity_suci.routing_indicator3 = 0xf;
         mobile_identity_suci.routing_indicator4 = 0xf;
-        mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+        mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
         mobile_identity_suci.home_network_pki_value = 0;
 
-        imsi_index = i + 1;
-        ogs_uint64_to_buffer(imsi_index, 5, mobile_identity_suci.scheme_output);
-
-        test_uei = test_ue_add_by_suci(&mobile_identity_suci, 13);
+        test_uei = test_ue_add_by_suci(
+                &mobile_identity_suci, scheme_outputi);
         ogs_assert(test_uei);
 
         test_uei->e_cgi.cell_id = 0x54f6401;
@@ -545,7 +544,13 @@
     tests1ap_recv(NULL, recvbuf);
 
     for (i = 0; i < NUM_OF_TEST_UE; i++) {
-        uint64_t imsi_index;
+        const char *scheme_output = {
+            "0000000001",
+            "0000000002",
+            "0000000003",
+            "0000000004",
+            "0000000005",
+        };
 
         /* Setup Test UE & Session Context */
         memset(&mobile_identity_suci, 0, sizeof(mobile_identity_suci));
@@ -556,13 +561,11 @@
         mobile_identity_suci.routing_indicator2 = 0xf;
         mobile_identity_suci.routing_indicator3 = 0xf;
         mobile_identity_suci.routing_indicator4 = 0xf;
-        mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+        mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
         mobile_identity_suci.home_network_pki_value = 0;
 
-        imsi_index = i + 1;
-        ogs_uint64_to_buffer(imsi_index, 5, mobile_identity_suci.scheme_output);
-
-        test_uei = test_ue_add_by_suci(&mobile_identity_suci, 13);
+        test_uei = test_ue_add_by_suci(
+                &mobile_identity_suci, scheme_outputi);
         ogs_assert(test_uei);
 
         /* Multiple eNB-UE-S1AP-UD */

open5gs_2.5.8.tar.xz/tests/attach/simple-test.c -> open5gs_2.6.0.tar.xz/tests/attach/simple-test.c Changed

open5gs_2.5.8.tar.xz/tests/attach/ue-context-test.c -> open5gs_2.6.0.tar.xz/tests/attach/ue-context-test.c Changed

@@ -46,15 +46,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf0;
@@ -214,15 +209,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x64010;
@@ -499,15 +489,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x64010;

open5gs_2.5.8.tar.xz/tests/common/context.c -> open5gs_2.6.0.tar.xz/tests/common/context.c Changed

@@ -805,26 +805,44 @@
     return OGS_OK;
 }
 
-void test_ue_set_mobile_identity_suci(test_ue_t *test_ue,
+static void test_ue_set_mobile_identity(test_ue_t *test_ue,
     ogs_nas_5gs_mobile_identity_suci_t *mobile_identity_suci,
-    uint16_t mobile_identity_suci_length)
+    const char *scheme_output_string)
 {
-    ogs_nas_5gs_mobile_identity_t mobile_identity;
+    ogs_nas_5gs_mobile_identity_t *mobile_identity = NULL;
+    uint16_t scheme_output_size;
+    uint8_t *scheme_output = NULL;
 
     ogs_assert(test_ue);
     ogs_assert(mobile_identity_suci);
-    ogs_assert(mobile_identity_suci_length);
+    ogs_assert(scheme_output_string);
 
-    test_ue->mobile_identity_suci_length = mobile_identity_suci_length;
-    memcpy(&test_ue->mobile_identity_suci, mobile_identity_suci,
-            mobile_identity_suci_length);
+    scheme_output_size = strlen(scheme_output_string)/2;
+    scheme_output = ogs_calloc(1, scheme_output_size);
+    ogs_assert(scheme_output);
+
+    scheme_output_size = ogs_ascii_to_hex(
+            scheme_output_string, strlen(scheme_output_string),
+            scheme_output, scheme_output_size);
+    ogs_assert(scheme_output_size);
+
+    mobile_identity = &test_ue->mobile_identity;
+
+    mobile_identity->length =
+        OGS_NAS_5GS_MOBILE_IDENTITY_SUCI_MIN_SIZE + scheme_output_size;
+    mobile_identity->buffer = ogs_calloc(1, mobile_identity->length);
+    ogs_assert(mobile_identity->buffer);
+    memcpy(mobile_identity->buffer,
+            mobile_identity_suci, OGS_NAS_5GS_MOBILE_IDENTITY_SUCI_MIN_SIZE);
+    memcpy((uint8_t *)mobile_identity->buffer +
+            OGS_NAS_5GS_MOBILE_IDENTITY_SUCI_MIN_SIZE,
+            scheme_output, scheme_output_size);
 
-    mobile_identity.length = test_ue->mobile_identity_suci_length;
-    mobile_identity.buffer = &test_ue->mobile_identity_suci;
+    ogs_free(scheme_output);
 
     if (test_ue->suci)
         ogs_free(test_ue->suci);
-    test_ue->suci = ogs_nas_5gs_suci_from_mobile_identity(&mobile_identity);
+    test_ue->suci = ogs_nas_5gs_suci_from_mobile_identity(mobile_identity);
     if (test_ue->supi)
         ogs_free(test_ue->supi);
     test_ue->supi = ogs_supi_from_suci(test_ue->suci);
@@ -890,13 +908,13 @@
 
 test_ue_t *test_ue_add_by_suci(
     ogs_nas_5gs_mobile_identity_suci_t *mobile_identity_suci,
-    uint16_t mobile_identity_suci_length)
+    const char *scheme_output)
 {
     int i, j;
     test_ue_t *test_ue = NULL;
 
     ogs_assert(mobile_identity_suci);
-    ogs_assert(mobile_identity_suci_length);
+    ogs_assert(scheme_output);
 
     ogs_pool_alloc(&test_ue_pool, &test_ue);
     ogs_assert(test_ue);
@@ -944,8 +962,7 @@
         }
     }
 
-    test_ue_set_mobile_identity_suci(
-            test_ue, mobile_identity_suci, mobile_identity_suci_length);
+    test_ue_set_mobile_identity(test_ue, mobile_identity_suci, scheme_output);
 
     test_ue_set_mobile_identity_imsi(test_ue);
     test_ue_set_mobile_identity_imsisv(test_ue);
@@ -961,6 +978,9 @@
 
     ogs_list_remove(&self.test_ue_list, test_ue);
 
+    if (test_ue->mobile_identity.buffer)
+        ogs_free(test_ue->mobile_identity.buffer);
+
     if (test_ue->suci)
         ogs_free(test_ue->suci);
     if (test_ue->supi)
@@ -1216,8 +1236,10 @@
     ogs_assert(test_ue);
     ogs_assert(doc);
 
-    OGS_HEX(test_ue->k_string, strlen(test_ue->k_string), test_ue->k);
-    OGS_HEX(test_ue->opc_string, strlen(test_ue->opc_string), test_ue->opc);
+    ogs_hex_from_string(
+            test_ue->k_string, test_ue->k, sizeof(test_ue->k));
+    ogs_hex_from_string(
+            test_ue->opc_string, test_ue->opc, sizeof(test_ue->opc));
 
     collection = mongoc_client_get_collection(
         ogs_mongoc()->client, ogs_mongoc()->name, "subscribers");

open5gs_2.5.8.tar.xz/tests/common/context.h -> open5gs_2.6.0.tar.xz/tests/common/context.h Changed

open5gs_2.5.8.tar.xz/tests/common/emm-build.c -> open5gs_2.6.0.tar.xz/tests/common/emm-build.c Changed

@@ -295,8 +295,10 @@
     message.emm.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM;
     message.emm.h.message_type = OGS_NAS_EPS_AUTHENTICATION_RESPONSE;
 
-    OGS_HEX(test_ue->k_string, strlen(test_ue->k_string), test_ue->k);
-    OGS_HEX(test_ue->opc_string, strlen(test_ue->opc_string), test_ue->opc);
+    ogs_hex_from_string(
+            test_ue->k_string, test_ue->k, sizeof(test_ue->k));
+    ogs_hex_from_string(
+            test_ue->opc_string, test_ue->opc, sizeof(test_ue->opc));
 
     milenage_f2345(test_ue->opc, test_ue->k, test_ue->rand,
             res, ck, ik, ak, NULL);
@@ -346,8 +348,10 @@
         authentication_failure->presencemask |=
             OGS_NAS_EPS_AUTHENTICATION_FAILURE_AUTHENTICATION_FAILURE_PARAMETER_PRESENT;
 
-        OGS_HEX(test_ue->k_string, strlen(test_ue->k_string), test_ue->k);
-        OGS_HEX(test_ue->opc_string, strlen(test_ue->opc_string), test_ue->opc);
+        ogs_hex_from_string(
+                test_ue->k_string, test_ue->k, sizeof(test_ue->k));
+        ogs_hex_from_string(
+                test_ue->opc_string, test_ue->opc, sizeof(test_ue->opc));
 
         milenage_f2345(test_ue->opc, test_ue->k, test_ue->rand,
                 NULL, NULL, NULL, NULL, ak);
@@ -877,7 +881,7 @@
     ogs_nas_eps_message_container_t *nas_message_container =
         &uplink_nas_transport->nas_message_container;
 
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
     const char *payload =
         "390167000300"
         "0581005155f55d11 030c914477680205 490000055ad2e2b1 252d467ff6de6c47"
@@ -895,7 +899,7 @@
     message.emm.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM;
     message.emm.h.message_type = OGS_NAS_EPS_UPLINK_NAS_TRANSPORT;
 
-    OGS_HEX(payload, strlen(payload), hexbuf);
+    ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf));
     nas_message_container->length = 106;
     memcpy(nas_message_container->buffer,
             hexbuf, nas_message_container->length);

open5gs_2.5.8.tar.xz/tests/common/gmm-build.c -> open5gs_2.6.0.tar.xz/tests/common/gmm-build.c Changed

@@ -87,9 +87,9 @@
 
     } else {
         registration_request->mobile_identity.length =
-            test_ue->mobile_identity_suci_length;
+            test_ue->mobile_identity.length;
         registration_request->mobile_identity.buffer =
-            &test_ue->mobile_identity_suci;
+            test_ue->mobile_identity.buffer;
     }
 
     if (test_ue->registration_request_param.uplink_data_status) {
@@ -423,9 +423,9 @@
             &mobile_identity_guti;
     } else {
         deregistration_request_from_ue->mobile_identity.length =
-            test_ue->mobile_identity_suci_length;
+            test_ue->mobile_identity.length;
         deregistration_request_from_ue->mobile_identity.buffer =
-            &test_ue->mobile_identity_suci;
+            test_ue->mobile_identity.buffer;
     }
 
     if (integrity_protected)
@@ -449,9 +449,9 @@
     message.gmm.h.message_type = OGS_NAS_5GS_IDENTITY_RESPONSE;
 
     identity_response->mobile_identity.length =
-        test_ue->mobile_identity_suci_length;
+        test_ue->mobile_identity.length;
     identity_response->mobile_identity.buffer =
-        &test_ue->mobile_identity_suci;
+        test_ue->mobile_identity.buffer;
 
     return ogs_nas_5gs_plain_encode(&message);
 }

open5gs_2.5.8.tar.xz/tests/common/gtpu.c -> open5gs_2.6.0.tar.xz/tests/common/gtpu.c Changed

@@ -356,7 +356,7 @@
     const char *payload =
         "6000000000083aff fe80000000000000 0000000000000002"
         "ff02000000000000 0000000000000002 85007d3500000000";
-    unsigned char tmpOGS_MAX_SDU_LEN;
+    unsigned char tmpOGS_HUGE_LEN;
     int payload_len = 48;
 
     ogs_assert(bearer);
@@ -370,7 +370,7 @@
     ogs_pkbuf_put(pkbuf, 200-OGS_GTPV1U_5GC_HEADER_LEN);
     memset(pkbuf->data, 0, pkbuf->len);
 
-    OGS_HEX(payload, strlen(payload), tmp);
+    ogs_hex_from_string(payload, tmp, sizeof(tmp));
     memcpy(pkbuf->data, tmp, payload_len);
 
     ip6_h = pkbuf->data;
@@ -425,7 +425,7 @@
         "60000000"
         "00103afffe800000 0000000074ee25ff fee4b579ff020000 0000000000000000"
         "000000028500da95 00000000010176ee 25e4b579";
-    unsigned char tmpOGS_MAX_SDU_LEN;
+    unsigned char tmpOGS_HUGE_LEN;
     int payload_len = 56;
 
     ogs_assert(bearer);
@@ -439,7 +439,7 @@
     ogs_pkbuf_put(pkbuf, 200-OGS_GTPV1U_5GC_HEADER_LEN);
     memset(pkbuf->data, 0, pkbuf->len);
 
-    OGS_HEX(payload, strlen(payload), tmp);
+    ogs_hex_from_string(payload, tmp, sizeof(tmp));
     memcpy(pkbuf->data, tmp, payload_len);
 
     ogs_pkbuf_trim(pkbuf, payload_len);

open5gs_2.5.8.tar.xz/tests/common/meson.build -> open5gs_2.6.0.tar.xz/tests/common/meson.build Changed

open5gs_2.5.8.tar.xz/tests/common/ngap-build.c -> open5gs_2.6.0.tar.xz/tests/common/ngap-build.c Changed

@@ -670,7 +670,7 @@
     NGAP_RAN_UE_NGAP_ID_t *RAN_UE_NGAP_ID = NULL;
     NGAP_UERadioCapability_t *UERadioCapability = NULL;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_capability_captured = "040ca1080f"
         "de1a00000074e5a0 31e000380a03c126 0c80038d80818804 804c0203018022a3"
         "6146b040d0d00012 0098087ad8202020 e1de38720c380020 64f1f570000f001c"
@@ -736,7 +736,7 @@
     asn_uint642INTEGER(AMF_UE_NGAP_ID, test_ue->amf_ue_ngap_id);
     *RAN_UE_NGAP_ID = test_ue->ran_ue_ngap_id;
 
-    OGS_HEX(_capability_captured, strlen(_capability_captured), tmp),
+    ogs_hex_from_string(_capability_captured, tmp, sizeof(tmp));
 
     UERadioCapability->size = 407;
     UERadioCapability->buf = CALLOC(UERadioCapability->size, sizeof(uint8_t));
@@ -1740,7 +1740,7 @@
     NGAP_SourceToTarget_TransparentContainer_t
         *SourceToTarget_TransparentContainer = NULL;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_container =
         "40"
         "0300001100000a00 010002f839000102 0120000002f83900 0000001000000a";
@@ -1876,7 +1876,7 @@
     SourceToTarget_TransparentContainer =
         &ie->value.choice.SourceToTarget_TransparentContainer;
 
-    OGS_HEX(_container, strlen(_container), tmp),
+    ogs_hex_from_string(_container, tmp, sizeof(tmp));
 
     SourceToTarget_TransparentContainer->size = 32;
     SourceToTarget_TransparentContainer->buf =
@@ -1903,7 +1903,7 @@
     NGAP_TargetToSource_TransparentContainer_t
         *TargetToSource_TransparentContainer = NULL;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_container =
         "00010000";
 
@@ -1992,7 +1992,7 @@
     TargetToSource_TransparentContainer =
         &ie->value.choice.TargetToSource_TransparentContainer;
 
-    OGS_HEX(_container, strlen(_container), tmp),
+    ogs_hex_from_string(_container, tmp, sizeof(tmp));
 
     TargetToSource_TransparentContainer->size = 4;
     TargetToSource_TransparentContainer->buf =

open5gs_2.5.8.tar.xz/tests/common/s1ap-build.c -> open5gs_2.6.0.tar.xz/tests/common/s1ap-build.c Changed

@@ -400,7 +400,7 @@
     S1AP_ENB_UE_S1AP_ID_t *ENB_UE_S1AP_ID = NULL;
     S1AP_UERadioCapability_t *UERadioCapability = NULL;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_capability_captured =
         "013001023c"
         "d98000bc000ff06e c4d00141b82c0000 000007d404000ef0 802000016a030000"
@@ -456,7 +456,7 @@
 
     UERadioCapability = &ie->value.choice.UERadioCapability;
 
-    OGS_HEX(_capability_captured, strlen(_capability_captured), tmp),
+    ogs_hex_from_string(_capability_captured, tmp, sizeof(tmp));
 
     UERadioCapability->size = 40;
     UERadioCapability->buf = CALLOC(UERadioCapability->size, sizeof(uint8_t));
@@ -1441,7 +1441,7 @@
     S1AP_Source_ToTarget_TransparentContainer_t
         *Source_ToTarget_TransparentContainer = NULL;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_container =
         "4080ab0f1014"
         "c59800018000bf06 ec4d00100302c000 0000000015a80014 06720af00348f100"
@@ -1545,7 +1545,7 @@
     Source_ToTarget_TransparentContainer =
         &ie->value.choice.Source_ToTarget_TransparentContainer;
 
-    OGS_HEX(_container, strlen(_container), tmp),
+    ogs_hex_from_string(_container, tmp, sizeof(tmp));
 
     Source_ToTarget_TransparentContainer->size = 206;
     Source_ToTarget_TransparentContainer->buf =
@@ -1574,7 +1574,7 @@
     S1AP_Target_ToSource_TransparentContainer_t
         *Target_ToSource_TransparentContainer = NULL;
 
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
     const char *payload =
         "00 80810bf900d8af40 00a0339057801f47 88009e81de2c20a4"
         "81de2c404a00ef16 2000010044013f21 2249008093efd243 3914cd2aa0a0142f"
@@ -1696,7 +1696,7 @@
         &ie->value.choice.Target_ToSource_TransparentContainer;
 
     ogs_s1ap_buffer_to_OCTET_STRING(
-            OGS_HEX(payload, strlen(payload), hexbuf), 132,
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 132,
             Target_ToSource_TransparentContainer);
 
     return ogs_s1ap_encode(&pdu);
@@ -2011,12 +2011,12 @@
         0,
     };
 
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-        OGS_HEX(payloadi, strlen(payloadi), hexbuf), leni);
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
 
     return pkbuf;
 }
@@ -2055,12 +2055,12 @@
         0,
         0,
     };
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-        OGS_HEX(payloadi, strlen(payloadi), hexbuf), leni);
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
 
     return pkbuf;
 }

open5gs_2.5.8.tar.xz/tests/common/sgsap-build.c -> open5gs_2.6.0.tar.xz/tests/common/sgsap-build.c Changed

@@ -35,12 +35,12 @@
         25,
         0,
     };
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-        OGS_HEX(payloadi, strlen(payloadi), hexbuf), leni);
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
 
     return pkbuf;
 }
@@ -59,12 +59,12 @@
         0,
         0,
     };
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-        OGS_HEX(payloadi, strlen(payloadi), hexbuf), leni);
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
 
     return pkbuf;
 }
@@ -83,12 +83,12 @@
         0,
         0,
     };
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-        OGS_HEX(payloadi, strlen(payloadi), hexbuf), leni);
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
 
     return pkbuf;
 }
@@ -119,12 +119,12 @@
         0,
         0,
     };
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-        OGS_HEX(payloadi, strlen(payloadi), hexbuf), leni);
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
 
     return pkbuf;
 }
@@ -143,12 +143,12 @@
         0,
         0,
     };
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-        OGS_HEX(payloadi, strlen(payloadi), hexbuf), leni);
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
 
     return pkbuf;
 }
@@ -167,12 +167,12 @@
         0,
         0,
     };
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-        OGS_HEX(payloadi, strlen(payloadi), hexbuf), leni);
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
 
     return pkbuf;
 }
@@ -188,12 +188,12 @@
     uint16_t lenTEST_SGSAP_MAX_MESSAGE = {
         51,
     };
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-        OGS_HEX(payloadi, strlen(payloadi), hexbuf), leni);
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
 
     return pkbuf;
 }
@@ -209,12 +209,12 @@
     uint16_t lenTEST_SGSAP_MAX_MESSAGE = {
         33,
     };
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-        OGS_HEX(payloadi, strlen(payloadi), hexbuf), leni);
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
 
     return pkbuf;
 }

open5gs_2.5.8.tar.xz/tests/core/conv-test.c -> open5gs_2.6.0.tar.xz/tests/core/conv-test.c Changed

@@ -35,16 +35,20 @@
 
     char buffer16;
 
-    ABTS_TRUE(tc, memcmp(k, OGS_HEX(K, strlen(K), buffer), 16) == 0);
+    ABTS_TRUE(tc, memcmp(k,
+                ogs_hex_from_string(K, buffer, sizeof(buffer)), 16) == 0);
 
-    ABTS_TRUE(tc, memcmp(op, OGS_HEX(OP, strlen(OP), buffer), 16) == 0);
+    ABTS_TRUE(tc, memcmp(op,
+                ogs_hex_from_string(OP, buffer, sizeof(buffer)), 16) == 0);
 
-    ABTS_TRUE(tc, memcmp(opc, OGS_HEX(OPc, strlen(OPc), buffer), 16) == 0);
+    ABTS_TRUE(tc, memcmp(opc,
+                ogs_hex_from_string(OPc, buffer, sizeof(buffer)), 16) == 0);
 
-    ABTS_TRUE(tc, memcmp(amf, OGS_HEX(AMF, strlen(AMF), buffer), 2) == 0);
+    ABTS_TRUE(tc, memcmp(amf,
+                ogs_hex_from_string(AMF, buffer, sizeof(buffer)), 2) == 0);
 
     ABTS_TRUE(tc, memcmp(lower, 
-                OGS_HEX(LOWER, strlen(LOWER), buffer), 4) == 0);
+                ogs_hex_from_string(LOWER, buffer, sizeof(buffer)), 4) == 0);
 }
 
 static void conv_test3(abts_case *tc, void *data)

open5gs_2.5.8.tar.xz/tests/core/tlv-test.c -> open5gs_2.6.0.tar.xz/tests/core/tlv-test.c Changed

open5gs_2.5.8.tar.xz/tests/crypt/abts-main.c -> open5gs_2.6.0.tar.xz/tests/crypt/abts-main.c Changed

open5gs_2.5.8.tar.xz/tests/crypt/base64-test.c -> open5gs_2.6.0.tar.xz/tests/crypt/base64-test.c Changed

@@ -63,11 +63,97 @@
     }
 }
 
+struct decode_tests_st {
+    const char *name;
+    uint8_t *raw;
+    unsigned raw_size;
+    const char *pem;
+    unsigned pem_size;
+    int res;
+};
+
+struct decode_tests_st decode_tests = {
+    {
+        .name = "dec-rnd1",
+        .pem = "-----BEGIN dec-rnd1-----\n"
+            "9ppGioRpeiiD2lLNYC85eA==\n"
+            "-----END rnd1-----\n",
+        .raw = "\xf6\x9a\x46\x8a\x84\x69\x7a\x28\x83\xda\x52\xcd\x60\x2f\x39\x78",
+        .raw_size = 16,
+        .res = OGS_OK
+    },
+    {
+        .name = "dec-rnd2",
+        .pem = "-----BEGIN dec-rnd2-----\n"
+            "LJ/7hUZ3TtPIz2dlc5+YvELe+Q==\n"
+            "-----END rnd2-----\n",
+        .raw = "\x2c\x9f\xfb\x85\x46\x77\x4e\xd3\xc8\xcf\x67\x65\x73\x9f\x98\xbc\x42\xde\xf9",
+        .raw_size = 19,
+        .res = OGS_OK
+    },
+    {
+        .name = "dec-extra-chars",
+        .pem = "-----BEGIN dec-extra-chars-----   \n\n"
+            "\n\n  LJ/7hUZ3TtPIz2dlc5+YvELe+Q==  \n"
+            "   -----END rnd2-----  \n  ",
+        .raw = "\x2c\x9f\xfb\x85\x46\x77\x4e\xd3\xc8\xcf\x67\x65\x73\x9f\x98\xbc\x42\xde\xf9",
+        .raw_size = 19,
+        .res = OGS_OK
+    },
+#if 0
+    {
+        .name = "dec-invalid-header",
+        .pem = "-----BEGIN dec-xxx-----\n"
+            "LJ/7hUZ3TtPIz2dlc5+YvELe+Q==\n"
+            "-----END rnd2-----\n",
+        .raw = "\x2c\x9f\xfb\x85\x46\x77\x4e\xd3\xc8\xcf\x67\x65\x73\x9f\x98\xbc\x42\xde\xf9",
+        .raw_size = 19,
+        .res = OGS_ERROR
+    },
+    {
+        .name = "leak1",
+        .pem = "-----BEGIN leak1-----E-\x00\x00-----END ",
+        .pem_size = 34,
+        .raw = "",
+        .raw_size = 0,
+        .res = OGS_ERROR
+    },
+#endif
+};
+
+static void base64_test2(abts_case *tc, void *data)
+{
+    int i, rv;
+    ogs_datum_t result;
+
+    for (i = 0; i < sizeof(decode_tests)/sizeof(decode_tests0); i++) {
+        if (!decode_testsi.pem_size)
+            decode_testsi.pem_size = strlen(decode_testsi.pem);
+
+        rv = ogs_fbase64_decode(
+                decode_testsi.name,
+                (const uint8_t *)decode_testsi.pem, decode_testsi.pem_size,
+                &result);
+
+        ABTS_INT_EQUAL(tc, decode_testsi.res, rv);
+
+        if (result.size) {
+            ABTS_INT_EQUAL(tc, decode_testsi.raw_size, result.size);
+            ABTS_TRUE(tc,
+                memcmp(decode_testsi.raw, result.data, result.size) == 0);
+        }
+
+        if (result.data)
+            ogs_free(result.data);
+    }
+}
+
 abts_suite *test_base64(abts_suite *suite)
 {
     suite = ADD_SUITE(suite)
 
     abts_run_test(suite, base64_test1, NULL);
+    abts_run_test(suite, base64_test2, NULL);
 
     return suite;
 }

open5gs_2.6.0.tar.xz/tests/crypt/ecies-test.c Added

@@ -0,0 +1,385 @@
+/*
+ * Copyright (C) 2022 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "ogs-crypt.h"
+#include "core/abts.h"
+
+static void ecies_profile_a(abts_case *tc, void *data)
+{
+    const char *_e = {
+        "c53c22208b61860b06c62e5406a7b330c2b577aa5558981510d128247d38bd1d",
+        "c80949f13ebe61af4ebdbd293ea4f942696b9e815d7e8f0096bbf6ed7de62256",
+        "C53C22208B61860B06C62E5406A7B330C2B577AA5558981510D128247D38BD1D",
+        "BE9EFF3E9F22A4B42A3D236E7A6C500B3F2E7E0C7449988BA800D664BF4FCD97",
+
+        /* Private Key in curve25519-1.key */
+        "10c9c67e861a5625a1db8f684123896d9b3506199d3df1968e07b6c8448bb147",
+        /* Private Key in TS33.501 C4.3.1 */
+        "c80949f13ebe61af4ebdbd293ea4f942696b9e815d7e8f0096bbf6ed7de62256",
+
+    };
+    const char *_k = {
+        "b2e92f836055a255837debf850b528997ce0201cb82adfe4be1f587d07d8457d",
+        "5a8d38864820197c3394b92613b20b91633cbd897119273bf8e4a6f4eec0a650",
+        "977D8B2FDAA7B64AA700D04227D5B440630EA4EC50F9082273A26BB678C92222",
+        "5A8D38864820197C3394B92613B20B91633CBD897119273BF8e4A6f4EEC0A650",
+
+        /* Public Key in TS33.501 C4.3.1 */
+        "b2e92f836055a255837debf850b528997ce0201cb82adfe4be1f587d07d8457d",
+        /* Public Key in curve25519-1.key */
+        "e421686f6fb2d70e3fa28d940494095686c3179fef53514667a6ed106b8a7d3d",
+
+    };
+    const char *_ek = {
+        "028ddf890ec83cdf163947ce45f6ec1a0e3070ea5fe57e2b1f05139f3e82422a",
+        "028ddf890ec83cdf163947ce45f6ec1a0e3070ea5fe57e2b1f05139f3e82422a",
+        "511C1DF473BB88317F923501F8BA944FD3B667D25699DCB552DBCEF60BBDC56D",
+        "511C1DF473BB88317F923501F8BA944FD3B667D25699DCB552DBCEF60BBDC56D",
+
+        /* Share Key from curve25519-1.key + TS33.501 C4.3.1 */
+        "514bacfdc28039187eec8196339d3ef2665691cd13abcc2a5df15561d9348c60",
+        /* Share Key from curve25519-1.key + TS33.501 C4.3.1 */
+        "514bacfdc28039187eec8196339d3ef2665691cd13abcc2a5df15561d9348c60",
+    };
+    int i, num;
+
+    uint8_t eOGS_ECCKEY_LEN;
+    uint8_t kOGS_ECCKEY_LEN;
+    uint8_t ekOGS_ECCKEY_LEN;
+    uint8_t tmpOGS_ECCKEY_LEN;
+
+    num = 6;
+    for (i = 0; i < num; i++) {
+        curve25519_donna(ek,
+            ogs_hex_from_string(_ei, e, sizeof(e)),
+            ogs_hex_from_string(_ki, k, sizeof(k)));
+
+        ABTS_TRUE(tc, memcmp(ek,
+            ogs_hex_from_string(_eki, tmp, sizeof(tmp)), OGS_ECCKEY_LEN) == 0);
+    }
+}
+
+static void ecies_profile_b(abts_case *tc, void *data)
+{
+    const char *_e = {
+        "F1AB1074477EBCC7F554EA1C5FC368B1616730155E0041AC447D6301975FECDA",
+        "99798858A1DC6A2C68637149A4B1DBFD1FDFF5ADDD62A2142F06699ED7602529",
+        "F1AB1074477EBCC7F554EA1C5FC368B1616730155E0041AC447D6301975FECDA",
+        "90A5898BD29FFA3F261E00E980067C70A2B1B992A21F5B4FEF6D4DF69FE804AD",
+
+        /* Private Key in secp256r1-2.key */
+        "74a9f918471f56f3befda5c51d738a3f94f5a52d4bc9db9799f5225fbccdde41",
+        /* Private Key in TS33.501 C4.4.1 */
+        "99798858A1DC6A2C68637149A4B1DBFD1FDFF5ADDD62A2142F06699ED7602529",
+    };
+    const char *_k = {
+        "039AAB8376597021E855679A9778EA0B67396E68C66DF32C0F41E9ACCA2DA9B9D1",
+        "0272DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD1",
+        "03759BB22C563D9F4A6B3C1419E543FC2F39D6823F02A9D71162B39399218B244B",
+        "0272DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD1",
+
+        /* Public Key in TS33.501 C4.4.1 */
+        "039AAB8376597021E855679A9778EA0B67396E68C66DF32C0F41E9ACCA2DA9B9D1",
+        /* Public Key in secp256r1-2.key */
+        "03adefcd1317d1ce8562ec25b91b4800120e1236d6e2661ea4235a84e3c85da244",
+    };
+    const char *_ek = {
+        "6C7E6518980025B982FBB2FF746E3C2E85A196D252099A7AD23EA7B4C0959CAE",
+        "6C7E6518980025B982FBB2FF746E3C2E85A196D252099A7AD23EA7B4C0959CAE",
+        "BC3529ED79541CF8C007CE9806330F4A5FF15064D7CF4B16943EF8F007597872",
+        "BC3529ED79541CF8C007CE9806330F4A5FF15064D7CF4B16943EF8F007597872",
+
+        /* Share Key from secp256r1-2.key + TS33.501 C4.4.1 */
+        "4072b8e3989b8695b35b99c923069508726fa3e65551aca1ec9560c501c190ce",
+        /* Share Key from secp256r1-2.key + TS33.501 C4.4.1 */
+        "4072b8e3989b8695b35b99c923069508726fa3e65551aca1ec9560c501c190ce",
+    };
+
+    uint8_t eOGS_ECCKEY_LEN;
+    uint8_t kOGS_ECCKEY_LEN+1;
+    uint8_t ekOGS_ECCKEY_LEN;
+    uint8_t tmpOGS_ECCKEY_LEN;
+
+    int i, r, num;
+
+    num = 6;
+    for (i = 0; i < num; i++) {
+        r = ecdh_shared_secret(
+                ogs_hex_from_string(_ki, k, sizeof(k)),
+                ogs_hex_from_string(_ei, e, sizeof(e)),
+                ek);
+        ABTS_INT_EQUAL(tc, 1, r);
+
+        ABTS_TRUE(tc, memcmp(ek,
+            ogs_hex_from_string(_eki, tmp, sizeof(tmp)), OGS_ECCKEY_LEN) == 0);
+    }
+}
+
+static void ansi_x963_kdf(abts_case *tc, void *data)
+{
+    const char *_z = {
+        "028ddf890ec83cdf163947ce45f6ec1a0e3070ea5fe57e2b1f05139f3e82422a",
+        "511C1DF473BB88317F923501F8BA944FD3B667D25699DCB552DBCEF60BBDC56D",
+        "6C7E6518980025B982FBB2FF746E3C2E85A196D252099A7AD23EA7B4C0959CAE",
+        "BC3529ED79541CF8C007CE9806330F4A5FF15064D7CF4B16943EF8F007597872",
+
+        /* Share Key from curve25519-1.key + TS33.501 C4.3.1 */
+        "514bacfdc28039187eec8196339d3ef2665691cd13abcc2a5df15561d9348c60",
+        /* Share Key from secp256r1-2.key + TS33.501 C4.4.1 */
+        "4072b8e3989b8695b35b99c923069508726fa3e65551aca1ec9560c501c190ce",
+    };
+    const char *_info = {
+        "b2e92f836055a255837debf850b528997ce0201cb82adfe4be1f587d07d8457d",
+        "977D8B2FDAA7B64AA700D04227D5B440630EA4EC50F9082273A26BB678C92222",
+        "039AAB8376597021E855679A9778EA0B67396E68C66DF32C0F41E9ACCA2DA9B9D1",
+        "03759BB22C563D9F4A6B3C1419E543FC2F39D6823F02A9D71162B39399218B244B",
+
+        /* Public Key in TS33.501 C4.3.1 */
+        "b2e92f836055a255837debf850b528997ce0201cb82adfe4be1f587d07d8457d",
+        /* Public Key in TS33.501 C4.4.1 */
+        "039AAB8376597021E855679A9778EA0B67396E68C66DF32C0F41E9ACCA2DA9B9D1",
+    };
+    int info_len = {
+        32,
+        32,
+        33,
+        33,
+
+        32,
+        33,
+    };
+    const char *_ek = {
+        "2ba342cabd2b3b1e5e4e890da11b65f6",
+        "FE77B87D87F40428EDD71BCA69D79059",
+        "8A65C3AED80295C12BD55087E965702A",
+        "84F9A78995D39E6968047547ECC12C4F",
+
+        /* Enc Key from curve25519-1.key + TS33.501 C4.3.1 */
+        "6a898587f494ed58a1185b01207b6710",
+        /* Enc Key from secp256r1-2.key + TS33.501 C4.4.1 */
+        "a950bf5f8922b395f9b6bcf8ddfa48c2",
+    };
+    const char *_icb = {
+        "e2622cb0cdd08204e721c8ea9b95a7c6",
+        "cafa5287de2b20e3df1bd3a858da00ac",
+        "EF285B4061C3BAEE858AB6EC68487DAE",
+        "a1a6b7f89d422a733675996ebe781eb7",
+
+        /* ICB from curve25519-1.key + TS33.501 C4.3.1 */
+        "ebfc734de36bf03d5e94b9f9db800b32",
+        /* ICB from secp256r1-2.key + TS33.501 C4.4.1 */
+        "ff0b5323557bd5e2b1da731cd6ca1416",
+    };
+    const char *_mk = {
+        "d9846966fb7cf5fcf11266c5957dea60b83fff2b7c940690a4bfe57b1eb52bd2",
+        "D87B69F4FE8CD6B211264EA5E69F682F151A82252684CDB15A047E6EF0595028",
+        "A5EBAC0BC48D9CF7AE5CE39CD840AC6C761AEC04078FAB954D634F923E901C64",
+        "39D5517E965F8E1252B61345ED45226C5F1A8C69F03D6C91437591F0B8E48FA0",
+
+        /* MAC Key from curve25519-1.key + TS33.501 C4.3.1 */
+        "19045a963a79b4e397f2b81eb0258cbc0a64c9102aaf9e936d5c9f6d44fd8434",
+        /* MAC Key from secp256r1-2.key + TS33.501 C4.4.1 */
+        "96f5757bcdb3f4c33976afc96cf7883d3dd017feb3ac229fd813d535e23ed58f",
+    };
+
+    uint8_t zOGS_ECCKEY_LEN;
+    uint8_t infoOGS_ECCKEY_LEN+1;
+
+    uint8_t ekOGS_KEY_LEN;
+    uint8_t icbOGS_IVEC_LEN;
+    uint8_t mkOGS_SHA256_DIGEST_SIZE;
+
+    uint8_t tmpOGS_SHA256_DIGEST_SIZE;
+
+    int i, num;
+
+    num = 6;
+    for (i = 0; i < num; i++) {
+        ogs_kdf_ansi_x963(
+            ogs_hex_from_string(_zi, z, sizeof(z)), OGS_ECCKEY_LEN,
+            ogs_hex_from_string(_infoi, info, sizeof(info)), info_leni,
+            ek, icb, mk);
+        ABTS_TRUE(tc, memcmp(ek,
+            ogs_hex_from_string(_eki, tmp, sizeof(tmp)), OGS_KEY_LEN) == 0);
+        ABTS_TRUE(tc, memcmp(icb,
+            ogs_hex_from_string(_icbi, tmp, sizeof(tmp)), OGS_IVEC_LEN) == 0);
+        ABTS_TRUE(tc, memcmp(mk,
+            ogs_hex_from_string(_mki, tmp, sizeof(tmp)), OGS_SHA256_DIGEST_SIZE) == 0);
+    }
+}
+
+static void aes_128ctr(abts_case *tc, void *data)
+{
+    const char *_ek = {
+        "2ba342cabd2b3b1e5e4e890da11b65f6",
+        "FE77B87D87F40428EDD71BCA69D79059",
+        "8A65C3AED80295C12BD55087E965702A",
+        "84F9A78995D39E6968047547ECC12C4F",
+
+        /* Enc Key from curve25519-1.key + TS33.501 C4.3.1 */
+        "6a898587f494ed58a1185b01207b6710",
+        /* Enc Key from secp256r1-2.key + TS33.501 C4.4.1 */
+        "a950bf5f8922b395f9b6bcf8ddfa48c2",
+    };
+    const char *_icb = {
+        "e2622cb0cdd08204e721c8ea9b95a7c6",
+        "cafa5287de2b20e3df1bd3a858da00ac",
+        "EF285B4061C3BAEE858AB6EC68487DAE",
+        "a1a6b7f89d422a733675996ebe781eb7",
+
+        /* ICB from curve25519-1.key + TS33.501 C4.3.1 */
+        "ebfc734de36bf03d5e94b9f9db800b32",
+        /* ICB from secp256r1-2.key + TS33.501 C4.4.1 */
+        "ff0b5323557bd5e2b1da731cd6ca1416",
+    };
+    const char *_plain = {
+        "00012080f6",
+        "766572796C6F6E67757365726E616D6531",
+        "00012080f6",
+        "766572796C6F6E67757365726E616D6531",
+
+        /* Plain-text from curve25519-1.key + TS33.501 C4.3.1 */
+        "00012080f6",
+        /* Plain-text from secp256r1-2.key + TS33.501 C4.4.1 */
+        "00012080f6",
+    };
+    const char *_cipher = {
+        "cb02352410",
+        "8E358A1582ADB15322C10E515141D2039A",
+        "46A33FC271",
+        "BE22D8B9F856A52ED381CD7EAF4CF2D525",
+
+        /* Ciphered-text from curve25519-1.key + TS33.501 C4.3.1 */
+        "7ee4435e19",
+        /* Ciphered-text from secp256r1-2.key + TS33.501 C4.4.1 */
+        "cdd22e3496",
+    };
+    int len = {
+        5,
+        17,
+        5,
+        17,
+
+        5,
+        5,
+    };
+
+    uint8_t ekOGS_KEY_LEN;
+    uint8_t icbOGS_IVEC_LEN;
+    uint8_t plain17;
+    uint8_t cipher17;
+    uint8_t tmp17;
+
+    int i, num;
+
+    num = 6;
+    for (i = 0; i < num; i++) {
+        ogs_aes_ctr128_encrypt(
+            ogs_hex_from_string(_eki, ek, sizeof(ek)),
+            ogs_hex_from_string(_icbi, icb, sizeof(icb)),
+            ogs_hex_from_string(_plaini, plain, sizeof(plain)), leni,
+            cipher);
+        ABTS_TRUE(tc, memcmp(cipher,
+            ogs_hex_from_string(_cipheri, tmp, sizeof(tmp)), leni) == 0);
+        ogs_aes_ctr128_encrypt(
+            ogs_hex_from_string(_eki, ek, sizeof(ek)),
+            ogs_hex_from_string(_icbi, icb, sizeof(icb)),
+            ogs_hex_from_string(_cipheri, cipher, sizeof(cipher)), leni,
+            plain);
+        ABTS_TRUE(tc, memcmp(plain,
+            ogs_hex_from_string(_plaini, tmp, sizeof(tmp)), leni) == 0);
+    }
+}
+
+static void hmac_sha_256(abts_case *tc, void *data)
+{
+    const char *_mk = {
+        "d9846966fb7cf5fcf11266c5957dea60b83fff2b7c940690a4bfe57b1eb52bd2",
+        "D87B69F4FE8CD6B211264EA5E69F682F151A82252684CDB15A047E6EF0595028",
+        "A5EBAC0BC48D9CF7AE5CE39CD840AC6C761AEC04078FAB954D634F923E901C64",
+        "39D5517E965F8E1252B61345ED45226C5F1A8C69F03D6C91437591F0B8E48FA0",
+
+        /* MAC Key from curve25519-1.key + TS33.501 C4.3.1 */
+        "19045a963a79b4e397f2b81eb0258cbc0a64c9102aaf9e936d5c9f6d44fd8434",
+        /* MAC Key from secp256r1-2.key + TS33.501 C4.4.1 */
+        "96f5757bcdb3f4c33976afc96cf7883d3dd017feb3ac229fd813d535e23ed58f",
+    };
+    const char *_cipher = {
+        "cb02352410",
+        "8E358A1582ADB15322C10E515141D2039A",
+        "46A33FC271",
+        "BE22D8B9F856A52ED381CD7EAF4CF2D525",
+
+        /* Ciphered-text from curve25519-1.key + TS33.501 C4.3.1 */
+        "7ee4435e19",
+        /* Ciphered-text from secp256r1-2.key + TS33.501 C4.4.1 */
+        "cdd22e3496",
+    };
+    const char *_mac_tag = {
+        "cddd9e730ef3fa87",
+        "12E1D7783A97F1AC",
+        "6AC7DAE96AA30A4D",
+        "3CDDC61A0A7882EB",
+
+        /* MAG-tag value from curve25519-1.key + TS33.501 C4.3.1 */
+        "78dc897bff24129c",
+        /* MAC-tag value secp256r1-2.key + TS33.501 C4.4.1 */
+        "5500e9242e65f58c",
+    };
+    int len = {
+        5,
+        17,
+        5,
+        17,
+
+        5,
+        5,
+    };
+
+    uint8_t mkOGS_SHA256_DIGEST_SIZE;
+    uint8_t cipher17;
+    uint8_t mac_tagOGS_MACTAG_LEN;
+    uint8_t tmpOGS_MACTAG_LEN;
+
+    int i, num;
+
+    num = 6;
+    for (i = 0; i < num; i++) {
+        ogs_hmac_sha256(
+            ogs_hex_from_string(_mki, mk, sizeof(mk)), OGS_SHA256_DIGEST_SIZE,
+            ogs_hex_from_string(_cipheri, cipher, sizeof(cipher)), leni,
+            mac_tag, OGS_MACTAG_LEN);
+        ABTS_TRUE(tc, memcmp(mac_tag,
+            ogs_hex_from_string(_mac_tagi, tmp, sizeof(tmp)),
+            OGS_MACTAG_LEN) == 0);
+    }
+}
+
+abts_suite *test_ecies(abts_suite *suite)
+{
+    suite = ADD_SUITE(suite)
+
+    abts_run_test(suite, ecies_profile_a, NULL);
+    abts_run_test(suite, ecies_profile_b, NULL);
+    abts_run_test(suite, ansi_x963_kdf, NULL);
+    abts_run_test(suite, aes_128ctr, NULL);
+    abts_run_test(suite, hmac_sha_256, NULL);
+
+    return suite;
+}

open5gs_2.5.8.tar.xz/tests/crypt/meson.build -> open5gs_2.6.0.tar.xz/tests/crypt/meson.build Changed

open5gs_2.5.8.tar.xz/tests/csfb/crash-test.c -> open5gs_2.6.0.tar.xz/tests/csfb/crash-test.c Changed

open5gs_2.5.8.tar.xz/tests/csfb/mo-active-test.c -> open5gs_2.6.0.tar.xz/tests/csfb/mo-active-test.c Changed

open5gs_2.5.8.tar.xz/tests/csfb/mo-idle-test.c -> open5gs_2.6.0.tar.xz/tests/csfb/mo-idle-test.c Changed

@@ -48,15 +48,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x19b010;
@@ -337,15 +332,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x19b010;
@@ -537,15 +527,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x19b010;
@@ -823,15 +808,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x19b010;

open5gs_2.5.8.tar.xz/tests/csfb/mo-sms-test.c -> open5gs_2.6.0.tar.xz/tests/csfb/mo-sms-test.c Changed

open5gs_2.5.8.tar.xz/tests/csfb/mt-active-test.c -> open5gs_2.6.0.tar.xz/tests/csfb/mt-active-test.c Changed

open5gs_2.5.8.tar.xz/tests/csfb/mt-idle-test.c -> open5gs_2.6.0.tar.xz/tests/csfb/mt-idle-test.c Changed

open5gs_2.5.8.tar.xz/tests/csfb/mt-sms-test.c -> open5gs_2.6.0.tar.xz/tests/csfb/mt-sms-test.c Changed

open5gs_2.5.8.tar.xz/tests/handover/5gc-n2-test.c -> open5gs_2.6.0.tar.xz/tests/handover/5gc-n2-test.c Changed

@@ -32,7 +32,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -53,15 +53,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -432,7 +427,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -456,15 +451,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1054,7 +1044,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -1075,15 +1065,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1470,7 +1455,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -1494,15 +1479,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -2125,7 +2105,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -2149,15 +2129,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/handover/5gc-xn-test.c -> open5gs_2.6.0.tar.xz/tests/handover/5gc-xn-test.c Changed

@@ -32,7 +32,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -53,15 +53,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/handover/epc-s1-test.c -> open5gs_2.6.0.tar.xz/tests/handover/epc-s1-test.c Changed

@@ -49,15 +49,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1234560;
@@ -619,15 +614,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1234560;
@@ -946,15 +936,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x37;
-    mobile_identity_suci.scheme_output1 = 0x46;
-    mobile_identity_suci.scheme_output2 = 0;
-    mobile_identity_suci.scheme_output3 = 0;
-    mobile_identity_suci.scheme_output4 = 0x06;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "3746000006");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1234560;

open5gs_2.5.8.tar.xz/tests/handover/epc-x2-test.c -> open5gs_2.6.0.tar.xz/tests/handover/epc-x2-test.c Changed

open5gs_2.5.8.tar.xz/tests/non3gpp/diameter-s6b-path.c -> open5gs_2.6.0.tar.xz/tests/non3gpp/diameter-s6b-path.c Changed

open5gs_2.5.8.tar.xz/tests/non3gpp/diameter-swx-path.c -> open5gs_2.6.0.tar.xz/tests/non3gpp/diameter-swx-path.c Changed

@@ -201,8 +201,10 @@
         uint64_t sqn_ms;
         int i;
 
-        OGS_HEX(test_ue->k_string, strlen(test_ue->k_string), test_ue->k);
-        OGS_HEX(test_ue->opc_string, strlen(test_ue->opc_string), test_ue->opc);
+        ogs_hex_from_string(
+                test_ue->k_string, test_ue->k, sizeof(test_ue->k));
+        ogs_hex_from_string(
+                test_ue->opc_string, test_ue->opc, sizeof(test_ue->opc));
 
         milenage_f2345(test_ue->opc, test_ue->k, test_ue->rand,
                 NULL, NULL, NULL, NULL, ak);
@@ -296,13 +298,28 @@
 
     /* Search the session, retrieve its data */
     ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(new == 0);
+    if (ret != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
+    if (new != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
 
     ret = fd_sess_state_retrieve(test_swx_reg, session, &sess_data);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(sess_data);
-    ogs_expect_or_return((void *)sess_data == data);
+    if (ret != 0) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if (!sess_data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if ((void *)sess_data != data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
 
     /* Value of Result Code */
     ret = fd_msg_search_avp(*msg, ogs_diam_result_code, &avp);
@@ -536,13 +553,28 @@
 
     /* Search the session, retrieve its data */
     ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(new == 0);
+    if (ret != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
+    if (new != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
 
     ret = fd_sess_state_retrieve(test_swx_reg, session, &sess_data);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(sess_data);
-    ogs_expect_or_return((void *)sess_data == data);
+    if (ret != 0) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if (!sess_data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if ((void *)sess_data != data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
 
     sess = sess_data->sess;
     ogs_assert(sess);

open5gs_2.5.8.tar.xz/tests/non3gpp/epdg-test.c -> open5gs_2.6.0.tar.xz/tests/non3gpp/epdg-test.c Changed

@@ -56,15 +56,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x10;
-    mobile_identity_suci.scheme_output1 = 0x32;
-    mobile_identity_suci.scheme_output2 = 0x54;
-    mobile_identity_suci.scheme_output3 = 0x86;
-    mobile_identity_suci.scheme_output4 = 0x91;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "1032548691");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf;
@@ -202,15 +197,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x10;
-    mobile_identity_suci.scheme_output1 = 0x32;
-    mobile_identity_suci.scheme_output2 = 0x54;
-    mobile_identity_suci.scheme_output3 = 0x86;
-    mobile_identity_suci.scheme_output4 = 0x91;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "1032548691");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf;
@@ -353,15 +343,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x10;
-    mobile_identity_suci.scheme_output1 = 0x32;
-    mobile_identity_suci.scheme_output2 = 0x54;
-    mobile_identity_suci.scheme_output3 = 0x86;
-    mobile_identity_suci.scheme_output4 = 0x91;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "1032548691");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf;

open5gs_2.5.8.tar.xz/tests/non3gpp/gtp-path.c -> open5gs_2.6.0.tar.xz/tests/non3gpp/gtp-path.c Changed

@@ -138,10 +138,16 @@
     h.teid = sess->smf_s2b_c_teid;
 
     pkbuf = test_s2b_build_create_session_request(h.type, sess, handover_ind);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("test_s2b_build_create_session_request() failed");
+        return OGS_ERROR;
+    }
 
     xact = ogs_gtp_xact_local_create(sess->gnode, &h, pkbuf, NULL, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -163,10 +169,16 @@
     h.teid = sess->smf_s2b_c_teid;
 
     pkbuf = test_s2b_build_delete_session_request(h.type, sess);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("test_s2b_build_delete_session_request() failed");
+        return OGS_ERROR;
+    }
 
     xact = ogs_gtp_xact_local_create(sess->gnode, &h, pkbuf, NULL, sess);
-    ogs_expect_or_return_val(xact, OGS_ERROR);
+    if (!xact) {
+        ogs_error("ogs_gtp_xact_local_create() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -192,10 +204,16 @@
     h.teid = sess->smf_s2b_c_teid;
 
     pkbuf = test_s2b_build_create_bearer_response(h.type, bearer);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("test_s2b_build_create_bearer_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);
@@ -221,10 +239,16 @@
     h.teid = sess->smf_s2b_c_teid;
 
     pkbuf = test_s2b_build_delete_bearer_response(h.type, bearer);
-    ogs_expect_or_return_val(pkbuf, OGS_ERROR);
+    if (!pkbuf) {
+        ogs_error("test_s2b_build_delete_bearer_response() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_update_tx(xact, &h, pkbuf);
-    ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp_xact_update_tx() failed");
+        return OGS_ERROR;
+    }
 
     rv = ogs_gtp_xact_commit(xact);
     ogs_expect(rv == OGS_OK);

open5gs_2.5.8.tar.xz/tests/non3gpp/meson.build -> open5gs_2.6.0.tar.xz/tests/non3gpp/meson.build Changed

open5gs_2.5.8.tar.xz/tests/non3gpp/s2b-build.c -> open5gs_2.6.0.tar.xz/tests/non3gpp/s2b-build.c Changed

@@ -240,7 +240,10 @@
     ogs_assert(sess->gnode->sock);
     rv = ogs_gtp2_sockaddr_to_f_teid(
             &sess->gnode->sock->local_addr, NULL, &epdg_s2b_u_teid, &len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp2_sockaddr_to_f_teid() failed");
+        return NULL;
+    }
     rsp->bearer_contexts.s2b_u_epdg_f_teid_8.presence = 1;
     rsp->bearer_contexts.s2b_u_epdg_f_teid_8.data = &epdg_s2b_u_teid;
     rsp->bearer_contexts.s2b_u_epdg_f_teid_8.len = len;
@@ -250,7 +253,10 @@
     smf_s2b_u_teid.interface_type = OGS_GTP2_F_TEID_S2B_U_PGW_GTP_U;
     smf_s2b_u_teid.teid = htobe32(bearer->sgw_s1u_teid);
     rv = ogs_gtp2_ip_to_f_teid(&bearer->sgw_s1u_ip, &smf_s2b_u_teid, &len);
-    ogs_expect_or_return_val(rv == OGS_OK, NULL);
+    if (rv != OGS_OK) {
+        ogs_error("ogs_gtp2_ip_to_f_teid() failed");
+        return NULL;
+    }
     rsp->bearer_contexts.s2b_u_pgw_f_teid.presence = 1;
     rsp->bearer_contexts.s2b_u_pgw_f_teid.data = &smf_s2b_u_teid;
     rsp->bearer_contexts.s2b_u_pgw_f_teid.len = OGS_GTP2_F_TEID_IPV4_LEN;

open5gs_2.5.8.tar.xz/tests/registration/abts-main.c -> open5gs_2.6.0.tar.xz/tests/registration/abts-main.c Changed

open5gs_2.5.8.tar.xz/tests/registration/auth-test.c -> open5gs_2.6.0.tar.xz/tests/registration/auth-test.c Changed

open5gs_2.5.8.tar.xz/tests/registration/crash-test.c -> open5gs_2.6.0.tar.xz/tests/registration/crash-test.c Changed

@@ -48,15 +48,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -412,15 +407,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -778,15 +768,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/registration/dereg-test.c -> open5gs_2.6.0.tar.xz/tests/registration/dereg-test.c Changed

@@ -48,15 +48,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -294,15 +289,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -506,15 +496,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -958,15 +943,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1257,15 +1237,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.6.0.tar.xz/tests/registration/ecc-test.c Added

@@ -0,0 +1,882 @@
+/*
+ * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "test-common.h"
+
+static void test1_func(abts_case *tc, void *data)
+{
+    int rv;
+    ogs_socknode_t *ngap;
+    ogs_socknode_t *gtpu;
+    ogs_pkbuf_t *gmmbuf;
+    ogs_pkbuf_t *gsmbuf;
+    ogs_pkbuf_t *nasbuf;
+    ogs_pkbuf_t *sendbuf;
+    ogs_pkbuf_t *recvbuf;
+    ogs_ngap_message_t message;
+    int i;
+
+    ogs_nas_5gs_mobile_identity_suci_t mobile_identity_suci;
+    test_ue_t *test_ue = NULL;
+    test_sess_t *sess = NULL;
+    test_bearer_t *qos_flow = NULL;
+
+    bson_t *doc = NULL;
+
+    const char *scheme_output =
+        "b2e92f83 6055a255 837debf8 50b52899"
+        "7ce0201c b82adfe4 be1f587d 07d8457d"
+        "7ee4435e 1978dc89 7bff2412 9c";
+
+    /* Setup Test UE & Session Context */
+    memset(&mobile_identity_suci, 0, sizeof(mobile_identity_suci));
+
+    mobile_identity_suci.h.supi_format = OGS_NAS_5GS_SUPI_FORMAT_IMSI;
+    mobile_identity_suci.h.type = OGS_NAS_5GS_MOBILE_IDENTITY_SUCI;
+    mobile_identity_suci.routing_indicator1 = 0;
+    mobile_identity_suci.routing_indicator2 = 0xf;
+    mobile_identity_suci.routing_indicator3 = 0xf;
+    mobile_identity_suci.routing_indicator4 = 0xf;
+    mobile_identity_suci.protection_scheme_id =
+        OGS_PROTECTION_SCHEME_PROFILE_A;
+    mobile_identity_suci.home_network_pki_value = 1;
+
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, scheme_output);
+    ogs_assert(test_ue);
+
+    test_ue->nr_cgi.cell_id = 0x40001;
+
+    test_ue->nas.registration.tsc = 0;
+    test_ue->nas.registration.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
+    test_ue->nas.registration.follow_on_request = 1;
+    test_ue->nas.registration.value = OGS_NAS_5GS_REGISTRATION_TYPE_INITIAL;
+
+    test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
+    test_ue->opc_string = "e8ed289deba952e4283b54e88e6183ca";
+
+    /* gNB connects to AMF */
+    ngap = testngap_client(AF_INET);
+    ABTS_PTR_NOTNULL(tc, ngap);
+
+    /* gNB connects to UPF */
+    gtpu = test_gtpu_server(1, AF_INET);
+    ABTS_PTR_NOTNULL(tc, gtpu);
+
+    /* Send NG-Setup Reqeust */
+    sendbuf = testngap_build_ng_setup_request(0x4000, 22);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive NG-Setup Response */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /********** Insert Subscriber in Database */
+    doc = test_db_new_simple(test_ue);
+    ABTS_PTR_NOTNULL(tc, doc);
+    ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc));
+
+    /* Send Registration request */
+    gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+
+    test_ue->registration_request_param.gmm_capability = 1;
+    test_ue->registration_request_param.s1_ue_network_capability = 1;
+    test_ue->registration_request_param.requested_nssai = 1;
+    test_ue->registration_request_param.last_visited_registered_tai = 1;
+    test_ue->registration_request_param.ue_usage_setting = 1;
+    nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false);
+    ABTS_PTR_NOTNULL(tc, nasbuf);
+
+    sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf,
+                NGAP_RRCEstablishmentCause_mo_Signalling, false, true);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Authentication request */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Authentication response */
+    gmmbuf = testgmm_build_authentication_response(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Security mode command */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Security mode complete */
+    gmmbuf = testgmm_build_security_mode_complete(test_ue, nasbuf);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive InitialContextSetupRequest +
+     * Registration accept */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_InitialContextSetup,
+            test_ue->ngap_procedure_code);
+
+    /* Send UERadioCapabilityInfoIndication */
+    sendbuf = testngap_build_ue_radio_capability_info_indication(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Send InitialContextSetupResponse */
+    sendbuf = testngap_build_initial_context_setup_response(test_ue, false);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Send Registration complete */
+    gmmbuf = testgmm_build_registration_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Configuration update command */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send De-registration request */
+    gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, false);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf,
+                NGAP_RRCEstablishmentCause_mo_Signalling, false, false);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive OLD UEContextReleaseCommand */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_UEContextRelease,
+            test_ue->ngap_procedure_code);
+
+    /* Send OLD UEContextReleaseComplete */
+    sendbuf = testngap_build_ue_context_release_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive UEContextReleaseCommand */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_UEContextRelease,
+            test_ue->ngap_procedure_code);
+
+    /* Send UEContextReleaseComplete */
+    sendbuf = testngap_build_ue_context_release_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    ogs_msleep(300);
+
+    /********** Remove Subscriber in Database */
+    ABTS_INT_EQUAL(tc, OGS_OK, test_db_remove_ue(test_ue));
+
+    /* gNB disonncect from UPF */
+    testgnb_gtpu_close(gtpu);
+
+    /* gNB disonncect from AMF */
+    testgnb_ngap_close(ngap);
+
+    /* Clear Test UE Context */
+    test_ue_remove(test_ue);
+}
+
+static void test2_func(abts_case *tc, void *data)
+{
+    int rv;
+    ogs_socknode_t *ngap;
+    ogs_socknode_t *gtpu;
+    ogs_pkbuf_t *gmmbuf;
+    ogs_pkbuf_t *gsmbuf;
+    ogs_pkbuf_t *nasbuf;
+    ogs_pkbuf_t *sendbuf;
+    ogs_pkbuf_t *recvbuf;
+    ogs_ngap_message_t message;
+    int i;
+
+    ogs_nas_5gs_mobile_identity_suci_t mobile_identity_suci;
+    test_ue_t *test_ue = NULL;
+    test_sess_t *sess = NULL;
+    test_bearer_t *qos_flow = NULL;
+
+    bson_t *doc = NULL;
+
+    const char *scheme_output =
+        "b2e92f83 6055a255 837debf8 50b52899"
+        "7ce0201c b82adfe4 be1f587d 07d8457d"
+        "7ee4435e 1978dc89 7bff2412 9c";
+
+    /* Setup Test UE & Session Context */
+    memset(&mobile_identity_suci, 0, sizeof(mobile_identity_suci));
+
+    mobile_identity_suci.h.supi_format = OGS_NAS_5GS_SUPI_FORMAT_IMSI;
+    mobile_identity_suci.h.type = OGS_NAS_5GS_MOBILE_IDENTITY_SUCI;
+    mobile_identity_suci.routing_indicator1 = 0;
+    mobile_identity_suci.routing_indicator2 = 0xf;
+    mobile_identity_suci.routing_indicator3 = 0xf;
+    mobile_identity_suci.routing_indicator4 = 0xf;
+    mobile_identity_suci.protection_scheme_id =
+        OGS_PROTECTION_SCHEME_PROFILE_A;
+    mobile_identity_suci.home_network_pki_value = 1;
+
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, scheme_output);
+    ogs_assert(test_ue);
+
+    test_ue->nr_cgi.cell_id = 0x40001;
+
+    test_ue->nas.registration.tsc = 0;
+    test_ue->nas.registration.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
+    test_ue->nas.registration.follow_on_request = 1;
+    test_ue->nas.registration.value = OGS_NAS_5GS_REGISTRATION_TYPE_INITIAL;
+
+    test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
+    test_ue->opc_string = "e8ed289deba952e4283b54e88e6183ca";
+
+    /* gNB connects to AMF */
+    ngap = testngap_client(AF_INET);
+    ABTS_PTR_NOTNULL(tc, ngap);
+
+    /* gNB connects to UPF */
+    gtpu = test_gtpu_server(1, AF_INET);
+    ABTS_PTR_NOTNULL(tc, gtpu);
+
+    /* Send NG-Setup Reqeust */
+    sendbuf = testngap_build_ng_setup_request(0x4000, 22);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive NG-Setup Response */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /********** Insert Subscriber in Database */
+    doc = test_db_new_simple(test_ue);
+    ABTS_PTR_NOTNULL(tc, doc);
+    ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc));
+
+    /* Send Registration request */
+    test_ue->registration_request_param.guti = 1;
+    gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+
+    test_ue->registration_request_param.gmm_capability = 1;
+    test_ue->registration_request_param.s1_ue_network_capability = 1;
+    test_ue->registration_request_param.requested_nssai = 1;
+    test_ue->registration_request_param.last_visited_registered_tai = 1;
+    test_ue->registration_request_param.ue_usage_setting = 1;
+    nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false);
+    ABTS_PTR_NOTNULL(tc, nasbuf);
+
+    sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf,
+                NGAP_RRCEstablishmentCause_mo_Signalling, false, true);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Identity request */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Identity response */
+    gmmbuf = testgmm_build_identity_response(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Authentication request */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Authentication response */
+    gmmbuf = testgmm_build_authentication_response(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Security mode command */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Security mode complete */
+    gmmbuf = testgmm_build_security_mode_complete(test_ue, nasbuf);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive InitialContextSetupRequest +
+     * Registration accept */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_InitialContextSetup,
+            test_ue->ngap_procedure_code);
+
+    /* Send UERadioCapabilityInfoIndication */
+    sendbuf = testngap_build_ue_radio_capability_info_indication(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Send InitialContextSetupResponse */
+    sendbuf = testngap_build_initial_context_setup_response(test_ue, false);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Send Registration complete */
+    gmmbuf = testgmm_build_registration_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Configuration update command */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send De-registration request */
+    gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, false);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf,
+                NGAP_RRCEstablishmentCause_mo_Signalling, false, false);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive OLD UEContextReleaseCommand */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_UEContextRelease,
+            test_ue->ngap_procedure_code);
+
+    /* Send OLD UEContextReleaseComplete */
+    sendbuf = testngap_build_ue_context_release_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive UEContextReleaseCommand */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_UEContextRelease,
+            test_ue->ngap_procedure_code);
+
+    /* Send UEContextReleaseComplete */
+    sendbuf = testngap_build_ue_context_release_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    ogs_msleep(300);
+
+    /********** Remove Subscriber in Database */
+    ABTS_INT_EQUAL(tc, OGS_OK, test_db_remove_ue(test_ue));
+
+    /* gNB disonncect from UPF */
+    testgnb_gtpu_close(gtpu);
+
+    /* gNB disonncect from AMF */
+    testgnb_ngap_close(ngap);
+
+    /* Clear Test UE Context */
+    test_ue_remove(test_ue);
+}
+
+static void test3_func(abts_case *tc, void *data)
+{
+    int rv;
+    ogs_socknode_t *ngap;
+    ogs_socknode_t *gtpu;
+    ogs_pkbuf_t *gmmbuf;
+    ogs_pkbuf_t *gsmbuf;
+    ogs_pkbuf_t *nasbuf;
+    ogs_pkbuf_t *sendbuf;
+    ogs_pkbuf_t *recvbuf;
+    ogs_ngap_message_t message;
+    int i;
+
+    ogs_nas_5gs_mobile_identity_suci_t mobile_identity_suci;
+    test_ue_t *test_ue = NULL;
+    test_sess_t *sess = NULL;
+    test_bearer_t *qos_flow = NULL;
+
+    bson_t *doc = NULL;
+
+    const char *scheme_output =
+        "039AAB83 76597021 E855679A 9778EA0B"
+        "67396E68 C66DF32C 0F41E9AC CA2DA9B9" "D1"
+        "cdd22e34 96"
+        "5500e9242e65f58c";
+
+    /* Setup Test UE & Session Context */
+    memset(&mobile_identity_suci, 0, sizeof(mobile_identity_suci));
+
+    mobile_identity_suci.h.supi_format = OGS_NAS_5GS_SUPI_FORMAT_IMSI;
+    mobile_identity_suci.h.type = OGS_NAS_5GS_MOBILE_IDENTITY_SUCI;
+    mobile_identity_suci.routing_indicator1 = 0;
+    mobile_identity_suci.routing_indicator2 = 0xf;
+    mobile_identity_suci.routing_indicator3 = 0xf;
+    mobile_identity_suci.routing_indicator4 = 0xf;
+    mobile_identity_suci.protection_scheme_id =
+        OGS_PROTECTION_SCHEME_PROFILE_B;
+    mobile_identity_suci.home_network_pki_value = 2;
+
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, scheme_output);
+    ogs_assert(test_ue);
+
+    test_ue->nr_cgi.cell_id = 0x40001;
+
+    test_ue->nas.registration.tsc = 0;
+    test_ue->nas.registration.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
+    test_ue->nas.registration.follow_on_request = 1;
+    test_ue->nas.registration.value = OGS_NAS_5GS_REGISTRATION_TYPE_INITIAL;
+
+    test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
+    test_ue->opc_string = "e8ed289deba952e4283b54e88e6183ca";
+
+    /* gNB connects to AMF */
+    ngap = testngap_client(AF_INET);
+    ABTS_PTR_NOTNULL(tc, ngap);
+
+    /* gNB connects to UPF */
+    gtpu = test_gtpu_server(1, AF_INET);
+    ABTS_PTR_NOTNULL(tc, gtpu);
+
+    /* Send NG-Setup Reqeust */
+    sendbuf = testngap_build_ng_setup_request(0x4000, 22);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive NG-Setup Response */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /********** Insert Subscriber in Database */
+    doc = test_db_new_simple(test_ue);
+    ABTS_PTR_NOTNULL(tc, doc);
+    ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc));
+
+    /* Send Registration request */
+    gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+
+    test_ue->registration_request_param.gmm_capability = 1;
+    test_ue->registration_request_param.s1_ue_network_capability = 1;
+    test_ue->registration_request_param.requested_nssai = 1;
+    test_ue->registration_request_param.last_visited_registered_tai = 1;
+    test_ue->registration_request_param.ue_usage_setting = 1;
+    nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false);
+    ABTS_PTR_NOTNULL(tc, nasbuf);
+
+    sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf,
+                NGAP_RRCEstablishmentCause_mo_Signalling, false, true);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Authentication request */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Authentication response */
+    gmmbuf = testgmm_build_authentication_response(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Security mode command */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Security mode complete */
+    gmmbuf = testgmm_build_security_mode_complete(test_ue, nasbuf);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive InitialContextSetupRequest +
+     * Registration accept */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_InitialContextSetup,
+            test_ue->ngap_procedure_code);
+
+    /* Send UERadioCapabilityInfoIndication */
+    sendbuf = testngap_build_ue_radio_capability_info_indication(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Send InitialContextSetupResponse */
+    sendbuf = testngap_build_initial_context_setup_response(test_ue, false);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Send Registration complete */
+    gmmbuf = testgmm_build_registration_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Configuration update command */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send De-registration request */
+    gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, false);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf,
+                NGAP_RRCEstablishmentCause_mo_Signalling, false, false);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive OLD UEContextReleaseCommand */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_UEContextRelease,
+            test_ue->ngap_procedure_code);
+
+    /* Send OLD UEContextReleaseComplete */
+    sendbuf = testngap_build_ue_context_release_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive UEContextReleaseCommand */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_UEContextRelease,
+            test_ue->ngap_procedure_code);
+
+    /* Send UEContextReleaseComplete */
+    sendbuf = testngap_build_ue_context_release_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    ogs_msleep(300);
+
+    /********** Remove Subscriber in Database */
+    ABTS_INT_EQUAL(tc, OGS_OK, test_db_remove_ue(test_ue));
+
+    /* gNB disonncect from UPF */
+    testgnb_gtpu_close(gtpu);
+
+    /* gNB disonncect from AMF */
+    testgnb_ngap_close(ngap);
+
+    /* Clear Test UE Context */
+    test_ue_remove(test_ue);
+}
+
+static void test4_func(abts_case *tc, void *data)
+{
+    int rv;
+    ogs_socknode_t *ngap;
+    ogs_socknode_t *gtpu;
+    ogs_pkbuf_t *gmmbuf;
+    ogs_pkbuf_t *gsmbuf;
+    ogs_pkbuf_t *nasbuf;
+    ogs_pkbuf_t *sendbuf;
+    ogs_pkbuf_t *recvbuf;
+    ogs_ngap_message_t message;
+    int i;
+
+    ogs_nas_5gs_mobile_identity_suci_t mobile_identity_suci;
+    test_ue_t *test_ue = NULL;
+    test_sess_t *sess = NULL;
+    test_bearer_t *qos_flow = NULL;
+
+    bson_t *doc = NULL;
+
+    const char *scheme_output =
+        "039AAB83 76597021 E855679A 9778EA0B"
+        "67396E68 C66DF32C 0F41E9AC CA2DA9B9" "D1"
+        "cdd22e34 96"
+        "5500e9242e65f58c";
+
+    /* Setup Test UE & Session Context */
+    memset(&mobile_identity_suci, 0, sizeof(mobile_identity_suci));
+
+    mobile_identity_suci.h.supi_format = OGS_NAS_5GS_SUPI_FORMAT_IMSI;
+    mobile_identity_suci.h.type = OGS_NAS_5GS_MOBILE_IDENTITY_SUCI;
+    mobile_identity_suci.routing_indicator1 = 0;
+    mobile_identity_suci.routing_indicator2 = 0xf;
+    mobile_identity_suci.routing_indicator3 = 0xf;
+    mobile_identity_suci.routing_indicator4 = 0xf;
+    mobile_identity_suci.protection_scheme_id =
+        OGS_PROTECTION_SCHEME_PROFILE_B;
+    mobile_identity_suci.home_network_pki_value = 2;
+
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, scheme_output);
+    ogs_assert(test_ue);
+
+    test_ue->nr_cgi.cell_id = 0x40001;
+
+    test_ue->nas.registration.tsc = 0;
+    test_ue->nas.registration.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE;
+    test_ue->nas.registration.follow_on_request = 1;
+    test_ue->nas.registration.value = OGS_NAS_5GS_REGISTRATION_TYPE_INITIAL;
+
+    test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc";
+    test_ue->opc_string = "e8ed289deba952e4283b54e88e6183ca";
+
+    /* gNB connects to AMF */
+    ngap = testngap_client(AF_INET);
+    ABTS_PTR_NOTNULL(tc, ngap);
+
+    /* gNB connects to UPF */
+    gtpu = test_gtpu_server(1, AF_INET);
+    ABTS_PTR_NOTNULL(tc, gtpu);
+
+    /* Send NG-Setup Reqeust */
+    sendbuf = testngap_build_ng_setup_request(0x4000, 22);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive NG-Setup Response */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /********** Insert Subscriber in Database */
+    doc = test_db_new_simple(test_ue);
+    ABTS_PTR_NOTNULL(tc, doc);
+    ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc));
+
+    /* Send Registration request */
+    test_ue->registration_request_param.guti = 1;
+    gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+
+    test_ue->registration_request_param.gmm_capability = 1;
+    test_ue->registration_request_param.s1_ue_network_capability = 1;
+    test_ue->registration_request_param.requested_nssai = 1;
+    test_ue->registration_request_param.last_visited_registered_tai = 1;
+    test_ue->registration_request_param.ue_usage_setting = 1;
+    nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false);
+    ABTS_PTR_NOTNULL(tc, nasbuf);
+
+    sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf,
+                NGAP_RRCEstablishmentCause_mo_Signalling, false, true);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Identity request */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Identity response */
+    gmmbuf = testgmm_build_identity_response(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Authentication request */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Authentication response */
+    gmmbuf = testgmm_build_authentication_response(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Security mode command */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send Security mode complete */
+    gmmbuf = testgmm_build_security_mode_complete(test_ue, nasbuf);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive InitialContextSetupRequest +
+     * Registration accept */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_InitialContextSetup,
+            test_ue->ngap_procedure_code);
+
+    /* Send UERadioCapabilityInfoIndication */
+    sendbuf = testngap_build_ue_radio_capability_info_indication(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Send InitialContextSetupResponse */
+    sendbuf = testngap_build_initial_context_setup_response(test_ue, false);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Send Registration complete */
+    gmmbuf = testgmm_build_registration_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive Configuration update command */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+
+    /* Send De-registration request */
+    gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, false);
+    ABTS_PTR_NOTNULL(tc, gmmbuf);
+    sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf,
+                NGAP_RRCEstablishmentCause_mo_Signalling, false, false);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive OLD UEContextReleaseCommand */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_UEContextRelease,
+            test_ue->ngap_procedure_code);
+
+    /* Send OLD UEContextReleaseComplete */
+    sendbuf = testngap_build_ue_context_release_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    /* Receive UEContextReleaseCommand */
+    recvbuf = testgnb_ngap_read(ngap);
+    ABTS_PTR_NOTNULL(tc, recvbuf);
+    testngap_recv(test_ue, recvbuf);
+    ABTS_INT_EQUAL(tc,
+            NGAP_ProcedureCode_id_UEContextRelease,
+            test_ue->ngap_procedure_code);
+
+    /* Send UEContextReleaseComplete */
+    sendbuf = testngap_build_ue_context_release_complete(test_ue);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+
+    ogs_msleep(300);
+
+    /********** Remove Subscriber in Database */
+    ABTS_INT_EQUAL(tc, OGS_OK, test_db_remove_ue(test_ue));
+
+    /* gNB disonncect from UPF */
+    testgnb_gtpu_close(gtpu);
+
+    /* gNB disonncect from AMF */
+    testgnb_ngap_close(ngap);
+
+    /* Clear Test UE Context */
+    test_ue_remove(test_ue);
+}
+
+abts_suite *test_ecc(abts_suite *suite)
+{
+    suite = ADD_SUITE(suite)
+
+    abts_run_test(suite, test1_func, NULL);
+    abts_run_test(suite, test2_func, NULL);
+    abts_run_test(suite, test3_func, NULL);
+    abts_run_test(suite, test4_func, NULL);
+
+    return suite;
+}

open5gs_2.5.8.tar.xz/tests/registration/gmm-status-test.c -> open5gs_2.6.0.tar.xz/tests/registration/gmm-status-test.c Changed

open5gs_2.5.8.tar.xz/tests/registration/guti-test.c -> open5gs_2.6.0.tar.xz/tests/registration/guti-test.c Changed

@@ -48,15 +48,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -528,15 +523,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -990,15 +980,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/registration/identity-test.c -> open5gs_2.6.0.tar.xz/tests/registration/identity-test.c Changed

@@ -48,15 +48,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -315,7 +310,7 @@
 #endif
 
     /* INVALID SUCI */
-    test_ue->mobile_identity_suci.scheme_output0 = 0x99;
+    ((uint8_t *)(test_ue->mobile_identity.buffer))9 = 0x99;
 
     /* Send Identity response */
     gmmbuf = testgmm_build_identity_response(test_ue);

open5gs_2.5.8.tar.xz/tests/registration/idle-test.c -> open5gs_2.6.0.tar.xz/tests/registration/idle-test.c Changed

@@ -48,15 +48,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -444,15 +439,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -692,15 +682,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1050,15 +1035,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1503,15 +1483,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1862,15 +1837,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/registration/meson.build -> open5gs_2.6.0.tar.xz/tests/registration/meson.build Changed

open5gs_2.5.8.tar.xz/tests/registration/multi-ue-test.c -> open5gs_2.6.0.tar.xz/tests/registration/multi-ue-test.c Changed

@@ -61,7 +61,13 @@
     ogs_pkbuf_free(recvbuf);
 
     for (i = 0; i < NUM_OF_TEST_UE; i++) {
-        uint64_t imsi_index;
+        const char *scheme_output = {
+            "0000000001",
+            "0000000002",
+            "0000000003",
+            "0000000004",
+            "0000000005",
+        };
 
         /* Setup Test UE & Session Context */
         memset(&mobile_identity_suci, 0, sizeof(mobile_identity_suci));
@@ -72,18 +78,11 @@
         mobile_identity_suci.routing_indicator2 = 0xf;
         mobile_identity_suci.routing_indicator3 = 0xf;
         mobile_identity_suci.routing_indicator4 = 0xf;
-        mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+        mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
         mobile_identity_suci.home_network_pki_value = 0;
-        mobile_identity_suci.scheme_output0 = 0;
-        mobile_identity_suci.scheme_output1 = 0;
-        mobile_identity_suci.scheme_output2 = 0x20;
-        mobile_identity_suci.scheme_output3 = 0x31;
-        mobile_identity_suci.scheme_output4 = 0x90;
 
-        imsi_index = i + 1;
-        ogs_uint64_to_buffer(imsi_index, 5, mobile_identity_suci.scheme_output);
-
-        test_uei = test_ue_add_by_suci(&mobile_identity_suci, 13);
+        test_uei = test_ue_add_by_suci(
+                &mobile_identity_suci, scheme_outputi);
         ogs_assert(test_uei);
 
         test_uei->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/registration/paging-test.c -> open5gs_2.6.0.tar.xz/tests/registration/paging-test.c Changed

@@ -48,15 +48,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -614,15 +609,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -959,15 +949,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1306,15 +1291,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1568,7 +1548,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -1589,15 +1569,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1968,7 +1943,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -1989,15 +1964,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -2483,15 +2453,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -2877,15 +2842,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/registration/reset-test.c -> open5gs_2.6.0.tar.xz/tests/registration/reset-test.c Changed

@@ -48,15 +48,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -360,15 +355,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -625,15 +615,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/registration/simple-test.c -> open5gs_2.6.0.tar.xz/tests/registration/simple-test.c Changed

open5gs_2.5.8.tar.xz/tests/registration/ue-context-test.c -> open5gs_2.6.0.tar.xz/tests/registration/ue-context-test.c Changed

@@ -48,15 +48,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -209,15 +204,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -509,15 +499,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -957,15 +942,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1332,15 +1312,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/slice/different-dnn-test.c -> open5gs_2.6.0.tar.xz/tests/slice/different-dnn-test.c Changed

open5gs_2.5.8.tar.xz/tests/slice/same-dnn-test.c -> open5gs_2.6.0.tar.xz/tests/slice/same-dnn-test.c Changed

@@ -48,14 +48,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x47;
-    mobile_identity_suci.scheme_output3 = 0x78;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 12);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "00004778");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -353,14 +349,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x47;
-    mobile_identity_suci.scheme_output3 = 0x78;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 12);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "00004778");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/unit/crash-test.c -> open5gs_2.6.0.tar.xz/tests/unit/crash-test.c Changed

@@ -343,12 +343,12 @@
     ogs_s1ap_message_t message;
     ogs_pkbuf_t *enb_pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     enb_pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(enb_pkbuf);
     ogs_pkbuf_put_data(enb_pkbuf, 
-            OGS_HEX(payload, strlen(payload), hexbuf), 38);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 38);
 
     result = ogs_s1ap_decode(&message, enb_pkbuf);
     ABTS_INT_EQUAL(tc, 0, result);
@@ -370,12 +370,12 @@
     ogs_s1ap_message_t message;
     ogs_pkbuf_t *enb_pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     enb_pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(enb_pkbuf);
     ogs_pkbuf_put_data(enb_pkbuf, 
-            OGS_HEX(payload, strlen(payload), hexbuf), 44);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 44);
 
     result = ogs_s1ap_decode(&message, enb_pkbuf);
     ABTS_INT_EQUAL(tc, 0, result);
@@ -396,12 +396,12 @@
     ogs_s1ap_message_t message;
     ogs_pkbuf_t *enb_pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     enb_pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(enb_pkbuf);
     ogs_pkbuf_put_data(enb_pkbuf,
-            OGS_HEX(payload, strlen(payload), hexbuf), 59);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 59);
 
     result = ogs_s1ap_decode(&message, enb_pkbuf);
     ABTS_INT_EQUAL(tc, 0, result);
@@ -420,12 +420,12 @@
     ogs_s1ap_message_t message;
     ogs_pkbuf_t *enb_pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     enb_pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(enb_pkbuf);
     ogs_pkbuf_put_data(enb_pkbuf,
-            OGS_HEX(payload, strlen(payload), hexbuf), 72);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 72);
 
     result = ogs_s1ap_decode(&message, enb_pkbuf);
     ABTS_INT_EQUAL(tc, 0, result);
@@ -587,12 +587,12 @@
 
     ogs_pkbuf_t *s1apbuf = NULL;
     ogs_pkbuf_t *emmbuf = NULL;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     emmbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(emmbuf);
     ogs_pkbuf_put_data(emmbuf,
-            OGS_HEX(nas_payload, strlen(nas_payload), hexbuf), 13);
+            ogs_hex_from_string(nas_payload, hexbuf, sizeof(hexbuf)), 13);
 
     s1apbuf = test_build_uplink_nas_transport(1, 1, emmbuf);
     ABTS_PTR_NOTNULL(tc, s1apbuf);

open5gs_2.5.8.tar.xz/tests/unit/gtp-message-test.c -> open5gs_2.6.0.tar.xz/tests/unit/gtp-message-test.c Changed

@@ -34,7 +34,7 @@
         "005d001f00490001 0005500016004505 0000000000000000 0000000000000000"
         "0000000072000200 40005f0002005400";
     char *_value = NULL;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     ogs_gtp2_create_session_request_t req;
     ogs_gtp2_uli_t uli;
@@ -109,7 +109,8 @@
 
     _value = (char*)"05766f6c7465036e 6732046d6e657406 6d6e63303130066d 6363353535046770 7273";
     req.access_point_name.presence = 1;
-    req.access_point_name.data = OGS_HEX(_value, strlen(_value), apnbuf);
+    req.access_point_name.data =
+        ogs_hex_from_string(_value, apnbuf, sizeof(apnbuf));
     req.access_point_name.len = sizeof(apnbuf);
 
     req.selection_mode.presence = 1;
@@ -183,8 +184,8 @@
             &req, OGS_TLV_MODE_T1_L2_I1);
     ABTS_PTR_NOTNULL(tc, pkbuf);
 
-    ABTS_TRUE(tc, memcmp(pkbuf->data,
-        OGS_HEX(_payload, strlen(_payload), hexbuf), pkbuf->len) == 0);
+    ABTS_TRUE(tc, memcmp(pkbuf->data, ogs_hex_from_string(
+                    _payload, hexbuf, sizeof(hexbuf)), pkbuf->len) == 0);
 
     memset(&req, 0, sizeof(req));
     rv = ogs_tlv_parse_msg(&req, &ogs_gtp2_tlv_desc_create_session_request,
@@ -194,19 +195,19 @@
     ABTS_INT_EQUAL(tc, 1, req.imsi.presence);
     ABTS_INT_EQUAL(tc, 8, req.imsi.len);
     _value = (char*)"55153011 340010f4";
-    ABTS_TRUE(tc, memcmp(OGS_HEX(_value, strlen(_value), hexbuf),
+    ABTS_TRUE(tc, memcmp(ogs_hex_from_string(_value, hexbuf, sizeof(hexbuf)),
                 req.imsi.data, req.imsi.len) == 0);
 
     ABTS_INT_EQUAL(tc, 1, req.msisdn.presence);
     ABTS_INT_EQUAL(tc, 6, req.msisdn.len);
     _value = (char*)"94715276 0041";
-    ABTS_TRUE(tc, memcmp(OGS_HEX(_value, strlen(_value), hexbuf),
+    ABTS_TRUE(tc, memcmp(ogs_hex_from_string(_value, hexbuf, sizeof(hexbuf)),
                 req.msisdn.data, req.msisdn.len) == 0);
 
     ABTS_INT_EQUAL(tc, 1, req.me_identity.presence);
     ABTS_INT_EQUAL(tc, 8, req.me_identity.len);
     _value = (char*)"53612000 91788400";
-    ABTS_TRUE(tc, memcmp(OGS_HEX(_value, strlen(_value), hexbuf),
+    ABTS_TRUE(tc, memcmp(ogs_hex_from_string(_value, hexbuf, sizeof(hexbuf)),
         req.me_identity.data, req.me_identity.len) == 0);
 
     ABTS_INT_EQUAL(tc, 1, req.user_location_information.presence);

open5gs_2.5.8.tar.xz/tests/unit/nas-message-test.c -> open5gs_2.6.0.tar.xz/tests/unit/nas-message-test.c Changed

@@ -32,14 +32,14 @@
     ogs_nas_eps_message_t message;
     ogs_pkbuf_t *pkbuf;
     int rv;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN);
     ogs_pkbuf_trim(pkbuf, 53);
     memcpy(pkbuf->data, 
-            OGS_HEX(payload, strlen(payload), hexbuf), pkbuf->len);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), pkbuf->len);
 
     rv = ogs_nas_emm_decode(&message, pkbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
@@ -81,7 +81,7 @@
     attach_accept->eps_attach_result.result = 
         OGS_NAS_ATTACH_RESULT_COMBINED_EPS_IMSI_ATTACH;
     attach_accept->t3412_value.unit = 
-        OGS_NAS_GRPS_TIMER_UNIT_MULTIPLES_OF_1_MM;
+        OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_1_MM;
     attach_accept->t3412_value.value = 3;
 
     memset(&tai0_list, 0, sizeof(ogs_eps_tai0_list_t));
@@ -94,7 +94,7 @@
 
     attach_accept->esm_message_container.length = sizeof(esm_buffer);
     attach_accept->esm_message_container.buffer = 
-        OGS_HEX(esm_payload, strlen(esm_payload), esm_buffer);
+        ogs_hex_from_string(esm_payload, esm_buffer, sizeof(esm_buffer));
 
     attach_accept->presencemask |= OGS_NAS_EPS_ATTACH_ACCEPT_GUTI_PRESENT;
     attach_accept->guti.length = 11;
@@ -132,7 +132,7 @@
     pkbuf = ogs_nas_eps_plain_encode(&message);
     ABTS_INT_EQUAL(tc, sizeof(buffer), pkbuf->len);
     ogs_log_hexdump(OGS_LOG_DEBUG, pkbuf->data, pkbuf->len);
-    ABTS_TRUE(tc, memcmp(OGS_HEX(payload, strlen(payload), buffer),
+    ABTS_TRUE(tc, memcmp(ogs_hex_from_string(payload, buffer, sizeof(buffer)),
             pkbuf->data, pkbuf->len) == 0);
 
     ogs_pkbuf_free(pkbuf);
@@ -145,14 +145,14 @@
     ogs_nas_eps_message_t message;
     ogs_pkbuf_t *pkbuf;
     int rv;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN);
     ogs_pkbuf_trim(pkbuf, 7);
     memcpy(pkbuf->data, 
-            OGS_HEX(payload, strlen(payload), hexbuf), pkbuf->len);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), pkbuf->len);
 
     rv = ogs_nas_emm_decode(&message, pkbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
@@ -179,7 +179,7 @@
 
     pkbuf = ogs_nas_eps_plain_encode(&message);
     ABTS_INT_EQUAL(tc, sizeof(buffer), pkbuf->len);
-    ABTS_TRUE(tc, memcmp(OGS_HEX(payload, strlen(payload), buffer),
+    ABTS_TRUE(tc, memcmp(ogs_hex_from_string(payload, buffer, sizeof(buffer)),
             pkbuf->data, pkbuf->len) == 0);
 
     ogs_pkbuf_free(pkbuf);
@@ -205,7 +205,7 @@
 {
     /* Identity Request */
     const char *payload = "075501";
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     ogs_nas_eps_message_t message;
     ogs_nas_eps_identity_request_t *identity_request =
@@ -218,7 +218,7 @@
     ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN);
     ogs_pkbuf_trim(pkbuf, 3);
     memcpy(pkbuf->data, 
-            OGS_HEX(payload, strlen(payload), hexbuf), pkbuf->len);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), pkbuf->len);
 
     rv = ogs_nas_emm_decode(&message, pkbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
@@ -272,7 +272,7 @@
 
     pkbuf = ogs_nas_eps_plain_encode(&message);
     ABTS_INT_EQUAL(tc, sizeof(buffer), pkbuf->len);
-    ABTS_TRUE(tc, memcmp(OGS_HEX(payload, strlen(payload), buffer),
+    ABTS_TRUE(tc, memcmp(ogs_hex_from_string(payload, buffer, sizeof(buffer)),
             pkbuf->data, pkbuf->len) == 0);
 
     ogs_pkbuf_free(pkbuf);
@@ -287,7 +287,7 @@
     ogs_nas_eps_message_t message;
     ogs_pkbuf_t *pkbuf;
     int rv;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
     ogs_nas_eps_service_request_t *service_request =
         &message.emm.service_request;
     ogs_nas_ksi_and_sequence_number_t *ksi_and_sequence_number = 
@@ -298,7 +298,7 @@
     ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN);
     ogs_pkbuf_trim(pkbuf, 4);
     memcpy(pkbuf->data, 
-            OGS_HEX(payload, strlen(payload), hexbuf), pkbuf->len);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), pkbuf->len);
 
     /* Decode service request */
     rv = ogs_nas_emm_decode(&message, pkbuf);
@@ -321,12 +321,164 @@
 
     pkbuf = ogs_nas_eps_plain_encode(&message);
     ABTS_INT_EQUAL(tc, sizeof(buffer), pkbuf->len);
-    ABTS_TRUE(tc, memcmp(OGS_HEX(payload, strlen(payload), buffer),
+    ABTS_TRUE(tc, memcmp(ogs_hex_from_string(payload, buffer, sizeof(buffer)),
             pkbuf->data, pkbuf->len) == 0);
 
     ogs_pkbuf_free(pkbuf);
 }
 
+static void ogs_nas_eps_message_test9(abts_case *tc, void *data)
+{
+    ogs_nas_gprs_timer_t gprs_timer;
+    int rv;
+
+    ogs_log_install_domain(&__ogs_nas_domain, "nas", OGS_LOG_FATAL);
+
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 1);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 2);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_2_SS,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 1, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 3);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 4);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_2_SS,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 2, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 63);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 64);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*2-1);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*2);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_1_MM,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 2, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*2+1);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*30);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_1_MM,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 30, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*31);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_UNIT_MULTIPLES_OF_1_MM,
+            gprs_timer.unit);
+    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);
+    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, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_from_sec(&gprs_timer, 60*10*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);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 1);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 2);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_2_SS,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 1, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 3);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 4);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_2_SS,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 2, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 63);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 64);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    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*2);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_MM,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 2, 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);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_MM,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 30, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*31);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_MM,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 31, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*32);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*10*4);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_10_MM,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 4, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*10*4+1);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*10*31);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_10_MM,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 31, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*10*32);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*10*36);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_HH,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 6, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*60*31);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_1_HH,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 31, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*60*32);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*60*40);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_10_HH,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 4, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*60*10*31);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_10_HH,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 31, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*60*10*32);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_320_HH,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 1, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*60*10*32*31);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+    ABTS_INT_EQUAL(tc, OGS_NAS_GPRS_TIMER_3_UNIT_MULTIPLES_OF_320_HH,
+            gprs_timer.unit);
+    ABTS_INT_EQUAL(tc, 31, gprs_timer.value);
+    rv = ogs_nas_gprs_timer_3_from_sec(&gprs_timer, 60*60*10*32*32);
+    ABTS_INT_EQUAL(tc, OGS_ERROR, rv);
+
+    ogs_log_install_domain(&__ogs_nas_domain, "nas", OGS_LOG_ERROR);
+}
+
 abts_suite *test_nas_message(abts_suite *suite)
 {
     suite = ADD_SUITE(suite)
@@ -343,6 +495,7 @@
     abts_run_test(suite, ogs_nas_eps_message_test6, NULL);
     abts_run_test(suite, ogs_nas_eps_message_test7, NULL);
     abts_run_test(suite, ogs_nas_eps_message_test8, NULL);
+    abts_run_test(suite, ogs_nas_eps_message_test9, NULL);
 
     return suite;
 }

open5gs_2.5.8.tar.xz/tests/unit/ngap-message-test.c -> open5gs_2.6.0.tar.xz/tests/unit/ngap-message-test.c Changed

@@ -90,7 +90,7 @@
     ogs_ngap_message_t message;
     ogs_pkbuf_t *pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     ogs_ngap_message_t *struct_ptr = NULL;
     size_t struct_size;
@@ -99,7 +99,7 @@
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-            OGS_HEX(payload, strlen(payload), hexbuf), 23);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 23);
 
     struct_ptr = &message;
     struct_size = sizeof(ogs_ngap_message_t);
@@ -125,7 +125,7 @@
     ogs_ngap_message_t message;
     ogs_pkbuf_t *pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     ogs_ngap_message_t *struct_ptr = NULL;
     size_t struct_size;
@@ -134,7 +134,7 @@
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-            OGS_HEX(payload, strlen(payload), hexbuf), 70);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 70);
 
     struct_ptr = &message;
     struct_size = sizeof(ogs_ngap_message_t);
@@ -160,7 +160,7 @@
     ogs_ngap_message_t message;
     ogs_pkbuf_t *pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     ogs_ngap_message_t *struct_ptr = NULL;
     size_t struct_size;
@@ -169,7 +169,7 @@
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-            OGS_HEX(payload, strlen(payload), hexbuf), 67);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 67);
 
     struct_ptr = &message;
     struct_size = sizeof(ogs_ngap_message_t);

open5gs_2.5.8.tar.xz/tests/unit/s1ap-message-test.c -> open5gs_2.6.0.tar.xz/tests/unit/s1ap-message-test.c Changed

@@ -32,12 +32,12 @@
     ogs_s1ap_message_t message;
     ogs_pkbuf_t *pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-            OGS_HEX(payload, strlen(payload), hexbuf), 49);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 49);
 
     result = ogs_s1ap_decode(&message, pkbuf);
     ABTS_INT_EQUAL(tc, 0, result);
@@ -62,12 +62,12 @@
     ogs_s1ap_message_t message;
     ogs_pkbuf_t *pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-            OGS_HEX(payload, strlen(payload), hexbuf), 115);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 115);
 
     result = ogs_s1ap_decode(&message, pkbuf);
     ABTS_INT_EQUAL(tc, 0, result);
@@ -87,12 +87,12 @@
     ogs_s1ap_message_t message;
     ogs_pkbuf_t *pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-            OGS_HEX(payload, strlen(payload), hexbuf), 41);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 41);
 
     result = ogs_s1ap_decode(&message, pkbuf);
     ABTS_INT_EQUAL(tc, 0, result);
@@ -113,12 +113,12 @@
     ogs_s1ap_message_t message;
     ogs_pkbuf_t *pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-            OGS_HEX(payload, strlen(payload), hexbuf), 128);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 128);
 
     result = ogs_s1ap_decode(&message, pkbuf);
     ABTS_INT_EQUAL(tc, 0, result);
@@ -138,12 +138,12 @@
     ogs_s1ap_message_t message;
     ogs_pkbuf_t *pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-            OGS_HEX(payload, strlen(payload), hexbuf), 78);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 78);
 
     result = ogs_s1ap_decode(&message, pkbuf);
     ABTS_INT_EQUAL(tc, 0, result);
@@ -163,12 +163,12 @@
     ogs_s1ap_message_t message;
     ogs_pkbuf_t *pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-            OGS_HEX(payload, strlen(payload), hexbuf), 78);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 78);
 
     result = ogs_s1ap_decode(&message, pkbuf);
     ABTS_INT_EQUAL(tc, 0, result);
@@ -188,12 +188,12 @@
     ogs_s1ap_message_t message;
     ogs_pkbuf_t *pkbuf;
     int result;
-    char hexbufOGS_MAX_SDU_LEN;
+    char hexbufOGS_HUGE_LEN;
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
     ogs_assert(pkbuf);
     ogs_pkbuf_put_data(pkbuf,
-            OGS_HEX(payload, strlen(payload), hexbuf), 78);
+            ogs_hex_from_string(payload, hexbuf, sizeof(hexbuf)), 78);
 
     result = ogs_s1ap_decode(&message, pkbuf);
     ABTS_INT_EQUAL(tc, 0, result);
@@ -363,7 +363,7 @@
         SecurityKey->size = 32;
         SecurityKey->buf = CALLOC(SecurityKey->size, sizeof(uint8_t));
         SecurityKey->bits_unused = 0;
-        OGS_HEX(kenb_string, strlen(kenb_string), kenb);
+        ogs_hex_from_string(kenb_string, kenb, sizeof(kenb));
         memcpy(SecurityKey->buf, kenb, SecurityKey->size);
     }
 
@@ -520,7 +520,7 @@
         UERadioCapability = &ie->value.choice.UERadioCapability;
 
         ogs_assert(UERadioCapability);
-        OGS_HEX(radio_string, strlen(radio_string), radio);
+        ogs_hex_from_string(radio_string, radio, sizeof(radio));
         ogs_s1ap_buffer_to_OCTET_STRING(
                 radio, TEST8_RADIO_SIZE, UERadioCapability);
     }
@@ -543,7 +543,7 @@
         Masked_IMEISV->size = 8;
         Masked_IMEISV->buf = CALLOC(Masked_IMEISV->size, sizeof(uint8_t));
         Masked_IMEISV->bits_unused = 0;
-        OGS_HEX(masked_string, strlen(masked_string), masked);
+        ogs_hex_from_string(masked_string, masked, sizeof(masked));
         memcpy(Masked_IMEISV->buf, masked, Masked_IMEISV->size);
     }
     {
@@ -739,7 +739,7 @@
         SecurityKey->size = 32;
         SecurityKey->buf = CALLOC(SecurityKey->size, sizeof(uint8_t));
         SecurityKey->bits_unused = 0;
-        OGS_HEX(kenb_string, strlen(kenb_string), kenb);
+        ogs_hex_from_string(kenb_string, kenb, sizeof(kenb));
         memcpy(SecurityKey->buf, kenb, SecurityKey->size);
     }
 
@@ -896,7 +896,7 @@
         UERadioCapability = &ie->value.choice.UERadioCapability;
 
         ogs_assert(UERadioCapability);
-        OGS_HEX(radio_string, strlen(radio_string), radio);
+        ogs_hex_from_string(radio_string, radio, sizeof(radio));
         ogs_s1ap_buffer_to_OCTET_STRING(
                 radio, TEST9_RADIO_SIZE, UERadioCapability);
     }
@@ -919,7 +919,7 @@
         Masked_IMEISV->size = 8;
         Masked_IMEISV->buf = CALLOC(Masked_IMEISV->size, sizeof(uint8_t));
         Masked_IMEISV->bits_unused = 0;
-        OGS_HEX(masked_string, strlen(masked_string), masked);
+        ogs_hex_from_string(masked_string, masked, sizeof(masked));
         memcpy(Masked_IMEISV->buf, masked, Masked_IMEISV->size);
     }
     {
@@ -1115,7 +1115,7 @@
         SecurityKey->size = 32;
         SecurityKey->buf = CALLOC(SecurityKey->size, sizeof(uint8_t));
         SecurityKey->bits_unused = 0;
-        OGS_HEX(kenb_string, strlen(kenb_string), kenb);
+        ogs_hex_from_string(kenb_string, kenb, sizeof(kenb));
         memcpy(SecurityKey->buf, kenb, SecurityKey->size);
     }
 
@@ -1272,7 +1272,7 @@
         UERadioCapability = &ie->value.choice.UERadioCapability;
 
         ogs_assert(UERadioCapability);
-        OGS_HEX(radio_string, strlen(radio_string), radio);
+        ogs_hex_from_string(radio_string, radio, sizeof(radio));
         ogs_s1ap_buffer_to_OCTET_STRING(
                 radio, TEST10_RADIO_SIZE, UERadioCapability);
     }
@@ -1295,7 +1295,7 @@
         Masked_IMEISV->size = 8;
         Masked_IMEISV->buf = CALLOC(Masked_IMEISV->size, sizeof(uint8_t));
         Masked_IMEISV->bits_unused = 0;
-        OGS_HEX(masked_string, strlen(masked_string), masked);
+        ogs_hex_from_string(masked_string, masked, sizeof(masked));
         memcpy(Masked_IMEISV->buf, masked, Masked_IMEISV->size);
     }
     {

open5gs_2.5.8.tar.xz/tests/unit/security-test.c -> open5gs_2.6.0.tar.xz/tests/unit/security-test.c Changed

@@ -52,27 +52,32 @@
 
     uint8_t tmp16;
 
-    milenage_opc(OGS_HEX(_k, strlen(_k), k), 
-            OGS_HEX(_op, strlen(_op), op), opc);
-    ABTS_TRUE(tc, memcmp(opc, OGS_HEX(_opc, strlen(_opc), tmp), 16) == 0);
+    milenage_opc(ogs_hex_from_string(_k, k, sizeof(k)),
+            ogs_hex_from_string(_op, op, sizeof(op)), opc);
+    ABTS_TRUE(tc, memcmp(opc,
+                ogs_hex_from_string(_opc, tmp, sizeof(tmp)), 16) == 0);
 
     milenage_f1(opc, k, 
-        OGS_HEX(_rand, strlen(_rand), rand),
-        OGS_HEX(_sqn, strlen(_sqn), sqn),
-        OGS_HEX(_amf, strlen(_amf), amf),
+        ogs_hex_from_string(_rand, rand, sizeof(rand)),
+        ogs_hex_from_string(_sqn, sqn, sizeof(sqn)),
+        ogs_hex_from_string(_amf, amf, sizeof(amf)),
         mac_a, mac_s);
     ABTS_TRUE(tc, memcmp(mac_a, 
-        OGS_HEX(_mac_a, strlen(_mac_a), tmp), 8) == 0);
+        ogs_hex_from_string(_mac_a, tmp, sizeof(tmp)), 8) == 0);
     ABTS_TRUE(tc, memcmp(mac_s, 
-        OGS_HEX(_mac_s, strlen(_mac_s), tmp), 8) == 0);
+        ogs_hex_from_string(_mac_s, tmp, sizeof(tmp)), 8) == 0);
 
     milenage_f2345(opc, k, rand, res, ck, ik, ak, akstar);
-    ABTS_TRUE(tc, memcmp(res, OGS_HEX(_res, strlen(_res), tmp), 8) == 0);
-    ABTS_TRUE(tc, memcmp(ck, OGS_HEX(_ck, strlen(_ck), tmp), 16) == 0);
-    ABTS_TRUE(tc, memcmp(ik, OGS_HEX(_ik, strlen(_ik), tmp), 16) == 0);
-    ABTS_TRUE(tc, memcmp(ak, OGS_HEX(_ak, strlen(_ak), tmp), 6) == 0);
+    ABTS_TRUE(tc, memcmp(res,
+                ogs_hex_from_string(_res, tmp, sizeof(tmp)), 8) == 0);
+    ABTS_TRUE(tc, memcmp(ck,
+                ogs_hex_from_string(_ck, tmp, sizeof(tmp)), 16) == 0);
+    ABTS_TRUE(tc, memcmp(ik,
+                ogs_hex_from_string(_ik, tmp, sizeof(tmp)), 16) == 0);
+    ABTS_TRUE(tc, memcmp(ak,
+                ogs_hex_from_string(_ak, tmp, sizeof(tmp)), 6) == 0);
     ABTS_TRUE(tc, memcmp(akstar, 
-        OGS_HEX(_akstar, strlen(_akstar), tmp), 6) == 0);
+        ogs_hex_from_string(_akstar, tmp, sizeof(tmp)), 6) == 0);
 }
 
 static void security_test2(abts_case *tc, void *data)
@@ -86,11 +91,12 @@
     uint8_t hmac32;
     uint8_t tmp32;
 
-    ogs_hmac_sha256(OGS_HEX(_key, strlen(_key), key), 4,
-        OGS_HEX(_message, strlen(_message), message), 28,
+    ogs_hmac_sha256(ogs_hex_from_string(_key, key, sizeof(key)), 4,
+        ogs_hex_from_string(_message, message, sizeof(message)), 28,
         hmac, 32);
 
-    ABTS_TRUE(tc, memcmp(hmac, OGS_HEX(_hmac, strlen(_hmac), tmp), 32) == 0);
+    ABTS_TRUE(tc, memcmp(hmac,
+                ogs_hex_from_string(_hmac, tmp, sizeof(tmp)), 32) == 0);
 }
 
 static void security_test3(abts_case *tc, void *data)
@@ -111,15 +117,15 @@
     uint8_t tmp32;
 
     ogs_auc_kasme(
-        OGS_HEX(_ck, strlen(_ck), ck),
-        OGS_HEX(_ik, strlen(_ik), ik),
-        OGS_HEX(_plmn_id, strlen(_plmn_id), plmn_id),
-        OGS_HEX(_sqn, strlen(_sqn), sqn),
-        OGS_HEX(_ak, strlen(_ak), ak),
+        ogs_hex_from_string(_ck, ck, sizeof(ck)),
+        ogs_hex_from_string(_ik, ik, sizeof(ik)),
+        ogs_hex_from_string(_plmn_id, plmn_id, sizeof(plmn_id)),
+        ogs_hex_from_string(_sqn, sqn, sizeof(sqn)),
+        ogs_hex_from_string(_ak, ak, sizeof(ak)),
         kasme);
 
     ABTS_TRUE(tc, 
-        memcmp(kasme, OGS_HEX(_kasme, strlen(_kasme), tmp), 32) == 0);
+        memcmp(kasme, ogs_hex_from_string(_kasme, tmp, sizeof(tmp)), 32) == 0);
 }
 
 static void security_test4(abts_case *tc, void *data)
@@ -136,11 +142,12 @@
     uint8_t mac4;
     ogs_pkbuf_t *pkbuf = NULL;
 
-    snow_3g_f9(OGS_HEX(_ik, strlen(_ik), ik),
+    snow_3g_f9(ogs_hex_from_string(_ik, ik, sizeof(ik)),
         0x38a6f056, ((int64_t)0x1f << 27), 0, 
-        OGS_HEX(_message, strlen(_message), message),
+        ogs_hex_from_string(_message, message, sizeof(message)),
         SECURITY_TEST4_BIT_LEN, mact);
-    ABTS_TRUE(tc, memcmp(mact, OGS_HEX(_mact, strlen(_mact), tmp), 4) == 0);
+    ABTS_TRUE(tc, memcmp(mact,
+                ogs_hex_from_string(_mact, tmp, sizeof(tmp)), 4) == 0);
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_NAS_HEADROOM+SECURITY_TEST4_LEN);
     ogs_assert(pkbuf);
@@ -180,12 +187,12 @@
     ogs_pkbuf_t *pkbuf = NULL;
 
     snow_3g_f8(
-        OGS_HEX(_ck, strlen(_ck), ck),
+        ogs_hex_from_string(_ck, ck, sizeof(ck)),
         0x72a4f20f, 0x0c, 1,
-        OGS_HEX(_plain, strlen(_plain), plain),
+        ogs_hex_from_string(_plain, plain, sizeof(plain)),
         SECURITY_TEST5_BIT_LEN);
     ABTS_TRUE(tc, memcmp(plain, 
-        OGS_HEX(_cipher, strlen(_cipher), tmp),
+        ogs_hex_from_string(_cipher, tmp, sizeof(tmp)),
         SECURITY_TEST5_LEN) == 0);
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_NAS_HEADROOM+SECURITY_TEST5_LEN);
@@ -195,7 +202,8 @@
 
     ogs_nas_encrypt(OGS_NAS_SECURITY_ALGORITHMS_128_EEA1,
         ck, 0x72a4f20f, 0x0c, 1, pkbuf);
-    ABTS_TRUE(tc, memcmp(pkbuf->data, OGS_HEX(_plain, strlen(_plain), tmp),
+    ABTS_TRUE(tc, memcmp(pkbuf->data,
+                ogs_hex_from_string(_plain, tmp, sizeof(tmp)),
         SECURITY_TEST5_LEN) == 0);
     ogs_pkbuf_free(pkbuf);
 }
@@ -222,13 +230,16 @@
     ABTS_PTR_NOTNULL(tc, m);
     memcpy(m, &count, sizeof(uint32_t));
     m4 = ((0x1a << 3) | (1 << 2));
-    memcpy(m+8, OGS_HEX(_message, strlen(_message), message), msg_len);
+    memcpy(m+8,
+            ogs_hex_from_string(_message, message, sizeof(message)), msg_len);
 
-    ogs_aes_cmac_calculate(mact, OGS_HEX(_ik, strlen(_ik), ik), m, m_len);
+    ogs_aes_cmac_calculate(mact,
+            ogs_hex_from_string(_ik, ik, sizeof(ik)), m, m_len);
 
     ogs_free(m);
 
-    ABTS_TRUE(tc, memcmp(mact, OGS_HEX(_mact, strlen(_mact), tmp), 4) == 0);
+    ABTS_TRUE(tc, memcmp(mact,
+                ogs_hex_from_string(_mact, tmp, sizeof(tmp)), 4) == 0);
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_NAS_HEADROOM+SECURITY_TEST6_LEN);
     ogs_assert(pkbuf);
@@ -269,18 +280,19 @@
     ivec4 = (0x0c << 3) | (1 << 2);
 
     ogs_aes_ctr128_encrypt(
-        OGS_HEX(_ck, strlen(_ck), ck), ivec,
-        OGS_HEX(_plain, strlen(_plain), plain), SECURITY_TEST7_LEN,
+        ogs_hex_from_string(_ck, ck, sizeof(ck)), ivec,
+        ogs_hex_from_string(_plain, plain, sizeof(plain)), SECURITY_TEST7_LEN,
         cipher);
 
-    ABTS_TRUE(tc, memcmp(cipher, OGS_HEX(_cipher, strlen(_cipher), tmp),
-        SECURITY_TEST7_LEN) == 0);
+    ABTS_TRUE(tc,
+            memcmp(cipher, ogs_hex_from_string(_cipher, tmp, sizeof(tmp)),
+                        SECURITY_TEST7_LEN) == 0);
 
     memset(ivec, 0, sizeof(ivec));
     memcpy(ivec+0, &count, sizeof(count));
     ivec4 = (0x0c << 3) | (1 << 2);
 
-    ogs_aes_ctr128_encrypt(OGS_HEX(_ck, strlen(_ck), ck),
+    ogs_aes_ctr128_encrypt(ogs_hex_from_string(_ck, ck, sizeof(ck)),
         ivec, cipher, SECURITY_TEST7_LEN, cipher);
 
     ABTS_TRUE(tc, memcmp(cipher, plain, SECURITY_TEST7_LEN) == 0);
@@ -292,8 +304,9 @@
 
     ogs_nas_encrypt(OGS_NAS_SECURITY_ALGORITHMS_128_EEA2,
         ck, 0xc675a64b, 0x0c, 1, pkbuf);
-    ABTS_TRUE(tc, memcmp(pkbuf->data, 
-        OGS_HEX(_cipher, strlen(_cipher), tmp), SECURITY_TEST7_LEN) == 0);
+    ABTS_TRUE(tc,
+            memcmp(pkbuf->data, ogs_hex_from_string(_cipher, tmp, sizeof(tmp)),
+                SECURITY_TEST7_LEN) == 0);
     ogs_pkbuf_free(pkbuf);
 }
 
@@ -315,17 +328,17 @@
     uint8_t mac4;
 
     zuc_eia3(
-        OGS_HEX(_ik, strlen(_ik), ik),
+        ogs_hex_from_string(_ik, ik, sizeof(ik)),
         0xa94059da,
         0xa,
         1,
         SECURITY_TEST8_BIT_LEN,
-        OGS_HEX(_message, strlen(_message), message),
+        ogs_hex_from_string(_message, message, sizeof(message)),
         &mac32);
     mac32 = ntohl(mac32);
 
     ABTS_TRUE(tc, memcmp(&mac32, 
-        OGS_HEX(_mact, strlen(_mact), mact), 4) == 0);
+        ogs_hex_from_string(_mact, mact, sizeof(mact)), 4) == 0);
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_NAS_HEADROOM+SECURITY_TEST8_LEN);
     ogs_assert(pkbuf);
@@ -353,23 +366,23 @@
     uint8_t tmpSECURITY_TEST9_LEN;
     ogs_pkbuf_t *pkbuf = NULL;
 
-    OGS_HEX(_plain, strlen(_plain), plain);
+    ogs_hex_from_string(_plain, plain, sizeof(plain));
     zuc_eea3(
-        OGS_HEX(_ck, strlen(_ck), ck),
+        ogs_hex_from_string(_ck, ck, sizeof(ck)),
         0x66035492, 0xf, 0,
         SECURITY_TEST9_BIT_LEN, plain, plain);
 
-    ABTS_TRUE(tc, memcmp(plain, OGS_HEX(_cipher, strlen(_cipher), tmp),
+    ABTS_TRUE(tc, memcmp(plain, ogs_hex_from_string(_cipher, tmp, sizeof(tmp)),
         SECURITY_TEST9_LEN) == 0);
 
     zuc_eea3(
-        OGS_HEX(_ck, strlen(_ck), ck),
+        ogs_hex_from_string(_ck, ck, sizeof(ck)),
         0x66035492, 0xf, 0,
         SECURITY_TEST9_BIT_LEN, 
-        OGS_HEX(_plain, strlen(_plain), plain),
+        ogs_hex_from_string(_plain, plain, sizeof(plain)),
         cipher);
 
-    ABTS_TRUE(tc, memcmp(cipher, OGS_HEX(_cipher, strlen(_cipher), tmp),
+    ABTS_TRUE(tc, memcmp(cipher, ogs_hex_from_string(_cipher, tmp, sizeof(tmp)),
         SECURITY_TEST9_LEN) == 0);
 
     pkbuf = ogs_pkbuf_alloc(NULL, OGS_NAS_HEADROOM+SECURITY_TEST9_LEN);
@@ -379,8 +392,9 @@
 
     ogs_nas_encrypt(OGS_NAS_SECURITY_ALGORITHMS_128_EEA3,
         ck, 0x66035492, 0xf, 0, pkbuf);
-    ABTS_TRUE(tc, memcmp(pkbuf->data, 
-        OGS_HEX(_cipher, strlen(_cipher), tmp), SECURITY_TEST9_LEN) == 0);
+    ABTS_TRUE(tc,
+        memcmp(pkbuf->data, ogs_hex_from_string(_cipher, tmp, sizeof(tmp)),
+            SECURITY_TEST9_LEN) == 0);
     ogs_pkbuf_free(pkbuf);
 }

open5gs_2.5.8.tar.xz/tests/volte/bearer-test.c -> open5gs_2.6.0.tar.xz/tests/volte/bearer-test.c Changed

open5gs_2.5.8.tar.xz/tests/volte/cx-test.c -> open5gs_2.6.0.tar.xz/tests/volte/cx-test.c Changed

open5gs_2.5.8.tar.xz/tests/volte/diameter-cx-path.c -> open5gs_2.6.0.tar.xz/tests/volte/diameter-cx-path.c Changed

@@ -237,13 +237,28 @@
 
     /* Search the session, retrieve its data */
     ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(new == 0);
+    if (ret != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
+    if (new != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
 
     ret = fd_sess_state_retrieve(test_cx_reg, session, &sess_data);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(sess_data);
-    ogs_expect_or_return((void *)sess_data == data);
+    if (ret != 0) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if (!sess_data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if ((void *)sess_data != data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
 
     test_ue = sess_data->test_ue;
     ogs_assert(test_ue);
@@ -434,8 +449,10 @@
         uint64_t sqn_ms;
         int i;
 
-        OGS_HEX(test_ue->k_string, strlen(test_ue->k_string), test_ue->k);
-        OGS_HEX(test_ue->opc_string, strlen(test_ue->opc_string), test_ue->opc);
+        ogs_hex_from_string(
+                test_ue->k_string, test_ue->k, sizeof(test_ue->k));
+        ogs_hex_from_string(
+                test_ue->opc_string, test_ue->opc, sizeof(test_ue->opc));
 
         milenage_f2345(test_ue->opc, test_ue->k, test_ue->rand,
                 NULL, NULL, NULL, NULL, ak);
@@ -541,13 +558,28 @@
 
     /* Search the session, retrieve its data */
     ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(new == 0);
+    if (ret != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
+    if (new != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
 
     ret = fd_sess_state_retrieve(test_cx_reg, session, &sess_data);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(sess_data);
-    ogs_expect_or_return((void *)sess_data == data);
+    if (ret != 0) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if (!sess_data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if ((void *)sess_data != data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
 
     test_ue = sess_data->test_ue;
     ogs_assert(test_ue);
@@ -809,13 +841,28 @@
 
     /* Search the session, retrieve its data */
     ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(new == 0);
+    if (ret != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
+    if (new != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
 
     ret = fd_sess_state_retrieve(test_cx_reg, session, &sess_data);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(sess_data);
-    ogs_expect_or_return((void *)sess_data == data);
+    if (ret != 0) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if (!sess_data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if ((void *)sess_data != data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
 
     test_ue = sess_data->test_ue;
     ogs_assert(test_ue);
@@ -1038,13 +1085,28 @@
 
     /* Search the session, retrieve its data */
     ret = fd_msg_sess_get(fd_g_config->cnf_dict, *msg, &session, &new);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(new == 0);
+    if (ret != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
+    if (new != 0) {
+        ogs_error("fd_msg_sess_get() failed");
+        return;
+    }
 
     ret = fd_sess_state_retrieve(test_cx_reg, session, &sess_data);
-    ogs_expect_or_return(ret == 0);
-    ogs_expect_or_return(sess_data);
-    ogs_expect_or_return((void *)sess_data == data);
+    if (ret != 0) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if (!sess_data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
+    if ((void *)sess_data != data) {
+        ogs_error("fd_sess_state_retrieve() failed");
+        return;
+    }
 
     test_ue = sess_data->test_ue;
     ogs_assert(test_ue);

open5gs_2.5.8.tar.xz/tests/volte/diameter-rx-path.c -> open5gs_2.6.0.tar.xz/tests/volte/diameter-rx-path.c Changed

open5gs_2.5.8.tar.xz/tests/volte/meson.build -> open5gs_2.6.0.tar.xz/tests/volte/meson.build Changed

open5gs_2.5.8.tar.xz/tests/volte/rx-test.c -> open5gs_2.6.0.tar.xz/tests/volte/rx-test.c Changed

@@ -52,15 +52,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x10;
-    mobile_identity_suci.scheme_output1 = 0x32;
-    mobile_identity_suci.scheme_output2 = 0x54;
-    mobile_identity_suci.scheme_output3 = 0x86;
-    mobile_identity_suci.scheme_output4 = 0x91;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "1032548691");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf;
@@ -567,15 +562,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x10;
-    mobile_identity_suci.scheme_output1 = 0x32;
-    mobile_identity_suci.scheme_output2 = 0x54;
-    mobile_identity_suci.scheme_output3 = 0x86;
-    mobile_identity_suci.scheme_output4 = 0x91;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "1032548691");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf;
@@ -921,15 +911,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x10;
-    mobile_identity_suci.scheme_output1 = 0x32;
-    mobile_identity_suci.scheme_output2 = 0x54;
-    mobile_identity_suci.scheme_output3 = 0x86;
-    mobile_identity_suci.scheme_output4 = 0x91;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "1032548691");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf;
@@ -1271,15 +1256,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x10;
-    mobile_identity_suci.scheme_output1 = 0x32;
-    mobile_identity_suci.scheme_output2 = 0x54;
-    mobile_identity_suci.scheme_output3 = 0x86;
-    mobile_identity_suci.scheme_output4 = 0x91;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "1032548691");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf;
@@ -1800,15 +1780,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x10;
-    mobile_identity_suci.scheme_output1 = 0x32;
-    mobile_identity_suci.scheme_output2 = 0x54;
-    mobile_identity_suci.scheme_output3 = 0x86;
-    mobile_identity_suci.scheme_output4 = 0x91;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "1032548691");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf;
@@ -2306,15 +2281,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x10;
-    mobile_identity_suci.scheme_output1 = 0x32;
-    mobile_identity_suci.scheme_output2 = 0x54;
-    mobile_identity_suci.scheme_output3 = 0x86;
-    mobile_identity_suci.scheme_output4 = 0x91;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "1032548691");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf;
@@ -2731,15 +2701,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0x10;
-    mobile_identity_suci.scheme_output1 = 0x32;
-    mobile_identity_suci.scheme_output2 = 0x54;
-    mobile_identity_suci.scheme_output3 = 0x86;
-    mobile_identity_suci.scheme_output4 = 0x91;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "1032548691");
     ogs_assert(test_ue);
 
     test_ue->e_cgi.cell_id = 0x1079baf;

open5gs_2.5.8.tar.xz/tests/volte/session-test.c -> open5gs_2.6.0.tar.xz/tests/volte/session-test.c Changed

open5gs_2.5.8.tar.xz/tests/volte/simple-test.c -> open5gs_2.6.0.tar.xz/tests/volte/simple-test.c Changed

open5gs_2.5.8.tar.xz/tests/volte/video-test.c -> open5gs_2.6.0.tar.xz/tests/volte/video-test.c Changed

open5gs_2.5.8.tar.xz/tests/vonr/af-test.c -> open5gs_2.6.0.tar.xz/tests/vonr/af-test.c Changed

@@ -33,7 +33,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -57,15 +57,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -718,7 +713,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -742,15 +737,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1198,7 +1188,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -1222,15 +1212,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1658,7 +1643,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -1682,15 +1667,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -2290,7 +2270,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -2314,15 +2294,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -3012,7 +2987,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -3036,15 +3011,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -3554,7 +3524,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -3578,15 +3548,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/vonr/qos-flow-test.c -> open5gs_2.6.0.tar.xz/tests/vonr/qos-flow-test.c Changed

@@ -32,7 +32,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -53,15 +53,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -297,7 +292,7 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     /* For checking qos_flow_identifier == 2 */
     ABTS_TRUE(tc, memcmp(recvbuf->data,
-        OGS_HEX(_gtp_payload, strlen(_gtp_payload), tmp), 20) == 0);
+        ogs_hex_from_string(_gtp_payload, tmp, sizeof(tmp)), 20) == 0);
     ogs_pkbuf_free(recvbuf);
 
     /* Send UEContextReleaseRequest */
@@ -376,7 +371,7 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     /* For checking qos_flow_identifier == 2 */
     ABTS_TRUE(tc, memcmp(recvbuf->data,
-        OGS_HEX(_gtp_payload, strlen(_gtp_payload), tmp), 20) == 0);
+        ogs_hex_from_string(_gtp_payload, tmp, sizeof(tmp)), 20) == 0);
     ogs_pkbuf_free(recvbuf);
 
     /* Send De-registration request */

open5gs_2.5.8.tar.xz/tests/vonr/session-test.c -> open5gs_2.6.0.tar.xz/tests/vonr/session-test.c Changed

@@ -32,7 +32,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -53,15 +53,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -516,7 +511,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -537,15 +532,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -950,7 +940,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -971,15 +961,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1370,7 +1355,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -1391,15 +1376,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -1718,7 +1698,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -1739,15 +1719,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;
@@ -2001,7 +1976,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -2022,15 +1997,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/vonr/simple-test.c -> open5gs_2.6.0.tar.xz/tests/vonr/simple-test.c Changed

@@ -33,7 +33,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -57,15 +57,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/tests/vonr/video-test.c -> open5gs_2.6.0.tar.xz/tests/vonr/video-test.c Changed

@@ -33,7 +33,7 @@
     ogs_ngap_message_t message;
     int i;
 
-    uint8_t tmpOGS_MAX_SDU_LEN;
+    uint8_t tmpOGS_HUGE_LEN;
     char *_gtp_payload = "34ff0024"
         "0000000100000085 010002004500001c 0c0b000040015a7a 0a2d00010a2d0002"
         "00000964cd7c291f";
@@ -57,15 +57,10 @@
     mobile_identity_suci.routing_indicator2 = 0xf;
     mobile_identity_suci.routing_indicator3 = 0xf;
     mobile_identity_suci.routing_indicator4 = 0xf;
-    mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME;
+    mobile_identity_suci.protection_scheme_id = OGS_PROTECTION_SCHEME_NULL;
     mobile_identity_suci.home_network_pki_value = 0;
-    mobile_identity_suci.scheme_output0 = 0;
-    mobile_identity_suci.scheme_output1 = 0;
-    mobile_identity_suci.scheme_output2 = 0x20;
-    mobile_identity_suci.scheme_output3 = 0x31;
-    mobile_identity_suci.scheme_output4 = 0x90;
 
-    test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13);
+    test_ue = test_ue_add_by_suci(&mobile_identity_suci, "0000203190");
     ogs_assert(test_ue);
 
     test_ue->nr_cgi.cell_id = 0x40001;

open5gs_2.5.8.tar.xz/vagrant/freebsd/Vagrantfile -> open5gs_2.6.0.tar.xz/vagrant/freebsd/Vagrantfile Changed

Changes of Revision 13